Revert "Merge pull request #20047 from smoogipoo/multiplayer-auto-skip"

This reverts commit db9970b72a, reversing
changes made to a4dc3fe412.

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.2.3",
+      "version": "2022.1.1",
       "commands": [
         "jb"
       ]

.github/workflows/ci.yml

@@ -1,8 +1,5 @@
 on: [push, pull_request]
 name: Continuous Integration
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   inspect-code:

osu.Android.props

@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.908.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.901.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -5,24 +5,29 @@ using System;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Game;
+using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osuTK;
+using osuTK.Graphics;
 using Squirrel;
 using Squirrel.SimpleSplat;
-using LogLevel = Squirrel.SimpleSplat.LogLevel;
-using UpdateManager = osu.Game.Updater.UpdateManager;
 
 namespace osu.Desktop.Updater
 {
     [SupportedOSPlatform("windows")]
-    public class SquirrelUpdateManager : UpdateManager
+    public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
     {
-        private Squirrel.UpdateManager? updateManager;
+        private UpdateManager? updateManager;
         private INotificationOverlay notificationOverlay = null!;
 
-        public Task PrepareUpdateAsync() => Squirrel.UpdateManager.RestartAppWhenExited();
+        public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
 
         private static readonly Logger logger = Logger.GetLogger("updater");
 
@@ -33,9 +38,6 @@ namespace osu.Desktop.Updater
 
         private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();
 
-        [Resolved]
-        private OsuGameBase game { get; set; } = null!;
-
         [BackgroundDependencyLoader]
         private void load(INotificationOverlay notifications)
         {
@@ -64,14 +66,7 @@ namespace osu.Desktop.Updater
                     if (updatePending)
                     {
                         // the user may have dismissed the completion notice, so show it again.
-                        notificationOverlay.Post(new UpdateApplicationCompleteNotification
-                        {
-                            Activated = () =>
-                            {
-                                restartToApplyUpdate();
-                                return true;
-                            },
-                        });
+                        notificationOverlay.Post(new UpdateCompleteNotification(this));
                         return true;
                     }
 
@@ -83,21 +78,19 @@ namespace osu.Desktop.Updater
 
                 if (notification == null)
                 {
-                    notification = new UpdateProgressNotification
-                    {
-                        CompletionClickAction = restartToApplyUpdate,
-                    };
-
+                    notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active };
                     Schedule(() => notificationOverlay.Post(notification));
                 }
 
-                notification.StartDownload();
+                notification.Progress = 0;
+                notification.Text = @"Downloading update...";
 
                 try
                 {
                     await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
-                    notification.StartInstall();
+                    notification.Progress = 0;
+                    notification.Text = @"Installing update...";
 
                     await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
@@ -117,7 +110,9 @@ namespace osu.Desktop.Updater
                     else
                     {
                         // In the case of an error, a separate notification will be displayed.
-                        notification.FailDownload();
+                        notification.State = ProgressNotificationState.Cancelled;
+                        notification.Close();
+
                         Logger.Error(e, @"update failed!");
                     }
                 }
@@ -139,24 +134,84 @@ namespace osu.Desktop.Updater
             return true;
         }
 
-        private bool restartToApplyUpdate()
-        {
-            PrepareUpdateAsync()
-                .ContinueWith(_ => Schedule(() => game.AttemptExit()));
-            return true;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             updateManager?.Dispose();
         }
 
+        private class UpdateCompleteNotification : ProgressCompletionNotification
+        {
+            [Resolved]
+            private OsuGame game { get; set; } = null!;
+
+            public UpdateCompleteNotification(SquirrelUpdateManager updateManager)
+            {
+                Text = @"Update ready to install. Click to restart!";
+
+                Activated = () =>
+                {
+                    updateManager.PrepareUpdateAsync()
+                                 .ContinueWith(_ => updateManager.Schedule(() => game.AttemptExit()));
+                    return true;
+                };
+            }
+        }
+
+        private class UpdateProgressNotification : ProgressNotification
+        {
+            private readonly SquirrelUpdateManager updateManager;
+
+            public UpdateProgressNotification(SquirrelUpdateManager updateManager)
+            {
+                this.updateManager = updateManager;
+            }
+
+            protected override Notification CreateCompletionNotification()
+            {
+                return new UpdateCompleteNotification(updateManager);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                IconContent.AddRange(new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Icon = FontAwesome.Solid.Upload,
+                        Colour = Color4.White,
+                        Size = new Vector2(20),
+                    }
+                });
+            }
+
+            public override void Close()
+            {
+                // cancelling updates is not currently supported by the underlying updater.
+                // only allow dismissing for now.
+
+                switch (State)
+                {
+                    case ProgressNotificationState.Cancelled:
+                        base.Close();
+                        break;
+                }
+            }
+        }
+
         private class SquirrelLogger : ILogger, IDisposable
         {
-            public LogLevel Level { get; set; } = LogLevel.Info;
+            public Squirrel.SimpleSplat.LogLevel Level { get; set; } = Squirrel.SimpleSplat.LogLevel.Info;
 
-            public void Write(string message, LogLevel logLevel)
+            public void Write(string message, Squirrel.SimpleSplat.LogLevel logLevel)
             {
                 if (logLevel < Level)
                     return;

osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs

@@ -1,43 +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.Framework.Testing;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneCatchTouchInput : OsuTestScene
-    {
-        private CatchTouchInputMapper catchTouchInputMapper = null!;
-
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("create input overlay", () =>
-            {
-                Child = new CatchInputManager(new CatchRuleset().RulesetInfo)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        catchTouchInputMapper = new CatchTouchInputMapper
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre
-                        }
-                    }
-                };
-            });
-        }
-
-        [Test]
-        public void TestBasic()
-        {
-            AddStep("show overlay", () => catchTouchInputMapper.Show());
-        }
-    }
-}

osu.Game.Rulesets.Catch/CatchInputManager.cs

@@ -4,13 +4,11 @@
 #nullable disable
 
 using System.ComponentModel;
-using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Catch
 {
-    [Cached]
     public class CatchInputManager : RulesetInputManager<CatchAction>
     {
         public CatchInputManager(RulesetInfo ruleset)

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using osu.Framework.Extensions.EnumExtensions;
@@ -31,7 +33,7 @@ namespace osu.Game.Rulesets.Catch
 {
     public class CatchRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
 

osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs

@@ -1,277 +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.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Catch.UI
-{
-    public class CatchTouchInputMapper : VisibilityContainer
-    {
-        public override bool PropagatePositionalInputSubTree => true;
-        public override bool PropagateNonPositionalInputSubTree => true;
-
-        private readonly Dictionary<object, TouchCatchAction> trackedActionSources = new Dictionary<object, TouchCatchAction>();
-
-        private KeyBindingContainer<CatchAction> keyBindingContainer = null!;
-
-        private Container mainContent = null!;
-
-        private InputArea leftBox = null!;
-        private InputArea rightBox = null!;
-        private InputArea leftDashBox = null!;
-        private InputArea rightDashBox = null!;
-
-        [BackgroundDependencyLoader]
-        private void load(CatchInputManager catchInputManager, OsuColour colours)
-        {
-            const float width = 0.15f;
-
-            keyBindingContainer = catchInputManager.KeyBindingContainer;
-
-            RelativeSizeAxes = Axes.Both;
-
-            Children = new Drawable[]
-            {
-                mainContent = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Width = width,
-                            Children = new Drawable[]
-                            {
-                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, trackedActionSources)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 0.5f,
-                                },
-                                leftBox = new InputArea(TouchCatchAction.MoveLeft, trackedActionSources)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 0.5f,
-                                    Colour = colours.Gray9,
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                },
-                            }
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Width = width,
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            Children = new Drawable[]
-                            {
-                                rightBox = new InputArea(TouchCatchAction.MoveRight, trackedActionSources)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 0.5f,
-                                    Colour = colours.Gray9,
-                                },
-                                rightDashBox = new InputArea(TouchCatchAction.DashRight, trackedActionSources)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 0.5f,
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                },
-                            }
-                        },
-                    },
-                },
-            };
-        }
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            // Hide whenever the keyboard is used.
-            Hide();
-            return false;
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            return updateAction(e.Button, getTouchCatchActionFromInput(e.ScreenSpaceMousePosition));
-        }
-
-        protected override bool OnTouchDown(TouchDownEvent e)
-        {
-            return updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            Show();
-
-            TouchCatchAction? action = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
-
-            // multiple mouse buttons may be pressed and handling the same action.
-            foreach (MouseButton button in e.PressedButtons)
-                updateAction(button, action);
-
-            return false;
-        }
-
-        protected override void OnTouchMove(TouchMoveEvent e)
-        {
-            updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
-            base.OnTouchMove(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            updateAction(e.Button, null);
-            base.OnMouseUp(e);
-        }
-
-        protected override void OnTouchUp(TouchUpEvent e)
-        {
-            updateAction(e.Touch.Source, null);
-            base.OnTouchUp(e);
-        }
-
-        private bool updateAction(object source, TouchCatchAction? newAction)
-        {
-            TouchCatchAction? actionBefore = null;
-
-            if (trackedActionSources.TryGetValue(source, out TouchCatchAction found))
-                actionBefore = found;
-
-            if (actionBefore != newAction)
-            {
-                if (newAction != null)
-                    trackedActionSources[source] = newAction.Value;
-                else
-                    trackedActionSources.Remove(source);
-
-                updatePressedActions();
-            }
-
-            return newAction != null;
-        }
-
-        private void updatePressedActions()
-        {
-            Show();
-
-            if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft))
-                keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.MoveLeft);
-
-            if (trackedActionSources.ContainsValue(TouchCatchAction.DashRight) || trackedActionSources.ContainsValue(TouchCatchAction.MoveRight))
-                keyBindingContainer.TriggerPressed(CatchAction.MoveRight);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.MoveRight);
-
-            if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.DashRight))
-                keyBindingContainer.TriggerPressed(CatchAction.Dash);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.Dash);
-        }
-
-        private TouchCatchAction? getTouchCatchActionFromInput(Vector2 screenSpaceInputPosition)
-        {
-            if (leftDashBox.Contains(screenSpaceInputPosition))
-                return TouchCatchAction.DashLeft;
-            if (rightDashBox.Contains(screenSpaceInputPosition))
-                return TouchCatchAction.DashRight;
-            if (leftBox.Contains(screenSpaceInputPosition))
-                return TouchCatchAction.MoveLeft;
-            if (rightBox.Contains(screenSpaceInputPosition))
-                return TouchCatchAction.MoveRight;
-
-            return null;
-        }
-
-        protected override void PopIn() => mainContent.FadeIn(300, Easing.OutQuint);
-
-        protected override void PopOut() => mainContent.FadeOut(300, Easing.OutQuint);
-
-        private class InputArea : CompositeDrawable, IKeyBindingHandler<CatchAction>
-        {
-            private readonly TouchCatchAction handledAction;
-
-            private readonly Box highlightOverlay;
-
-            private readonly IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions;
-
-            private bool isHighlighted;
-
-            public InputArea(TouchCatchAction handledAction, IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions)
-            {
-                this.handledAction = handledAction;
-                this.trackedActions = trackedActions;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        CornerRadius = 10,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.15f,
-                            },
-                            highlightOverlay = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                Blending = BlendingParameters.Additive,
-                            }
-                        }
-                    }
-                };
-            }
-
-            public bool OnPressed(KeyBindingPressEvent<CatchAction> _)
-            {
-                updateHighlight();
-                return false;
-            }
-
-            public void OnReleased(KeyBindingReleaseEvent<CatchAction> _)
-            {
-                updateHighlight();
-            }
-
-            private void updateHighlight()
-            {
-                bool isHandling = trackedActions.Any(a => a.Value == handledAction);
-
-                if (isHandling == isHighlighted)
-                    return;
-
-                isHighlighted = isHandling;
-                highlightOverlay.FadeTo(isHighlighted ? 0.1f : 0, isHighlighted ? 80 : 400, Easing.OutQuint);
-            }
-        }
-
-        public enum TouchCatchAction
-        {
-            MoveLeft,
-            MoveRight,
-            DashLeft,
-            DashRight,
-        }
-    }
-}

osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -33,12 +32,6 @@ namespace osu.Game.Rulesets.Catch.UI
             TimeRange.Value = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            KeyBindingInputManager.Add(new CatchTouchInputMapper());
-        }
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
         protected override ReplayRecorder CreateReplayRecorder(Score score) => new CatchReplayRecorder(score, (CatchPlayfield)Playfield);

osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
@@ -11,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 {
     public class ManiaRulesetConfigManager : RulesetConfigManager<ManiaRulesetSetting>
     {
-        public ManiaRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
+        public ManiaRulesetConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
         {
         }
@@ -31,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
                 scrollTime => new SettingDescription(
                     rawValue: scrollTime,
                     name: "Scroll Speed",
-                    value: $"{scrollTime}ms (speed {(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime)})"
+                    value: $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime)} ({scrollTime}ms)"
                 )
             )
         };

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         private readonly bool isForCurrentRuleset;
         private readonly double originalOverallDifficulty;
 
-        public override int Version => 20220902;
+        public override int Version => 20220701;
 
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,7 +48,7 @@ namespace osu.Game.Rulesets.Mania
         /// </summary>
         public const int MAX_STAGE_KEYS = 10;
 
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
@@ -283,7 +285,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
-        public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
+        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
 
         public override RulesetSettingsSubsection CreateSettings() => new ManiaSettingsSubsection(this);
 

osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs

@@ -1,7 +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;
+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Mania
                     LabelText = "Scrolling direction",
                     Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
-                new SettingsSlider<double, ManiaScrollSlider>
+                new SettingsSlider<double, TimeSlider>
                 {
                     LabelText = "Scroll speed",
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
@@ -46,10 +47,5 @@ namespace osu.Game.Rulesets.Mania
                 }
             };
         }
-
-        private class ManiaScrollSlider : OsuSliderBar<double>
-        {
-            public override LocalisableString TooltipText => $"{Current.Value}ms (speed {(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value)})";
-        }
     }
 }

osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private const double difficulty_multiplier = 0.0675;
         private double hitWindowGreat;
 
-        public override int Version => 20220902;
+        public override int Version => 20220701;
 
         public OsuDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs

@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -54,9 +53,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
 
-        [UsedImplicitly]
-        private readonly IBindable<int> sliderVersion;
-
         public PathControlPointPiece(Slider slider, PathControlPoint controlPoint)
         {
             this.slider = slider;
@@ -65,8 +61,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             // we don't want to run the path type update on construction as it may inadvertently change the slider.
             cachePoints(slider);
 
-            sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ =>
+            slider.Path.Version.BindValueChanged(_ =>
             {
                 cachePoints(slider);
                 updatePathType();

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs

@@ -89,10 +89,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
                     HitObject.DifficultyControlPoint = nearestDifficultyPoint ?? new DifficultyControlPoint();
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
-
-                    // Replacing the DifficultyControlPoint above doesn't trigger any kind of invalidation.
-                    // Without re-applying defaults, velocity won't be updated.
-                    ApplyDefaultsToHitObject();
                     break;
 
                 case SliderPlacementState.Body:

osu.Game.Rulesets.Osu/Mods/OsuModRandom.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.Localisation;
 using osu.Framework.Utils;
@@ -10,7 +9,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Osu.Utils;
 
@@ -27,100 +25,40 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
 
-        private Random random = null!;
+        private Random? rng;
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
-            if (beatmap is not OsuBeatmap osuBeatmap)
+            if (!(beatmap is OsuBeatmap osuBeatmap))
                 return;
 
             Seed.Value ??= RNG.Next();
 
-            random = new Random((int)Seed.Value);
+            rng = new Random((int)Seed.Value);
 
             var positionInfos = OsuHitObjectGenerationUtils.GeneratePositionInfos(osuBeatmap.HitObjects);
 
-            // Offsets the angles of all hit objects in a "section" by the same amount.
-            float sectionOffset = 0;
+            float rateOfChangeMultiplier = 0;
 
-            // Whether the angles are positive or negative (clockwise or counter-clockwise flow).
-            bool flowDirection = false;
-
-            for (int i = 0; i < positionInfos.Count; i++)
+            foreach (var positionInfo in positionInfos)
             {
-                if (shouldStartNewSection(osuBeatmap, positionInfos, i))
-                {
-                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.0008f);
-                    flowDirection = !flowDirection;
-                }
+                // rateOfChangeMultiplier only changes every 5 iterations in a combo
+                // to prevent shaky-line-shaped streams
+                if (positionInfo.HitObject.IndexInCurrentCombo % 5 == 0)
+                    rateOfChangeMultiplier = (float)rng.NextDouble() * 2 - 1;
 
-                if (i == 0)
+                if (positionInfo == positionInfos.First())
                 {
-                    positionInfos[i].DistanceFromPrevious = (float)(random.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
-                    positionInfos[i].RelativeAngle = (float)(random.NextDouble() * 2 * Math.PI - Math.PI);
+                    positionInfo.DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
+                    positionInfo.RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
                 }
                 else
                 {
-                    // Offsets only the angle of the current hit object if a flow change occurs.
-                    float flowChangeOffset = 0;
-
-                    // Offsets only the angle of the current hit object.
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
-
-                    if (shouldApplyFlowChange(positionInfos, i))
-                    {
-                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
-                        flowDirection = !flowDirection;
-                    }
-
-                    float totalOffset =
-                        // sectionOffset and oneTimeOffset should mainly affect patterns with large spacing.
-                        (sectionOffset + oneTimeOffset) * positionInfos[i].DistanceFromPrevious +
-                        // flowChangeOffset should mainly affect streams.
-                        flowChangeOffset * (playfield_diagonal - positionInfos[i].DistanceFromPrevious);
-
-                    positionInfos[i].RelativeAngle = getRelativeTargetAngle(positionInfos[i].DistanceFromPrevious, totalOffset, flowDirection);
+                    positionInfo.RelativeAngle = rateOfChangeMultiplier * 2 * (float)Math.PI * Math.Min(1f, positionInfo.DistanceFromPrevious / (playfield_diagonal * 0.5f));
                 }
             }
 
             osuBeatmap.HitObjects = OsuHitObjectGenerationUtils.RepositionHitObjects(positionInfos);
         }
-
-        /// <param name="targetDistance">The target distance between the previous and the current <see cref="OsuHitObject"/>.</param>
-        /// <param name="offset">The angle (in rad) by which the target angle should be offset.</param>
-        /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
-        private static float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
-        {
-            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310))) + 0.5 + offset);
-            float relativeAngle = (float)Math.PI - angle;
-            return flowDirection ? -relativeAngle : relativeAngle;
-        }
-
-        /// <returns>Whether a new section should be started at the current <see cref="OsuHitObject"/>.</returns>
-        private bool shouldStartNewSection(OsuBeatmap beatmap, IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
-        {
-            if (i == 0)
-                return true;
-
-            // Exclude new-combo-spam and 1-2-combos.
-            bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
-                                              positionInfos[i - 1].HitObject.NewCombo;
-            bool previousObjectWasOnDownbeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true);
-            bool previousObjectWasOnBeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject);
-
-            return (previousObjectStartedCombo && random.NextDouble() < 0.6f) ||
-                   previousObjectWasOnDownbeat ||
-                   (previousObjectWasOnBeat && random.NextDouble() < 0.4f);
-        }
-
-        /// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns>
-        private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
-        {
-            // Exclude new-combo-spam and 1-2-combos.
-            bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
-                                              positionInfos[i - 1].HitObject.NewCombo;
-
-            return previousObjectStartedCombo && random.NextDouble() < 0.6f;
-        }
     }
 }

osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs

@@ -362,12 +362,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             return breaks.Any(breakPeriod =>
             {
-                OsuHitObject? firstObjAfterBreak = originalHitObjects.FirstOrDefault(obj => almostBigger(obj.StartTime, breakPeriod.EndTime));
+                var firstObjAfterBreak = originalHitObjects.First(obj => almostBigger(obj.StartTime, breakPeriod.EndTime));
 
                 return almostBigger(time, breakPeriod.StartTime)
-                       // There should never really be a break section with no objects after it, but we've seen crashes from users with malformed beatmaps,
-                       // so it's best to guard against this.
-                       && (firstObjAfterBreak == null || definitelyBigger(firstObjAfterBreak.StartTime, time));
+                       && definitelyBigger(firstObjAfterBreak.StartTime, time);
             });
         }
 

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,7 +44,7 @@ namespace osu.Game.Rulesets.Osu
 {
     public class OsuRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
@@ -237,7 +239,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
-        public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
+        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
         protected override IEnumerable<HitResult> GetValidHitResults()
         {

osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs

@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
+            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
         }
 
         private void resetState(DrawableHitObject obj)

osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
@@ -187,39 +186,5 @@ namespace osu.Game.Rulesets.Osu.Utils
                 length * MathF.Sin(angle)
             );
         }
-
-        /// <param name="beatmap">The beatmap hitObject is a part of.</param>
-        /// <param name="hitObject">The <see cref="OsuHitObject"/> that should be checked.</param>
-        /// <param name="downbeatsOnly">If true, this method only returns true if hitObject is on a downbeat.
-        /// If false, it returns true if hitObject is on any beat.</param>
-        /// <returns>true if hitObject is on a (down-)beat, false otherwise.</returns>
-        public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
-        {
-            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-
-            double timeSinceTimingPoint = hitObject.StartTime - timingPoint.Time;
-
-            double beatLength = timingPoint.BeatLength;
-
-            if (downbeatsOnly)
-                beatLength *= timingPoint.TimeSignature.Numerator;
-
-            // Ensure within 1ms of expected location.
-            return Math.Abs(timeSinceTimingPoint + 1) % beatLength < 2;
-        }
-
-        /// <summary>
-        /// Generates a random number from a normal distribution using the Box-Muller transform.
-        /// </summary>
-        public static float RandomGaussian(Random rng, float mean = 0, float stdDev = 1)
-        {
-            // Generate 2 random numbers in the interval (0,1].
-            // x1 must not be 0 since log(0) = undefined.
-            double x1 = 1 - rng.NextDouble();
-            double x2 = 1 - rng.NextDouble();
-
-            double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(2 * Math.PI * x2);
-            return mean + stdDev * (float)stdNormal;
-        }
     }
 }

osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs

@@ -1,96 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Extensions.TypeExtensions;
-using osu.Framework.Screens;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Taiko.Tests.Judgements
-{
-    public class JudgementTest : RateAdjustedBeatmapTestScene
-    {
-        private ScoreAccessibleReplayPlayer currentPlayer = null!;
-        protected List<JudgementResult> JudgementResults { get; private set; } = null!;
-
-        protected void AssertJudgementCount(int count)
-        {
-            AddAssert($"{count} judgement{(count > 0 ? "s" : "")}", () => JudgementResults, () => Has.Count.EqualTo(count));
-        }
-
-        protected void AssertResult<T>(int index, HitResult expectedResult)
-        {
-            AddAssert($"{typeof(T).ReadableName()} ({index}) judged as {expectedResult}",
-                () => JudgementResults.Where(j => j.HitObject is T).OrderBy(j => j.HitObject.StartTime).ElementAt(index).Type,
-                () => Is.EqualTo(expectedResult));
-        }
-
-        protected void PerformTest(List<ReplayFrame> frames, Beatmap<TaikoHitObject>? beatmap = null)
-        {
-            AddStep("load player", () =>
-            {
-                Beatmap.Value = CreateWorkingBeatmap(beatmap);
-
-                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
-
-                p.OnLoadComplete += _ =>
-                {
-                    p.ScoreProcessor.NewJudgement += result =>
-                    {
-                        if (currentPlayer == p) JudgementResults.Add(result);
-                    };
-                };
-
-                LoadScreen(currentPlayer = p);
-                JudgementResults = new List<JudgementResult>();
-            });
-
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
-            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
-        }
-
-        protected Beatmap<TaikoHitObject> CreateBeatmap(params TaikoHitObject[] hitObjects)
-        {
-            var beatmap = new Beatmap<TaikoHitObject>
-            {
-                HitObjects = hitObjects.ToList(),
-                BeatmapInfo =
-                {
-                    Difficulty = new BeatmapDifficulty { SliderTickRate = 4 },
-                    Ruleset = new TaikoRuleset().RulesetInfo
-                },
-            };
-
-            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
-            return beatmap;
-        }
-
-        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,
-                })
-            {
-            }
-        }
-    }
-}

osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs

@@ -1,201 +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.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Replays;
-
-namespace osu.Game.Rulesets.Taiko.Tests.Judgements
-{
-    public class TestSceneDrumRollJudgements : JudgementTest
-    {
-        [Test]
-        public void TestHitAllDrumRoll()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(1001),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
-
-            AssertJudgementCount(3);
-            AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitSomeDrumRoll()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
-
-            AssertJudgementCount(3);
-            AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitNoneDrumRoll()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
-
-            AssertJudgementCount(3);
-            AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
-            AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitAllStrongDrumRollWithOneKey()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(1001),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(6);
-
-            AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
-
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitSomeStrongDrumRollWithOneKey()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(6);
-
-            AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
-            AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
-
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitAllStrongDrumRollWithBothKeys()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(1000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
-                new TaikoReplayFrame(1001),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(6);
-
-            AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
-
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
-        }
-
-        [Test]
-        public void TestHitSomeStrongDrumRollWithBothKeys()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
-                new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(6);
-
-            AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
-            AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
-
-            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
-        }
-    }
-}

osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs

@@ -1,133 +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.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Replays;
-
-namespace osu.Game.Rulesets.Taiko.Tests.Judgements
-{
-    public class TestSceneHitJudgements : JudgementTest
-    {
-        [Test]
-        public void TestHitCentreHit()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(hit_time, TaikoAction.LeftCentre),
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Centre,
-                StartTime = hit_time
-            }));
-
-            AssertJudgementCount(1);
-            AssertResult<Hit>(0, HitResult.Great);
-        }
-
-        [Test]
-        public void TestHitRimHit()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(hit_time, TaikoAction.LeftRim),
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Rim,
-                StartTime = hit_time
-            }));
-
-            AssertJudgementCount(1);
-            AssertResult<Hit>(0, HitResult.Great);
-        }
-
-        [Test]
-        public void TestMissHit()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0)
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Centre,
-                StartTime = hit_time
-            }));
-
-            AssertJudgementCount(1);
-            AssertResult<Hit>(0, HitResult.Miss);
-        }
-
-        [Test]
-        public void TestHitStrongHitWithOneKey()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(hit_time, TaikoAction.LeftCentre),
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Centre,
-                StartTime = hit_time,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(2);
-            AssertResult<Hit>(0, HitResult.Great);
-            AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
-        }
-
-        [Test]
-        public void TestHitStrongHitWithBothKeys()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(hit_time, TaikoAction.LeftCentre, TaikoAction.RightCentre),
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Centre,
-                StartTime = hit_time,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(2);
-            AssertResult<Hit>(0, HitResult.Great);
-            AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
-        }
-
-        [Test]
-        public void TestMissStrongHit()
-        {
-            const double hit_time = 1000;
-
-            PerformTest(new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-            }, CreateBeatmap(new Hit
-            {
-                Type = HitType.Centre,
-                StartTime = hit_time,
-                IsStrong = true
-            }));
-
-            AssertJudgementCount(2);
-            AssertResult<Hit>(0, HitResult.Miss);
-            AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
-        }
-    }
-}

osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs

@@ -1,118 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Replays;
-
-namespace osu.Game.Rulesets.Taiko.Tests.Judgements
-{
-    public class TestSceneSwellJudgements : JudgementTest
-    {
-        [Test]
-        public void TestHitAllSwell()
-        {
-            const double hit_time = 1000;
-
-            Swell swell = new Swell
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                RequiredHits = 10
-            };
-
-            List<ReplayFrame> frames = new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2001),
-            };
-
-            for (int i = 0; i < swell.RequiredHits; i++)
-            {
-                double frameTime = 1000 + i * 50;
-                frames.Add(new TaikoReplayFrame(frameTime, i % 2 == 0 ? TaikoAction.LeftCentre : TaikoAction.LeftRim));
-                frames.Add(new TaikoReplayFrame(frameTime + 10));
-            }
-
-            PerformTest(frames, CreateBeatmap(swell));
-
-            AssertJudgementCount(11);
-
-            for (int i = 0; i < swell.RequiredHits; i++)
-                AssertResult<SwellTick>(i, HitResult.IgnoreHit);
-
-            AssertResult<Swell>(0, HitResult.LargeBonus);
-        }
-
-        [Test]
-        public void TestHitSomeSwell()
-        {
-            const double hit_time = 1000;
-
-            Swell swell = new Swell
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                RequiredHits = 10
-            };
-
-            List<ReplayFrame> frames = new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2001),
-            };
-
-            for (int i = 0; i < swell.RequiredHits / 2; i++)
-            {
-                double frameTime = 1000 + i * 50;
-                frames.Add(new TaikoReplayFrame(frameTime, i % 2 == 0 ? TaikoAction.LeftCentre : TaikoAction.LeftRim));
-                frames.Add(new TaikoReplayFrame(frameTime + 10));
-            }
-
-            PerformTest(frames, CreateBeatmap(swell));
-
-            AssertJudgementCount(11);
-
-            for (int i = 0; i < swell.RequiredHits / 2; i++)
-                AssertResult<SwellTick>(i, HitResult.IgnoreHit);
-            for (int i = swell.RequiredHits / 2; i < swell.RequiredHits; i++)
-                AssertResult<SwellTick>(i, HitResult.IgnoreMiss);
-
-            AssertResult<Swell>(0, HitResult.IgnoreMiss);
-        }
-
-        [Test]
-        public void TestHitNoneSwell()
-        {
-            const double hit_time = 1000;
-
-            Swell swell = new Swell
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                RequiredHits = 10
-            };
-
-            List<ReplayFrame> frames = new List<ReplayFrame>
-            {
-                new TaikoReplayFrame(0),
-                new TaikoReplayFrame(2001),
-            };
-
-            PerformTest(frames, CreateBeatmap(swell));
-
-            AssertJudgementCount(11);
-
-            for (int i = 0; i < swell.RequiredHits; i++)
-                AssertResult<SwellTick>(i, HitResult.IgnoreMiss);
-
-            AssertResult<Swell>(0, HitResult.IgnoreMiss);
-
-            AddAssert("all tick offsets are 0", () => JudgementResults.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
-        }
-    }
-}

osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs

@@ -25,11 +25,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestDrumRoll(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new DrumRoll { StartTime = 1000, EndTime = 3000 }, false), shouldMiss);
+        public void TestDrumRoll(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new DrumRoll { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Swell { StartTime = 1000, EndTime = 3000 }, false), shouldMiss);
+        public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
         private class TestTaikoRuleset : TaikoRuleset
         {

osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs

@@ -112,6 +112,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss }, TaikoMascotAnimationState.Fail);
+            assertStateAfterResult(new JudgementResult(new DrumRoll(), new TaikoDrumRollJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok }, TaikoMascotAnimationState.Idle);
         }
 

osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollJudgements.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.
+
+#nullable disable
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneDrumRollJudgements : TestSceneTaikoPlayer
+    {
+        [Test]
+        public void TestStrongDrumRollFullyJudgedOnKilled()
+        {
+            AddUntilStep("gameplay finished", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddAssert("all judgements are misses", () => Player.Results.All(r => r.Type == r.Judgement.MinResult));
+        }
+
+        protected override bool Autoplay => false;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap<TaikoHitObject>
+        {
+            BeatmapInfo = { Ruleset = new TaikoRuleset().RulesetInfo },
+            HitObjects =
+            {
+                new DrumRoll
+                {
+                    StartTime = 1000,
+                    Duration = 1000,
+                    IsStrong = true
+                }
+            }
+        };
+    }
+}

osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs

@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneSwellJudgements : TestSceneTaikoPlayer
+    {
+        [Test]
+        public void TestZeroTickTimeOffsets()
+        {
+            AddUntilStep("gameplay finished", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddAssert("all tick offsets are 0", () => Player.Results.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
+        }
+
+        protected override bool Autoplay => true;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap<TaikoHitObject>
+            {
+                BeatmapInfo = { Ruleset = new TaikoRuleset().RulesetInfo },
+                HitObjects =
+                {
+                    new Swell
+                    {
+                        StartTime = 1000,
+                        Duration = 1000,
+                    }
+                }
+            };
+
+            return beatmap;
+        }
+    }
+}

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             };
 
         [Test]
-        public void TestSwellDoesNotFail()
+        public void TestSpinnerDoesFail()
         {
             bool judged = false;
             AddStep("Setup judgements", () =>
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Player.ScoreProcessor.NewJudgement += _ => judged = true;
             });
             AddUntilStep("swell judged", () => judged);
-            AddAssert("not failed", () => !Player.GameplayState.HasFailed);
+            AddAssert("failed", () => Player.GameplayState.HasFailed);
         }
     }
 }

osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
     {
         private const double difficulty_multiplier = 1.35;
 
-        public override int Version => 20220902;
+        public override int Version => 20220701;
 
         public TaikoDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)

osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollJudgement.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.
+
+#nullable disable
+
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.Judgements
+{
+    public class TaikoDrumRollJudgement : TaikoJudgement
+    {
+        protected override double HealthIncreaseFor(HitResult result)
+        {
+            // Drum rolls can be ignored with no health penalty
+            switch (result)
+            {
+                case HitResult.Miss:
+                    return 0;
+
+                default:
+                    return base.HealthIncreaseFor(result);
+            }
+        }
+    }
+}

osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs

@@ -9,8 +9,18 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoDrumRollTickJudgement : TaikoJudgement
     {
-        public override HitResult MaxResult => HitResult.SmallBonus;
+        public override HitResult MaxResult => HitResult.SmallTickHit;
 
-        protected override double HealthIncreaseFor(HitResult result) => 0;
+        protected override double HealthIncreaseFor(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.SmallTickHit:
+                    return 0.15;
+
+                default:
+                    return 0;
+            }
+        }
     }
 }

osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoStrongJudgement : TaikoJudgement
     {
-        public override HitResult MaxResult => HitResult.LargeBonus;
+        public override HitResult MaxResult => HitResult.SmallBonus;
 
         // MainObject already changes the HP
         protected override double HealthIncreaseFor(HitResult result) => 0;

osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs

@@ -9,13 +9,11 @@ namespace osu.Game.Rulesets.Taiko.Judgements
 {
     public class TaikoSwellJudgement : TaikoJudgement
     {
-        public override HitResult MaxResult => HitResult.LargeBonus;
-
         protected override double HealthIncreaseFor(HitResult result)
         {
             switch (result)
             {
-                case HitResult.IgnoreMiss:
+                case HitResult.Miss:
                     return -0.65;
 
                 default:

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Utils;
@@ -16,6 +17,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -41,8 +43,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
-        public override bool DisplayResult => false;
-
         public DrawableDrumRoll()
             : this(null)
         {
@@ -143,7 +143,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (timeOffset < 0)
                 return;
 
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            int countHit = NestedHitObjects.Count(o => o.IsHit);
+
+            if (countHit >= HitObject.RequiredGoodHits)
+            {
+                ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Ok);
+            }
+            else
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs

@@ -16,6 +16,7 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
 
@@ -38,8 +39,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
-        public override bool DisplayResult => false;
-
         public DrawableSwell()
             : this(null)
         {
@@ -202,7 +201,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, Easing.OutQuint);
 
                 if (numHits == HitObject.RequiredHits)
-                    ApplyResult(r => r.Type = r.Judgement.MaxResult);
+                    ApplyResult(r => r.Type = HitResult.Great);
             }
             else
             {
@@ -223,7 +222,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                         tick.TriggerResult(false);
                 }
 
-                ApplyResult(r => r.Type = numHits == HitObject.RequiredHits ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : r.Judgement.MinResult);
             }
         }
 

osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Game.Rulesets.Objects.Types;
+using System;
 using System.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -11,6 +12,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Judgements;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
@@ -40,12 +42,24 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public int TickRate = 1;
 
+        /// <summary>
+        /// Number of drum roll ticks required for a "Good" hit.
+        /// </summary>
+        public double RequiredGoodHits { get; protected set; }
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Great" hit.
+        /// </summary>
+        public double RequiredGreatHits { get; protected set; }
+
         /// <summary>
         /// The length (in milliseconds) between ticks of this drumroll.
         /// <para>Half of this value is the hit window of the ticks.</para>
         /// </summary>
         private double tickSpacing = 100;
 
+        private float overallDifficulty = BeatmapDifficulty.DEFAULT_DIFFICULTY;
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -56,12 +70,16 @@ namespace osu.Game.Rulesets.Taiko.Objects
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
+            overallDifficulty = difficulty.OverallDifficulty;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             createTicks(cancellationToken);
 
+            RequiredGoodHits = NestedHitObjects.Count * Math.Min(0.15, 0.05 + 0.10 / 6 * overallDifficulty);
+            RequiredGreatHits = NestedHitObjects.Count * Math.Min(0.30, 0.10 + 0.20 / 6 * overallDifficulty);
+
             base.CreateNestedHitObjects(cancellationToken);
         }
 
@@ -88,7 +106,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             }
         }
 
-        public override Judgement CreateJudgement() => new IgnoreJudgement();
+        public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
@@ -96,8 +114,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public class StrongNestedHit : StrongNestedHitObject
         {
-            // The strong hit of the drum roll doesn't actually provide any score.
-            public override Judgement CreateJudgement() => new IgnoreJudgement();
         }
 
         #region LegacyBeatmapEncoder

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko
 {
     public class TaikoRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
 
@@ -197,8 +199,11 @@ namespace osu.Game.Rulesets.Taiko
         {
             switch (result)
             {
+                case HitResult.SmallTickHit:
+                    return "drum tick";
+
                 case HitResult.SmallBonus:
-                    return "bonus";
+                    return "strong bonus";
             }
 
             return base.GetDisplayNameForHitResult(result);

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -317,9 +317,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 default:
-                    if (!result.Type.IsScorable())
-                        break;
-
                     judgementContainer.Add(judgementPools[result.Type].Get(j =>
                     {
                         j.Apply(result, judgedObject);

osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs

@@ -67,24 +67,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        [Test]
-        public void TestDecodeTaikoReplay()
-        {
-            var decoder = new TestLegacyScoreDecoder();
-
-            using (var resourceStream = TestResources.OpenResource("Replays/taiko-replay.osr"))
-            {
-                var score = decoder.Parse(resourceStream);
-
-                Assert.AreEqual(1, score.ScoreInfo.Ruleset.OnlineID);
-                Assert.AreEqual(4, score.ScoreInfo.Statistics[HitResult.Great]);
-                Assert.AreEqual(2, score.ScoreInfo.Statistics[HitResult.LargeBonus]);
-                Assert.AreEqual(4, score.ScoreInfo.MaxCombo);
-
-                Assert.That(score.Replay.Frames, Is.Not.Empty);
-            }
-        }
-
         [TestCase(3, true)]
         [TestCase(6, false)]
         [TestCase(LegacyBeatmapDecoder.LATEST_VERSION, false)]

osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs

@@ -97,25 +97,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        [Test]
-        public void TestCorrectAnimationStartTime()
-        {
-            var decoder = new LegacyStoryboardDecoder();
-
-            using (var resStream = TestResources.OpenResource("animation-starts-before-alpha.osb"))
-            using (var stream = new LineBufferedReader(resStream))
-            {
-                var storyboard = decoder.Decode(stream);
-
-                StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
-                Assert.AreEqual(1, background.Elements.Count);
-
-                Assert.AreEqual(2000, background.Elements[0].StartTime);
-                // This property should be used in DrawableStoryboardAnimation as a starting point for animation playback.
-                Assert.AreEqual(1000, (background.Elements[0] as StoryboardAnimation)?.EarliestTransformTime);
-            }
-        }
-
         [Test]
         public void TestOutOfOrderStartTimes()
         {
@@ -136,26 +117,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        [Test]
-        public void TestEarliestStartTimeWithLoopAlphas()
-        {
-            var decoder = new LegacyStoryboardDecoder();
-
-            using (var resStream = TestResources.OpenResource("loop-containing-earlier-non-zero-fade.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(1000, background.Elements[0].StartTime);
-                Assert.AreEqual(1000, background.Elements[1].StartTime);
-
-                Assert.AreEqual(1000, storyboard.EarliestEventTime);
-            }
-        }
-
         [Test]
         public void TestDecodeVariableWithSuffix()
         {

osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs

@@ -7,12 +7,10 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -111,7 +109,7 @@ namespace osu.Game.Tests.Editing.Checks
         /// <param name="audioBitrate">The bitrate of the audio file the beatmap uses.</param>
         private Mock<IWorkingBeatmap> getMockWorkingBeatmap(int? audioBitrate)
         {
-            var mockTrack = new Mock<OsuTestScene.ClockBackedTestWorkingBeatmap.TrackVirtualManual>(new FramedClock(), "virtual");
+            var mockTrack = new Mock<Track>();
             mockTrack.SetupGet(t => t.Bitrate).Returns(audioBitrate);
 
             var mockWorkingBeatmap = new Mock<IWorkingBeatmap>();

osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs

@@ -118,31 +118,17 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsNull(filterCriteria.BPM.Max);
         }
 
-        private static readonly object[] correct_length_query_examples =
+        private static readonly object[] length_query_examples =
         {
+            new object[] { "6ms", TimeSpan.FromMilliseconds(6), TimeSpan.FromMilliseconds(1) },
             new object[] { "23s", TimeSpan.FromSeconds(23), TimeSpan.FromSeconds(1) },
             new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1) },
             new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1) },
             new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1) },
-            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1) },
-            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1) },
-            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
-            new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1) },
-            new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1) },
-            new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1) },
-            new object[] { "1h20s", TimeSpan.FromSeconds(3620), TimeSpan.FromSeconds(1) },
         };
 
         [Test]
-        [TestCaseSource(nameof(correct_length_query_examples))]
+        [TestCaseSource(nameof(length_query_examples))]
         public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale)
         {
             string query = $"length={lengthQuery} time";
@@ -154,29 +140,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(expectedLength.TotalMilliseconds + scale.TotalMilliseconds / 2.0, filterCriteria.Length.Max);
         }
 
-        private static readonly object[] incorrect_length_query_examples =
-        {
-            new object[] { "7.5m27s" },
-            new object[] { "7m27" },
-            new object[] { "7m7m7m" },
-            new object[] { "7m70s" },
-            new object[] { "5s6m" },
-            new object[] { "0:" },
-            new object[] { ":0" },
-            new object[] { "0:3:" },
-            new object[] { "3:15.5" },
-        };
-
-        [Test]
-        [TestCaseSource(nameof(incorrect_length_query_examples))]
-        public void TestInvalidLengthQueries(string lengthQuery)
-        {
-            string query = $"length={lengthQuery} time";
-            var filterCriteria = new FilterCriteria();
-            FilterQueryParser.ApplyQueries(filterCriteria, query);
-            Assert.AreEqual(false, filterCriteria.Length.HasFilter);
-        }
-
         [Test]
         public void TestApplyDivisorQueries()
         {
@@ -191,16 +154,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsTrue(filterCriteria.BeatDivisor.IsUpperInclusive);
         }
 
-        [Test]
-        public void TestPartialStatusMatch()
-        {
-            const string query = "status=r";
-            var filterCriteria = new FilterCriteria();
-            FilterQueryParser.ApplyQueries(filterCriteria, query);
-            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Min);
-            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Max);
-        }
-
         [Test]
         public void TestApplyStatusQueries()
         {

osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs

@@ -1,9 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -14,20 +13,21 @@ namespace osu.Game.Tests.NonVisual
     {
         [TestCase(0)]
         [TestCase(1)]
-        public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
+        public void TestTrueGameplayRateWithZeroAdjustment(double underlyingClockRate)
         {
             var framedClock = new FramedClock(new ManualClock { Rate = underlyingClockRate });
             var gameplayClock = new TestGameplayClockContainer(framedClock);
 
-            Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
+            Assert.That(gameplayClock.TrueGameplayRate, Is.EqualTo(0));
         }
 
         private class TestGameplayClockContainer : GameplayClockContainer
         {
+            public override IEnumerable<double> NonGameplayAdjustments => new[] { 0.0 };
+
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
                 : base(underlyingClock)
             {
-                AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
             }
         }
     }

osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs

@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Online
         {
             AddStep("download beatmap", () => beatmaps.Download(test_db_model));
 
-            AddStep("cancel download from notification", () => recentNotification.Close(true));
+            AddStep("cancel download from notification", () => recentNotification.Close());
 
             AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_db_model) == null);
             AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);

osu.Game.Tests/Resources/animation-starts-before-alpha.osb

@@ -1,5 +0,0 @@
-[Events]
-//Storyboard Layer 0 (Background)
-Animation,Background,Centre,"img.jpg",320,240,2,150,LoopForever
- S,0,1000,1500,0.08 // animation should start playing from this point in time..
- F,0,2000,,0,1      // .. not this point in time

osu.Game.Tests/Resources/loop-containing-earlier-non-zero-fade.osb

@@ -1,14 +0,0 @@
-osu file format v14
-
-[Events]
-//Storyboard Layer 0 (Background)
-Sprite,Background,TopCentre,"img.jpg",320,240
- L,1000,1
-  F,0,0,,1       // fade inside a loop with non-zero alpha and an earlier start time should be the true start time..
- F,0,2000,,0     // ..not a zero alpha fade with a later start time
-
-Sprite,Background,TopCentre,"img.jpg",320,240
- L,2000,1
-  F,0,0,24,0     // fade inside a loop with zero alpha but later start time than the top-level zero alpha start time.
-  F,0,24,48,1
- F,0,1000,,1     // ..so this should be the true start time

osu.Game.Tests/Skins/SkinDeserialisationTest.cs

@@ -36,9 +36,7 @@ namespace osu.Game.Tests.Skins
             "Archives/modified-default-20220723.osk",
             "Archives/modified-classic-20220723.osk",
             // Covers legacy song progress, UR counter, colour hit error metre.
-            "Archives/modified-classic-20220801.osk",
-            // Covers clicks/s counter
-            "Archives/modified-default-20220818.osk"
+            "Archives/modified-classic-20220801.osk"
         };
 
         /// <summary>

osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs

@@ -15,14 +15,12 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps.Drawables.Cards;
-using osu.Game.Beatmaps.Drawables.Cards.Buttons;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Beatmaps
 {
@@ -297,22 +295,5 @@ namespace osu.Game.Tests.Visual.Beatmaps
 
             BeatmapCardNormal firstCard() => this.ChildrenOfType<BeatmapCardNormal>().First();
         }
-
-        [Test]
-        public void TestPlayButtonByTouchInput()
-        {
-            AddStep("create cards", () => Child = createContent(OverlayColourScheme.Blue, beatmapSetInfo => new BeatmapCardNormal(beatmapSetInfo)));
-
-            // mimics touch input
-            AddStep("touch play button area on first card", () =>
-            {
-                InputManager.MoveMouseTo(firstCard().ChildrenOfType<PlayButton>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddAssert("first card is playing", () => firstCard().ChildrenOfType<PlayButton>().Single().Playing.Value);
-
-            BeatmapCardNormal firstCard() => this.ChildrenOfType<BeatmapCardNormal>().First();
-        }
     }
 }

osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs

@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables.Cards.Buttons;
 using osu.Game.Configuration;
-using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
@@ -59,7 +58,6 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    State = { Value = DownloadState.NotDownloaded },
                     Scale = new Vector2(2)
                 };
             });

osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 };
             });
             AddStep("enable dim", () => thumbnail.Dimmed.Value = true);
-            AddUntilStep("button visible", () => playButton.Alpha == 1);
+            AddUntilStep("button visible", () => playButton.IsPresent);
 
             AddStep("click button", () =>
             {
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
 
             AddStep("disable dim", () => thumbnail.Dimmed.Value = false);
             AddWaitStep("wait some", 3);
-            AddAssert("button still visible", () => playButton.Alpha == 1);
+            AddAssert("button still visible", () => playButton.IsPresent);
 
             // The track plays in real-time, so we need to check for progress in increments to avoid timeout.
             AddUntilStep("progress > 0.25", () => thumbnail.ChildrenOfType<PlayButton>().Single().Progress.Value > 0.25);
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
             AddUntilStep("progress > 0.75", () => thumbnail.ChildrenOfType<PlayButton>().Single().Progress.Value > 0.75);
 
             AddUntilStep("wait for track to end", () => !playButton.Playing.Value);
-            AddUntilStep("button hidden", () => playButton.Alpha == 0);
+            AddUntilStep("button hidden", () => !playButton.IsPresent);
         }
 
         private void iconIs(IconUsage usage) => AddUntilStep("icon is correct", () => playButton.ChildrenOfType<SpriteIcon>().Any(icon => icon.Icon.Equals(usage)));

osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs

@@ -1,85 +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.Linq;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Storyboards;
-using osu.Game.Tests.Beatmaps.IO;
-using osuTK.Input;
-
-namespace osu.Game.Tests.Visual.Editing
-{
-    public class TestSceneDifficultyDelete : EditorTestScene
-    {
-        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
-        protected override bool IsolateSavingFromDatabase => false;
-
-        [Resolved]
-        private OsuGameBase game { get; set; } = null!;
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; } = null!;
-
-        private BeatmapSetInfo importedBeatmapSet = null!;
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null!)
-            => beatmaps.GetWorkingBeatmap(importedBeatmapSet.Beatmaps.First());
-
-        public override void SetUpSteps()
-        {
-            AddStep("import test beatmap", () => importedBeatmapSet = BeatmapImportHelper.LoadOszIntoOsu(game, virtualTrack: true).GetResultSafely());
-            base.SetUpSteps();
-        }
-
-        [Test]
-        public void TestDeleteDifficulties()
-        {
-            Guid deletedDifficultyID = Guid.Empty;
-            int countBeforeDeletion = 0;
-            string beatmapSetHashBefore = string.Empty;
-
-            for (int i = 0; i < 12; i++)
-            {
-                // Will be reloaded after each deletion.
-                AddUntilStep("wait for editor to load", () => Editor?.ReadyForUse == true);
-
-                AddStep("store selected difficulty", () =>
-                {
-                    deletedDifficultyID = EditorBeatmap.BeatmapInfo.ID;
-                    countBeforeDeletion = Beatmap.Value.BeatmapSetInfo.Beatmaps.Count;
-                    beatmapSetHashBefore = Beatmap.Value.BeatmapSetInfo.Hash;
-                });
-
-                AddStep("click File", () => this.ChildrenOfType<DrawableOsuMenuItem>().First().TriggerClick());
-
-                if (i == 11)
-                {
-                    // last difficulty shouldn't be able to be deleted.
-                    AddAssert("Delete menu item disabled", () => getDeleteMenuItem().Item.Action.Disabled);
-                }
-                else
-                {
-                    AddStep("click delete", () => getDeleteMenuItem().TriggerClick());
-                    AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog != null);
-                    AddStep("confirm", () => InputManager.Key(Key.Number1));
-
-                    AddAssert($"difficulty {i} is deleted", () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Select(b => b.ID), () => Does.Not.Contain(deletedDifficultyID));
-                    AddAssert("count decreased by one", () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Count, () => Is.EqualTo(countBeforeDeletion - 1));
-                    AddAssert("set hash changed", () => Beatmap.Value.BeatmapSetInfo.Hash, () => Is.Not.EqualTo(beatmapSetHashBefore));
-                }
-            }
-        }
-
-        private DrawableOsuMenuItem getDeleteMenuItem() => this.ChildrenOfType<DrawableOsuMenuItem>()
-                                                               .Single(item => item.ChildrenOfType<SpriteText>().Any(text => text.Text.ToString().StartsWith("Delete", StringComparison.Ordinal)));
-    }
-}

osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs

@@ -1,75 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Tests.Beatmaps;
-using osuTK.Input;
-
-namespace osu.Game.Tests.Visual.Editing
-{
-    public class TestSceneSelectionBlueprintDeselection : EditorTestScene
-    {
-        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
-
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
-
-        [Test]
-        public void TestSingleDeleteAtSameTime()
-        {
-            HitCircle? circle1 = null;
-
-            AddStep("add two circles at the same time", () =>
-            {
-                EditorClock.Seek(0);
-                circle1 = new HitCircle();
-                var circle2 = new HitCircle();
-
-                EditorBeatmap.Add(circle1);
-                EditorBeatmap.Add(circle2);
-
-                EditorBeatmap.SelectedHitObjects.Add(circle1);
-                EditorBeatmap.SelectedHitObjects.Add(circle2);
-            });
-
-            AddStep("delete the first circle", () => EditorBeatmap.Remove(circle1));
-            AddAssert("one hitobject remains", () => EditorBeatmap.HitObjects.Count == 1);
-            AddAssert("one hitobject selected", () => EditorBeatmap.SelectedHitObjects.Count == 1);
-        }
-
-        [Test]
-        public void TestBigStackDeleteAtSameTime()
-        {
-            AddStep("add 20 circles at the same time", () =>
-            {
-                EditorClock.Seek(0);
-
-                for (int i = 0; i < 20; i++)
-                {
-                    EditorBeatmap.Add(new HitCircle());
-                }
-            });
-
-            AddStep("select half of the circles", () =>
-            {
-                foreach (var hitObject in EditorBeatmap.HitObjects.SkipLast(10).Reverse())
-                {
-                    EditorBeatmap.SelectedHitObjects.Add(hitObject);
-                }
-            });
-
-            AddStep("delete all selected circles", () =>
-            {
-                InputManager.PressKey(Key.Delete);
-                InputManager.ReleaseKey(Key.Delete);
-            });
-
-            AddAssert("10 hitobjects remain", () => EditorBeatmap.HitObjects.Count == 10);
-            AddAssert("no hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 0);
-        }
-    }
-}

osu.Game.Tests/Visual/Editing/TimelineTestScene.cs

@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -46,10 +45,7 @@ namespace osu.Game.Tests.Visual.Editing
             Dependencies.Cache(EditorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(EditorBeatmap);
 
-            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer();
-            Debug.Assert(Composer != null);
-
-            Composer.Alpha = 0;
+            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d => d.Alpha = 0);
 
             Add(new OsuContextMenuContainer
             {

osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs

@@ -1,130 +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.Audio;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Testing;
-using osu.Framework.Timing;
-using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.ClicksPerSecond;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Gameplay
-{
-    public class TestSceneClicksPerSecondCalculator : OsuTestScene
-    {
-        private ClicksPerSecondCalculator calculator = null!;
-
-        private TestGameplayClock manualGameplayClock = null!;
-
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("create components", () =>
-            {
-                manualGameplayClock = new TestGameplayClock();
-
-                Child = new DependencyProvidingContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    CachedDependencies = new (Type, object)[] { (typeof(IGameplayClock), manualGameplayClock) },
-                    Children = new Drawable[]
-                    {
-                        calculator = new ClicksPerSecondCalculator(),
-                        new DependencyProvidingContainer
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
-                            Child = new ClicksPerSecondCounter
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Scale = new Vector2(5),
-                            }
-                        }
-                    },
-                };
-            });
-        }
-
-        [Test]
-        public void TestBasicConsistency()
-        {
-            seek(1000);
-            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
-            checkClicksPerSecondValue(10);
-        }
-
-        [Test]
-        public void TestRateAdjustConsistency()
-        {
-            seek(1000);
-            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
-            checkClicksPerSecondValue(10);
-            AddStep("set rate 0.5x", () => manualGameplayClock.TrueGameplayRate = 0.5);
-            checkClicksPerSecondValue(5);
-        }
-
-        [Test]
-        public void TestInputsDiscardedOnRewind()
-        {
-            seek(1000);
-            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
-            checkClicksPerSecondValue(10);
-            seek(500);
-            checkClicksPerSecondValue(6);
-            seek(1000);
-            checkClicksPerSecondValue(6);
-        }
-
-        private void checkClicksPerSecondValue(int i) => AddAssert("clicks/s is correct", () => calculator.Value, () => Is.EqualTo(i));
-
-        private void seekClockImmediately(double time) => manualGameplayClock.CurrentTime = time;
-
-        private void seek(double time) => AddStep($"Seek to {time}ms", () => seekClockImmediately(time));
-
-        private void addInputs(IEnumerable<double> inputs)
-        {
-            double baseTime = manualGameplayClock.CurrentTime;
-
-            foreach (double timestamp in inputs)
-            {
-                seekClockImmediately(timestamp);
-                calculator.AddInputTimestamp();
-            }
-
-            seekClockImmediately(baseTime);
-        }
-
-        private class TestGameplayClock : IGameplayClock
-        {
-            public double CurrentTime { get; set; }
-
-            public double Rate => 1;
-
-            public bool IsRunning => true;
-
-            public double TrueGameplayRate { set => adjustableAudioComponent.Tempo.Value = value; }
-
-            private readonly AudioAdjustments adjustableAudioComponent = new AudioAdjustments();
-
-            public void ProcessFrame()
-            {
-            }
-
-            public double ElapsedFrameTime => throw new NotImplementedException();
-            public double FramesPerSecond => throw new NotImplementedException();
-            public FrameTimeInfo TimeInfo => throw new NotImplementedException();
-            public double StartTime => throw new NotImplementedException();
-
-            public IAdjustableAudioComponent AdjustmentsFromMods => adjustableAudioComponent;
-
-            public IEnumerable<double> NonGameplayAdjustments => throw new NotImplementedException();
-            public IBindable<bool> IsPaused => throw new NotImplementedException();
-        }
-    }
-}

osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -71,18 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
         }
 
-        [Test]
-        public void TestZeroScale()
-        {
-            const string lookup_name = "hitcircleoverlay";
-
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
-            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
-            AddAssert("sprites present", () => sprites.All(s => s.IsPresent));
-            AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(0, 1)));
-            AddAssert("sprites not present", () => sprites.All(s => !s.IsPresent));
-        }
-
         [Test]
         public void TestNegativeScale()
         {

osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs

@@ -66,20 +66,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(-10000, -10000, true)]
         public void TestStoryboardProducesCorrectStartTimeFadeInAfterOtherEvents(double firstStoryboardEvent, double expectedStartTime, bool addEventToLoop)
         {
-            const double loop_start_time = -20000;
-
             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, loop_start_time, -18000, 0, 1);
-            var loopGroup = sprite.AddLoop(loop_start_time, 50);
-            loopGroup.Scale.Add(Easing.None, loop_start_time, -18000, 0, 1);
+            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;
-            double loopRelativeOffset = addEventToLoop ? -loop_start_time : 0;
-            target.Alpha.Add(Easing.None, loopRelativeOffset + firstStoryboardEvent, loopRelativeOffset + firstStoryboardEvent + 500, 0, 1);
+            double targetTime = addEventToLoop ? 20000 : 0;
+            target.Alpha.Add(Easing.None, targetTime + firstStoryboardEvent, targetTime + firstStoryboardEvent + 500, 0, 1);
 
             // these should be ignored due to being in the future.
             sprite.TimelineGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);

osu.Game.Tests/Visual/Gameplay/TestScenePause.cs

@@ -370,7 +370,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddUntilStep("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value, () => Is.EqualTo(1));
+            AddAssert("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value == 1);
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());

osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs

@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value, () => Is.EqualTo(1));
 
-            clickNotification();
+            clickNotificationIfAny();
 
             AddAssert("check " + volumeName, assert);
 
@@ -370,12 +370,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 batteryInfo.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-
-            if (shouldWarn)
-                clickNotification();
-            else
-                AddAssert("notification not triggered", () => notificationOverlay.UnreadCount.Value == 0);
-
+            AddAssert($"notification {(shouldWarn ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == (shouldWarn ? 1 : 0));
+            clickNotificationIfAny();
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
@@ -440,13 +436,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("skip button not visible", () => !checkSkipButtonVisible());
         }
 
-        private void clickNotification()
+        private void clickNotificationIfAny()
         {
-            Notification notification = null;
-
-            AddUntilStep("wait for notification", () => (notification = notificationOverlay.ChildrenOfType<Notification>().FirstOrDefault()) != null);
-            AddStep("open notification overlay", () => notificationOverlay.Show());
-            AddStep("click notification", () => notification.TriggerClick());
+            AddStep("click notification", () => notificationOverlay.ChildrenOfType<Notification>().FirstOrDefault()?.TriggerClick());
         }
 
         private EpilepsyWarning getWarning() => loader.ChildrenOfType<EpilepsyWarning>().SingleOrDefault();

osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs

@@ -81,11 +81,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             CreateTest();
 
             AddUntilStep("fail screen displayed", () => Player.ChildrenOfType<FailOverlay>().First().State.Value == Visibility.Visible);
-            AddUntilStep("wait for button clickable", () => Player.ChildrenOfType<SaveFailedScoreButton>().First().ChildrenOfType<OsuClickableContainer>().First().Enabled.Value);
-
             AddUntilStep("score not in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) == null));
             AddStep("click save button", () => Player.ChildrenOfType<SaveFailedScoreButton>().First().ChildrenOfType<OsuClickableContainer>().First().TriggerClick());
-            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddUntilStep("score not in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
         }
 
         [Test]

osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs

@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for load", () => downloadButton.IsLoaded);
 
-            AddAssert("state is unknown", () => downloadButton.State.Value == DownloadState.Unknown);
+            AddAssert("state is not downloaded", () => downloadButton.State.Value == DownloadState.NotDownloaded);
             AddAssert("button is not enabled", () => !downloadButton.ChildrenOfType<DownloadButton>().First().Enabled.Value);
         }
 

osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -20,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditor : PlayerTestScene
     {
-        private SkinEditor? skinEditor;
+        private SkinEditor skinEditor;
 
         protected override bool Autoplay => true;
 
@@ -40,33 +42,29 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Player.ScaleTo(0.4f);
                 LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
-            AddUntilStep("wait for loaded", () => skinEditor!.IsLoaded);
+            AddUntilStep("wait for loaded", () => skinEditor.IsLoaded);
         }
 
         [Test]
         public void TestToggleEditor()
         {
-            AddToggleStep("toggle editor visibility", _ => skinEditor!.ToggleVisibility());
+            AddToggleStep("toggle editor visibility", _ => skinEditor.ToggleVisibility());
         }
 
         [Test]
         public void TestEditComponent()
         {
-            BarHitErrorMeter hitErrorMeter = null!;
+            BarHitErrorMeter hitErrorMeter = null;
 
             AddStep("select bar hit error blueprint", () =>
             {
                 var blueprint = skinEditor.ChildrenOfType<SkinBlueprint>().First(b => b.Item is BarHitErrorMeter);
 
                 hitErrorMeter = (BarHitErrorMeter)blueprint.Item;
-                skinEditor!.SelectedComponents.Clear();
+                skinEditor.SelectedComponents.Clear();
                 skinEditor.SelectedComponents.Add(blueprint.Item);
             });
 
-            AddStep("move by keyboard", () => InputManager.Key(Key.Right));
-
-            AddAssert("hitErrorMeter moved", () => hitErrorMeter.X != 0);
-
             AddAssert("value is default", () => hitErrorMeter.JudgementLineThickness.IsDefault);
 
             AddStep("hover first slider", () =>

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -22,9 +24,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneStoryboard : OsuTestScene
     {
-        private Container<DrawableStoryboard> storyboardContainer = null!;
-
-        private DrawableStoryboard? storyboard;
+        private Container<DrawableStoryboard> storyboardContainer;
+        private DrawableStoryboard storyboard;
 
         [Test]
         public void TestStoryboard()
@@ -39,7 +40,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardMissingVideo()
         {
-            AddStep("Load storyboard with missing video", () => loadStoryboard("storyboard_no_video.osu"));
+            AddStep("Load storyboard with missing video", loadStoryboardNoVideo);
         }
 
         [BackgroundDependencyLoader]
@@ -76,18 +77,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.BindValueChanged(beatmapChanged, true);
         }
 
-        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e) => loadStoryboard(e.NewValue.Storyboard);
+        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e) => loadStoryboard(e.NewValue);
 
         private void restart()
         {
             var track = Beatmap.Value.Track;
 
             track.Reset();
-            loadStoryboard(Beatmap.Value.Storyboard);
+            loadStoryboard(Beatmap.Value);
             track.Start();
         }
 
-        private void loadStoryboard(Storyboard toLoad)
+        private void loadStoryboard(IWorkingBeatmap working)
         {
             if (storyboard != null)
                 storyboardContainer.Remove(storyboard, true);
@@ -95,25 +96,34 @@ namespace osu.Game.Tests.Visual.Gameplay
             var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
             storyboardContainer.Clock = decoupledClock;
 
-            storyboard = toLoad.CreateDrawable(SelectedMods.Value);
+            storyboard = working.Storyboard.CreateDrawable(SelectedMods.Value);
             storyboard.Passing = false;
 
+            storyboardContainer.Add(storyboard);
+            decoupledClock.ChangeSource(working.Track);
+        }
+
+        private void loadStoryboardNoVideo()
+        {
+            if (storyboard != null)
+                storyboardContainer.Remove(storyboard, true);
+
+            var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
+            storyboardContainer.Clock = decoupledClock;
+
+            Storyboard sb;
+
+            using (var str = TestResources.OpenResource("storyboard_no_video.osu"))
+            using (var bfr = new LineBufferedReader(str))
+            {
+                var decoder = new LegacyStoryboardDecoder();
+                sb = decoder.Decode(bfr);
+            }
+
+            storyboard = sb.CreateDrawable(SelectedMods.Value);
+
             storyboardContainer.Add(storyboard);
             decoupledClock.ChangeSource(Beatmap.Value.Track);
         }
-
-        private void loadStoryboard(string filename)
-        {
-            Storyboard loaded;
-
-            using (var str = TestResources.OpenResource(filename))
-            using (var bfr = new LineBufferedReader(str))
-            {
-                var decoder = new LegacyStoryboardDecoder();
-                loaded = decoder.Decode(bfr);
-            }
-
-            loadStoryboard(loaded);
-        }
     }
 }

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs

@@ -91,7 +91,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                          break;
 
                                      case StopCountdownRequest:
-                                         clearRoomCountdown();
+                                         multiplayerRoom.Countdown = null;
+                                         raiseRoomUpdated();
                                          break;
                                  }
                              });
@@ -243,14 +244,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddStep("start countdown", () => multiplayerClient.Object.SendMatchRequest(new StartMatchCountdownRequest { Duration = TimeSpan.FromMinutes(1) }).WaitSafely());
-            AddUntilStep("countdown started", () => multiplayerRoom.ActiveCountdowns.Any());
+            AddUntilStep("countdown started", () => multiplayerRoom.Countdown != null);
 
             AddStep("transfer host to local user", () => transferHost(localUser));
             AddUntilStep("local user is host", () => multiplayerRoom.Host?.Equals(multiplayerClient.Object.LocalUser) == true);
 
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
             checkLocalUserState(MultiplayerUserState.Ready);
-            AddAssert("countdown still active", () => multiplayerRoom.ActiveCountdowns.Any());
+            AddAssert("countdown still active", () => multiplayerRoom.Countdown != null);
         }
 
         [Test]
@@ -391,13 +392,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void setRoomCountdown(TimeSpan duration)
         {
-            multiplayerRoom.ActiveCountdowns.Add(new MatchStartCountdown { TimeRemaining = duration });
-            raiseRoomUpdated();
-        }
-
-        private void clearRoomCountdown()
-        {
-            multiplayerRoom.ActiveCountdowns.Clear();
+            multiplayerRoom.Countdown = new MatchStartCountdown { TimeRemaining = duration };
             raiseRoomUpdated();
         }
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs

@@ -13,11 +13,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus;
-using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play;
@@ -334,18 +332,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("player 2 playing from correct point in time", () => getPlayer(PLAYER_2_ID).ChildrenOfType<DrawableRuleset>().Single().FrameStableClock.CurrentTime > 30000);
         }
 
-        [Test]
-        public void TestGameplayRateAdjust()
-        {
-            start(getPlayerIds(4), mods: new[] { new APIMod(new OsuModDoubleTime()) });
-
-            loadSpectateScreen();
-
-            sendFrames(getPlayerIds(4), 300);
-
-            AddUntilStep("wait for correct track speed", () => Beatmap.Value.Track.Rate, () => Is.EqualTo(1.5));
-        }
-
         [Test]
         public void TestPlayersLeaveWhileSpectating()
         {
@@ -434,7 +420,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
 
-        private void start(int[] userIds, int? beatmapId = null, APIMod[]? mods = null)
+        private void start(int[] userIds, int? beatmapId = null)
         {
             AddStep("start play", () =>
             {
@@ -443,11 +429,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     var user = new MultiplayerRoomUser(id)
                     {
                         User = new APIUser { Id = id },
-                        Mods = mods ?? Array.Empty<APIMod>(),
                     };
 
-                    OnlinePlayDependencies.MultiplayerClient.AddUser(user, true);
-                    SpectatorClient.SendStartPlay(id, beatmapId ?? importedBeatmapId, mods);
+                    OnlinePlayDependencies.MultiplayerClient.AddUser(user.User, true);
+                    SpectatorClient.SendStartPlay(id, beatmapId ?? importedBeatmapId);
 
                     playingUsers.Add(user);
                 }

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs

@@ -19,6 +19,7 @@ using osu.Game.Database;
 using osu.Game.Online.Rooms;
 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;
@@ -67,6 +68,37 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen() && songSelect.BeatmapSetsLoaded);
         }
 
+        [Test]
+        public void TestBeatmapRevertedOnExitIfNoSelection()
+        {
+            BeatmapInfo selectedBeatmap = null;
+
+            AddStep("select beatmap",
+                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.Where(beatmap => beatmap.Ruleset.OnlineID == 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()
         {
@@ -120,8 +152,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public new BeatmapCarousel Carousel => base.Carousel;
 
-            public TestMultiplayerMatchSongSelect(Room room)
-                : base(room)
+            public TestMultiplayerMatchSongSelect(Room room, WorkingBeatmap beatmap = null, RulesetInfo ruleset = null)
+                : base(room, null, beatmap, ruleset)
             {
             }
         }

osu.Game.Tests/Visual/Navigation/TestSceneStartupImport.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
@@ -11,7 +13,7 @@ namespace osu.Game.Tests.Visual.Navigation
 {
     public class TestSceneStartupImport : OsuGameTestScene
     {
-        private string? importFilename;
+        private string importFilename;
 
         protected override TestOsuGame CreateTestGame() => new TestOsuGame(LocalStorage, API, new[] { importFilename });
 

osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs

@@ -35,8 +35,6 @@ namespace osu.Game.Tests.Visual.Online
 
         private OsuConfigManager localConfig;
 
-        private bool returnCursorOnResponse;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -63,7 +61,6 @@ namespace osu.Game.Tests.Visual.Online
                     searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                     {
                         BeatmapSets = setsForResponse,
-                        Cursor = returnCursorOnResponse ? new Cursor() : null,
                     });
 
                     return true;
@@ -109,7 +106,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
+            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
 
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -130,10 +127,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
+            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
-            AddStep("show more results", () => fetchFor(getManyBeatmaps(30).ToArray()));
+            AddStep("show more results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 30).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(30);
         }
 
@@ -142,7 +139,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
+            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
             setCardSize(BeatmapCardSize.Extra, viaConfig);
@@ -164,7 +161,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("fetch for 0 beatmaps", () => fetchFor());
             placeholderShown();
 
-            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
+            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
             AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 100);
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -183,32 +180,6 @@ namespace osu.Game.Tests.Visual.Online
                 });
         }
 
-        /// <summary>
-        /// During pagination, the first beatmap of the second page may be a duplicate of the last beatmap from the previous page.
-        /// This is currently the case with osu!web API due to ES relevance score's presence in the response cursor.
-        /// See: https://github.com/ppy/osu-web/issues/9270
-        /// </summary>
-        [Test]
-        public void TestDuplicatedBeatmapOnlyShowsOnce()
-        {
-            APIBeatmapSet beatmapSet = null;
-
-            AddStep("show many results", () =>
-            {
-                beatmapSet = CreateAPIBeatmapSet(Ruleset.Value);
-                beatmapSet.Title = "last beatmap of first page";
-
-                fetchFor(getManyBeatmaps(49).Append(beatmapSet).ToArray(), true);
-            });
-            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 50);
-
-            AddStep("set next page", () => setSearchResponse(getManyBeatmaps(49).Prepend(beatmapSet).ToArray(), false));
-            AddStep("scroll to end", () => overlay.ChildrenOfType<OverlayScrollContainer>().Single().ScrollToEnd());
-            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 99);
-
-            AddAssert("beatmap not duplicated", () => overlay.ChildrenOfType<BeatmapCard>().Count(c => c.BeatmapSet.Equals(beatmapSet)) == 1);
-        }
-
         [Test]
         public void TestUserWithoutSupporterUsesSupporterOnlyFiltersWithoutResults()
         {
@@ -365,23 +336,13 @@ namespace osu.Game.Tests.Visual.Online
 
         private static int searchCount;
 
-        private APIBeatmapSet[] getManyBeatmaps(int count) => Enumerable.Range(0, count).Select(_ => CreateAPIBeatmapSet(Ruleset.Value)).ToArray();
-
-        private void fetchFor(params APIBeatmapSet[] beatmaps) => fetchFor(beatmaps, false);
-
-        private void fetchFor(APIBeatmapSet[] beatmaps, bool hasNextPage)
-        {
-            setSearchResponse(beatmaps, hasNextPage);
-
-            // trigger arbitrary change for fetching.
-            searchControl.Query.Value = $"search {searchCount++}";
-        }
-
-        private void setSearchResponse(APIBeatmapSet[] beatmaps, bool hasNextPage)
+        private void fetchFor(params APIBeatmapSet[] beatmaps)
         {
             setsForResponse.Clear();
             setsForResponse.AddRange(beatmaps);
-            returnCursorOnResponse = hasNextPage;
+
+            // trigger arbitrary change for fetching.
+            searchControl.Query.Value = $"search {searchCount++}";
         }
 
         private void setRankAchievedFilter(ScoreRank[] ranks)

osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs

@@ -154,7 +154,7 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
-        private ulong onlineID = 1;
+        private int onlineID = 1;
 
         private APIScoresCollection createScores()
         {

osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs

@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -19,25 +20,15 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneHitEventTimingDistributionGraph : OsuTestScene
     {
-        private HitEventTimingDistributionGraph graph = null!;
-        private readonly BindableFloat width = new BindableFloat(600);
-        private readonly BindableFloat height = new BindableFloat(130);
+        private HitEventTimingDistributionGraph graph;
 
         private static readonly HitObject placeholder_object = new HitCircle();
 
-        public TestSceneHitEventTimingDistributionGraph()
-        {
-            width.BindValueChanged(e => graph.Width = e.NewValue);
-            height.BindValueChanged(e => graph.Height = e.NewValue);
-        }
-
         [Test]
         public void TestManyDistributedEvents()
         {
             createTest(CreateDistributedHitEvents());
             AddStep("add adjustment", () => graph.UpdateOffset(10));
-            AddSliderStep("width", 0.0f, 1000.0f, width.Value, width.Set);
-            AddSliderStep("height", 0.0f, 1000.0f, height.Value, height.Set);
         }
 
         [Test]
@@ -52,65 +43,6 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
         }
 
-        [Test]
-        public void TestSparse()
-        {
-            createTest(new List<HitEvent>
-            {
-                new HitEvent(-7, HitResult.Perfect, placeholder_object, placeholder_object, null),
-                new HitEvent(-6, HitResult.Perfect, placeholder_object, placeholder_object, null),
-                new HitEvent(-5, HitResult.Perfect, placeholder_object, placeholder_object, null),
-                new HitEvent(5, HitResult.Perfect, placeholder_object, placeholder_object, null),
-                new HitEvent(6, HitResult.Perfect, placeholder_object, placeholder_object, null),
-                new HitEvent(7, HitResult.Perfect, placeholder_object, placeholder_object, null),
-            });
-        }
-
-        [Test]
-        public void TestVariousTypesOfHitResult()
-        {
-            createTest(CreateDistributedHitEvents(0, 50).Select(h =>
-            {
-                double offset = Math.Abs(h.TimeOffset);
-                HitResult result = offset > 36 ? HitResult.Miss
-                    : offset > 32 ? HitResult.Meh
-                    : offset > 24 ? HitResult.Ok
-                    : offset > 16 ? HitResult.Good
-                    : offset > 8 ? HitResult.Great
-                    : HitResult.Perfect;
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
-            }).ToList());
-        }
-
-        [Test]
-        public void TestMultipleWindowsOfHitResult()
-        {
-            var wide = CreateDistributedHitEvents(0, 50).Select(h =>
-            {
-                double offset = Math.Abs(h.TimeOffset);
-                HitResult result = offset > 36 ? HitResult.Miss
-                    : offset > 32 ? HitResult.Meh
-                    : offset > 24 ? HitResult.Ok
-                    : offset > 16 ? HitResult.Good
-                    : offset > 8 ? HitResult.Great
-                    : HitResult.Perfect;
-
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
-            });
-            var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
-            {
-                double offset = Math.Abs(h.TimeOffset);
-                HitResult result = offset > 25 ? HitResult.Miss
-                    : offset > 20 ? HitResult.Meh
-                    : offset > 15 ? HitResult.Ok
-                    : offset > 10 ? HitResult.Good
-                    : offset > 5 ? HitResult.Great
-                    : HitResult.Perfect;
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
-            });
-            createTest(wide.Concat(narrow).ToList());
-        }
-
         [Test]
         public void TestZeroTimeOffset()
         {
@@ -148,7 +80,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(width.Value, height.Value)
+                    Size = new Vector2(600, 130)
                 }
             };
         });

osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs

@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select unchanged Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
-                var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>().AsNonNull();
+                var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>();
                 difficultyAdjustMod.ReadFromDifficulty(advancedStats.BeatmapInfo.Difficulty);
                 SelectedMods.Value = new[] { difficultyAdjustMod };
             });
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select changed Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
-                var difficultyAdjustMod = ruleset.CreateMod<OsuModDifficultyAdjust>().AsNonNull();
+                var difficultyAdjustMod = ruleset.CreateMod<OsuModDifficultyAdjust>();
                 var originalDifficulty = advancedStats.BeatmapInfo.Difficulty;
 
                 difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     if (isIterating)
                         AddUntilStep("selection changed", () => !carousel.SelectedBeatmapInfo?.Equals(selection) == true);
                     else
-                        AddUntilStep("selection not changed", () => carousel.SelectedBeatmapInfo?.Equals(selection) == true);
+                        AddUntilStep("selection not changed", () => carousel.SelectedBeatmapInfo.Equals(selection));
                 }
             }
         }
@@ -382,7 +382,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             // buffer the selection
             setSelected(3, 2);
 
-            AddStep("get search text", () => searchText = carousel.SelectedBeatmapSet!.Metadata.Title);
+            AddStep("get search text", () => searchText = carousel.SelectedBeatmapSet.Metadata.Title);
 
             setSelected(1, 3);
 
@@ -701,7 +701,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             setSelected(2, 1);
             AddAssert("Selection is non-null", () => currentSelection != null);
 
-            AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet!));
+            AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet));
             waitForSelection(2);
 
             AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
@@ -804,7 +804,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("filter to ruleset 0", () =>
                 carousel.Filter(new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(0) }, false));
             AddStep("select filtered map skipping filtered", () => carousel.SelectBeatmap(testMixed.Beatmaps[1], false));
-            AddAssert("unfiltered beatmap not selected", () => carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 0);
+            AddAssert("unfiltered beatmap not selected", () => carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 0);
 
             AddStep("remove mixed set", () =>
             {
@@ -854,7 +854,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 AddStep("Restore no filter", () =>
                 {
                     carousel.Filter(new FilterCriteria(), false);
-                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet!.ID);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
                 });
             }
 
@@ -899,10 +899,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 AddStep("Restore different ruleset filter", () =>
                 {
                     carousel.Filter(new FilterCriteria { Ruleset = rulesets.GetRuleset(1) }, false);
-                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet!.ID);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
                 });
 
-                AddAssert("selection changed", () => !carousel.SelectedBeatmapInfo!.Equals(manySets.First().Beatmaps.First()));
+                AddAssert("selection changed", () => !carousel.SelectedBeatmapInfo.Equals(manySets.First().Beatmaps.First()));
             }
 
             AddAssert("Selection was random", () => eagerSelectedIDs.Count > 2);

osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.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 disable
+
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -12,7 +13,6 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
@@ -46,12 +46,11 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public class TestScenePlaySongSelect : ScreenTestScene
     {
-        private BeatmapManager manager = null!;
-        private RulesetStore rulesets = null!;
-        private MusicController music = null!;
-        private WorkingBeatmap defaultBeatmap = null!;
-        private OsuConfigManager config = null!;
-        private TestSongSelect? songSelect;
+        private BeatmapManager manager;
+        private RulesetStore rulesets;
+        private MusicController music;
+        private WorkingBeatmap defaultBeatmap;
+        private TestSongSelect songSelect;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -70,6 +69,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
         }
 
+        private OsuConfigManager config;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
@@ -84,7 +85,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 songSelect = null;
             });
 
-            AddStep("delete all beatmaps", () => manager.Delete());
+            AddStep("delete all beatmaps", () => manager?.Delete());
         }
 
         [Test]
@@ -97,7 +98,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
             AddUntilStep("wait for placeholder hidden", () => getPlaceholder()?.State.Value == Visibility.Hidden);
 
-            AddStep("delete all beatmaps", () => manager.Delete());
+            AddStep("delete all beatmaps", () => manager?.Delete());
             AddUntilStep("wait for placeholder visible", () => getPlaceholder()?.State.Value == Visibility.Visible);
         }
 
@@ -143,7 +144,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            AddAssert("filter count is 1", () => songSelect?.FilterCount == 1);
+            AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
         }
 
         [Test]
@@ -155,7 +156,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap? selected = null;
+            WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
@@ -165,7 +166,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -178,7 +179,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap? selected = null;
+            WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
@@ -188,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Down);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -201,23 +202,23 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
 
-            WorkingBeatmap? selected = null;
+            WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
-            AddUntilStep("wait for beatmaps to load", () => songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
+            AddUntilStep("wait for beatmaps to load", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
 
             AddStep("select next and enter", () =>
             {
-                InputManager.MoveMouseTo(songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
-                                                    .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect!.Carousel.SelectedBeatmapInfo)));
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                   .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect.Carousel.SelectedBeatmapInfo)));
 
                 InputManager.Click(MouseButton.Left);
 
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -230,14 +231,14 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap? selected = null;
+            WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
             AddStep("select next and enter", () =>
             {
-                InputManager.MoveMouseTo(songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
-                                                    .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect!.Carousel.SelectedBeatmapInfo)));
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                   .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect.Carousel.SelectedBeatmapInfo)));
 
                 InputManager.PressButton(MouseButton.Left);
 
@@ -246,7 +247,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -259,11 +260,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
 
-            AddStep("return", () => songSelect!.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
-            AddAssert("filter count is 1", () => songSelect!.FilterCount == 1);
+            AddStep("return", () => songSelect.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
+            AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
         }
 
         [Test]
@@ -277,13 +278,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
 
             AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
-            AddStep("return", () => songSelect!.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
-            AddAssert("filter count is 2", () => songSelect!.FilterCount == 2);
+            AddStep("return", () => songSelect.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
+            AddAssert("filter count is 2", () => songSelect.FilterCount == 2);
         }
 
         [Test]
@@ -294,7 +295,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
 
             AddStep("update beatmap", () =>
             {
@@ -303,9 +304,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(anotherBeatmap);
             });
 
-            AddStep("return", () => songSelect!.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
-            AddAssert("carousel updated", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(Beatmap.Value.BeatmapInfo) == true);
+            AddStep("return", () => songSelect.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
+            AddAssert("carousel updated", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(Beatmap.Value.BeatmapInfo));
         }
 
         [Test]
@@ -317,15 +318,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
 
             checkMusicPlaying(true);
-            AddStep("select first", () => songSelect!.Carousel.SelectBeatmap(songSelect!.Carousel.BeatmapSets.First().Beatmaps.First()));
+            AddStep("select first", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.First()));
             checkMusicPlaying(true);
 
             AddStep("manual pause", () => music.TogglePause());
             checkMusicPlaying(false);
-            AddStep("select next difficulty", () => songSelect!.Carousel.SelectNext(skipDifficulties: false));
+            AddStep("select next difficulty", () => songSelect.Carousel.SelectNext(skipDifficulties: false));
             checkMusicPlaying(false);
 
-            AddStep("select next set", () => songSelect!.Carousel.SelectNext());
+            AddStep("select next set", () => songSelect.Carousel.SelectNext());
             checkMusicPlaying(true);
         }
 
@@ -365,13 +366,13 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestDummy()
         {
             createSongSelect();
-            AddUntilStep("dummy selected", () => songSelect!.CurrentBeatmap == defaultBeatmap);
+            AddUntilStep("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap);
 
-            AddUntilStep("dummy shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap == defaultBeatmap);
+            AddUntilStep("dummy shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap);
 
             addManyTestMaps();
 
-            AddUntilStep("random map selected", () => songSelect!.CurrentBeatmap != defaultBeatmap);
+            AddUntilStep("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
         }
 
         [Test]
@@ -380,7 +381,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
             addManyTestMaps();
 
-            AddUntilStep("random map selected", () => songSelect!.CurrentBeatmap != defaultBeatmap);
+            AddUntilStep("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
 
             AddStep(@"Sort by Artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
             AddStep(@"Sort by Title", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Title));
@@ -397,7 +398,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
             addRulesetImportStep(2);
-            AddUntilStep("no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -407,13 +408,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
             addRulesetImportStep(2);
             addRulesetImportStep(1);
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
 
             changeRuleset(1);
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 1);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 1);
 
             changeRuleset(0);
-            AddUntilStep("no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -422,7 +423,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
             changeRuleset(0);
 
-            Live<BeatmapSetInfo>? original = null;
+            Live<BeatmapSetInfo> original = null!;
             int originalOnlineSetID = 0;
 
             AddStep(@"Sort by artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
@@ -430,17 +431,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("import original", () =>
             {
                 original = manager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).GetResultSafely();
-
-                Debug.Assert(original != null);
-
-                originalOnlineSetID = original.Value.OnlineID;
+                originalOnlineSetID = original!.Value.OnlineID;
             });
 
             // This will move the beatmap set to a different location in the carousel.
             AddStep("Update original with bogus info", () =>
             {
-                Debug.Assert(original != null);
-
                 original.PerformWrite(set =>
                 {
                     foreach (var beatmap in set.Beatmaps)
@@ -461,19 +457,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(testBeatmapSetInfo);
             }, 10);
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
 
-            Task<Live<BeatmapSetInfo>?> updateTask = null!;
-
-            AddStep("update beatmap", () =>
-            {
-                Debug.Assert(original != null);
-
-                updateTask = manager.ImportAsUpdate(new ProgressNotification(), new ImportTask(TestResources.GetQuickTestBeatmapForImport()), original.Value);
-            });
+            Task<Live<BeatmapSetInfo>> updateTask = null!;
+            AddStep("update beatmap", () => updateTask = manager.ImportAsUpdate(new ProgressNotification(), new ImportTask(TestResources.GetQuickTestBeatmapForImport()), original.Value));
             AddUntilStep("wait for update completion", () => updateTask.IsCompleted);
 
-            AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("retained selection", () => songSelect.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
         }
 
         [Test]
@@ -483,13 +473,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
 
             addRulesetImportStep(2);
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
 
             addRulesetImportStep(0);
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            BeatmapInfo? target = null;
+            BeatmapInfo target = null;
 
             AddStep("select beatmap/ruleset externally", () =>
             {
@@ -500,10 +490,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(target) == true);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(target));
 
             // this is an important check, to make sure updateComponentFromBeatmap() was actually run
-            AddUntilStep("selection shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
+            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -513,13 +503,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
 
             addRulesetImportStep(2);
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
 
             addRulesetImportStep(0);
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            BeatmapInfo? target = null;
+            BeatmapInfo target = null;
 
             AddStep("select beatmap/ruleset externally", () =>
             {
@@ -530,12 +520,12 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Ruleset.Value = rulesets.AvailableRulesets.First(r => r.OnlineID == 0);
             });
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(target) == true);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(target));
 
             AddUntilStep("has correct ruleset", () => Ruleset.Value.OnlineID == 0);
 
             // this is an important check, to make sure updateComponentFromBeatmap() was actually run
-            AddUntilStep("selection shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
+            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -553,12 +543,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("change ruleset", () =>
             {
                 SelectedMods.ValueChanged += onModChange;
-                songSelect!.Ruleset.ValueChanged += onRulesetChange;
+                songSelect.Ruleset.ValueChanged += onRulesetChange;
 
                 Ruleset.Value = new TaikoRuleset().RulesetInfo;
 
                 SelectedMods.ValueChanged -= onModChange;
-                songSelect!.Ruleset.ValueChanged -= onRulesetChange;
+                songSelect.Ruleset.ValueChanged -= onRulesetChange;
             });
 
             AddAssert("mods changed before ruleset", () => modChangeIndex < rulesetChangeIndex);
@@ -589,18 +579,18 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
             addManyTestMaps();
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
 
             bool startRequested = false;
 
             AddStep("set filter and finalize", () =>
             {
-                songSelect!.StartRequested = () => startRequested = true;
+                songSelect.StartRequested = () => startRequested = true;
 
-                songSelect!.Carousel.Filter(new FilterCriteria { SearchText = "somestringthatshouldn'tbematchable" });
-                songSelect!.FinaliseSelection();
+                songSelect.Carousel.Filter(new FilterCriteria { SearchText = "somestringthatshouldn'tbematchable" });
+                songSelect.FinaliseSelection();
 
-                songSelect!.StartRequested = null;
+                songSelect.StartRequested = null;
             });
 
             AddAssert("start not requested", () => !startRequested);
@@ -620,15 +610,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             // used for filter check below
             AddStep("allow convert display", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
 
-            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
-            AddUntilStep("has no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
 
-            BeatmapInfo? target = null;
+            BeatmapInfo target = null;
 
             int targetRuleset = differentRuleset ? 1 : 0;
 
@@ -642,24 +632,24 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
 
             AddAssert("selected only shows expected ruleset (plus converts)", () =>
             {
-                var selectedPanel = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item.State.Value == CarouselItemState.Selected);
+                var selectedPanel = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item.State.Value == CarouselItemState.Selected);
 
                 // special case for converts checked here.
                 return selectedPanel.ChildrenOfType<FilterableDifficultyIcon>().All(i =>
                     i.IsFiltered || i.Item.BeatmapInfo.Ruleset.OnlineID == targetRuleset || i.Item.BeatmapInfo.Ruleset.OnlineID == 0);
             });
 
-            AddUntilStep("carousel has correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
+            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(target));
 
-            AddStep("reset filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
+            AddStep("reset filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
 
             AddAssert("game still correct", () => Beatmap.Value?.BeatmapInfo.MatchesOnlineID(target) == true);
-            AddAssert("carousel still correct", () => songSelect!.Carousel.SelectedBeatmapInfo.MatchesOnlineID(target));
+            AddAssert("carousel still correct", () => songSelect.Carousel.SelectedBeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -672,15 +662,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             changeRuleset(0);
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
 
-            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
-            AddUntilStep("has no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
 
-            BeatmapInfo? target = null;
+            BeatmapInfo target = null;
 
             AddStep("select beatmap externally", () =>
             {
@@ -692,15 +682,15 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
 
-            AddUntilStep("carousel has correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
+            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(target));
 
-            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nononoo");
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nononoo");
 
             AddUntilStep("game lost selection", () => Beatmap.Value is DummyWorkingBeatmap);
-            AddAssert("carousel lost selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+            AddAssert("carousel lost selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -721,11 +711,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
 
-            AddAssert("no mods selected", () => songSelect!.Mods.Value.Count == 0);
+            AddAssert("no mods selected", () => songSelect.Mods.Value.Count == 0);
         }
 
         [Test]
@@ -748,11 +738,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
 
-            AddAssert("autoplay still selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay still selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
         }
 
         [Test]
@@ -775,11 +765,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("only autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
+            AddAssert("only autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
 
-            AddAssert("relax returned", () => songSelect!.Mods.Value.Single() is ModRelax);
+            AddAssert("relax returned", () => songSelect.Mods.Value.Single() is ModRelax);
         }
 
         [Test]
@@ -788,10 +778,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             Guid? previousID = null;
             createSongSelect();
             addRulesetImportStep(0);
-            AddStep("Move to last difficulty", () => songSelect!.Carousel.SelectBeatmap(songSelect!.Carousel.BeatmapSets.First().Beatmaps.Last()));
-            AddStep("Store current ID", () => previousID = songSelect!.Carousel.SelectedBeatmapInfo!.ID);
-            AddStep("Hide first beatmap", () => manager.Hide(songSelect!.Carousel.SelectedBeatmapSet!.Beatmaps.First()));
-            AddAssert("Selected beatmap has not changed", () => songSelect!.Carousel.SelectedBeatmapInfo?.ID == previousID);
+            AddStep("Move to last difficulty", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.Last()));
+            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmapInfo.ID);
+            AddStep("Hide first beatmap", () => manager.Hide(songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First()));
+            AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmapInfo.ID == previousID);
         }
 
         [Test]
@@ -802,24 +792,17 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for selection", () => !Beatmap.IsDefault);
 
-            DrawableCarouselBeatmapSet set = null!;
+            DrawableCarouselBeatmapSet set = null;
             AddStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
             });
 
-            FilterableDifficultyIcon difficultyIcon = null!;
-
+            FilterableDifficultyIcon difficultyIcon = null;
             AddUntilStep("Find an icon", () =>
             {
-                var foundIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
-                                   .FirstOrDefault(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
-
-                if (foundIcon == null)
-                    return false;
-
-                difficultyIcon = foundIcon;
-                return true;
+                return (difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
+                                            .FirstOrDefault(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex())) != null;
             });
 
             AddStep("Click on a difficulty", () =>
@@ -832,24 +815,21 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
 
             double? maxBPM = null;
-            AddStep("Filter some difficulties", () => songSelect!.Carousel.Filter(new FilterCriteria
+            AddStep("Filter some difficulties", () => songSelect.Carousel.Filter(new FilterCriteria
             {
                 BPM = new FilterCriteria.OptionalRange<double>
                 {
-                    Min = maxBPM = songSelect!.Carousel.SelectedBeatmapSet!.MaxBPM,
+                    Min = maxBPM = songSelect.Carousel.SelectedBeatmapSet.MaxBPM,
                     IsLowerInclusive = true
                 }
             }));
 
-            BeatmapInfo? filteredBeatmap = null;
-            FilterableDifficultyIcon? filteredIcon = null;
+            BeatmapInfo filteredBeatmap = null;
+            FilterableDifficultyIcon filteredIcon = null;
 
             AddStep("Get filtered icon", () =>
             {
-                var selectedSet = songSelect!.Carousel.SelectedBeatmapSet;
-
-                Debug.Assert(selectedSet != null);
-
+                var selectedSet = songSelect.Carousel.SelectedBeatmapSet;
                 filteredBeatmap = selectedSet.Beatmaps.First(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(selectedSet, filteredBeatmap);
                 filteredIcon = set.ChildrenOfType<FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
@@ -862,7 +842,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("Selected beatmap correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(filteredBeatmap) == true);
+            AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(filteredBeatmap));
         }
 
         [Test]
@@ -927,14 +907,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(TestResources.CreateTestBeatmapSetInfo(3, usableRulesets));
             });
 
-            DrawableCarouselBeatmapSet? set = null;
+            DrawableCarouselBeatmapSet set = null;
             AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
                 return set != null;
             });
 
-            FilterableDifficultyIcon? difficultyIcon = null;
+            FilterableDifficultyIcon difficultyIcon = null;
             AddUntilStep("Find an icon for different ruleset", () =>
             {
                 difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
@@ -957,7 +937,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.OnlineID == 3);
 
-            AddAssert("Selected beatmap still same set", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == previousSetID);
+            AddAssert("Selected beatmap still same set", () => songSelect.Carousel.SelectedBeatmapInfo.BeatmapSet?.OnlineID == previousSetID);
             AddAssert("Selected beatmap is mania", () => Beatmap.Value.BeatmapInfo.Ruleset.OnlineID == 3);
         }
 
@@ -968,7 +948,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            BeatmapSetInfo? imported = null;
+            BeatmapSetInfo imported = null;
 
             AddStep("import huge difficulty count map", () =>
             {
@@ -976,27 +956,20 @@ namespace osu.Game.Tests.Visual.SongSelect
                 imported = manager.Import(TestResources.CreateTestBeatmapSetInfo(50, usableRulesets))?.Value;
             });
 
-            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported?.Beatmaps.First()));
+            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported.Beatmaps.First()));
 
-            DrawableCarouselBeatmapSet? set = null;
+            DrawableCarouselBeatmapSet set = null;
             AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
                 return set != null;
             });
 
-            GroupedDifficultyIcon groupIcon = null!;
-
+            GroupedDifficultyIcon groupIcon = null;
             AddUntilStep("Find group icon for different ruleset", () =>
             {
-                var foundIcon = set.ChildrenOfType<GroupedDifficultyIcon>()
-                                   .FirstOrDefault(icon => icon.Items.First().BeatmapInfo.Ruleset.OnlineID == 3);
-
-                if (foundIcon == null)
-                    return false;
-
-                groupIcon = foundIcon;
-                return true;
+                return (groupIcon = set.ChildrenOfType<GroupedDifficultyIcon>()
+                                       .FirstOrDefault(icon => icon.Items.First().BeatmapInfo.Ruleset.OnlineID == 3)) != null;
             });
 
             AddAssert("Check ruleset is osu!", () => Ruleset.Value.OnlineID == 0);
@@ -1031,7 +1004,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 // this ruleset change should be overridden by the present.
                 Ruleset.Value = getSwitchBeatmap().Ruleset;
 
-                songSelect!.PresentScore(new ScoreInfo
+                songSelect.PresentScore(new ScoreInfo
                 {
                     User = new APIUser { Username = "woo" },
                     BeatmapInfo = getPresentBeatmap(),
@@ -1039,7 +1012,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 });
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1065,10 +1038,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 // this beatmap change should be overridden by the present.
                 Beatmap.Value = manager.GetWorkingBeatmap(getSwitchBeatmap());
 
-                songSelect!.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
+                songSelect.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1081,29 +1054,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("toggle mod overlay on", () => InputManager.Key(Key.F1));
-            AddUntilStep("mod overlay shown", () => songSelect!.ModSelect.State.Value == Visibility.Visible);
+            AddUntilStep("mod overlay shown", () => songSelect.ModSelect.State.Value == Visibility.Visible);
 
             AddStep("toggle mod overlay off", () => InputManager.Key(Key.F1));
-            AddUntilStep("mod overlay hidden", () => songSelect!.ModSelect.State.Value == Visibility.Hidden);
+            AddUntilStep("mod overlay hidden", () => songSelect.ModSelect.State.Value == Visibility.Hidden);
         }
 
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
-            AddUntilStep("wait for difficulty panels visible", () => songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
+            AddUntilStep("wait for difficulty panels visible", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
         }
 
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.IndexOf(info);
 
-        private NoResultsPlaceholder? getPlaceholder() => songSelect!.ChildrenOfType<NoResultsPlaceholder>().FirstOrDefault();
+        private NoResultsPlaceholder getPlaceholder() => songSelect.ChildrenOfType<NoResultsPlaceholder>().FirstOrDefault();
 
-        private int getCurrentBeatmapIndex()
-        {
-            Debug.Assert(songSelect!.Carousel.SelectedBeatmapSet != null);
-            Debug.Assert(songSelect!.Carousel.SelectedBeatmapInfo != null);
-
-            return getBeatmapIndex(songSelect!.Carousel.SelectedBeatmapSet, songSelect!.Carousel.SelectedBeatmapInfo);
-        }
+        private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmapInfo);
 
         private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, FilterableDifficultyIcon icon)
         {
@@ -1112,14 +1079,14 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void addRulesetImportStep(int id)
         {
-            Live<BeatmapSetInfo>? imported = null;
+            Live<BeatmapSetInfo> imported = null;
             AddStep($"import test map for ruleset {id}", () => imported = importForRuleset(id));
             // This is specifically for cases where the add is happening post song select load.
             // For cases where song select is null, the assertions are provided by the load checks.
-            AddUntilStep("wait for imported to arrive in carousel", () => songSelect == null || songSelect!.Carousel.BeatmapSets.Any(s => s.ID == imported?.ID));
+            AddUntilStep("wait for imported to arrive in carousel", () => songSelect == null || songSelect.Carousel.BeatmapSets.Any(s => s.ID == imported?.ID));
         }
 
-        private Live<BeatmapSetInfo>? importForRuleset(int id) => manager.Import(TestResources.CreateTestBeatmapSetInfo(3, rulesets.AvailableRulesets.Where(r => r.OnlineID == id).ToArray()));
+        private Live<BeatmapSetInfo> importForRuleset(int id) => manager.Import(TestResources.CreateTestBeatmapSetInfo(3, rulesets.AvailableRulesets.Where(r => r.OnlineID == id).ToArray()));
 
         private void checkMusicPlaying(bool playing) =>
             AddUntilStep($"music {(playing ? "" : "not ")}playing", () => music.IsPlaying == playing);
@@ -1131,8 +1098,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         private void createSongSelect()
         {
             AddStep("create song select", () => LoadScreen(songSelect = new TestSongSelect()));
-            AddUntilStep("wait for present", () => songSelect!.IsCurrentScreen());
-            AddUntilStep("wait for carousel loaded", () => songSelect!.Carousel.IsAlive);
+            AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+            AddUntilStep("wait for carousel loaded", () => songSelect.Carousel.IsAlive);
         }
 
         /// <summary>
@@ -1156,14 +1123,12 @@ namespace osu.Game.Tests.Visual.SongSelect
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-
-            if (rulesets.IsNotNull())
-                rulesets.Dispose();
+            rulesets?.Dispose();
         }
 
         private class TestSongSelect : PlaySongSelect
         {
-            public Action? StartRequested;
+            public Action StartRequested;
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 

osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs

@@ -1,7 +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.Diagnostics;
+#nullable disable
+
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -12,7 +13,6 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Tests.Resources;
@@ -22,10 +22,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneTopLocalRank : OsuTestScene
     {
-        private RulesetStore rulesets = null!;
-        private BeatmapManager beatmapManager = null!;
-        private ScoreManager scoreManager = null!;
-        private TopLocalRank topLocalRank = null!;
+        private RulesetStore rulesets;
+        private BeatmapManager beatmapManager;
+        private ScoreManager scoreManager;
+        private TopLocalRank topLocalRank;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -47,21 +47,21 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Create local rank", () =>
             {
-                Child = topLocalRank = new TopLocalRank(importedBeatmap)
+                Add(topLocalRank = new TopLocalRank(importedBeatmap)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(10),
-                };
+                });
             });
-
-            AddAssert("No rank displayed initially", () => topLocalRank.DisplayedRank == null);
         }
 
         [Test]
         public void TestBasicImportDelete()
         {
-            ScoreInfo testScoreInfo = null!;
+            ScoreInfo testScoreInfo = null;
+
+            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
 
             AddStep("Add score for current user", () =>
             {
@@ -73,100 +73,73 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
+            AddUntilStep("Became present", () => topLocalRank.IsPresent);
+            AddAssert("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
 
-            AddStep("Delete score", () => scoreManager.Delete(testScoreInfo));
+            AddStep("Delete score", () =>
+            {
+                scoreManager.Delete(testScoreInfo);
+            });
 
-            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
+            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
         }
 
         [Test]
         public void TestRulesetChange()
         {
+            ScoreInfo testScoreInfo;
+
             AddStep("Add score for current user", () =>
-            {
-                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
-
-                testScoreInfo.User = API.LocalUser.Value;
-                testScoreInfo.Rank = ScoreRank.B;
-
-                scoreManager.Import(testScoreInfo);
-            });
-
-            AddUntilStep("Wait for initial display", () => topLocalRank.DisplayedRank == ScoreRank.B);
-
-            AddStep("Change ruleset", () => Ruleset.Value = rulesets.GetRuleset("fruits"));
-            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
-
-            AddStep("Change ruleset back", () => Ruleset.Value = rulesets.GetRuleset("osu"));
-            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
-        }
-
-        [Test]
-        public void TestHigherScoreSet()
-        {
-            AddStep("Add score for current user", () =>
-            {
-                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
-
-                testScoreInfo.User = API.LocalUser.Value;
-                testScoreInfo.Rank = ScoreRank.B;
-
-                scoreManager.Import(testScoreInfo);
-            });
-
-            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
-
-            AddStep("Add higher score for current user", () =>
-            {
-                var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
-
-                testScoreInfo2.User = API.LocalUser.Value;
-                testScoreInfo2.Rank = ScoreRank.X;
-                testScoreInfo2.TotalScore = 1000000;
-                testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
-
-                scoreManager.Import(testScoreInfo2);
-            });
-
-            AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
-        }
-
-        [Test]
-        public void TestLegacyScore()
-        {
-            ScoreInfo testScoreInfo = null!;
-
-            AddStep("Add legacy score for current user", () =>
             {
                 testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
-                testScoreInfo.TotalScore = scoreManager.GetTotalScore(testScoreInfo, ScoringMode.Classic);
 
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
+            AddUntilStep("Wait for initial presence", () => topLocalRank.IsPresent);
+
+            AddStep("Change ruleset", () => Ruleset.Value = rulesets.GetRuleset("fruits"));
+            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
+
+            AddStep("Change ruleset back", () => Ruleset.Value = rulesets.GetRuleset("osu"));
+            AddUntilStep("Became present", () => topLocalRank.IsPresent);
+        }
+
+        [Test]
+        public void TestHigherScoreSet()
+        {
+            ScoreInfo testScoreInfo = null;
+
+            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
+
+            AddStep("Add score for current user", () =>
+            {
+                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+
+                testScoreInfo.User = API.LocalUser.Value;
+                testScoreInfo.Rank = ScoreRank.B;
+
+                scoreManager.Import(testScoreInfo);
+            });
+
+            AddUntilStep("Became present", () => topLocalRank.IsPresent);
+            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
 
             AddStep("Add higher score for current user", () =>
             {
                 var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo2.User = API.LocalUser.Value;
-                testScoreInfo2.Rank = ScoreRank.X;
-                testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
-                testScoreInfo2.TotalScore = scoreManager.GetTotalScore(testScoreInfo2);
-
-                // ensure second score has a total score (standardised) less than first one (classic)
-                // despite having better statistics, otherwise this test is pointless.
-                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
+                testScoreInfo2.Rank = ScoreRank.S;
+                testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
 
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
+            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.S);
         }
     }
 }

osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs

@@ -3,13 +3,9 @@
 
 #nullable disable
 
-using System.Linq;
-using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -19,13 +15,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapListingSortTabControl : OsuTestScene
     {
-        private readonly BeatmapListingSortTabControl control;
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
         public TestSceneBeatmapListingSortTabControl()
         {
+            BeatmapListingSortTabControl control;
             OsuSpriteText current;
             OsuSpriteText direction;
 
@@ -50,83 +45,5 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
             control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
         }
-
-        [Test]
-        public void TestRankedSort()
-        {
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Any);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Leaderboard);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Ranked);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Qualified);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Loved);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Favourites);
-            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Pending);
-            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Wip);
-            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Graveyard);
-            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Mine);
-        }
-
-        [Test]
-        public void TestUpdatedSort()
-        {
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Any);
-            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Leaderboard);
-            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Ranked);
-            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Qualified);
-            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Loved);
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Favourites);
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Pending);
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Wip);
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Graveyard);
-            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Mine);
-        }
-
-        [Test]
-        public void TestNominationsSort()
-        {
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Any);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Leaderboard);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Ranked);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Qualified);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Loved);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Favourites);
-            criteriaShowsOnCategory(true, SortCriteria.Nominations, SearchCategory.Pending);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Wip);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Graveyard);
-            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Mine);
-        }
-
-        [Test]
-        public void TestResetNoQuery()
-        {
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Any);
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Leaderboard);
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Ranked);
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Qualified);
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Loved);
-            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Favourites);
-            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Pending);
-            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Wip);
-            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Graveyard);
-            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Mine);
-        }
-
-        private void criteriaShowsOnCategory(bool expected, SortCriteria criteria, SearchCategory category)
-        {
-            AddAssert($"{criteria.ToString().ToLowerInvariant()} {(expected ? "shown" : "not shown")} on {category.ToString().ToLowerInvariant()}", () =>
-            {
-                control.Reset(category, false);
-                return control.ChildrenOfType<TabControl<SortCriteria>>().Single().Items.Contains(criteria) == expected;
-            });
-        }
-
-        private void resetUsesCriteriaOnCategory(SortCriteria criteria, SearchCategory category)
-        {
-            AddAssert($"reset uses {criteria.ToString().ToLowerInvariant()} on {category.ToString().ToLowerInvariant()}", () =>
-            {
-                control.Reset(category, false);
-                return control.Current.Value == criteria;
-            });
-        }
     }
 }

osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs

@@ -7,19 +7,15 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Updater;
-using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneNotificationOverlay : OsuManualInputManagerTestScene
+    public class TestSceneNotificationOverlay : OsuTestScene
     {
         private NotificationOverlay notificationOverlay = null!;
 
@@ -27,15 +23,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private SpriteText displayedCount = null!;
 
-        public double TimeToCompleteProgress { get; set; } = 2000;
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            TimeToCompleteProgress = 2000;
             progressingNotifications.Clear();
 
-            Children = new Drawable[]
+            Content.Children = new Drawable[]
             {
                 notificationOverlay = new NotificationOverlay
                 {
@@ -48,191 +41,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
-        [Test]
-        public void TestForwardWithFlingRight()
-        {
-            bool activated = false;
-            SimpleNotification notification = null!;
-
-            AddStep("post", () =>
-            {
-                activated = false;
-                notificationOverlay.Post(notification = new SimpleNotification
-                {
-                    Text = @"Welcome to osu!. Enjoy your stay!",
-                    Activated = () => activated = true,
-                });
-            });
-
-            AddStep("start drag", () =>
-            {
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(500, 0));
-            });
-
-            AddStep("fling away", () =>
-            {
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
-
-            AddAssert("was not closed", () => !notification.WasClosed);
-            AddAssert("was not activated", () => !activated);
-            AddAssert("is not read", () => !notification.Read);
-            AddAssert("is not toast", () => !notification.IsInToastTray);
-
-            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddAssert("unread count one", () => notificationOverlay.UnreadCount.Value == 1);
-        }
-
-        [Test]
-        public void TestDismissWithoutActivationFling()
-        {
-            bool activated = false;
-            SimpleNotification notification = null!;
-
-            AddStep("post", () =>
-            {
-                activated = false;
-                notificationOverlay.Post(notification = new SimpleNotification
-                {
-                    Text = @"Welcome to osu!. Enjoy your stay!",
-                    Activated = () => activated = true,
-                });
-            });
-
-            AddStep("start drag", () =>
-            {
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
-                InputManager.PressButton(MouseButton.Left);
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
-            });
-
-            AddStep("fling away", () =>
-            {
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
-
-            AddUntilStep("wait for closed", () => notification.WasClosed);
-            AddAssert("was not activated", () => !activated);
-            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
-        }
-
-        [Test]
-        public void TestDismissWithoutActivationCloseButton()
-        {
-            bool activated = false;
-            SimpleNotification notification = null!;
-
-            AddStep("post", () =>
-            {
-                activated = false;
-                notificationOverlay.Post(notification = new SimpleNotification
-                {
-                    Text = @"Welcome to osu!. Enjoy your stay!",
-                    Activated = () => activated = true,
-                });
-            });
-
-            AddStep("click to activate", () =>
-            {
-                InputManager.MoveMouseTo(notificationOverlay
-                                         .ChildrenOfType<Notification>().Single()
-                                         .ChildrenOfType<Notification.CloseButton>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("wait for closed", () => notification.WasClosed);
-            AddAssert("was not activated", () => !activated);
-            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
-            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
-        }
-
-        [Test]
-        public void TestDismissWithoutActivationRightClick()
-        {
-            bool activated = false;
-            SimpleNotification notification = null!;
-
-            AddStep("post", () =>
-            {
-                activated = false;
-                notificationOverlay.Post(notification = new SimpleNotification
-                {
-                    Text = @"Welcome to osu!. Enjoy your stay!",
-                    Activated = () => activated = true,
-                });
-            });
-
-            AddStep("click to activate", () =>
-            {
-                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddUntilStep("wait for closed", () => notification.WasClosed);
-            AddAssert("was not activated", () => !activated);
-            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
-        }
-
-        [Test]
-        public void TestActivate()
-        {
-            bool activated = false;
-            SimpleNotification notification = null!;
-
-            AddStep("post", () =>
-            {
-                activated = false;
-                notificationOverlay.Post(notification = new SimpleNotification
-                {
-                    Text = @"Welcome to osu!. Enjoy your stay!",
-                    Activated = () => activated = true,
-                });
-            });
-
-            AddStep("click to activate", () =>
-            {
-                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("wait for closed", () => notification.WasClosed);
-            AddAssert("was activated", () => activated);
-            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
-        }
-
-        [Test]
-        public void TestPresence()
-        {
-            AddAssert("tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
-            AddAssert("overlay not present", () => !notificationOverlay.IsPresent);
-
-            AddStep(@"post notification", sendBackgroundNotification);
-
-            AddUntilStep("wait tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
-            AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
-        }
-
-        [Test]
-        public void TestPresenceWithManualDismiss()
-        {
-            AddAssert("tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
-            AddAssert("overlay not present", () => !notificationOverlay.IsPresent);
-
-            AddStep(@"post notification", sendBackgroundNotification);
-            AddStep("click notification", () => notificationOverlay.ChildrenOfType<Notification>().Single().TriggerClick());
-
-            AddUntilStep("wait tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
-            AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
-        }
-
         [Test]
         public void TestCompleteProgress()
         {
             ProgressNotification notification = null!;
-
             AddStep("add progress notification", () =>
             {
                 notification = new ProgressNotification
@@ -245,31 +57,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddUntilStep("wait completion", () => notification.State == ProgressNotificationState.Completed);
-
-            AddAssert("Completion toast shown", () => notificationOverlay.ToastCount == 1);
-            AddUntilStep("wait forwarded", () => notificationOverlay.ToastCount == 0);
-        }
-
-        [Test]
-        public void TestCompleteProgressSlow()
-        {
-            ProgressNotification notification = null!;
-
-            AddStep("Set progress slow", () => TimeToCompleteProgress *= 2);
-            AddStep("add progress notification", () =>
-            {
-                notification = new ProgressNotification
-                {
-                    Text = @"Uploading to BSS...",
-                    CompletionText = "Uploaded to BSS!",
-                };
-                notificationOverlay.Post(notification);
-                progressingNotifications.Add(notification);
-            });
-
-            AddUntilStep("wait completion", () => notification.State == ProgressNotificationState.Completed);
-
-            AddAssert("Completion toast shown", () => notificationOverlay.ToastCount == 1);
         }
 
         [Test]
@@ -292,55 +79,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("cancel notification", () => notification.State = ProgressNotificationState.Cancelled);
         }
 
-        [Test]
-        public void TestReadState()
-        {
-            SimpleNotification notification = null!;
-            AddStep(@"post", () => notificationOverlay.Post(notification = new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" }));
-            AddUntilStep("check is toast", () => !notification.IsInToastTray);
-            AddAssert("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
-
-            AddUntilStep("wait for forward to overlay", () => !notification.IsInToastTray);
-
-            setState(Visibility.Visible);
-            AddAssert("state is not read", () => !notification.Read);
-            AddUntilStep("light is visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 1);
-
-            setState(Visibility.Hidden);
-            setState(Visibility.Visible);
-            AddAssert("state is read", () => notification.Read);
-            AddUntilStep("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
-        }
-
-        [Test]
-        public void TestUpdateNotificationFlow()
-        {
-            bool applyUpdate = false;
-
-            AddStep(@"post update", () =>
-            {
-                applyUpdate = false;
-
-                var updateNotification = new UpdateManager.UpdateProgressNotification
-                {
-                    CompletionClickAction = () => applyUpdate = true
-                };
-
-                notificationOverlay.Post(updateNotification);
-                progressingNotifications.Add(updateNotification);
-            });
-
-            checkProgressingCount(1);
-            waitForCompletion();
-
-            UpdateManager.UpdateApplicationCompleteNotification? completionNotification = null;
-            AddUntilStep("wait for completion notification",
-                () => (completionNotification = notificationOverlay.ChildrenOfType<UpdateManager.UpdateApplicationCompleteNotification>().SingleOrDefault()) != null);
-            AddStep("click notification", () => completionNotification?.TriggerClick());
-
-            AddUntilStep("wait for update applied", () => applyUpdate);
-        }
-
         [Test]
         public void TestBasicFlow()
         {
@@ -439,7 +177,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             foreach (var n in progressingNotifications.FindAll(n => n.State == ProgressNotificationState.Active))
             {
                 if (n.Progress < 1)
-                    n.Progress += (float)(Time.Elapsed / TimeToCompleteProgress);
+                    n.Progress += (float)(Time.Elapsed / 2000);
                 else
                     n.State = ProgressNotificationState.Completed;
             }

osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs

@@ -1,94 +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.Globalization;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneSizePreservingSpriteText : OsuGridTestScene
-    {
-        private readonly List<Container> parentContainers = new List<Container>();
-        private readonly List<UprightAspectMaintainingContainer> childContainers = new List<UprightAspectMaintainingContainer>();
-        private readonly OsuSpriteText osuSpriteText = new OsuSpriteText();
-        private readonly SizePreservingSpriteText sizePreservingSpriteText = new SizePreservingSpriteText();
-
-        public TestSceneSizePreservingSpriteText()
-            : base(1, 2)
-        {
-            for (int i = 0; i < 2; i++)
-            {
-                UprightAspectMaintainingContainer childContainer;
-                Container parentContainer = new Container
-                {
-                    Origin = Anchor.BottomRight,
-                    Anchor = Anchor.BottomCentre,
-                    AutoSizeAxes = Axes.Both,
-                    Rotation = 45,
-                    Y = -200,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Colour4.Red,
-                        },
-                        childContainer = new UprightAspectMaintainingContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Colour4.Blue,
-                                },
-                            }
-                        },
-                    }
-                };
-
-                Container cellInfo = new Container
-                {
-                    Origin = Anchor.TopCentre,
-                    Anchor = Anchor.TopCentre,
-                    Margin = new MarginPadding
-                    {
-                        Top = 100,
-                    },
-                    Child = new OsuSpriteText
-                    {
-                        Text = (i == 0) ? "OsuSpriteText" : "SizePreservingSpriteText",
-                        Font = OsuFont.GetFont(Typeface.Inter, weight: FontWeight.Bold, size: 40),
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                    },
-                };
-
-                parentContainers.Add(parentContainer);
-                childContainers.Add(childContainer);
-                Cell(i).Add(cellInfo);
-                Cell(i).Add(parentContainer);
-            }
-
-            childContainers[0].Add(osuSpriteText);
-            childContainers[1].Add(sizePreservingSpriteText);
-            osuSpriteText.Font = sizePreservingSpriteText.Font = OsuFont.GetFont(Typeface.Venera, weight: FontWeight.Bold, size: 20);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-            osuSpriteText.Text = sizePreservingSpriteText.Text = DateTime.Now.ToString(CultureInfo.InvariantCulture);
-        }
-    }
-}

osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs

@@ -1,244 +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.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics;
-using osu.Framework.Utils;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics;
-using osuTK.Graphics;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneUprightAspectMaintainingContainer : OsuGridTestScene
-    {
-        private const int rows = 3;
-        private const int columns = 4;
-
-        private readonly ScaleMode[] scaleModeValues = { ScaleMode.NoScaling, ScaleMode.Horizontal, ScaleMode.Vertical };
-        private readonly float[] scalingFactorValues = { 1.0f / 3, 1.0f / 2, 1.0f, 1.5f };
-
-        private readonly List<List<Container>> parentContainers = new List<List<Container>>(rows);
-        private readonly List<List<UprightAspectMaintainingContainer>> childContainers = new List<List<UprightAspectMaintainingContainer>>(rows);
-
-        // Preferably should be set to (4 * 2^n)
-        private const int rotation_step_count = 3;
-
-        private readonly List<int> flipStates = new List<int>();
-        private readonly List<float> rotationSteps = new List<float>();
-        private readonly List<float> scaleSteps = new List<float>();
-
-        public TestSceneUprightAspectMaintainingContainer()
-            : base(rows, columns)
-        {
-            for (int i = 0; i < rows; i++)
-            {
-                parentContainers.Add(new List<Container>());
-                childContainers.Add(new List<UprightAspectMaintainingContainer>());
-
-                for (int j = 0; j < columns; j++)
-                {
-                    UprightAspectMaintainingContainer child;
-                    Container parent = new Container
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Height = 80,
-                        Width = 80,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = new Color4(255, 0, 0, 160),
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = "Parent",
-                            },
-                            child = new UprightAspectMaintainingContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                AutoSizeAxes = Axes.Both,
-
-                                // These are the parameters being Tested
-                                Scaling = scaleModeValues[i],
-                                ScalingFactor = scalingFactorValues[j],
-
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = new Color4(0, 0, 255, 160),
-                                    },
-                                    new OsuSpriteText
-                                    {
-                                        Text = "Text",
-                                        Font = OsuFont.Numeric,
-                                        Origin = Anchor.Centre,
-                                        Anchor = Anchor.Centre,
-                                        Padding = new MarginPadding
-                                        {
-                                            Horizontal = 4,
-                                            Vertical = 4,
-                                        }
-                                    },
-                                }
-                            }
-                        }
-                    };
-
-                    Container cellInfo = new Container
-                    {
-                        Children = new Drawable[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Text = "Scaling: " + scaleModeValues[i].ToString(),
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = "ScalingFactor: " + scalingFactorValues[j].ToString("0.00"),
-                                Margin = new MarginPadding
-                                {
-                                    Top = 15,
-                                },
-                            },
-                        },
-                    };
-
-                    Cell(i * columns + j).Add(cellInfo);
-                    Cell(i * columns + j).Add(parent);
-                    parentContainers[i].Add(parent);
-                    childContainers[i].Add(child);
-                }
-            }
-
-            flipStates.AddRange(new[] { 1, -1 });
-            rotationSteps.AddRange(Enumerable.Range(0, rotation_step_count).Select(x => 360f * ((float)x / rotation_step_count)));
-            scaleSteps.AddRange(new[] { 1, 0.3f, 1.5f });
-        }
-
-        [Test]
-        public void ExplicitlySizedParent()
-        {
-            var parentStates = from xFlip in flipStates
-                               from yFlip in flipStates
-                               from xScale in scaleSteps
-                               from yScale in scaleSteps
-                               from rotation in rotationSteps
-                               select new { xFlip, yFlip, xScale, yScale, rotation };
-
-            foreach (var state in parentStates)
-            {
-                Vector2 parentScale = new Vector2(state.xFlip * state.xScale, state.yFlip * state.yScale);
-                float parentRotation = state.rotation;
-
-                AddStep("S: (" + parentScale.X.ToString("0.00") + ", " + parentScale.Y.ToString("0.00") + "), R: " + parentRotation.ToString("0.00"), () =>
-                {
-                    foreach (List<Container> list in parentContainers)
-                    {
-                        foreach (Container container in list)
-                        {
-                            container.Scale = parentScale;
-                            container.Rotation = parentRotation;
-                        }
-                    }
-                });
-
-                AddAssert("Check if state is valid", () =>
-                {
-                    foreach (int i in Enumerable.Range(0, parentContainers.Count))
-                    {
-                        foreach (int j in Enumerable.Range(0, parentContainers[i].Count))
-                        {
-                            if (!uprightAspectMaintainingContainerStateIsValid(parentContainers[i][j], childContainers[i][j]))
-                                return false;
-                        }
-                    }
-
-                    return true;
-                });
-            }
-        }
-
-        private bool uprightAspectMaintainingContainerStateIsValid(Container parent, UprightAspectMaintainingContainer child)
-        {
-            Matrix3 parentMatrix = parent.DrawInfo.Matrix;
-            Matrix3 childMatrix = child.DrawInfo.Matrix;
-            Vector3 childScale = childMatrix.ExtractScale();
-            Vector3 parentScale = parentMatrix.ExtractScale();
-
-            // Orientation check
-            if (!(isNearlyZero(MathF.Abs(childMatrix.M21)) && isNearlyZero(MathF.Abs(childMatrix.M12))))
-                return false;
-
-            // flip check
-            if (!(childMatrix.M11 * childMatrix.M22 > 0))
-                return false;
-
-            // Aspect ratio check
-            if (!isNearlyZero(childScale.X - childScale.Y))
-                return false;
-
-            // ScalingMode check
-            switch (child.Scaling)
-            {
-                case ScaleMode.NoScaling:
-                    if (!(isNearlyZero(childMatrix.M11 - 1.0f) && isNearlyZero(childMatrix.M22 - 1.0f)))
-                        return false;
-
-                    break;
-
-                case ScaleMode.Vertical:
-                    if (!(checkScaling(child.ScalingFactor, parentScale.Y, childScale.Y)))
-                        return false;
-
-                    break;
-
-                case ScaleMode.Horizontal:
-                    if (!(checkScaling(child.ScalingFactor, parentScale.X, childScale.X)))
-                        return false;
-
-                    break;
-            }
-
-            return true;
-        }
-
-        private bool checkScaling(float scalingFactor, float parentScale, float childScale)
-        {
-            if (scalingFactor <= 1.0f)
-            {
-                if (!isNearlyZero(1.0f + (parentScale - 1.0f) * scalingFactor - childScale))
-                    return false;
-            }
-            else if (scalingFactor > 1.0f)
-            {
-                if (parentScale < 1.0f)
-                {
-                    if (!isNearlyZero((parentScale * (1.0f / scalingFactor)) - childScale))
-                        return false;
-                }
-                else if (!isNearlyZero(parentScale * scalingFactor - childScale))
-                    return false;
-            }
-
-            return true;
-        }
-
-        private bool isNearlyZero(float f, float epsilon = Precision.FLOAT_EPSILON)
-        {
-            return f < epsilon;
-        }
-    }
-}

osu.Game.Tournament/Models/TournamentMatch.cs

@@ -106,16 +106,13 @@ namespace osu.Game.Tournament.Models
         }
 
         /// <summary>
-        /// Initialise this match with zeroed scores. Will be a noop if either team is not present or if either of the scores are non-zero.
+        /// Initialise this match with zeroed scores. Will be a noop if either team is not present.
         /// </summary>
         public void StartMatch()
         {
             if (Team1.Value == null || Team2.Value == null)
                 return;
 
-            if (Team1Score.Value > 0 || Team2Score.Value > 0)
-                return;
-
             Team1Score.Value = 0;
             Team2Score.Value = 0;
         }

osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs

@@ -170,7 +170,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
             availableTeams.Add(team);
 
-            RemoveAll(c => c is ScrollingTeam, true);
+            RemoveAll(c => c is ScrollingTeam, false);
             setScrollState(ScrollState.Idle);
         }
 

osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs

@@ -25,7 +25,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         public bool ShowScore
         {
-            get => teamDisplay.ShowScore;
             set => teamDisplay.ShowScore = value;
         }
 
@@ -93,14 +92,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private void teamChanged(ValueChangedEvent<TournamentTeam> team)
         {
-            bool wasShowingScores = teamDisplay?.ShowScore ?? false;
-
             InternalChildren = new Drawable[]
             {
                 teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
             };
-
-            teamDisplay.ShowScore = wasShowingScores;
         }
     }
 }

osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs

@@ -280,7 +280,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
         protected override bool OnClick(ClickEvent e)
         {
-            if (editorInfo == null || Match is ConditionalTournamentMatch || e.Button != MouseButton.Left)
+            if (editorInfo == null || Match is ConditionalTournamentMatch)
                 return false;
 
             Selected = true;

osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs

@@ -46,10 +46,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new MatchHeader
-                {
-                    ShowScores = true,
-                },
+                new MatchHeader(),
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {
                     Y = 160,

osu.Game/BackgroundBeatmapProcessor.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -15,7 +14,6 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets;
-using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game
@@ -25,9 +23,6 @@ namespace osu.Game
         [Resolved]
         private RulesetStore rulesetStore { get; set; } = null!;
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
         [Resolved]
         private RealmAccess realmAccess { get; set; } = null!;
 
@@ -51,7 +46,6 @@ namespace osu.Game
                 Logger.Log("Beginning background beatmap processing..");
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
-                processScoresWithMissingStatistics();
             }).ContinueWith(t =>
             {
                 if (t.Exception?.InnerException is ObjectDisposedException)
@@ -146,52 +140,5 @@ namespace osu.Game
                 });
             }
         }
-
-        private void processScoresWithMissingStatistics()
-        {
-            HashSet<Guid> scoreIds = new HashSet<Guid>();
-
-            Logger.Log("Querying for scores to reprocess...");
-
-            realmAccess.Run(r =>
-            {
-                foreach (var score in r.All<ScoreInfo>())
-                {
-                    if (score.Statistics.Sum(kvp => kvp.Value) > 0 && score.MaximumStatistics.Sum(kvp => kvp.Value) == 0)
-                        scoreIds.Add(score.ID);
-                }
-            });
-
-            Logger.Log($"Found {scoreIds.Count} scores which require reprocessing.");
-
-            foreach (var id in scoreIds)
-            {
-                while (localUserPlayInfo?.IsPlaying.Value == true)
-                {
-                    Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
-                }
-
-                try
-                {
-                    var score = scoreManager.Query(s => s.ID == id);
-
-                    scoreManager.PopulateMaximumStatistics(score);
-
-                    // Can't use async overload because we're not on the update thread.
-                    // ReSharper disable once MethodHasAsyncOverload
-                    realmAccess.Write(r =>
-                    {
-                        r.Find<ScoreInfo>(id).MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
-                    });
-
-                    Logger.Log($"Populated maximum statistics for score {id}");
-                }
-                catch (Exception e)
-                {
-                    Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
-                }
-            }
-        }
     }
 }

osu.Game/Beatmaps/BeatmapManager.cs

@@ -319,7 +319,8 @@ namespace osu.Game.Beatmaps
 
                 AddFile(setInfo, stream, createBeatmapFilenameFromMetadata(beatmapInfo));
 
-                updateHashAndMarkDirty(setInfo);
+                setInfo.Hash = beatmapImporter.ComputeHash(setInfo);
+                setInfo.Status = BeatmapOnlineStatus.LocallyModified;
 
                 Realm.Write(r =>
                 {
@@ -362,33 +363,6 @@ namespace osu.Game.Beatmaps
             });
         }
 
-        /// <summary>
-        /// Delete a beatmap difficulty immediately.
-        /// </summary>
-        /// <remarks>
-        /// There's no undoing this operation, as we don't have a soft-deletion flag on <see cref="BeatmapInfo"/>.
-        /// This may be a future consideration if there's a user requirement for undeleting support.
-        /// </remarks>
-        public void DeleteDifficultyImmediately(BeatmapInfo beatmapInfo)
-        {
-            Realm.Write(r =>
-            {
-                if (!beatmapInfo.IsManaged)
-                    beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID);
-
-                Debug.Assert(beatmapInfo.BeatmapSet != null);
-                Debug.Assert(beatmapInfo.File != null);
-
-                var setInfo = beatmapInfo.BeatmapSet;
-
-                DeleteFile(setInfo, beatmapInfo.File);
-                setInfo.Beatmaps.Remove(beatmapInfo);
-
-                updateHashAndMarkDirty(setInfo);
-                workingBeatmapCache.Invalidate(setInfo);
-            });
-        }
-
         /// <summary>
         /// Delete videos from a list of beatmaps.
         /// This will post notifications tracking progress.
@@ -442,12 +416,6 @@ namespace osu.Game.Beatmaps
         public Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original) =>
             beatmapImporter.ImportAsUpdate(notification, importTask, original);
 
-        private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
-        {
-            setInfo.Hash = beatmapImporter.ComputeHash(setInfo);
-            setInfo.Status = BeatmapOnlineStatus.LocallyModified;
-        }
-
         #region Implementation of ICanAcceptFiles
 
         public Task Import(params string[] paths) => beatmapImporter.Import(paths);

osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs

@@ -14,7 +14,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public abstract class BeatmapCard : OsuClickableContainer, IEquatable<BeatmapCard>
+    public abstract class BeatmapCard : OsuClickableContainer
     {
         public const float TRANSITION_DURATION = 400;
         public const float CORNER_RADIUS = 10;
@@ -96,16 +96,5 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     throw new ArgumentOutOfRangeException(nameof(size), size, @"Unsupported card size");
             }
         }
-
-        public bool Equals(BeatmapCard? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return BeatmapSet.Equals(other.BeatmapSet);
-        }
-
-        public override bool Equals(object obj) => obj is BeatmapCard other && Equals(other);
-        public override int GetHashCode() => BeatmapSet.GetHashCode();
     }
 }

osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs

@@ -17,7 +17,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
 {
     public class DownloadButton : BeatmapCardIconButton
     {
-        public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
+        public IBindable<DownloadState> State => state;
+        private readonly Bindable<DownloadState> state = new Bindable<DownloadState>();
 
         private readonly APIBeatmapSet beatmapSet;
 
@@ -47,19 +48,14 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
         {
             base.LoadComplete();
             preferNoVideo.BindValueChanged(_ => updateState());
-            State.BindValueChanged(_ => updateState(), true);
+            state.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
         }
 
         private void updateState()
         {
-            switch (State.Value)
+            switch (state.Value)
             {
-                case DownloadState.Unknown:
-                    Action = null;
-                    TooltipText = string.Empty;
-                    break;
-
                 case DownloadState.Downloading:
                 case DownloadState.Importing:
                     Action = null;

osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs

@@ -41,9 +41,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
 
             Anchor = Origin = Anchor.Centre;
 
-            // needed for touch input to work when card is not hovered/expanded
-            AlwaysPresent = true;
-
             Children = new Drawable[]
             {
                 icon = new SpriteIcon

osu.Game/Beatmaps/FramedBeatmapClock.cs

@@ -121,18 +121,7 @@ namespace osu.Game.Beatmaps
         protected override void Update()
         {
             base.Update();
-
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime)
-            {
-                // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
-                // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93
-                // This is not always the case here when doing large seeks.
-                // (Of note, this is not an issue if the source is adjustable, as the source is seeked to be in time by DecoupleableInterpolatingFramedClock).
-                // Rather than trying to get around this by fixing the framework clock stack, let's work around it for now.
-                Seek(Source.CurrentTime);
-            }
-            else
-                finalClockSource.ProcessFrame();
+            finalClockSource.ProcessFrame();
         }
 
         public double TotalAppliedOffset

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -280,15 +280,12 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            var processor = rulesetInstance.CreateBeatmapProcessor(converted);
+            IBeatmapProcessor processor = rulesetInstance.CreateBeatmapProcessor(converted);
 
-            if (processor != null)
-            {
-                foreach (var mod in mods.OfType<IApplicableToBeatmapProcessor>())
-                    mod.ApplyToBeatmapProcessor(processor);
+            foreach (var mod in mods.OfType<IApplicableToBeatmapProcessor>())
+                mod.ApplyToBeatmapProcessor(processor);
 
-                processor.PreProcess();
-            }
+            processor?.PreProcess();
 
             // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
             foreach (var obj in converted.HitObjects)

osu.Game/Database/ModelDownloader.cs

@@ -111,7 +111,7 @@ namespace osu.Game.Database
                 {
                     if (error is WebException webException && webException.Message == @"TooManyRequests")
                     {
-                        notification.Close(false);
+                        notification.Close();
                         PostNotification?.Invoke(new TooManyDownloadsNotification());
                     }
                     else

osu.Game/Database/RealmArchiveModelImporter.cs

@@ -108,42 +108,47 @@ namespace osu.Game.Database
 
             bool isBatchImport = tasks.Length >= minimum_items_considered_batch_import;
 
-            await Task.WhenAll(tasks.Select(async task =>
+            try
             {
-                if (notification.CancellationToken.IsCancellationRequested)
-                    return;
-
-                try
+                await Task.WhenAll(tasks.Select(async task =>
                 {
-                    var model = await Import(task, isBatchImport, notification.CancellationToken).ConfigureAwait(false);
+                    notification.CancellationToken.ThrowIfCancellationRequested();
 
-                    lock (imported)
+                    try
                     {
-                        if (model != null)
-                            imported.Add(model);
-                        current++;
+                        var model = await Import(task, isBatchImport, 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 (OperationCanceledException)
-                {
-                }
-                catch (Exception e)
-                {
-                    Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
-                }
-            })).ConfigureAwait(false);
-
-            if (imported.Count == 0)
+                    catch (TaskCanceledException)
+                    {
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
+                    }
+                })).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
             {
-                if (notification.CancellationToken.IsCancellationRequested)
+                if (imported.Count == 0)
                 {
                     notification.State = ProgressNotificationState.Cancelled;
                     return imported;
                 }
+            }
 
+            if (imported.Count == 0)
+            {
                 notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
                 notification.State = ProgressNotificationState.Cancelled;
             }

osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs

@@ -4,9 +4,7 @@
 #nullable disable
 
 using Markdig;
-using Markdig.Extensions.AutoLinks;
-using Markdig.Extensions.EmphasisExtras;
-using Markdig.Extensions.Footnotes;
+using Markdig.Extensions.AutoIdentifiers;
 using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
@@ -20,18 +18,6 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
-        /// <summary>
-        /// Allows this markdown container to parse and link footnotes.
-        /// </summary>
-        /// <seealso cref="FootnoteExtension"/>
-        protected virtual bool Footnotes => false;
-
-        /// <summary>
-        /// Allows this markdown container to make URL text clickable.
-        /// </summary>
-        /// <seealso cref="AutoLinkExtension"/>
-        protected virtual bool Autolinks => false;
-
         public OsuMarkdownContainer()
         {
             LineSpacing = 21;
@@ -92,22 +78,10 @@ namespace osu.Game.Graphics.Containers.Markdown
             return new OsuMarkdownUnorderedListItem(level);
         }
 
-        // reference: https://github.com/ppy/osu-web/blob/05488a96b25b5a09f2d97c54c06dd2bae59d1dc8/app/Libraries/Markdown/OsuMarkdown.php#L301
         protected override MarkdownPipeline CreateBuilder()
-        {
-            var pipeline = new MarkdownPipelineBuilder()
-                           .UseAutoIdentifiers()
-                           .UsePipeTables()
-                           .UseEmphasisExtras(EmphasisExtraOptions.Strikethrough)
-                           .UseYamlFrontMatter();
-
-            if (Footnotes)
-                pipeline = pipeline.UseFootnotes();
-
-            if (Autolinks)
-                pipeline = pipeline.UseAutoLinks();
-
-            return pipeline.Build();
-        }
+            => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
+                                            .UseEmojiAndSmiley()
+                                            .UseYamlFrontMatter()
+                                            .UseAdvancedExtensions().Build();
     }
 }

osu.Game/Graphics/Containers/SectionsContainer.cs

@@ -55,7 +55,6 @@ namespace osu.Game.Graphics.Containers
 
                 fixedHeader?.Expire();
                 fixedHeader = value;
-
                 if (value == null) return;
 
                 AddInternal(fixedHeader);
@@ -71,10 +70,8 @@ namespace osu.Game.Graphics.Containers
                 if (value == footer) return;
 
                 if (footer != null)
-                    scrollContainer.Remove(footer, false);
-
+                    scrollContainer.Remove(footer, true);
                 footer = value;
-
                 if (value == null) return;
 
                 footer.Anchor |= Anchor.y2;

osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs

@@ -1,119 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Layout;
-using osuTK;
-
-namespace osu.Game.Graphics.Containers
-{
-    /// <summary>
-    /// A container that reverts any rotation (and optionally scale) applied by its direct parent.
-    /// </summary>
-    public class UprightAspectMaintainingContainer : Container
-    {
-        /// <summary>
-        /// Controls how much this container scales compared to its parent (default is 1.0f).
-        /// </summary>
-        public float ScalingFactor { get; set; } = 1;
-
-        /// <summary>
-        /// Controls the scaling of this container.
-        /// </summary>
-        public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
-
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
-
-        public UprightAspectMaintainingContainer()
-        {
-            AddLayout(layout);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!layout.IsValid)
-            {
-                keepUprightAndUnstretched();
-                layout.Validate();
-            }
-        }
-
-        /// <summary>
-        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
-        /// </summary>
-        private void keepUprightAndUnstretched()
-        {
-            // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
-            var parentMatrix = Parent.DrawInfo.Matrix;
-
-            // Remove Translation.>
-            parentMatrix.M31 = 0.0f;
-            parentMatrix.M32 = 0.0f;
-
-            Matrix3 reversedParent = parentMatrix.Inverted();
-
-            // Extract the rotation.
-            float angle = MathF.Atan2(reversedParent.M12, reversedParent.M11);
-            Rotation = MathHelper.RadiansToDegrees(angle);
-
-            // Remove rotation from the C matrix so that it only contains shear and scale.
-            Matrix3 m = Matrix3.CreateRotationZ(-angle);
-            reversedParent *= m;
-
-            // Extract shear.
-            float alpha = reversedParent.M21 / reversedParent.M22;
-            Shear = new Vector2(-alpha, 0);
-
-            // Etract scale.
-            float sx = reversedParent.M11;
-            float sy = reversedParent.M22;
-
-            Vector3 parentScale = parentMatrix.ExtractScale();
-
-            float usedScale = 1.0f;
-
-            switch (Scaling)
-            {
-                case ScaleMode.Horizontal:
-                    usedScale = parentScale.X;
-                    break;
-
-                case ScaleMode.Vertical:
-                    usedScale = parentScale.Y;
-                    break;
-            }
-
-            if (Scaling != ScaleMode.NoScaling)
-            {
-                if (ScalingFactor < 1.0f)
-                    usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
-                if (ScalingFactor > 1.0f)
-                    usedScale = (usedScale < 1.0f) ? usedScale * (1.0f / ScalingFactor) : usedScale * ScalingFactor;
-            }
-
-            Scale = new Vector2(sx * usedScale, sy * usedScale);
-        }
-    }
-
-    public enum ScaleMode
-    {
-        /// <summary>
-        /// Prevent this container from scaling.
-        /// </summary>
-        NoScaling,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
-        /// </summary>
-        Vertical,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
-        /// </summary>
-        Horizontal,
-    }
-}

osu.Game/Graphics/OsuColour.cs

@@ -102,31 +102,26 @@ namespace osu.Game.Graphics
         /// <summary>
         /// Retrieves the colour for a <see cref="HitResult"/>.
         /// </summary>
-        public Color4 ForHitResult(HitResult result)
+        public Color4 ForHitResult(HitResult judgement)
         {
-            switch (result)
+            switch (judgement)
             {
-                case HitResult.SmallTickMiss:
-                case HitResult.LargeTickMiss:
-                case HitResult.Miss:
-                    return Red;
+                case HitResult.Perfect:
+                case HitResult.Great:
+                    return Blue;
+
+                case HitResult.Ok:
+                case HitResult.Good:
+                    return Green;
 
                 case HitResult.Meh:
                     return Yellow;
 
-                case HitResult.Ok:
-                    return Green;
-
-                case HitResult.Good:
-                    return GreenLight;
-
-                case HitResult.SmallTickHit:
-                case HitResult.LargeTickHit:
-                case HitResult.Great:
-                    return Blue;
+                case HitResult.Miss:
+                    return Red;
 
                 default:
-                    return BlueLight;
+                    return Color4.White;
             }
         }
 

osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs

@@ -1,108 +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.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Graphics.Sprites
-{
-    /// <summary>
-    /// A wrapped version of <see cref="OsuSpriteText"/> which will expand in size based on text content, but never shrink back down.
-    /// </summary>
-    public class SizePreservingSpriteText : CompositeDrawable
-    {
-        private readonly OsuSpriteText text = new OsuSpriteText();
-
-        private Vector2 maximumSize;
-
-        public SizePreservingSpriteText(Vector2? minimumSize = null)
-        {
-            text.Origin = Anchor.Centre;
-            text.Anchor = Anchor.Centre;
-
-            AddInternal(text);
-            maximumSize = minimumSize ?? Vector2.Zero;
-        }
-
-        protected override void Update()
-        {
-            Width = maximumSize.X = MathF.Max(maximumSize.X, text.Width);
-            Height = maximumSize.Y = MathF.Max(maximumSize.Y, text.Height);
-        }
-
-        public new Axes AutoSizeAxes
-        {
-            get => Axes.None;
-            set => throw new InvalidOperationException("You can't set AutoSizeAxes of this container");
-        }
-
-        /// <summary>
-        /// Gets or sets the text to be displayed.
-        /// </summary>
-        public LocalisableString Text
-        {
-            get => text.Text;
-            set => text.Text = value;
-        }
-
-        /// <summary>
-        /// Contains information on the font used to display the text.
-        /// </summary>
-        public FontUsage Font
-        {
-            get => text.Font;
-            set => text.Font = value;
-        }
-
-        /// <summary>
-        /// True if a shadow should be displayed around the text.
-        /// </summary>
-        public bool Shadow
-        {
-            get => text.Shadow;
-            set => text.Shadow = value;
-        }
-
-        /// <summary>
-        /// The colour of the shadow displayed around the text. A shadow will only be displayed if the <see cref="Shadow"/> property is set to true.
-        /// </summary>
-        public Color4 ShadowColour
-        {
-            get => text.ShadowColour;
-            set => text.ShadowColour = value;
-        }
-
-        /// <summary>
-        /// The offset of the shadow displayed around the text. A shadow will only be displayed if the <see cref="Shadow"/> property is set to true.
-        /// </summary>
-        public Vector2 ShadowOffset
-        {
-            get => text.ShadowOffset;
-            set => text.ShadowOffset = value;
-        }
-
-        /// <summary>
-        /// True if the <see cref="SpriteText"/>'s vertical size should be equal to <see cref="FontUsage.Size"/>  (the full height) or precisely the size of used characters.
-        /// Set to false to allow better centering of individual characters/numerals/etc.
-        /// </summary>
-        public bool UseFullGlyphHeight
-        {
-            get => text.UseFullGlyphHeight;
-            set => text.UseFullGlyphHeight = value;
-        }
-
-        public override bool IsPresent => text.IsPresent;
-
-        public override string ToString() => text.ToString();
-
-        public float LineBaseHeight => text.LineBaseHeight;
-
-        public IEnumerable<LocalisableString> FilterTerms => text.FilterTerms;
-    }
-}