Merge branch 'master' into Colour_hit_meter_improved

.config/dotnet-tools.json

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

.github/workflows/ci.yml

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

CodeAnalysis/BannedSymbols.txt

@@ -6,8 +6,6 @@ T:System.IComparable;Don't use non-generic IComparable. Use generic version inst
 T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
-T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
-T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
 M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />

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.916.1" />
   </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,26 +5,24 @@ using System;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-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 Squirrel;
 using Squirrel.SimpleSplat;
+using LogLevel = Squirrel.SimpleSplat.LogLevel;
+using UpdateManager = osu.Game.Updater.UpdateManager;
 
 namespace osu.Desktop.Updater
 {
     [SupportedOSPlatform("windows")]
-    public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
+    public class SquirrelUpdateManager : UpdateManager
     {
-        private UpdateManager? updateManager;
+        private Squirrel.UpdateManager? updateManager;
         private INotificationOverlay notificationOverlay = null!;
 
-        public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
+        public Task PrepareUpdateAsync() => Squirrel.UpdateManager.RestartAppWhenExited();
 
         private static readonly Logger logger = Logger.GetLogger("updater");
 
@@ -35,6 +33,9 @@ namespace osu.Desktop.Updater
 
         private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();
 
+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load(INotificationOverlay notifications)
         {
@@ -63,7 +64,14 @@ namespace osu.Desktop.Updater
                     if (updatePending)
                     {
                         // the user may have dismissed the completion notice, so show it again.
-                        notificationOverlay.Post(new UpdateCompleteNotification(this));
+                        notificationOverlay.Post(new UpdateApplicationCompleteNotification
+                        {
+                            Activated = () =>
+                            {
+                                restartToApplyUpdate();
+                                return true;
+                            },
+                        });
                         return true;
                     }
 
@@ -75,19 +83,21 @@ namespace osu.Desktop.Updater
 
                 if (notification == null)
                 {
-                    notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active };
+                    notification = new UpdateProgressNotification
+                    {
+                        CompletionClickAction = restartToApplyUpdate,
+                    };
+
                     Schedule(() => notificationOverlay.Post(notification));
                 }
 
-                notification.Progress = 0;
-                notification.Text = @"Downloading update...";
+                notification.StartDownload();
 
                 try
                 {
                     await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
-                    notification.Progress = 0;
-                    notification.Text = @"Installing update...";
+                    notification.StartInstall();
 
                     await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
@@ -107,9 +117,7 @@ namespace osu.Desktop.Updater
                     else
                     {
                         // In the case of an error, a separate notification will be displayed.
-                        notification.State = ProgressNotificationState.Cancelled;
-                        notification.Close();
-
+                        notification.FailDownload();
                         Logger.Error(e, @"update failed!");
                     }
                 }
@@ -131,78 +139,24 @@ 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 SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Upload,
-                        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 Squirrel.SimpleSplat.LogLevel Level { get; set; } = Squirrel.SimpleSplat.LogLevel.Info;
+            public LogLevel Level { get; set; } = LogLevel.Info;
 
-            public void Write(string message, Squirrel.SimpleSplat.LogLevel logLevel)
+            public void Write(string message, LogLevel logLevel)
             {
                 if (logLevel < Level)
                     return;

osu.Desktop/osu.Desktop.csproj

@@ -27,11 +27,6 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.14">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">

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

@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
         }
 
-        private class TestSkin : DefaultSkin
+        private class TestSkin : TrianglesSkin
         {
             public bool FlipCatcherPlate { get; set; }
 

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

@@ -106,20 +106,37 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestCatcherCatchWidth()
         {
             float halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
+
+            AddStep("move catcher to center", () => catcher.X = CatchPlayfield.CENTER_X);
+
+            float leftPlateBounds = CatchPlayfield.CENTER_X - halfWidth;
+            float rightPlateBounds = CatchPlayfield.CENTER_X + halfWidth;
+
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth + 1 });
-                attemptCatch(new Fruit { X = halfWidth - 1 });
+                attemptCatch(new Fruit { X = leftPlateBounds + 1 });
+                attemptCatch(new Fruit { X = rightPlateBounds - 1 });
             });
             checkPlate(2);
+
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth - 1 });
-                attemptCatch(new Fruit { X = halfWidth + 1 });
+                attemptCatch(new Fruit { X = leftPlateBounds - 1 });
+                attemptCatch(new Fruit { X = rightPlateBounds + 1 });
             });
             checkPlate(2);
         }
 
+        [Test]
+        public void TestFruitClampedToCatchableRegion()
+        {
+            AddStep("catch fruit left", () => attemptCatch(new Fruit { X = -CatchPlayfield.WIDTH }));
+            checkPlate(1);
+            AddStep("move catcher to right", () => catcher.X = CatchPlayfield.WIDTH);
+            AddStep("catch fruit right", () => attemptCatch(new Fruit { X = CatchPlayfield.WIDTH * 2 }));
+            checkPlate(2);
+        }
+
         [Test]
         public void TestFruitChangesCatcherState()
         {

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.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;
@@ -33,7 +31,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();
 
@@ -184,7 +182,16 @@ namespace osu.Game.Rulesets.Catch
 
         public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new CatchDifficultyCalculator(RulesetInfo, beatmap);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new CatchLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new CatchLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public override PerformanceCalculator CreatePerformanceCalculator() => new CatchPerformanceCalculator();
 

osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -69,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
         /// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
         /// </remarks>
-        public float EffectiveX => OriginalX + XOffset;
+        public float EffectiveX => Math.Clamp(OriginalX + XOffset, 0, CatchPlayfield.WIDTH);
 
         public double TimePreempt { get; set; } = 1000;
 

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -11,6 +11,7 @@ using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -84,8 +85,8 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = OriginalX + Path.PositionAt(
-                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
+                                X = ClampToPlayfield(EffectiveX + Path.PositionAt(
+                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X),
                             });
                         }
                     }
@@ -102,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
 
@@ -113,14 +114,16 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => OriginalX + this.CurvePositionAt(1).X;
+        public float EndX => ClampToPlayfield(EffectiveX + this.CurvePositionAt(1).X);
+
+        public float ClampToPlayfield(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
 
         [JsonIgnore]
         public double Duration

osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(SkinManager skins)
         {
-            var defaultLegacySkin = skins.DefaultLegacySkin;
+            var defaultLegacySkin = skins.DefaultClassicSkin;
 
             // sprite names intentionally swapped to match stable member naming / ease of cross-referencing
             explosion1.Texture = defaultLegacySkin.GetTexture("scoreboard-explosion-2");

osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs

@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestDefaultSkin()
         {
-            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = DefaultSkin.CreateInfo().ToLiveUnmanaged());
+            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged());
         }
 
         [Test]

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

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

@@ -11,7 +11,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)
         {
         }

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.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;
@@ -48,7 +46,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();
 
@@ -64,7 +62,16 @@ namespace osu.Game.Rulesets.Mania
 
         public override HitObjectComposer CreateHitObjectComposer() => new ManiaHitObjectComposer(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new ManiaLegacySkinTransformer(skin, beatmap);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new ManiaLegacySkinTransformer(skin, beatmap);
+            }
+
+            return null;
+        }
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
@@ -285,7 +292,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.Osu.Tests/Mods/TestSceneOsuModAlternate.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
@@ -125,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         /// Ensures alternation is reset before the first hitobject after a break.
         /// </summary>
         [Test]
-        public void TestInputSingularWithBreak() => CreateModTest(new ModTestData
+        public void TestInputSingularWithBreak([Values] bool pressBeforeSecondObject) => CreateModTest(new ModTestData
         {
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
@@ -155,21 +156,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     },
                 }
             },
-            ReplayFrames = new List<ReplayFrame>
+            ReplayFrames = new ReplayFrame[]
             {
                 // first press to start alternate lock.
-                new OsuReplayFrame(500, new Vector2(100), OsuAction.LeftButton),
-                new OsuReplayFrame(501, new Vector2(100)),
-                // press same key after break but before hit object.
-                new OsuReplayFrame(2250, new Vector2(300, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(2251, new Vector2(300, 100)),
+                new OsuReplayFrame(450, new Vector2(100), OsuAction.LeftButton),
+                new OsuReplayFrame(451, new Vector2(100)),
                 // press same key at second hitobject and ensure it has been hit.
-                new OsuReplayFrame(2500, new Vector2(500, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(2501, new Vector2(500, 100)),
+                new OsuReplayFrame(2450, new Vector2(500, 100), OsuAction.LeftButton),
+                new OsuReplayFrame(2451, new Vector2(500, 100)),
                 // press same key at third hitobject and ensure it has been missed.
-                new OsuReplayFrame(3000, new Vector2(500, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(3001, new Vector2(500, 100)),
-            }
+                new OsuReplayFrame(2950, new Vector2(500, 100), OsuAction.LeftButton),
+                new OsuReplayFrame(2951, new Vector2(500, 100)),
+            }.Concat(!pressBeforeSecondObject
+                ? Enumerable.Empty<ReplayFrame>()
+                : new ReplayFrame[]
+                {
+                    // press same key after break but before hit object.
+                    new OsuReplayFrame(2250, new Vector2(300, 100), OsuAction.LeftButton),
+                    new OsuReplayFrame(2251, new Vector2(300, 100)),
+                }
+            ).ToList()
         });
     }
 }

osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs

@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
             AddStep("setup default legacy skin", () =>
             {
-                skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo;
+                skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
             });
         });
     }

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs

@@ -58,10 +58,11 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null)
         {
-            var drawable = createSingle(circleSize, auto, timeOffset, positionOffset);
-
             var playfield = new TestOsuPlayfield();
-            playfield.Add(drawable);
+
+            for (double t = timeOffset; t < timeOffset + 60000; t += 2000)
+                playfield.Add(createSingle(circleSize, auto, t, positionOffset));
+
             return playfield;
         }
 

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin(null))
+            Child = new SkinProvidingContainer(new TrianglesSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)

osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs

@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var tintingSkin = skinManager.GetSkin(DefaultLegacySkin.CreateInfo());
                 tintingSkin.Configuration.ConfigDictionary["AllowSliderBallTint"] = "1";
 
-                var provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(tintingSkin, Beatmap.Value.Beatmap);
+                var provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(tintingSkin, Beatmap.Value.Beatmap);
 
                 Child = new SkinProvidingContainer(provider)
                 {

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -5,7 +5,6 @@
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <summary>
         /// Calculates a rhythm multiplier for the difficulty of the tap associated with historic data of the current <see cref="OsuDifficultyHitObject"/>.
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double lastDelta = lastObj.StrainTime;
                 double currRatio = 1.0 + 6.0 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
 
-                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - greatWindow * 0.6) / (greatWindow * 0.6));
+                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.3) / (currObj.HitWindowGreat * 0.3));
 
                 windowPenalty = Math.Min(1, windowPenalty);
 

osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <item><description>and how easily they can be cheesed.</description></item>
         /// </list>
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             var osuNextObj = (OsuDifficultyHitObject)current.Next(0);
 
             double strainTime = osuCurrObj.StrainTime;
-            double greatWindowFull = greatWindow * 2;
             double doubletapness = 1;
 
             // Nerf doubletappable doubles.
@@ -45,13 +44,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double nextDeltaTime = Math.Max(1, osuNextObj.DeltaTime);
                 double deltaDifference = Math.Abs(nextDeltaTime - currDeltaTime);
                 double speedRatio = currDeltaTime / Math.Max(currDeltaTime, deltaDifference);
-                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / greatWindowFull), 2);
+                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / osuCurrObj.HitWindowGreat), 2);
                 doubletapness = Math.Pow(speedRatio, 1 - windowRatio);
             }
 
             // Cap deltatime to the OD 300 hitwindow.
             // 0.93 is derived from making sure 260bpm OD8 streams aren't nerfed harshly, whilst 0.92 limits the effect of the cap.
-            strainTime /= Math.Clamp((strainTime / greatWindowFull) / 0.93, 0.92, 1);
+            strainTime /= Math.Clamp((strainTime / osuCurrObj.HitWindowGreat) / 0.93, 0.92, 1);
 
             // derive speedBonus for calculation
             double speedBonus = 1.0;

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

@@ -23,7 +23,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
     public class OsuDifficultyCalculator : DifficultyCalculator
     {
         private const double difficulty_multiplier = 0.0675;
-        private double hitWindowGreat;
 
         public override int Version => 20220902;
 
@@ -45,6 +44,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
 
+            if (mods.Any(m => m is OsuModTouchDevice))
+            {
+                aimRating = Math.Pow(aimRating, 0.8);
+                flashlightRating = Math.Pow(flashlightRating, 0.8);
+            }
+
             if (mods.Any(h => h is OsuModRelax))
             {
                 aimRating *= 0.9;
@@ -76,6 +81,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
             int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
 
+            HitWindows hitWindows = new OsuHitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
+
             return new OsuDifficultyAttributes
             {
                 StarRating = starRating,
@@ -112,22 +122,18 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            HitWindows hitWindows = new OsuHitWindows();
-            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
-
-            hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
-
             return new Skill[]
             {
                 new Aim(mods, true),
                 new Aim(mods, false),
-                new Speed(mods, hitWindowGreat),
+                new Speed(mods),
                 new Flashlight(mods)
             };
         }
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
+            new OsuModTouchDevice(),
             new OsuModDoubleTime(),
             new OsuModHalfTime(),
             new OsuModEasy(),

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

@@ -88,12 +88,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         private double computeAimValue(ScoreInfo score, OsuDifficultyAttributes attributes)
         {
-            double rawAim = attributes.AimDifficulty;
-
-            if (score.Mods.Any(m => m is OsuModTouchDevice))
-                rawAim = Math.Pow(rawAim, 0.8);
-
-            double aimValue = Math.Pow(5.0 * Math.Max(1.0, rawAim / 0.0675) - 4.0, 3.0) / 100000.0;
+            double aimValue = Math.Pow(5.0 * Math.Max(1.0, attributes.AimDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
 
             double lengthBonus = 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
                                  (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);
@@ -233,12 +228,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (!score.Mods.Any(h => h is OsuModFlashlight))
                 return 0.0;
 
-            double rawFlashlight = attributes.FlashlightDifficulty;
-
-            if (score.Mods.Any(m => m is OsuModTouchDevice))
-                rawFlashlight = Math.Pow(rawFlashlight, 0.8);
-
-            double flashlightValue = Math.Pow(rawFlashlight, 2.0) * 25.0;
+            double flashlightValue = Math.Pow(attributes.FlashlightDifficulty, 2.0) * 25.0;
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (effectiveMissCount > 0)

osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs

@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
@@ -78,6 +79,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public double? Angle { get; private set; }
 
+        /// <summary>
+        /// Retrieves the full hit window for a Great <see cref="HitResult"/>.
+        /// </summary>
+        public double HitWindowGreat { get; private set; }
+
         private readonly OsuHitObject lastLastObject;
         private readonly OsuHitObject lastObject;
 
@@ -90,6 +96,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             // Capped to 25ms to prevent difficulty calculation breaking from simultaneous objects.
             StrainTime = Math.Max(DeltaTime, min_delta_time);
 
+            if (BaseObject is Slider sliderObject)
+            {
+                HitWindowGreat = 2 * sliderObject.HeadCircle.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+            else
+            {
+                HitWindowGreat = 2 * BaseObject.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+
             setDistances(clockRate);
         }
 

osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs

@@ -26,14 +26,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
         protected override int ReducedSectionCount => 5;
         protected override double DifficultyMultiplier => 1.04;
-        private readonly double greatWindow;
 
         private readonly List<double> objectStrains = new List<double>();
 
-        public Speed(Mod[] mods, double hitWindowGreat)
+        public Speed(Mod[] mods)
             : base(mods)
         {
-            greatWindow = hitWindowGreat;
         }
 
         private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000);
@@ -43,9 +41,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         protected override double StrainValueAt(DifficultyHitObject current)
         {
             currentStrain *= strainDecay(((OsuDifficultyHitObject)current).StrainTime);
-            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current, greatWindow) * skillMultiplier;
+            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current) * skillMultiplier;
 
-            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current, greatWindow);
+            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current);
 
             double totalStrain = currentStrain * currentRhythm;
 

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

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -53,6 +54,9 @@ 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;
@@ -61,11 +65,15 @@ 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);
 
-            slider.Path.Version.BindValueChanged(_ =>
+            sliderVersion = slider.Path.Version.GetBoundCopy();
+
+            // schedule ensure that updates are only applied after all operations from a single frame are applied.
+            // this avoids inadvertently changing the slider path type for batch operations.
+            sliderVersion.BindValueChanged(_ => Scheduler.AddOnce(() =>
             {
                 cachePoints(slider);
                 updatePathType();
-            });
+            }));
 
             controlPoint.Changed += updateMarkerDisplay;
 

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

@@ -303,11 +303,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
+                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition));
+
+                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? Parent.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - slider.Position;
+
                 for (int i = 0; i < controlPoints.Count; ++i)
                 {
                     var controlPoint = controlPoints[i];
                     if (selectedControlPoints.Contains(controlPoint))
-                        controlPoint.Position = dragStartPositions[i] + (e.MousePosition - e.MouseDownPosition);
+                        controlPoint.Position = dragStartPositions[i] + movementDelta;
                 }
             }
 

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

@@ -198,7 +198,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                cursor.Position = ToLocalSpace(inputManager.CurrentState.Mouse.Position) - HitObject.Position;
+                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+                cursor.Position = ToLocalSpace(result?.ScreenSpacePosition ?? inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
             else if (cursor != null)
             {

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

@@ -163,7 +163,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected override void OnDrag(DragEvent e)
         {
             if (placementControlPoint != null)
-                placementControlPoint.Position = e.MousePosition - HitObject.Position;
+            {
+                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+                placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - HitObject.Position;
+            }
         }
 
         protected override void OnMouseUp(MouseUpEvent e)

osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs

@@ -127,16 +127,13 @@ namespace osu.Game.Rulesets.Osu.Edit
                 {
                     didFlip = true;
 
-                    var controlPoints = slider.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(new Vector2(
-                            (direction == Direction.Horizontal ? -1 : 1) * p.Position.X,
-                            (direction == Direction.Vertical ? -1 : 1) * p.Position.Y
-                        ), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    slider.Path.ControlPoints.Clear();
-                    slider.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (var cp in slider.Path.ControlPoints)
+                    {
+                        cp.Position = new Vector2(
+                            (direction == Direction.Horizontal ? -1 : 1) * cp.Position.X,
+                            (direction == Direction.Vertical ? -1 : 1) * cp.Position.Y
+                        );
+                    }
                 }
             }
 
@@ -186,13 +183,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 if (h is IHasPath path)
                 {
-                    var controlPoints = path.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(RotatePointAroundOrigin(p.Position, Vector2.Zero, delta), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    path.Path.ControlPoints.Clear();
-                    path.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (PathControlPoint cp in path.Path.ControlPoints)
+                        cp.Position = RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
                 }
             }
 

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

@@ -18,7 +18,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public abstract class InputBlockingMod : Mod, IApplicableToDrawableRuleset<OsuHitObject>
+    public abstract class InputBlockingMod : Mod, IApplicableToDrawableRuleset<OsuHitObject>, IUpdatableByPlayfield
     {
         public override double ScoreMultiplier => 1.0;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(OsuModCinema) };
@@ -62,15 +62,18 @@ namespace osu.Game.Rulesets.Osu.Mods
             gameplayClock = drawableRuleset.FrameStableClock;
         }
 
+        public void Update(Playfield playfield)
+        {
+            if (LastAcceptedAction != null && nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
+                LastAcceptedAction = null;
+        }
+
         protected abstract bool CheckValidNewAction(OsuAction action);
 
         private bool checkCorrectAction(OsuAction action)
         {
             if (nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
-            {
-                LastAcceptedAction = null;
                 return true;
-            }
 
             switch (action)
             {

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

@@ -4,9 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -25,6 +28,16 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTarget)).ToArray();
 
+        [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(SettingsSlider<float>))]
+        public BindableFloat AngleSharpness { get; } = new BindableFloat
+        {
+            Default = 7,
+            Value = 7,
+            MinValue = 1,
+            MaxValue = 10,
+            Precision = 0.1f
+        };
+
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
 
         private Random random = null!;
@@ -50,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (shouldStartNewSection(osuBeatmap, positionInfos, i))
                 {
-                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.0008f);
+                    sectionOffset = getRandomOffset(0.0008f);
                     flowDirection = !flowDirection;
                 }
 
@@ -65,11 +78,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                     float flowChangeOffset = 0;
 
                     // Offsets only the angle of the current hit object.
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
+                    float oneTimeOffset = getRandomOffset(0.002f);
 
                     if (shouldApplyFlowChange(positionInfos, i))
                     {
-                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
+                        flowChangeOffset = getRandomOffset(0.002f);
                         flowDirection = !flowDirection;
                     }
 
@@ -86,13 +99,36 @@ namespace osu.Game.Rulesets.Osu.Mods
             osuBeatmap.HitObjects = OsuHitObjectGenerationUtils.RepositionHitObjects(positionInfos);
         }
 
+        private float getRandomOffset(float stdDev)
+        {
+            // Range: [0.5, 2]
+            // Higher angle sharpness -> lower multiplier
+            float customMultiplier = (1.5f * AngleSharpness.MaxValue - AngleSharpness.Value) / (1.5f * AngleSharpness.MaxValue - AngleSharpness.Default);
+
+            return OsuHitObjectGenerationUtils.RandomGaussian(random, 0, stdDev * customMultiplier);
+        }
+
         /// <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)
+        private float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310))) + 0.5 + offset);
+            // Range: [0.1, 1]
+            float angleSharpness = AngleSharpness.Value / AngleSharpness.MaxValue;
+            // Range: [0, 0.9]
+            float angleWideness = 1 - angleSharpness;
+
+            // Range: [-60, 30]
+            float customOffsetX = angleSharpness * 100 - 70;
+            // Range: [-0.075, 0.15]
+            float customOffsetY = angleWideness * 0.25f - 0.075f;
+
+            targetDistance += customOffsetX;
+            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310 + customOffsetX))) + 0.5);
+            angle += offset + customOffsetY;
+
             float relativeAngle = (float)Math.PI - angle;
+
             return flowDirection ? -relativeAngle : relativeAngle;
         }
 

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs

@@ -1,9 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
+using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects;
@@ -21,32 +20,36 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         public const int SPACING = 32;
         public const double PREEMPT = 800;
 
-        public DrawablePool<FollowPoint> Pool;
+        public DrawablePool<FollowPoint>? Pool { private get; set; }
 
         protected override void OnApply(FollowPointLifetimeEntry entry)
         {
             base.OnApply(entry);
 
-            entry.Invalidated += onEntryInvalidated;
-            refreshPoints();
+            entry.Invalidated += scheduleRefresh;
+
+            // Our clock may not be correct at this point if `LoadComplete` has not run yet.
+            // Without a schedule, animations referencing FollowPoint's clock (see `IAnimationTimeReference`) would be incorrect on first pool usage.
+            scheduleRefresh();
         }
 
         protected override void OnFree(FollowPointLifetimeEntry entry)
         {
             base.OnFree(entry);
 
-            entry.Invalidated -= onEntryInvalidated;
+            entry.Invalidated -= scheduleRefresh;
             // Return points to the pool.
             ClearInternal(false);
         }
 
-        private void onEntryInvalidated() => Scheduler.AddOnce(refreshPoints);
-
-        private void refreshPoints()
+        private void scheduleRefresh() => Scheduler.AddOnce(() =>
         {
+            Debug.Assert(Pool != null);
+
             ClearInternal(false);
 
             var entry = Entry;
+
             if (entry?.End == null) return;
 
             OsuHitObject start = entry.Start;
@@ -95,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             }
 
             entry.LifetimeEnd = finalTransformEndTime;
-        }
+        });
 
         /// <summary>
         /// Computes the fade time of follow point positioned between two hitobjects.

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.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;
@@ -29,6 +27,7 @@ using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.Skinning.Argon;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Osu.UI;
@@ -44,7 +43,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();
 
@@ -233,13 +232,25 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSettingsSubsection CreateSettings() => new OsuSettingsSubsection(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new OsuLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new OsuLegacySkinTransformer(skin);
+
+                case ArgonSkin:
+                    return new OsuArgonSkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public int LegacyID => 0;
 
         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/Argon/ArgonFollowCircle.cs

@@ -0,0 +1,71 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonFollowCircle : FollowCircle
+    {
+        public ArgonFollowCircle()
+        {
+            InternalChild = new CircularContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                BorderThickness = 4,
+                BorderColour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                Blending = BlendingParameters.Additive,
+                Child = new Box
+                {
+                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.3f,
+                }
+            };
+        }
+
+        protected override void OnSliderPress()
+        {
+            const float duration = 300f;
+
+            if (Precision.AlmostEquals(0, Alpha))
+                this.ScaleTo(1);
+
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA, duration, Easing.OutQuint)
+                .FadeIn(duration, Easing.OutQuint);
+        }
+
+        protected override void OnSliderRelease()
+        {
+            const float duration = 150;
+
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.2f, duration, Easing.OutQuint)
+                .FadeTo(0, duration, Easing.OutQuint);
+        }
+
+        protected override void OnSliderEnd()
+        {
+            const float duration = 300;
+
+            this.ScaleTo(1, duration, Easing.OutQuint)
+                .FadeOut(duration / 2, Easing.OutQuint);
+        }
+
+        protected override void OnSliderTick()
+        {
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
+                .Then()
+                .ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
+        }
+
+        protected override void OnSliderBreak()
+        {
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs

@@ -0,0 +1,85 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        protected readonly HitResult Result;
+
+        protected SpriteText JudgementText { get; private set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        public ArgonJudgementPiece(HitResult result)
+        {
+            Result = result;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                JudgementText = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Text = Result.GetDescription().ToUpperInvariant(),
+                    Colour = colours.ForHitResult(Result),
+                    Spacing = new Vector2(5, 0),
+                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold),
+                }
+            };
+        }
+
+        /// <summary>
+        /// Plays the default animation for this judgement piece.
+        /// </summary>
+        /// <remarks>
+        /// The base implementation only handles fade (for all result types) and misses.
+        /// Individual rulesets are recommended to implement their appropriate hit animations.
+        /// </remarks>
+        public virtual void PlayAnimation()
+        {
+            switch (Result)
+            {
+                default:
+                    JudgementText
+                        .ScaleTo(Vector2.One)
+                        .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
+                    break;
+
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveTo(Vector2.Zero);
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(0);
+                    this.RotateTo(40, 800, Easing.InQuint);
+                    break;
+            }
+
+            this.FadeOutFromOne(800);
+        }
+
+        public Drawable? GetAboveHitObjectsProxiedContent() => null;
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs

@@ -0,0 +1,220 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonMainCirclePiece : CompositeDrawable
+    {
+        public const float BORDER_THICKNESS = (OsuHitObject.OBJECT_RADIUS * 2) * (2f / 58);
+
+        public const float GRADIENT_THICKNESS = BORDER_THICKNESS * 2.5f;
+
+        public const float OUTER_GRADIENT_SIZE = (OsuHitObject.OBJECT_RADIUS * 2) - BORDER_THICKNESS * 4;
+
+        public const float INNER_GRADIENT_SIZE = OUTER_GRADIENT_SIZE - GRADIENT_THICKNESS * 2;
+        public const float INNER_FILL_SIZE = INNER_GRADIENT_SIZE - GRADIENT_THICKNESS * 2;
+
+        private readonly Circle outerFill;
+        private readonly Circle outerGradient;
+        private readonly Circle innerGradient;
+        private readonly Circle innerFill;
+
+        private readonly RingPiece border;
+        private readonly OsuSpriteText number;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+        private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
+        private readonly FlashPiece flash;
+
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; } = null!;
+
+        public ArgonMainCirclePiece(bool withOuterFill)
+        {
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                outerFill = new Circle // renders white outer border and dark fill
+                {
+                    Size = Size,
+                    Alpha = withOuterFill ? 1 : 0,
+                },
+                outerGradient = new Circle // renders the outer bright gradient
+                {
+                    Size = new Vector2(OUTER_GRADIENT_SIZE),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                innerGradient = new Circle // renders the inner bright gradient
+                {
+                    Size = new Vector2(INNER_GRADIENT_SIZE),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                innerFill = new Circle // renders the inner dark fill
+                {
+                    Size = new Vector2(INNER_FILL_SIZE),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                number = new OsuSpriteText
+                {
+                    Font = OsuFont.Default.With(size: 52, weight: FontWeight.Bold),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = -2,
+                    Text = @"1",
+                },
+                flash = new FlashPiece(),
+                border = new RingPiece(BORDER_THICKNESS),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
+
+            accentColour.BindTo(drawableObject.AccentColour);
+            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            accentColour.BindValueChanged(colour =>
+            {
+                outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
+                outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
+                innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
+                flash.Colour = colour.NewValue;
+            }, true);
+
+            indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableObject, drawableObject.State.Value);
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
+                switch (state)
+                {
+                    case ArmedState.Hit:
+                        // Fade out time is at a maximum of 800. Must match `DrawableHitCircle`'s arbitrary lifetime spec.
+                        const double fade_out_time = 800;
+
+                        const double flash_in_duration = 150;
+                        const double resize_duration = 300;
+
+                        const float shrink_size = 0.8f;
+
+                        // Animating with the number present is distracting.
+                        // The number disappearing is hidden by the bright flash.
+                        number.FadeOut(flash_in_duration / 2);
+
+                        // The fill layers add too much noise during the explosion animation.
+                        // They will be hidden by the additive effects anyway.
+                        outerFill.FadeOut(flash_in_duration, Easing.OutQuint);
+                        innerFill.FadeOut(flash_in_duration, Easing.OutQuint);
+
+                        // The inner-most gradient should actually be resizing, but is only visible for
+                        // a few milliseconds before it's hidden by the flash, so it's pointless overhead to bother with it.
+                        innerGradient.FadeOut(flash_in_duration, Easing.OutQuint);
+
+                        // The border is always white, but after hit it gets coloured by the skin/beatmap's colouring.
+                        // A gradient is applied to make the border less prominent over the course of the animation.
+                        // Without this, the border dominates the visual presence of the explosion animation in a bad way.
+                        border.TransformTo(nameof
+                            (BorderColour), ColourInfo.GradientVertical(
+                            accentColour.Value.Opacity(0.5f),
+                            accentColour.Value.Opacity(0)), fade_out_time);
+
+                        // The outer ring shrinks immediately, but accounts for its thickness so it doesn't overlap the inner
+                        // gradient layers.
+                        border.ResizeTo(Size * shrink_size + new Vector2(border.BorderThickness), resize_duration, Easing.OutElasticHalf);
+
+                        // The outer gradient is resize with a slight delay from the border.
+                        // This is to give it a bomb-like effect, with the border "triggering" its animation when getting close.
+                        using (BeginDelayedSequence(flash_in_duration / 12))
+                            outerGradient.ResizeTo(outerGradient.Size * shrink_size, resize_duration, Easing.OutElasticHalf);
+
+                        // The flash layer starts white to give the wanted brightness, but is almost immediately
+                        // recoloured to the accent colour. This would more correctly be done with two layers (one for the initial flash)
+                        // but works well enough with the colour fade.
+                        flash.FadeTo(1, flash_in_duration, Easing.OutQuint);
+                        flash.FlashColour(Color4.White, flash_in_duration, Easing.OutQuint);
+
+                        this.FadeOut(fade_out_time, Easing.OutQuad);
+                        break;
+                }
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+        }
+
+        private class FlashPiece : Circle
+        {
+            public FlashPiece()
+            {
+                Size = new Vector2(OsuHitObject.OBJECT_RADIUS);
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Alpha = 0;
+                Blending = BlendingParameters.Additive;
+
+                // The edge effect provides the fill due to not being rendered hollow.
+                Child.Alpha = 0;
+                Child.AlwaysPresent = true;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Colour,
+                    Radius = OsuHitObject.OBJECT_RADIUS * 1.2f,
+                };
+            }
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs

@@ -0,0 +1,54 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonReverseArrow : CompositeDrawable
+    {
+        private Bindable<Color4> accentColour = null!;
+
+        private SpriteIcon icon = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject hitObject)
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
+            InternalChildren = new Drawable[]
+            {
+                new Circle
+                {
+                    Size = new Vector2(40, 20),
+                    Colour = Color4.White,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                icon = new SpriteIcon
+                {
+                    Icon = FontAwesome.Solid.AngleDoubleRight,
+                    Size = new Vector2(16),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+
+            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4));
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs

@@ -0,0 +1,109 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderBall : CircularContainer
+    {
+        private readonly Box fill;
+        private readonly SpriteIcon icon;
+
+        private readonly Vector2 defaultIconScale = new Vector2(0.6f, 0.8f);
+
+        [Resolved(canBeNull: true)]
+        private DrawableHitObject? parentObject { get; set; }
+
+        public ArgonSliderBall()
+        {
+            Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE);
+
+            Masking = true;
+
+            BorderThickness = ArgonMainCirclePiece.GRADIENT_THICKNESS;
+            BorderColour = Color4.White;
+
+            InternalChildren = new Drawable[]
+            {
+                fill = new Box
+                {
+                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                icon = new SpriteIcon
+                {
+                    Size = new Vector2(48),
+                    Scale = defaultIconScale,
+                    Icon = FontAwesome.Solid.AngleRight,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (parentObject != null)
+            {
+                parentObject.ApplyCustomUpdateState += updateStateTransforms;
+                updateStateTransforms(parentObject, parentObject.State.Value);
+            }
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableObject, ArmedState _)
+        {
+            // Gets called by slider ticks, tails, etc., leading to duplicated
+            // animations which in this case have no visual impact (due to
+            // instant fade) but may negatively affect performance
+            if (drawableObject is not DrawableSlider)
+                return;
+
+            const float duration = 200;
+            const float icon_scale = 0.9f;
+
+            using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
+            {
+                this.FadeInFromZero(duration, Easing.OutQuint);
+                icon.ScaleTo(0).Then().ScaleTo(defaultIconScale, duration, Easing.OutElasticHalf);
+            }
+
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
+                this.FadeOut(duration, Easing.OutQuint);
+                icon.ScaleTo(defaultIconScale * icon_scale, duration, Easing.OutQuint);
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            //undo rotation on layers which should not be rotated.
+            float appliedRotation = Parent.Rotation;
+
+            fill.Rotation = -appliedRotation;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (parentObject != null)
+                parentObject.ApplyCustomUpdateState -= updateStateTransforms;
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs

@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderBody : PlaySliderBody
+    {
+        protected override void LoadComplete()
+        {
+            const float path_radius = ArgonMainCirclePiece.OUTER_GRADIENT_SIZE / 2;
+
+            base.LoadComplete();
+
+            AccentColourBindable.BindValueChanged(accent => BorderColour = accent.NewValue, true);
+            ScaleBindable.BindValueChanged(scale => PathRadius = path_radius * scale.NewValue, true);
+
+            // This border size thing is kind of weird, hey.
+            const float intended_thickness = ArgonMainCirclePiece.GRADIENT_THICKNESS / path_radius;
+
+            BorderSize = intended_thickness / Default.DrawableSliderPath.BORDER_PORTION;
+        }
+
+        protected override Default.DrawableSliderPath CreateSliderPath() => new DrawableSliderPath();
+
+        private class DrawableSliderPath : Default.DrawableSliderPath
+        {
+            protected override Color4 ColourAt(float position)
+            {
+                if (CalculatedBorderPortion != 0f && position <= CalculatedBorderPortion)
+                    return BorderColour;
+
+                return AccentColour.Darken(4);
+            }
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs

@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderScorePoint : CircularContainer
+    {
+        private Bindable<Color4> accentColour = null!;
+
+        private const float size = 12;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject hitObject)
+        {
+            Masking = true;
+            Origin = Anchor.Centre;
+            Size = new Vector2(size);
+            BorderThickness = 3;
+            BorderColour = Color4.White;
+            Child = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                AlwaysPresent = true,
+                Alpha = 0,
+            };
+
+            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(accent => BorderColour = accent.NewValue);
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs

@@ -0,0 +1,73 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class OsuArgonSkinTransformer : ISkin
+    {
+        public OsuArgonSkinTransformer(ISkin skin)
+        {
+        }
+
+        public Drawable? GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case GameplaySkinComponent<HitResult> resultComponent:
+                    return new ArgonJudgementPiece(resultComponent.Component);
+
+                case OsuSkinComponent osuComponent:
+                    switch (osuComponent.Component)
+                    {
+                        case OsuSkinComponents.HitCircle:
+                            return new ArgonMainCirclePiece(true);
+
+                        case OsuSkinComponents.SliderHeadHitCircle:
+                            return new ArgonMainCirclePiece(false);
+
+                        case OsuSkinComponents.SliderBody:
+                            return new ArgonSliderBody();
+
+                        case OsuSkinComponents.SliderBall:
+                            return new ArgonSliderBall();
+
+                        case OsuSkinComponents.SliderFollowCircle:
+                            return new ArgonFollowCircle();
+
+                        case OsuSkinComponents.SliderScorePoint:
+                            return new ArgonSliderScorePoint();
+
+                        case OsuSkinComponents.ReverseArrow:
+                            return new ArgonReverseArrow();
+                    }
+
+                    break;
+            }
+
+            return null;
+        }
+
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        {
+            return null;
+        }
+
+        public ISample? GetSample(ISampleInfo sampleInfo)
+        {
+            return null;
+        }
+
+        public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
+        {
+            return null;
+        }
+    }
+}

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

@@ -10,8 +10,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class DrawableSliderPath : SmoothPath
     {
-        protected const float BORDER_PORTION = 0.128f;
-        protected const float GRADIENT_PORTION = 1 - BORDER_PORTION;
+        public const float BORDER_PORTION = 0.128f;
+        public const float GRADIENT_PORTION = 1 - BORDER_PORTION;
 
         private const float border_max_size = 8f;
         private const float border_min_size = 0f;

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

@@ -16,9 +16,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class PlaySliderBody : SnakingSliderBody
     {
-        private IBindable<float> scaleBindable;
+        protected IBindable<float> ScaleBindable { get; private set; } = null!;
+
+        protected IBindable<Color4> AccentColourBindable { get; private set; } = null!;
+
         private IBindable<int> pathVersion;
-        private IBindable<Color4> accentColour;
 
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
@@ -30,14 +32,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             var drawableSlider = (DrawableSlider)drawableObject;
 
-            scaleBindable = drawableSlider.ScaleBindable.GetBoundCopy();
-            scaleBindable.BindValueChanged(scale => PathRadius = OsuHitObject.OBJECT_RADIUS * scale.NewValue, true);
+            ScaleBindable = drawableSlider.ScaleBindable.GetBoundCopy();
+            ScaleBindable.BindValueChanged(scale => PathRadius = OsuHitObject.OBJECT_RADIUS * scale.NewValue, true);
 
             pathVersion = drawableSlider.PathVersion.GetBoundCopy();
             pathVersion.BindValueChanged(_ => Refresh());
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
-            accentColour.BindValueChanged(accent => AccentColour = GetBodyAccentColour(skin, accent.NewValue), true);
+            AccentColourBindable = drawableObject.AccentColour.GetBoundCopy();
+            AccentColourBindable.BindValueChanged(accent => AccentColour = GetBodyAccentColour(skin, accent.NewValue), true);
 
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
             config?.BindWith(OsuRulesetSetting.SnakingOutSliders, configSnakingOut);

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

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -14,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class RingPiece : CircularContainer
     {
-        public RingPiece()
+        public RingPiece(float thickness = 9)
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
@@ -22,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             Origin = Anchor.Centre;
 
             Masking = true;
-            BorderThickness = 9; // roughly matches slider borders and makes stacked circles distinctly visible from each other.
+            BorderThickness = thickness;
             BorderColour = Color4.White;
 
             Child = new Box

osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj

@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.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;
@@ -37,7 +35,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();
 
@@ -45,7 +43,16 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new TaikoBeatmapConverter(beatmap, this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TaikoLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new TaikoLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public const string SHORT_NAME = "taiko";
 

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

@@ -306,7 +306,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                     new Color4(128, 255, 128, 255),
                     new Color4(255, 187, 255, 255),
                     new Color4(255, 177, 140, 255),
-                    new Color4(100, 100, 100, 100),
+                    new Color4(100, 100, 100, 255), // alpha is specified as 100, but should be ignored.
                 };
                 Assert.AreEqual(expectedColors.Length, comboColors.Count);
                 for (int i = 0; i < expectedColors.Length; i++)

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

@@ -97,6 +97,25 @@ 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()
         {

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

@@ -118,17 +118,31 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsNull(filterCriteria.BPM.Max);
         }
 
-        private static readonly object[] length_query_examples =
+        private static readonly object[] correct_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(length_query_examples))]
+        [TestCaseSource(nameof(correct_length_query_examples))]
         public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale)
         {
             string query = $"length={lengthQuery} time";
@@ -140,6 +154,29 @@ 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()
         {
@@ -154,6 +191,16 @@ 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/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());
+            AddStep("cancel download from notification", () => recentNotification.Close(true));
 
             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

@@ -0,0 +1,5 @@
+[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/Skins/IO/ImportSkinTest.cs

@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Skins.IO
             skinManager.CurrentSkinInfo.Value.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
-                Assert.AreEqual(typeof(DefaultSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
                 new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
 
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Skins.IO
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
-                Assert.AreEqual(typeof(DefaultSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
             });
 
             return Task.CompletedTask;
@@ -226,7 +226,7 @@ namespace osu.Game.Tests.Skins.IO
         {
             var skinManager = osu.Dependencies.Get<SkinManager>();
 
-            skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo;
+            skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
 
             skinManager.EnsureMutableSkin();
 

osu.Game.Tests/Skins/LegacySkinDecoderTest.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Skins
                     new Color4(142, 199, 255, 255),
                     new Color4(255, 128, 128, 255),
                     new Color4(128, 255, 255, 255),
-                    new Color4(100, 100, 100, 100),
+                    new Color4(100, 100, 100, 255), // alpha is specified as 100, but should be ignored.
                 };
 
                 Assert.AreEqual(expectedColors.Count, comboColors.Count);

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

@@ -0,0 +1,75 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.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/TestSceneZoomableScrollContainer.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -66,6 +67,18 @@ namespace osu.Game.Tests.Visual.Editing
             AddUntilStep("Scroll container is loaded", () => scrollContainer.LoadState >= LoadState.Loaded);
         }
 
+        [Test]
+        public void TestInitialZoomOutOfRange()
+        {
+            AddStep("Invalid ZoomableScrollContainer throws ArgumentException", () =>
+            {
+                Assert.Throws<ArgumentException>(() =>
+                {
+                    _ = new ZoomableScrollContainer(1, 60, 0);
+                });
+            });
+        }
+
         [Test]
         public void TestWidthInitialization()
         {

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

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

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

@@ -1,12 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -19,7 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             SetContents(skin =>
             {
-                var implementation = skin != null
+                var implementation = skin is LegacySkin
                     ? CreateLegacyImplementation()
                     : CreateDefaultImplementation();
 

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

@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestEmptyLegacyBeatmapSkinFallsBack()
         {
-            CreateSkinTest(DefaultSkin.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
+            CreateSkinTest(TrianglesSkin.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
             AddUntilStep("wait for hud load", () => Player.ChildrenOfType<SkinnableTargetContainer>().All(c => c.ComponentsLoaded));
             AddAssert("hud from default skin", () => AssertComponentsFromExpectedSource(SkinnableTarget.MainHUDComponents, skinManager.CurrentSkin.Value));
         }
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestOsuRuleset : OsuRuleset
         {
-            public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
+            public override ISkin CreateSkinTransformer(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
 
             private class TestOsuLegacySkinTransformer : OsuLegacySkinTransformer
             {

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

@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hit first hitobject", () =>
             {
                 InputManager.Click(MouseButton.Left);
-                return nextObjectEntry.Result.HasResult;
+                return nextObjectEntry.Result?.HasResult == true;
             });
 
             AddAssert("check correct object after hit", () => sampleTriggerSource.GetMostValidObject() == beatmap.HitObjects[1]);

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

@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private TestParticleSpewer createSpewer() =>
-            new TestParticleSpewer(skinManager.DefaultLegacySkin.GetTexture("star2"))
+            new TestParticleSpewer(skinManager.DefaultClassicSkin.GetTexture("star2"))
             {
                 Origin = Anchor.Centre,
                 RelativePositionAxes = Axes.Both,

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

@@ -264,13 +264,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestMutedNotificationMasterVolume()
         {
-            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.IsDefault);
+            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.Value == 0.5);
         }
 
         [Test]
         public void TestMutedNotificationTrackVolume()
         {
-            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.IsDefault);
+            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.Value == 0.5);
         }
 
         [Test]

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

@@ -15,8 +15,10 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -101,6 +103,37 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for last played to update", () => getLastPlayed() != null);
         }
 
+        [Test]
+        public void TestModReferenceNotRetained()
+        {
+            AddStep("allow fail", () => allowFail = false);
+
+            Mod[] originalMods = { new OsuModDaycore { SpeedChange = { Value = 0.8 } } };
+            Mod[] playerMods = null!;
+
+            AddStep("load player with mods", () => LoadPlayer(originalMods));
+            AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
+
+            AddStep("get mods at start of gameplay", () => playerMods = Player.Score.ScoreInfo.Mods.ToArray());
+
+            // Player creates new instance of mods during load.
+            AddAssert("player score has copied mods", () => playerMods.First(), () => Is.Not.SameAs(originalMods.First()));
+            AddAssert("player score has matching mods", () => playerMods.First(), () => Is.EqualTo(originalMods.First()));
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+
+            AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
+
+            // Player creates new instance of mods after gameplay to ensure any runtime references to drawables etc. are not retained.
+            AddAssert("results screen score has copied mods", () => (Player.GetChildScreen() as ResultsScreen)?.Score.Mods.First(), () => Is.Not.SameAs(playerMods.First()));
+            AddAssert("results screen score has matching", () => (Player.GetChildScreen() as ResultsScreen)?.Score.Mods.First(), () => Is.EqualTo(playerMods.First()));
+
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddUntilStep("databased score has correct mods", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)).Mods.First(), () => Is.EqualTo(playerMods.First()));
+        }
+
         [Test]
         public void TestScoreStoredLocally()
         {

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

@@ -1,8 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -51,13 +51,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleSeeking()
         {
-            DefaultSongProgress getDefaultProgress() => this.ChildrenOfType<DefaultSongProgress>().Single();
+            void applyToDefaultProgress(Action<DefaultSongProgress> action) =>
+                this.ChildrenOfType<DefaultSongProgress>().ForEach(action);
 
-            AddStep("allow seeking", () => getDefaultProgress().AllowSeeking.Value = true);
-            AddStep("hide graph", () => getDefaultProgress().ShowGraph.Value = false);
-            AddStep("disallow seeking", () => getDefaultProgress().AllowSeeking.Value = false);
-            AddStep("allow seeking", () => getDefaultProgress().AllowSeeking.Value = true);
-            AddStep("show graph", () => getDefaultProgress().ShowGraph.Value = true);
+            AddStep("allow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = true));
+            AddStep("hide graph", () => applyToDefaultProgress(s => s.ShowGraph.Value = false));
+            AddStep("disallow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = false));
+            AddStep("allow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = true));
+            AddStep("show graph", () => applyToDefaultProgress(s => s.ShowGraph.Value = true));
         }
 
         private void setHitObjects()

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

@@ -1,63 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.Linq;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Models;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osu.Game.Tests.Resources;
-
-namespace osu.Game.Tests.Visual.Navigation
-{
-    public class TestEFToRealmMigration : OsuGameTestScene
-    {
-        public override void RecycleLocalStorage(bool isDisposing)
-        {
-            base.RecycleLocalStorage(isDisposing);
-
-            if (isDisposing)
-                return;
-
-            using (var outStream = LocalStorage.CreateFileSafely(DatabaseContextFactory.DATABASE_NAME))
-            using (var stream = TestResources.OpenResource(DatabaseContextFactory.DATABASE_NAME))
-                stream.CopyTo(outStream);
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                Assert.Ignore("EF-to-realm migrations are not supported on M1 ARM architectures.");
-        }
-
-        public override void SetUpSteps()
-        {
-            // base SetUpSteps are executed before the above SetUp, therefore early-return to allow ignoring test properly.
-            // attempting to ignore here would yield a TargetInvocationException instead.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                return;
-
-            base.SetUpSteps();
-        }
-
-        [Test]
-        public void TestMigration()
-        {
-            // Numbers are taken from the test database (see commit f03de16ee5a46deac3b5f2ca1edfba5c4c5dca7d).
-            AddAssert("Check beatmaps", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<BeatmapSetInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check skins", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<SkinInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check scores", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<ScoreInfo>().Count() == 1));
-
-            // One extra file is created during realm migration / startup due to the circles intro import.
-            AddAssert("Check files", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<RealmFile>().Count() == 271));
-        }
-    }
-}

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

@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestEditDefaultSkin()
         {
-            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.DEFAULT_SKIN);
+            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.TRIANGLES_SKIN);
 
             AddStep("open settings", () => { Game.Settings.Show(); });
 
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("open skin editor", () => skinEditor.Show());
 
             // Until step required as the skin editor may take time to load (and an extra scheduled frame for the mutable part).
-            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.DEFAULT_SKIN);
+            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.TRIANGLES_SKIN);
             AddAssert("is not protected", () => skinManager.CurrentSkinInfo.Value.PerformRead(s => !s.Protected));
 
             AddUntilStep("export button enabled", () => Game.Settings.ChildrenOfType<SkinSection.ExportSkinButton>().SingleOrDefault()?.Enabled.Value == true);

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

@@ -35,6 +35,8 @@ namespace osu.Game.Tests.Visual.Online
 
         private OsuConfigManager localConfig;
 
+        private bool returnCursorOnResponse;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,6 +63,7 @@ namespace osu.Game.Tests.Visual.Online
                     searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                     {
                         BeatmapSets = setsForResponse,
+                        Cursor = returnCursorOnResponse ? new Cursor() : null,
                     });
 
                     return true;
@@ -106,7 +109,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
 
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -127,10 +130,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
-            AddStep("show more results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 30).ToArray()));
+            AddStep("show more results", () => fetchFor(getManyBeatmaps(30).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(30);
         }
 
@@ -139,7 +142,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
             setCardSize(BeatmapCardSize.Extra, viaConfig);
@@ -161,7 +164,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("fetch for 0 beatmaps", () => fetchFor());
             placeholderShown();
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 100);
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -180,6 +183,32 @@ 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()
         {
@@ -336,15 +365,25 @@ namespace osu.Game.Tests.Visual.Online
 
         private static int searchCount;
 
-        private void fetchFor(params APIBeatmapSet[] beatmaps)
+        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)
         {
-            setsForResponse.Clear();
-            setsForResponse.AddRange(beatmaps);
+            setSearchResponse(beatmaps, hasNextPage);
 
             // trigger arbitrary change for fetching.
             searchControl.Query.Value = $"search {searchCount++}";
         }
 
+        private void setSearchResponse(APIBeatmapSet[] beatmaps, bool hasNextPage)
+        {
+            setsForResponse.Clear();
+            setsForResponse.AddRange(beatmaps);
+            returnCursorOnResponse = hasNextPage;
+        }
+
         private void setRankAchievedFilter(ScoreRank[] ranks)
         {
             AddStep($"set Rank Achieved filter to [{string.Join(',', ranks)}]", () =>

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

@@ -5,6 +5,7 @@ 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,14 +20,24 @@ 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 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]
@@ -137,7 +148,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(600, 130)
+                    Size = new Vector2(width.Value, height.Value)
                 }
             };
         });

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>();
+                var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>().AsNonNull();
                 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>();
+                var difficultyAdjustMod = ruleset.CreateMod<OsuModDifficultyAdjust>().AsNonNull();
                 var originalDifficulty = advancedStats.BeatmapInfo.Difficulty;
 
                 difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);

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

@@ -1,8 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -13,6 +12,7 @@ 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;
-        private BeatmapManager beatmapManager;
-        private ScoreManager scoreManager;
-        private TopLocalRank topLocalRank;
+        private RulesetStore rulesets = null!;
+        private BeatmapManager beatmapManager = null!;
+        private ScoreManager scoreManager = null!;
+        private TopLocalRank topLocalRank = null!;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -47,21 +47,21 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Create local rank", () =>
             {
-                Add(topLocalRank = new TopLocalRank(importedBeatmap)
+                Child = 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;
-
-            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
+            ScoreInfo testScoreInfo = null!;
 
             AddStep("Add score for current user", () =>
             {
@@ -73,25 +73,19 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
-            AddAssert("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
-            AddStep("Delete score", () =>
-            {
-                scoreManager.Delete(testScoreInfo);
-            });
+            AddStep("Delete score", () => scoreManager.Delete(testScoreInfo));
 
-            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
+            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
         }
 
         [Test]
         public void TestRulesetChange()
         {
-            ScoreInfo testScoreInfo;
-
             AddStep("Add score for current user", () =>
             {
-                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
@@ -99,25 +93,21 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Wait for initial presence", () => topLocalRank.IsPresent);
+            AddUntilStep("Wait for initial display", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
             AddStep("Change ruleset", () => Ruleset.Value = rulesets.GetRuleset("fruits"));
-            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
+            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
 
             AddStep("Change ruleset back", () => Ruleset.Value = rulesets.GetRuleset("osu"));
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
         }
 
         [Test]
         public void TestHigherScoreSet()
         {
-            ScoreInfo testScoreInfo = null;
-
-            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
-
             AddStep("Add score for current user", () =>
             {
-                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
@@ -125,21 +115,58 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
-            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
+            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.S;
-                testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
+                testScoreInfo2.Rank = ScoreRank.X;
+                testScoreInfo2.TotalScore = 1000000;
+                testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
 
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.S);
+            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);
+
+            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);
+
+                scoreManager.Import(testScoreInfo2);
+            });
+
+            AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
         }
     }
 }

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

@@ -3,9 +3,13 @@
 
 #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;
@@ -15,12 +19,13 @@ 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;
 
@@ -45,5 +50,83 @@ 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/TestSceneModsEffectDisplay.cs

@@ -0,0 +1,68 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Framework.Testing;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public class TestSceneModsEffectDisplay : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Test]
+        public void TestModsEffectDisplay()
+        {
+            TestDisplay testDisplay = null!;
+            Box background = null!;
+
+            AddStep("add display", () =>
+            {
+                Add(testDisplay = new TestDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                });
+                var boxes = testDisplay.ChildrenOfType<Box>();
+                background = boxes.First();
+            });
+
+            AddStep("set value to default", () => testDisplay.Current.Value = 50);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
+
+            AddStep("set value to less", () => testDisplay.Current.Value = 40);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
+
+            AddStep("set value to bigger", () => testDisplay.Current.Value = 60);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
+        }
+
+        private class TestDisplay : ModsEffectDisplay
+        {
+            public Container<Drawable> Container => Content;
+
+            protected override LocalisableString Label => "Test display";
+
+            public TestDisplay()
+            {
+                Current.Default = 50;
+            }
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -10,13 +11,17 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Multiplayer;
 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 : OsuTestScene
+    public class TestSceneNotificationOverlay : OsuManualInputManagerTestScene
     {
         private NotificationOverlay notificationOverlay = null!;
 
@@ -29,10 +34,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            InputManager.MoveMouseTo(Vector2.Zero);
+
             TimeToCompleteProgress = 2000;
             progressingNotifications.Clear();
 
-            Content.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 notificationOverlay = new NotificationOverlay
                 {
@@ -42,9 +49,164 @@ namespace osu.Game.Tests.Visual.UserInterface
                 displayedCount = new OsuSpriteText()
             };
 
-            notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
+            notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"unread 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()
         {
@@ -70,6 +232,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
         }
 
+        [Test]
+        public void TestProgressClick()
+        {
+            ProgressNotification notification = null!;
+
+            AddStep("add progress notification", () =>
+            {
+                notification = new ProgressNotification
+                {
+                    Text = @"Uploading to BSS...",
+                    CompletionText = "Uploaded to BSS!",
+                };
+                notificationOverlay.Post(notification);
+                progressingNotifications.Add(notification);
+            });
+
+            AddStep("hover over notification", () => InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<ProgressNotification>().Single()));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("not cancelled", () => notification.State == ProgressNotificationState.Active);
+
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddAssert("cancelled", () => notification.State == ProgressNotificationState.Cancelled);
+        }
+
         [Test]
         public void TestCompleteProgress()
         {
@@ -112,6 +299,8 @@ 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);
+            AddAssert("only one unread", () => notificationOverlay.UnreadCount.Value == 1);
         }
 
         [Test]
@@ -134,6 +323,55 @@ 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()
         {
@@ -215,6 +453,14 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddRepeatStep("send barrage", sendBarrage, 10);
         }
 
+        [Test]
+        public void TestServerShuttingDownNotification()
+        {
+            AddStep("post with 5 seconds", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromSeconds(5))));
+            AddStep("post with 30 seconds", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromSeconds(30))));
+            AddStep("post with 6 hours", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromHours(6))));
+        }
+
         protected override void Update()
         {
             base.Update();

osu.Game.Tests/osu.Game.Tests.csproj

@@ -6,7 +6,6 @@
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game/Beatmaps/BeatmapSetFileInfo.cs

@@ -1,31 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapSetFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapSetInfoID { get; set; }
-
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}

osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs

@@ -19,6 +19,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.BZip2;
+using SQLitePCL;
 
 namespace osu.Game.Beatmaps
 {
@@ -41,6 +42,17 @@ namespace osu.Game.Beatmaps
 
         public BeatmapUpdaterMetadataLookup(IAPIProvider api, Storage storage)
         {
+            try
+            {
+                // required to initialise native SQLite libraries on some platforms.
+                Batteries_V2.Init();
+                raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+            }
+            catch
+            {
+                // may fail if platform not supported.
+            }
+
             this.api = api;
             this.storage = storage;
 
@@ -192,7 +204,7 @@ namespace osu.Game.Beatmaps
 
             try
             {
-                using (var db = new SqliteConnection(DatabaseContextFactory.CreateDatabaseConnectionString("online.db", storage)))
+                using (var db = new SqliteConnection(string.Concat("Data Source=", storage.GetFullPath($@"{"online.db"}", true))))
                 {
                     db.Open();
 

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
+    public abstract class BeatmapCard : OsuClickableContainer, IEquatable<BeatmapCard>
     {
         public const float TRANSITION_DURATION = 400;
         public const float CORNER_RADIUS = 10;
@@ -96,5 +96,16 @@ 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/EFBeatmapDifficulty.cs

@@ -1,80 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using osu.Game.Database;
-
-namespace osu.Game.Beatmaps
-{
-    [Table(@"BeatmapDifficulty")]
-    public class EFBeatmapDifficulty : IHasPrimaryKey, IBeatmapDifficultyInfo
-    {
-        /// <summary>
-        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
-        /// </summary>
-        public const float DEFAULT_DIFFICULTY = 5;
-
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
-        public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
-        public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
-
-        private float? approachRate;
-
-        public EFBeatmapDifficulty()
-        {
-        }
-
-        public EFBeatmapDifficulty(IBeatmapDifficultyInfo source)
-        {
-            CopyFrom(source);
-        }
-
-        public float ApproachRate
-        {
-            get => approachRate ?? OverallDifficulty;
-            set => approachRate = value;
-        }
-
-        public double SliderMultiplier { get; set; } = 1;
-        public double SliderTickRate { get; set; } = 1;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapDifficulty"/>.
-        /// </summary>
-        public EFBeatmapDifficulty Clone()
-        {
-            var diff = (EFBeatmapDifficulty)Activator.CreateInstance(GetType());
-            CopyTo(diff);
-            return diff;
-        }
-
-        public virtual void CopyFrom(IBeatmapDifficultyInfo other)
-        {
-            ApproachRate = other.ApproachRate;
-            DrainRate = other.DrainRate;
-            CircleSize = other.CircleSize;
-            OverallDifficulty = other.OverallDifficulty;
-
-            SliderMultiplier = other.SliderMultiplier;
-            SliderTickRate = other.SliderTickRate;
-        }
-
-        public virtual void CopyTo(EFBeatmapDifficulty other)
-        {
-            other.ApproachRate = ApproachRate;
-            other.DrainRate = DrainRate;
-            other.CircleSize = CircleSize;
-            other.OverallDifficulty = OverallDifficulty;
-
-            other.SliderMultiplier = SliderMultiplier;
-            other.SliderTickRate = SliderTickRate;
-        }
-    }
-}

osu.Game/Beatmaps/EFBeatmapInfo.cs

@@ -1,183 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapInfo")]
-    public class EFBeatmapInfo : IEquatable<EFBeatmapInfo>, IHasPrimaryKey, IBeatmapInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapVersion;
-
-        private int? onlineID;
-
-        [JsonProperty("id")]
-        [Column("OnlineBeatmapID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        [JsonIgnore]
-        public int BeatmapSetInfoID { get; set; }
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        [Required]
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [JsonIgnore]
-        public int BaseDifficultyID { get; set; }
-
-        public EFBeatmapDifficulty BaseDifficulty { get; set; }
-
-        [NotMapped]
-        public APIBeatmap OnlineInfo { get; set; }
-
-        /// <summary>
-        /// The playable length in milliseconds of this beatmap.
-        /// </summary>
-        public double Length { get; set; }
-
-        /// <summary>
-        /// The most common BPM of this beatmap.
-        /// </summary>
-        public double BPM { get; set; }
-
-        public string Path { get; set; }
-
-        [JsonProperty("file_sha2")]
-        public string Hash { get; set; }
-
-        [JsonIgnore]
-        public bool Hidden { get; set; }
-
-        /// <summary>
-        /// MD5 is kept for legacy support (matching against replays, osu-web-10 etc.).
-        /// </summary>
-        [JsonProperty("file_md5")]
-        public string MD5Hash { get; set; }
-
-        // General
-        public double AudioLeadIn { get; set; }
-        public float StackLeniency { get; set; } = 0.7f;
-        public bool SpecialStyle { get; set; }
-
-        [Column("RulesetID")]
-        public int RulesetInfoID { get; set; }
-
-        public EFRulesetInfo RulesetInfo { get; set; }
-
-        public bool LetterboxInBreaks { get; set; }
-        public bool WidescreenStoryboard { get; set; }
-        public bool EpilepsyWarning { get; set; }
-
-        /// <summary>
-        /// Whether or not sound samples should change rate when playing with speed-changing mods.
-        /// TODO: only read/write supported for now, requires implementation in gameplay.
-        /// </summary>
-        public bool SamplesMatchPlaybackRate { get; set; }
-
-        public CountdownType Countdown { get; set; } = CountdownType.Normal;
-
-        /// <summary>
-        /// The number of beats to move the countdown backwards (compared to its default location).
-        /// </summary>
-        public int CountdownOffset { get; set; }
-
-        [NotMapped]
-        public int[] Bookmarks { get; set; } = Array.Empty<int>();
-
-        public double DistanceSpacing { get; set; }
-        public int BeatDivisor { get; set; }
-        public int GridSize { get; set; }
-        public double TimelineZoom { get; set; }
-
-        // Metadata
-        [Column("Version")]
-        public string DifficultyName { get; set; }
-
-        [JsonProperty("difficulty_rating")]
-        [Column("StarDifficulty")]
-        public double StarRating { get; set; }
-
-        /// <summary>
-        /// Currently only populated for beatmap deletion. Use <see cref="ScoreManager"/> to query scores.
-        /// </summary>
-        public List<EFScoreInfo> Scores { get; set; }
-
-        [JsonIgnore]
-        public DifficultyRating DifficultyRating => StarDifficulty.GetDifficultyRating(StarRating);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        public bool Equals(EFBeatmapInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapInfo other) => other is EFBeatmapInfo b && Equals(b);
-
-        public bool AudioEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                        BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                        (Metadata ?? BeatmapSetInfo.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).AudioFile;
-
-        public bool BackgroundEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                             BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                             (Metadata ?? BeatmapSetInfo.Metadata).BackgroundFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).BackgroundFile;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapInfo"/>.
-        /// </summary>
-        public EFBeatmapInfo Clone() => (EFBeatmapInfo)MemberwiseClone();
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapInfo
-
-        [JsonIgnore]
-        IBeatmapMetadataInfo IBeatmapInfo.Metadata => Metadata ?? BeatmapSetInfo?.Metadata ?? new EFBeatmapMetadata();
-
-        [JsonIgnore]
-        IBeatmapDifficultyInfo IBeatmapInfo.Difficulty => BaseDifficulty;
-
-        [JsonIgnore]
-        IBeatmapSetInfo IBeatmapInfo.BeatmapSet => BeatmapSetInfo;
-
-        [JsonIgnore]
-        IRulesetInfo IBeatmapInfo.Ruleset => RulesetInfo;
-
-        #endregion
-    }
-}

osu.Game/Beatmaps/EFBeatmapMetadata.cs

@@ -1,89 +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.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Users;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapMetadata")]
-    public class EFBeatmapMetadata : IEquatable<EFBeatmapMetadata>, IHasPrimaryKey, IBeatmapMetadataInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public string Title { get; set; } = string.Empty;
-
-        [JsonProperty("title_unicode")]
-        public string TitleUnicode { get; set; } = string.Empty;
-
-        public string Artist { get; set; } = string.Empty;
-
-        [JsonProperty("artist_unicode")]
-        public string ArtistUnicode { get; set; } = string.Empty;
-
-        [JsonIgnore]
-        public List<EFBeatmapInfo> Beatmaps { get; set; } = new List<EFBeatmapInfo>();
-
-        [JsonIgnore]
-        public List<EFBeatmapSetInfo> BeatmapSets { get; set; } = new List<EFBeatmapSetInfo>();
-
-        /// <summary>
-        /// The author of the beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public APIUser Author = new APIUser();
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"user_id")]
-        [Column("AuthorID")]
-        public int AuthorID
-        {
-            get => Author.Id; // This should not be used, but is required to make EF work correctly.
-            set => Author.Id = value;
-        }
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"creator")]
-        [Column("Author")]
-        public string AuthorString
-        {
-            get => Author.Username; // This should not be used, but is required to make EF work correctly.
-            set => Author.Username = value;
-        }
-
-        public string Source { get; set; } = string.Empty;
-
-        [JsonProperty(@"tags")]
-        public string Tags { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The time in milliseconds to begin playing the track for preview purposes.
-        /// If -1, the track should begin playing at 40% of its length.
-        /// </summary>
-        public int PreviewTime { get; set; } = -1;
-
-        public string AudioFile { get; set; } = string.Empty;
-
-        public string BackgroundFile { get; set; } = string.Empty;
-
-        public bool Equals(EFBeatmapMetadata other) => ((IBeatmapMetadataInfo)this).Equals(other);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        IUser IBeatmapMetadataInfo.Author => Author;
-    }
-}

osu.Game/Beatmaps/EFBeatmapSetInfo.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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Extensions;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapSetInfo")]
-    public class EFBeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<EFBeatmapSetInfo>, IBeatmapSetInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        private int? onlineID;
-
-        [Column("OnlineBeatmapSetID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        public DateTimeOffset DateAdded { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [NotNull]
-        public List<EFBeatmapInfo> Beatmaps { get; } = new List<EFBeatmapInfo>();
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        public List<BeatmapSetFileInfo> Files { get; } = new List<BeatmapSetFileInfo>();
-
-        /// <summary>
-        /// The maximum star difficulty of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxStarDifficulty => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.StarRating);
-
-        /// <summary>
-        /// The maximum playable length in milliseconds of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxLength => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.Length);
-
-        /// <summary>
-        /// The maximum BPM of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxBPM => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.BPM);
-
-        [NotMapped]
-        public bool DeletePending { get; set; }
-
-        public string Hash { get; set; }
-
-        /// <summary>
-        /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
-        /// The path returned is relative to the user file storage.
-        /// </summary>
-        /// <param name="filename">The name of the file to get the storage path of.</param>
-        public string GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.GetStoragePath();
-
-        public override string ToString() => Metadata?.ToString() ?? base.ToString();
-
-        public bool Protected { get; set; }
-
-        public bool Equals(EFBeatmapSetInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapSetInfo other) => other is EFBeatmapSetInfo b && Equals(b);
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapSetInfo
-
-        IBeatmapMetadataInfo IBeatmapSetInfo.Metadata => Metadata ?? Beatmaps.FirstOrDefault()?.Metadata ?? new EFBeatmapMetadata();
-        IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-
-        #endregion
-    }
-}

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -79,7 +79,7 @@ namespace osu.Game.Beatmaps.Formats
             switch (section)
             {
                 case Section.Colours:
-                    HandleColours(output, line);
+                    HandleColours(output, line, false);
                     return;
             }
         }
@@ -93,7 +93,7 @@ namespace osu.Game.Beatmaps.Formats
             return line;
         }
 
-        protected void HandleColours<TModel>(TModel output, string line)
+        protected void HandleColours<TModel>(TModel output, string line, bool allowAlpha)
         {
             var pair = SplitKeyVal(line);
 
@@ -108,7 +108,7 @@ namespace osu.Game.Beatmaps.Formats
 
             try
             {
-                byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
+                byte alpha = allowAlpha && split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
                 colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -280,12 +280,15 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            IBeatmapProcessor processor = rulesetInstance.CreateBeatmapProcessor(converted);
+            var processor = rulesetInstance.CreateBeatmapProcessor(converted);
 
-            foreach (var mod in mods.OfType<IApplicableToBeatmapProcessor>())
-                mod.ApplyToBeatmapProcessor(processor);
+            if (processor != null)
+            {
+                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/Configuration/OsuConfigManager.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Configuration
         {
             // UI/selection defaults
             SetDefault(OsuSetting.Ruleset, string.Empty);
-            SetDefault(OsuSetting.Skin, SkinInfo.DEFAULT_SKIN.ToString());
+            SetDefault(OsuSetting.Skin, SkinInfo.TRIANGLES_SKIN.ToString());
 
             SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
             SetDefault(OsuSetting.BeatmapDetailModsFilter, false);

osu.Game/Database/DatabaseContextFactory.cs

@@ -1,218 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Framework.Statistics;
-
-namespace osu.Game.Database
-{
-    public class DatabaseContextFactory : IDatabaseContextFactory
-    {
-        private readonly Storage storage;
-
-        public const string DATABASE_NAME = @"client.db";
-
-        private ThreadLocal<OsuDbContext> threadContexts;
-
-        private readonly object writeLock = new object();
-
-        private bool currentWriteDidWrite;
-        private bool currentWriteDidError;
-
-        private int currentWriteUsages;
-
-        private IDbContextTransaction currentWriteTransaction;
-
-        public DatabaseContextFactory(Storage storage)
-        {
-            this.storage = storage;
-            recycleThreadContexts();
-        }
-
-        private static readonly GlobalStatistic<int> reads = GlobalStatistics.Get<int>("Database", "Get (Read)");
-        private static readonly GlobalStatistic<int> writes = GlobalStatistics.Get<int>("Database", "Get (Write)");
-        private static readonly GlobalStatistic<int> commits = GlobalStatistics.Get<int>("Database", "Commits");
-        private static readonly GlobalStatistic<int> rollbacks = GlobalStatistics.Get<int>("Database", "Rollbacks");
-
-        /// <summary>
-        /// Get a context for the current thread for read-only usage.
-        /// If a <see cref="DatabaseWriteUsage"/> is in progress, the existing write-safe context will be returned.
-        /// </summary>
-        public OsuDbContext Get()
-        {
-            reads.Value++;
-            return threadContexts.Value;
-        }
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        public DatabaseWriteUsage GetForWrite(bool withTransaction = true)
-        {
-            writes.Value++;
-            Monitor.Enter(writeLock);
-            OsuDbContext context;
-
-            try
-            {
-                if (currentWriteTransaction == null && withTransaction)
-                {
-                    // this mitigates the fact that changes on tracked entities will not be rolled back with the transaction by ensuring write operations are always executed in isolated contexts.
-                    // if this results in sub-optimal efficiency, we may need to look into removing Database-level transactions in favour of running SaveChanges where we currently commit the transaction.
-                    if (threadContexts.IsValueCreated)
-                        recycleThreadContexts();
-
-                    context = threadContexts.Value;
-                    currentWriteTransaction = context.Database.BeginTransaction();
-                }
-                else
-                {
-                    // we want to try-catch the retrieval of the context because it could throw an error (in CreateContext).
-                    context = threadContexts.Value;
-                }
-            }
-            catch
-            {
-                // retrieval of a context could trigger a fatal error.
-                Monitor.Exit(writeLock);
-                throw;
-            }
-
-            Interlocked.Increment(ref currentWriteUsages);
-
-            return new DatabaseWriteUsage(context, usageCompleted) { IsTransactionLeader = currentWriteTransaction != null && currentWriteUsages == 1 };
-        }
-
-        private void usageCompleted(DatabaseWriteUsage usage)
-        {
-            int usages = Interlocked.Decrement(ref currentWriteUsages);
-
-            try
-            {
-                currentWriteDidWrite |= usage.PerformedWrite;
-                currentWriteDidError |= usage.Errors.Any();
-
-                if (usages == 0)
-                {
-                    if (currentWriteDidError)
-                    {
-                        rollbacks.Value++;
-                        currentWriteTransaction?.Rollback();
-                    }
-                    else
-                    {
-                        commits.Value++;
-                        currentWriteTransaction?.Commit();
-                    }
-
-                    if (currentWriteDidWrite || currentWriteDidError)
-                    {
-                        // explicitly dispose to ensure any outstanding flushes happen as soon as possible (and underlying resources are purged).
-                        usage.Context.Dispose();
-
-                        // once all writes are complete, we want to refresh thread-specific contexts to make sure they don't have stale local caches.
-                        recycleThreadContexts();
-                    }
-
-                    currentWriteTransaction = null;
-                    currentWriteDidWrite = false;
-                    currentWriteDidError = false;
-                }
-            }
-            finally
-            {
-                Monitor.Exit(writeLock);
-            }
-        }
-
-        private void recycleThreadContexts()
-        {
-            // Contexts for other threads are not disposed as they may be in use elsewhere. Instead, fresh contexts are exposed
-            // for other threads to use, and we rely on the finalizer inside OsuDbContext to handle their previous contexts
-            threadContexts?.Value.Dispose();
-            threadContexts = new ThreadLocal<OsuDbContext>(CreateContext, true);
-        }
-
-        protected virtual OsuDbContext CreateContext() => new OsuDbContext(CreateDatabaseConnectionString(DATABASE_NAME, storage))
-        {
-            Database = { AutoTransactionsEnabled = false }
-        };
-
-        public void CreateBackup(string backupFilename)
-        {
-            Logger.Log($"Creating full EF database backup at {backupFilename}", LoggingTarget.Database);
-
-            using (var source = storage.GetStream(DATABASE_NAME, mode: FileMode.Open))
-            using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
-                source.CopyTo(destination);
-        }
-
-        public void ResetDatabase()
-        {
-            lock (writeLock)
-            {
-                recycleThreadContexts();
-
-                try
-                {
-                    int attempts = 10;
-
-                    // Retry logic taken from MigratableStorage.AttemptOperation.
-                    while (true)
-                    {
-                        try
-                        {
-                            storage.Delete(DATABASE_NAME);
-                            return;
-                        }
-                        catch (Exception)
-                        {
-                            if (attempts-- == 0)
-                                throw;
-                        }
-
-                        Thread.Sleep(250);
-                    }
-                }
-                catch
-                {
-                    // for now we are not sure why file handles are kept open by EF, but this is generally only used in testing
-                }
-            }
-        }
-
-        public void FlushConnections()
-        {
-            if (threadContexts != null)
-            {
-                foreach (var context in threadContexts.Values)
-                    context.Dispose();
-            }
-
-            recycleThreadContexts();
-        }
-
-        public static string CreateDatabaseConnectionString(string filename, Storage storage) => string.Concat("Data Source=", storage.GetFullPath($@"{filename}", true));
-
-        private readonly ManualResetEventSlim migrationComplete = new ManualResetEventSlim();
-
-        public void SetMigrationCompletion() => migrationComplete.Set();
-
-        public void WaitForMigrationCompletion()
-        {
-            if (!migrationComplete.Wait(300000))
-                throw new TimeoutException("Migration took too long (likely stuck).");
-        }
-    }
-}

osu.Game/Database/DatabaseWriteUsage.cs

@@ -1,60 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Database
-{
-    public class DatabaseWriteUsage : IDisposable
-    {
-        public readonly OsuDbContext Context;
-        private readonly Action<DatabaseWriteUsage> usageCompleted;
-
-        public DatabaseWriteUsage(OsuDbContext context, Action<DatabaseWriteUsage> onCompleted)
-        {
-            Context = context;
-            usageCompleted = onCompleted;
-        }
-
-        public bool PerformedWrite { get; private set; }
-
-        private bool isDisposed;
-        public List<Exception> Errors = new List<Exception>();
-
-        /// <summary>
-        /// Whether this write usage will commit a transaction on completion.
-        /// If false, there is a parent usage responsible for transaction commit.
-        /// </summary>
-        public bool IsTransactionLeader;
-
-        protected void Dispose(bool disposing)
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            try
-            {
-                PerformedWrite |= Context.SaveChanges() > 0;
-            }
-            catch (Exception e)
-            {
-                Errors.Add(e);
-                throw;
-            }
-            finally
-            {
-                usageCompleted?.Invoke(this);
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}

osu.Game/Database/EFToRealmMigrator.cs

@@ -1,595 +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.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Development;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Models;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osuTK;
-using Realms;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
-using SharpCompress.Writers.Zip;
-
-namespace osu.Game.Database
-{
-    internal class EFToRealmMigrator : CompositeDrawable
-    {
-        public Task<bool> MigrationCompleted => migrationCompleted.Task;
-
-        private readonly TaskCompletionSource<bool> migrationCompleted = new TaskCompletionSource<bool>();
-
-        [Resolved]
-        private DatabaseContextFactory efContextFactory { get; set; } = null!;
-
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
-        [Resolved]
-        private OsuConfigManager config { get; set; } = null!;
-
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; } = null!;
-
-        [Resolved]
-        private OsuGame game { get; set; } = null!;
-
-        [Resolved]
-        private Storage storage { get; set; } = null!;
-
-        private readonly OsuTextFlowContainer currentOperationText;
-
-        public EFToRealmMigrator()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Spacing = new Vector2(10),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Database migration in progress",
-                            Font = OsuFont.Default.With(size: 40)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "This could take a few minutes depending on the speed of your disk(s).",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Please keep the window open until this completes!",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new LoadingSpinner(true)
-                        {
-                            State = { Value = Visibility.Visible }
-                        },
-                        currentOperationText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: 30))
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                            TextAnchor = Anchor.TopCentre,
-                        },
-                    }
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            beginMigration();
-        }
-
-        private void beginMigration()
-        {
-            const string backup_folder = "backups";
-
-            string backupSuffix = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
-
-            // required for initial backup.
-            var realmBlockOperations = realm.BlockAllOperations("EF migration");
-
-            Task.Factory.StartNew(() =>
-            {
-                try
-                {
-                    realm.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.realm"));
-                }
-                finally
-                {
-                    // Once the backup is created, we need to stop blocking operations so the migration can complete.
-                    realmBlockOperations.Dispose();
-                    // Clean up here so we don't accidentally dispose twice.
-                    realmBlockOperations = null;
-                }
-
-                efContextFactory.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.db"));
-
-                using (var ef = efContextFactory.Get())
-                {
-                    realm.Write(r =>
-                    {
-                        // Before beginning, ensure realm is in an empty state.
-                        // Migrations which are half-completed could lead to issues if the user tries a second time.
-                        // Note that we only do this for beatmaps and scores since the other migrations are yonks old.
-                        r.RemoveAll<BeatmapSetInfo>();
-                        r.RemoveAll<BeatmapInfo>();
-                        r.RemoveAll<BeatmapMetadata>();
-                        r.RemoveAll<ScoreInfo>();
-                    });
-
-                    ef.Migrate();
-
-                    migrateSettings(ef);
-                    migrateSkins(ef);
-                    migrateBeatmaps(ef);
-                    migrateScores(ef);
-                }
-            }, TaskCreationOptions.LongRunning).ContinueWith(t =>
-            {
-                if (t.Exception == null)
-                {
-                    log("Migration successful!");
-
-                    if (DebugUtils.IsDebugBuild)
-                    {
-                        Logger.Log(
-                            "Your development database has been fully migrated to realm. If you switch back to a pre-realm branch and need your previous database, rename the backup file back to \"client.db\".\n\nNote that doing this can potentially leave your file store in a bad state.",
-                            level: LogLevel.Important);
-                    }
-                }
-                else
-                {
-                    log("Migration failed!");
-                    Logger.Log(t.Exception.ToString(), LoggingTarget.Database);
-
-                    if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && t.Exception.Flatten().InnerException is TypeInitializationException)
-                    {
-                        // Not guaranteed to be the only cause of exception, but let's roll with it for now.
-                        log("Please download and run the intel version of osu! once\nto allow data migration to complete!");
-                        efContextFactory.SetMigrationCompletion();
-                        return;
-                    }
-
-                    notificationOverlay.Post(new SimpleErrorNotification
-                    {
-                        Text =
-                            "IMPORTANT: During data migration, some of your data could not be successfully migrated. The previous version has been backed up.\n\nFor further assistance, please open a discussion on github and attach your backup files (click to get started).",
-                        Activated = () =>
-                        {
-                            game.OpenUrlExternally(
-                                $@"https://github.com/ppy/osu/discussions/new?title=Realm%20migration%20issue ({t.Exception.Message})&body=Please%20drag%20the%20""attach_me.zip""%20file%20here!&category=q-a",
-                                true);
-
-                            const string attachment_filename = "attach_me.zip";
-
-                            var backupStorage = storage.GetStorageForDirectory(backup_folder);
-
-                            backupStorage.Delete(attachment_filename);
-
-                            try
-                            {
-                                using (var zip = ZipArchive.Create())
-                                {
-                                    zip.AddAllFromDirectory(backupStorage.GetFullPath(string.Empty));
-                                    zip.SaveTo(Path.Combine(backupStorage.GetFullPath(string.Empty), attachment_filename), new ZipWriterOptions(CompressionType.Deflate));
-                                }
-                            }
-                            catch { }
-
-                            backupStorage.PresentFileExternally(attachment_filename);
-
-                            return true;
-                        }
-                    });
-                }
-
-                // Regardless of success, since the game is going to continue with startup let's move the ef database out of the way.
-                // If we were to not do this, the migration would run another time the next time the user starts the game.
-                deletePreRealmData();
-
-                // If something went wrong and the disposal token wasn't invoked above, ensure it is here.
-                realmBlockOperations?.Dispose();
-
-                migrationCompleted.SetResult(true);
-                efContextFactory.SetMigrationCompletion();
-            });
-        }
-
-        private void deletePreRealmData()
-        {
-            // Delete the database permanently.
-            // Will cause future startups to not attempt migration.
-            efContextFactory.ResetDatabase();
-        }
-
-        private void log(string message)
-        {
-            Logger.Log(message, LoggingTarget.Database);
-            Scheduler.AddOnce(m => currentOperationText.Text = m, message);
-        }
-
-        private void migrateBeatmaps(OsuDbContext ef)
-        {
-            // can be removed 20220730.
-            var existingBeatmapSets = ef.EFBeatmapSetInfo
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.RulesetInfo)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                                        .Include(s => s.Files).ThenInclude(f => f.FileInfo)
-                                        .Include(s => s.Metadata)
-                                        .AsSplitQuery();
-
-            log("Beginning beatmaps migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingBeatmapSets.Any())
-            {
-                log("No beatmaps found to migrate");
-                return;
-            }
-
-            int count = existingBeatmapSets.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} beatmaps in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var beatmapSet in existingBeatmapSets)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} beatmaps...");
-                        }
-
-                        var realmBeatmapSet = new BeatmapSetInfo
-                        {
-                            OnlineID = beatmapSet.OnlineID ?? -1,
-                            DateAdded = beatmapSet.DateAdded,
-                            Status = beatmapSet.Status,
-                            DeletePending = beatmapSet.DeletePending,
-                            Hash = beatmapSet.Hash,
-                            Protected = beatmapSet.Protected,
-                        };
-
-                        migrateFiles(beatmapSet, r, realmBeatmapSet);
-
-                        foreach (var beatmap in beatmapSet.Beatmaps)
-                        {
-                            var ruleset = r.Find<RulesetInfo>(beatmap.RulesetInfo.ShortName);
-                            var metadata = getBestMetadata(beatmap.Metadata, beatmapSet.Metadata);
-
-                            if (ruleset == null)
-                            {
-                                log($"Skipping {++missing} beatmaps with missing ruleset");
-                                continue;
-                            }
-
-                            var realmBeatmap = new BeatmapInfo(ruleset, new BeatmapDifficulty(beatmap.BaseDifficulty), metadata)
-                            {
-                                DifficultyName = beatmap.DifficultyName,
-                                Status = beatmap.Status,
-                                OnlineID = beatmap.OnlineID ?? -1,
-                                Length = beatmap.Length,
-                                BPM = beatmap.BPM,
-                                Hash = beatmap.Hash,
-                                StarRating = beatmap.StarRating,
-                                MD5Hash = beatmap.MD5Hash,
-                                Hidden = beatmap.Hidden,
-                                AudioLeadIn = beatmap.AudioLeadIn,
-                                StackLeniency = beatmap.StackLeniency,
-                                SpecialStyle = beatmap.SpecialStyle,
-                                LetterboxInBreaks = beatmap.LetterboxInBreaks,
-                                WidescreenStoryboard = beatmap.WidescreenStoryboard,
-                                EpilepsyWarning = beatmap.EpilepsyWarning,
-                                SamplesMatchPlaybackRate = beatmap.SamplesMatchPlaybackRate,
-                                DistanceSpacing = beatmap.DistanceSpacing,
-                                BeatDivisor = beatmap.BeatDivisor,
-                                GridSize = beatmap.GridSize,
-                                TimelineZoom = beatmap.TimelineZoom,
-                                Countdown = beatmap.Countdown,
-                                CountdownOffset = beatmap.CountdownOffset,
-                                Bookmarks = beatmap.Bookmarks,
-                                BeatmapSet = realmBeatmapSet,
-                            };
-
-                            realmBeatmapSet.Beatmaps.Add(realmBeatmap);
-                        }
-
-                        r.Add(realmBeatmapSet);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} beatmaps to realm");
-            });
-        }
-
-        private BeatmapMetadata getBestMetadata(EFBeatmapMetadata? beatmapMetadata, EFBeatmapMetadata? beatmapSetMetadata)
-        {
-            var metadata = beatmapMetadata ?? beatmapSetMetadata ?? new EFBeatmapMetadata();
-
-            return new BeatmapMetadata
-            {
-                Title = metadata.Title,
-                TitleUnicode = metadata.TitleUnicode,
-                Artist = metadata.Artist,
-                ArtistUnicode = metadata.ArtistUnicode,
-                Author =
-                {
-                    OnlineID = metadata.Author.Id,
-                    Username = metadata.Author.Username,
-                },
-                Source = metadata.Source,
-                Tags = metadata.Tags,
-                PreviewTime = metadata.PreviewTime,
-                AudioFile = metadata.AudioFile,
-                BackgroundFile = metadata.BackgroundFile,
-            };
-        }
-
-        private void migrateScores(OsuDbContext db)
-        {
-            // can be removed 20220730.
-            var existingScores = db.ScoreInfo
-                                   .Include(s => s.Ruleset)
-                                   .Include(s => s.BeatmapInfo)
-                                   .Include(s => s.Files)
-                                   .ThenInclude(f => f.FileInfo)
-                                   .AsSplitQuery();
-
-            log("Beginning scores migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingScores.Any())
-            {
-                log("No scores found to migrate");
-                return;
-            }
-
-            int count = existingScores.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} scores in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var score in existingScores)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} scores...");
-                        }
-
-                        var beatmap = r.All<BeatmapInfo>().FirstOrDefault(b => b.Hash == score.BeatmapInfo.Hash);
-                        var ruleset = r.Find<RulesetInfo>(score.Ruleset.ShortName);
-
-                        if (beatmap == null || ruleset == null)
-                        {
-                            log($"Skipping {++missing} scores with missing ruleset or beatmap");
-                            continue;
-                        }
-
-                        var user = new RealmUser
-                        {
-                            OnlineID = score.User.OnlineID,
-                            Username = score.User.Username
-                        };
-
-                        var realmScore = new ScoreInfo(beatmap, ruleset, user)
-                        {
-                            Hash = score.Hash,
-                            DeletePending = score.DeletePending,
-                            OnlineID = score.OnlineID ?? -1,
-                            ModsJson = score.ModsJson,
-                            StatisticsJson = score.StatisticsJson,
-                            TotalScore = score.TotalScore,
-                            MaxCombo = score.MaxCombo,
-                            Accuracy = score.Accuracy,
-                            Date = score.Date,
-                            PP = score.PP,
-                            Rank = score.Rank,
-                            HitEvents = score.HitEvents,
-                            Passed = score.Passed,
-                            Combo = score.Combo,
-                            Position = score.Position,
-                            Statistics = score.Statistics,
-                            Mods = score.Mods,
-                            APIMods = score.APIMods,
-                        };
-
-                        migrateFiles(score, r, realmScore);
-
-                        r.Add(realmScore);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} scores to realm");
-            });
-        }
-
-        private void migrateSkins(OsuDbContext db)
-        {
-            // can be removed 20220530.
-            var existingSkins = db.SkinInfo
-                                  .Include(s => s.Files)
-                                  .ThenInclude(f => f.FileInfo)
-                                  .AsSplitQuery()
-                                  .ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSkins.Any())
-                return;
-
-            var userSkinChoice = config.GetBindable<string>(OsuSetting.Skin);
-            int.TryParse(userSkinChoice.Value, out int userSkinInt);
-
-            switch (userSkinInt)
-            {
-                case EFSkinInfo.DEFAULT_SKIN:
-                    userSkinChoice.Value = SkinInfo.DEFAULT_SKIN.ToString();
-                    break;
-
-                case EFSkinInfo.CLASSIC_SKIN:
-                    userSkinChoice.Value = SkinInfo.CLASSIC_SKIN.ToString();
-                    break;
-            }
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    // note that this cannot be written as: `r.All<SkinInfo>().All(s => s.Protected)`, because realm does not support `.All()`.
-                    if (!r.All<SkinInfo>().Any(s => !s.Protected))
-                    {
-                        log($"Migrating {existingSkins.Count} skins");
-
-                        foreach (var skin in existingSkins)
-                        {
-                            var realmSkin = new SkinInfo
-                            {
-                                Name = skin.Name,
-                                Creator = skin.Creator,
-                                Hash = skin.Hash,
-                                Protected = false,
-                                InstantiationInfo = skin.InstantiationInfo,
-                            };
-
-                            migrateFiles(skin, r, realmSkin);
-
-                            r.Add(realmSkin);
-
-                            if (skin.ID == userSkinInt)
-                                userSkinChoice.Value = realmSkin.ID.ToString();
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private static void migrateFiles<T>(IHasFiles<T> fileSource, Realm realm, IHasRealmFiles realmObject) where T : INamedFileInfo
-        {
-            foreach (var file in fileSource.Files)
-            {
-                var realmFile = realm.Find<RealmFile>(file.FileInfo.Hash);
-
-                if (realmFile == null)
-                    realm.Add(realmFile = new RealmFile { Hash = file.FileInfo.Hash });
-
-                realmObject.Files.Add(new RealmNamedFileUsage(realmFile, file.Filename));
-            }
-        }
-
-        private void migrateSettings(OsuDbContext db)
-        {
-            // migrate ruleset settings. can be removed 20220315.
-            var existingSettings = db.DatabasedSetting.ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSettings.Any())
-                return;
-
-            log("Beginning settings migration to realm");
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    if (!r.All<RealmRulesetSetting>().Any())
-                    {
-                        log($"Migrating {existingSettings.Count} settings");
-
-                        foreach (var dkb in existingSettings)
-                        {
-                            if (dkb.RulesetID == null)
-                                continue;
-
-                            string? shortName = getRulesetShortNameFromLegacyID(dkb.RulesetID.Value);
-
-                            if (string.IsNullOrEmpty(shortName))
-                                continue;
-
-                            r.Add(new RealmRulesetSetting
-                            {
-                                Key = dkb.Key,
-                                Value = dkb.StringValue,
-                                RulesetName = shortName,
-                                Variant = dkb.Variant ?? 0,
-                            });
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
-    }
-}

osu.Game/Database/IDatabaseContextFactory.cs

@@ -1,23 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-namespace osu.Game.Database
-{
-    public interface IDatabaseContextFactory
-    {
-        /// <summary>
-        /// Get a context for read-only usage.
-        /// </summary>
-        OsuDbContext Get();
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        DatabaseWriteUsage GetForWrite(bool withTransaction = true);
-    }
-}

osu.Game/Database/Live.cs

@@ -51,7 +51,15 @@ namespace osu.Game.Database
             ID = id;
         }
 
-        public bool Equals(Live<T>? other) => ID == other?.ID;
+        public bool Equals(Live<T>? other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+            if (other == null) return false;
+
+            return ID == other.ID;
+        }
+
+        public override int GetHashCode() => HashCode.Combine(ID);
 
         public override string ToString() => PerformRead(i => i.ToString());
     }

osu.Game/Database/ModelDownloader.cs

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

osu.Game/Database/OsuDbContext.cs

@@ -1,214 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using osu.Framework.Logging;
-using osu.Framework.Statistics;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.IO;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using SQLitePCL;
-using LogLevel = Microsoft.Extensions.Logging.LogLevel;
-
-namespace osu.Game.Database
-{
-    public class OsuDbContext : DbContext
-    {
-        public DbSet<EFBeatmapInfo> EFBeatmapInfo { get; set; }
-        public DbSet<EFBeatmapDifficulty> BeatmapDifficulty { get; set; }
-        public DbSet<EFBeatmapMetadata> BeatmapMetadata { get; set; }
-        public DbSet<EFBeatmapSetInfo> EFBeatmapSetInfo { get; set; }
-        public DbSet<FileInfo> FileInfo { get; set; }
-        public DbSet<EFRulesetInfo> RulesetInfo { get; set; }
-        public DbSet<EFSkinInfo> SkinInfo { get; set; }
-        public DbSet<EFScoreInfo> ScoreInfo { get; set; }
-
-        // migrated to realm
-        public DbSet<DatabasedSetting> DatabasedSetting { get; set; }
-
-        private readonly string connectionString;
-
-        private static readonly Lazy<OsuDbLoggerFactory> logger = new Lazy<OsuDbLoggerFactory>(() => new OsuDbLoggerFactory());
-
-        private static readonly GlobalStatistic<int> contexts = GlobalStatistics.Get<int>("Database", "Contexts");
-
-        static OsuDbContext()
-        {
-            // required to initialise native SQLite libraries on some platforms.
-            Batteries_V2.Init();
-
-            // https://github.com/aspnet/EntityFrameworkCore/issues/9994#issuecomment-508588678
-            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
-        }
-
-        /// <summary>
-        /// Create a new in-memory OsuDbContext instance.
-        /// </summary>
-        public OsuDbContext()
-            : this("DataSource=:memory:")
-        {
-            // required for tooling (see https://wildermuth.com/2017/07/06/Program-cs-in-ASP-NET-Core-2-0).
-
-            Migrate();
-        }
-
-        /// <summary>
-        /// Create a new OsuDbContext instance.
-        /// </summary>
-        /// <param name="connectionString">A valid SQLite connection string.</param>
-        public OsuDbContext(string connectionString)
-        {
-            this.connectionString = connectionString;
-
-            var connection = Database.GetDbConnection();
-
-            try
-            {
-                connection.Open();
-
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "PRAGMA journal_mode=WAL;";
-                    cmd.ExecuteNonQuery();
-
-                    cmd.CommandText = "PRAGMA foreign_keys=OFF;";
-                    cmd.ExecuteNonQuery();
-                }
-            }
-            catch
-            {
-                connection.Close();
-                throw;
-            }
-
-            contexts.Value++;
-        }
-
-        ~OsuDbContext()
-        {
-            // DbContext does not contain a finalizer (https://github.com/aspnet/EntityFrameworkCore/issues/8872)
-            // This is used to clean up previous contexts when fresh contexts are exposed via DatabaseContextFactory
-            Dispose();
-        }
-
-        private bool isDisposed;
-
-        public override void Dispose()
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            base.Dispose();
-
-            contexts.Value--;
-            GC.SuppressFinalize(this);
-        }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            base.OnConfiguring(optionsBuilder);
-            optionsBuilder
-                // this is required for the time being due to the way we are querying in places like BeatmapStore.
-                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
-                .UseLoggerFactory(logger.Value);
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.MD5Hash);
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.Hash);
-
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.Hash).IsUnique();
-
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFSkinInfo>().HasMany(s => s.Files).WithOne(f => f.SkinInfo);
-
-            modelBuilder.Entity<DatabasedSetting>().HasIndex(b => new { b.RulesetID, b.Variant });
-
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.ReferenceCount);
-
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.Available);
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.ShortName).IsUnique();
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasOne(b => b.BaseDifficulty);
-
-            modelBuilder.Entity<EFScoreInfo>().HasIndex(b => b.OnlineID).IsUnique();
-        }
-
-        private class OsuDbLoggerFactory : ILoggerFactory
-        {
-            #region Disposal
-
-            public void Dispose()
-            {
-            }
-
-            #endregion
-
-            public ILogger CreateLogger(string categoryName) => new OsuDbLogger();
-
-            public void AddProvider(ILoggerProvider provider)
-            {
-                // no-op. called by tooling.
-            }
-
-            private class OsuDbLogger : ILogger
-            {
-                public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-                {
-                    if (logLevel < LogLevel.Information)
-                        return;
-
-                    Framework.Logging.LogLevel frameworkLogLevel;
-
-                    switch (logLevel)
-                    {
-                        default:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Debug;
-                            break;
-
-                        case LogLevel.Warning:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Important;
-                            break;
-
-                        case LogLevel.Error:
-                        case LogLevel.Critical:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Error;
-                            break;
-                    }
-
-                    Logger.Log(formatter(state, exception), LoggingTarget.Database, frameworkLogLevel);
-                }
-
-                public bool IsEnabled(LogLevel logLevel)
-                {
-#if DEBUG_DATABASE
-                    return logLevel > LogLevel.Debug;
-#else
-                    return logLevel > LogLevel.Information;
-#endif
-                }
-
-                public IDisposable BeginScope<TState>(TState state) => null;
-            }
-        }
-
-        public void Migrate() => Database.Migrate();
-    }
-}

osu.Game/Database/RealmAccess.cs

@@ -24,6 +24,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -45,8 +46,6 @@ namespace osu.Game.Database
         /// </summary>
         public readonly string Filename;
 
-        private readonly IDatabaseContextFactory? efContextFactory;
-
         private readonly SynchronizationContext? updateThreadSyncContext;
 
         /// <summary>
@@ -70,8 +69,9 @@ namespace osu.Game.Database
         /// 22   2022-07-31    Added ModPreset.
         /// 23   2022-08-01    Added LastLocalUpdate to BeatmapInfo.
         /// 24   2022-08-22    Added MaximumStatistics to ScoreInfo.
+        /// 25   2022-09-18    Remove skins to add with new naming.
         /// </summary>
-        private const int schema_version = 24;
+        private const int schema_version = 25;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -162,11 +162,9 @@ namespace osu.Game.Database
         /// <param name="storage">The game storage which will be used to create the realm backing file.</param>
         /// <param name="filename">The filename to use for the realm backing file. A ".realm" extension will be added automatically if not specified.</param>
         /// <param name="updateThread">The game update thread, used to post realm operations into a thread-safe context.</param>
-        /// <param name="efContextFactory">An EF factory used only for migration purposes.</param>
-        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null, IDatabaseContextFactory? efContextFactory = null)
+        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null)
         {
             this.storage = storage;
-            this.efContextFactory = efContextFactory;
 
             updateThreadSyncContext = updateThread?.SynchronizationContext ?? SynchronizationContext.Current;
 
@@ -873,11 +871,25 @@ namespace osu.Game.Database
                     }
 
                     break;
+
+                case 25:
+                    // Remove the default skins so they can be added back by SkinManager with updated naming.
+                    migration.NewRealm.RemoveRange(migration.NewRealm.All<SkinInfo>().Where(s => s.Protected));
+                    break;
             }
         }
 
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory?.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
+        private string? getRulesetShortNameFromLegacyID(long rulesetId)
+        {
+            try
+            {
+                return new APIBeatmap.APIRuleset { OnlineID = (int)rulesetId }.ShortName;
+            }
+            catch
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// Create a full realm backup.