Merge pull request #17299 from nekodex/arm64

Update download links for macOS builds (to add Apple Silicon)
Merge pull request #17327 from frenzibyte/simplify-extension-methods
2026-05-18 00:49:53 +08:00 · 2022-03-19 20:45:51 +09:00 · 2022-03-19 20:23:09 +09:00 · 2022-03-19 20:22:06 +09:00 · 2022-03-19 20:21:41 +09:00 · 2022-03-19 11:39:01 +01:00
395 changed files with 10063 additions and 3100 deletions
@@ -0,0 +1,72 @@
+name: Bug report
+description: Report a very clearly broken issue.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # osu! bug report
+
+        Important to note that your issue may have already been reported before. Please check:
+        - Pinned issues, at the top of https://github.com/ppy/osu/issues.
+        - Current open `priority:0` issues, filterable [here](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Apriority%3A0).
+        - And most importantly, search for your issue. If you find that it already exists, respond with a reaction or add any further information that may be helpful.
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Crash to desktop
+        - Game behaviour
+        - Performance
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or videos
+      description: Add screenshots or videos that show the bug here.
+      placeholder: Drag and drop the screenshots/videos into this box.
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Version
+      description: The version you encountered this bug on. This is shown at the bottom of the main menu and also at the end of the settings screen.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Logs
+
+        Attaching log files is required for every reported bug. See instructions below on how to find them.
+
+        If the game has not yet been closed since you found the bug:
+          1. Head on to game settings and click on "Open osu! folder"
+          2. Then open the `logs` folder located there
+
+        **Logs are reset when you reopen the game.** If the game crashed or has been closed since you found the bug, retrieve the logs using the file explorer instead.
+
+        The default places to find the logs are as follows:
+          - `%AppData%/osu/logs` *on Windows*
+          - `~/.local/share/osu/logs` *on Linux & macOS*
+          - `Android/data/sh.ppy.osulazer/files/logs` *on Android*
+          - *On iOS*, they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
+
+        If you have selected a custom location for the game files, you can find the `logs` folder there.
+
+        After locating the `logs` folder, select all log files inside and drag them into the "Logs" box below.
+
+  - type: textarea
+    attributes:
+      label: Logs
+      placeholder: Drag and drop the log files into this box.
+    validations:
+      required: true
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Benchmarks" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net5.0/osu.Game.Benchmarks.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net6.0/osu.Game.Benchmarks.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <method v="2">
      <option name="Build" />
    </method>
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Catch.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <browser url="http://localhost:5000" />
    <method v="2">
      <option name="Build" />
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Mania.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <browser url="http://localhost:5000" />
    <method v="2">
      <option name="Build" />
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Osu.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <browser url="http://localhost:5000" />
    <method v="2">
      <option name="Build" />
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Taiko.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <browser url="http://localhost:5000" />
    <method v="2">
      <option name="Build" />
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0/osu!.dll" />
    <option name="PROGRAM_PARAMETERS" value="--tournament" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <method v="2">
      <option name="Build" />
    </method>
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <browser url="http://localhost:5000" />
    <method v="2">
      <option name="Build" />
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0/osu!.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <method v="2">
      <option name="Build" />
    </method>
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net6.0/osu.Game.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net6.0" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
    <method v="2">
      <option name="Build" />
    </method>
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net6.0/osu!.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build osu! (Debug)",
@@ -19,7 +19,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/net6.0/osu!.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build osu! (Release)",
@@ -31,7 +31,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net6.0/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build tests (Debug)",
@@ -43,7 +43,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/net5.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/net6.0/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build tests (Release)",
@@ -55,7 +55,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net6.0/osu!.dll",
                "--tournament"
            ],
            "cwd": "${workspaceRoot}",
@@ -68,7 +68,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/net6.0/osu!.dll",
                "--tournament"
            ],
            "cwd": "${workspaceRoot}",
@@ -81,7 +81,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll",
                "--tournament"
            ],
            "cwd": "${workspaceRoot}",
@@ -94,7 +94,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll",
                "--tournament"
            ],
            "cwd": "${workspaceRoot}",
@@ -105,7 +105,7 @@
            "name": "Benchmark",
            "type": "coreclr",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net5.0/osu.Game.Benchmarks.dll",
+            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net6.0/osu.Game.Benchmarks.dll",
            "args": [
                "--filter",
                "*"
@@ -18,7 +18,6 @@
  <ItemGroup Label="Code Analysis">
    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" PrivateAssets="All" />
    <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
  </ItemGroup>
  <PropertyGroup Label="Code Analysis">
    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>
@@ -31,7 +31,7 @@ If you are looking to install or test osu! without setting up a development envi

 **Latest build:**

-| [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | [macOS 10.15+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 10+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
+| [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 10+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
 | ------------- | ------------- | ------------- | ------------- | ------------- |

 - The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
@@ -50,7 +50,7 @@ Please make sure you have the following prerequisites:

 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
 - When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
+- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
 - When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.

 ### Downloading the source code
@@ -72,7 +72,7 @@ git pull

 Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).

- Visual Studio / Rider users should load the project via one of the platform-specific `.slnf` files, rather than the main `.sln.` This will allow access to template run configurations.
+- Visual Studio / Rider users should load the project via one of the platform-specific `.slnf` files, rather than the main `.sln`. This will allow access to template run configurations.

 You can also build and run *osu!* from the command-line with a single command:

@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -1,11 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Pippidon.Scoring
-{
-    public class PippidonScoreProcessor : ScoreProcessor
-    {
-    }
-}
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -51,11 +51,11 @@
    <Reference Include="Java.Interop" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.211.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.214.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.304.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.314.0" />
  </ItemGroup>
  <ItemGroup Label="Transitive Dependencies">
    <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
-    <PackageReference Include="Realm" Version="10.9.0" />
+    <PackageReference Include="Realm" Version="10.10.0" />
  </ItemGroup>
 </Project>
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
@@ -108,10 +109,7 @@ namespace osu.Desktop
                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);

            // update ruleset
-            int onlineID = ruleset.Value.OnlineID;
-            bool isLegacyRuleset = onlineID >= 0 && onlineID <= ILegacyRuleset.MAX_LEGACY_RULESET_ID;
-
-            presence.Assets.SmallImageKey = isLegacyRuleset ? $"mode_{onlineID}" : "mode_custom";
+            presence.Assets.SmallImageKey = ruleset.Value.IsLegacyRuleset() ? $"mode_{ruleset.Value.OnlineID}" : "mode_custom";
            presence.Assets.SmallImageText = ruleset.Value.Name;

            client.SetPresence(presence);
@@ -77,10 +77,9 @@ namespace osu.Desktop.LegacyIpc
                case LegacyIpcDifficultyCalculationRequest req:
                    try
                    {
-                        var ruleset = getLegacyRulesetFromID(req.RulesetId);
-
+                        WorkingBeatmap beatmap = new FlatFileWorkingBeatmap(req.BeatmapFile);
+                        var ruleset = beatmap.BeatmapInfo.Ruleset.CreateInstance();
                        Mod[] mods = ruleset.ConvertFromLegacyMods((LegacyMods)req.Mods).ToArray();
-                        WorkingBeatmap beatmap = new FlatFileWorkingBeatmap(req.BeatmapFile, _ => ruleset);

                        return new LegacyIpcDifficultyCalculationResponse
                        {
@@ -3,6 +3,7 @@

 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -96,6 +97,8 @@ namespace osu.Desktop
            switch (RuntimeInfo.OS)
            {
                case RuntimeInfo.Platform.Windows:
+                    Debug.Assert(OperatingSystem.IsWindows());
+
                    return new SquirrelUpdateManager();

                default:
@@ -3,6 +3,7 @@

 using System;
 using System.IO;
+using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Desktop.LegacyIpc;
@@ -12,6 +13,7 @@ using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IPC;
 using osu.Game.Tournament;
+using Squirrel;

 namespace osu.Desktop
 {
@@ -24,6 +26,10 @@ namespace osu.Desktop
        [STAThread]
        public static void Main(string[] args)
        {
+            // run Squirrel first, as the app may exit after these run
+            if (OperatingSystem.IsWindows())
+                setupSquirrel();
+
            // Back up the cwd before DesktopGameHost changes it
            string cwd = Environment.CurrentDirectory;

@@ -104,6 +110,23 @@ namespace osu.Desktop
            }
        }

+        [SupportedOSPlatform("windows")]
+        private static void setupSquirrel()
+        {
+            SquirrelAwareApp.HandleEvents(onInitialInstall: (version, tools) =>
+            {
+                tools.CreateShortcutForThisExe();
+                tools.CreateUninstallerRegistryEntry();
+            }, onAppUninstall: (version, tools) =>
+            {
+                tools.RemoveShortcutForThisExe();
+                tools.RemoveUninstallerRegistryEntry();
+            }, onEveryRun: (version, tools, firstRun) =>
+            {
+                tools.SetProcessAppUserModelId();
+            });
+        }
+
        private static int allowableExceptions = DebugUtils.IsDebugBuild ? 0 : 1;

        /// <summary>
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -16,10 +17,11 @@ using osu.Game.Overlays.Notifications;
 using osuTK;
 using osuTK.Graphics;
 using Squirrel;
-using LogLevel = Splat.LogLevel;
+using Squirrel.SimpleSplat;

 namespace osu.Desktop.Updater
 {
+    [SupportedOSPlatform("windows")]
    public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
    {
        private UpdateManager updateManager;
@@ -34,12 +36,14 @@ namespace osu.Desktop.Updater
        /// </summary>
        private bool updatePending;

+        private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();
+
        [BackgroundDependencyLoader]
        private void load(NotificationOverlay notification)
        {
            notificationOverlay = notification;

-            Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
+            SquirrelLocator.CurrentMutable.Register(() => squirrelLogger, typeof(ILogger));
        }

        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);
@@ -49,9 +53,11 @@ namespace osu.Desktop.Updater
            // should we schedule a retry on completion of this check?
            bool scheduleRecheck = true;

+            const string github_token = null; // TODO: populate.
+
            try
            {
-                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true).ConfigureAwait(false);
+                updateManager ??= new GithubUpdateManager(@"https://github.com/ppy/osu", false, github_token, @"osulazer");

                var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);

@@ -201,11 +207,11 @@ namespace osu.Desktop.Updater
            }
        }

-        private class SquirrelLogger : Splat.ILogger, IDisposable
+        private class SquirrelLogger : ILogger, IDisposable
        {
-            public LogLevel Level { get; set; } = LogLevel.Info;
+            public Squirrel.SimpleSplat.LogLevel Level { get; set; } = Squirrel.SimpleSplat.LogLevel.Info;

-            public void Write(string message, LogLevel logLevel)
+            public void Write(string message, Squirrel.SimpleSplat.LogLevel logLevel)
            {
                if (logLevel < Level)
                    return;
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
  <assemblyIdentity version="1.0.0.0" name="osu!" />
+  <SquirrelAwareVersion xmlns="urn:schema-squirrel-com:asm.v1">1</SquirrelAwareVersion>
  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
    <security>
      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -17,4 +18,4 @@
      <dpiAware>true</dpiAware>
    </asmv3:windowsSettings>
  </asmv3:application>
-</asmv1:assembly>
+</asmv1:assembly>
@@ -24,10 +24,10 @@
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
  </ItemGroup>
  <ItemGroup Label="Package References">
+    <PackageReference Include="Clowd.Squirrel" Version="2.8.28-pre" />
    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.14">
      <PrivateAssets>all</PrivateAssets>
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Catch.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Catch.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
        [SetUp]
        public void SetUp() => Schedule(() =>
        {
-            scoreProcessor = new ScoreProcessor();
+            scoreProcessor = new ScoreProcessor(new CatchRuleset());

            SetContents(_ => new CatchComboDisplay
            {
@@ -19,7 +19,6 @@ using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using System;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Catch.Edit;
@@ -182,7 +181,7 @@ namespace osu.Game.Rulesets.Catch

        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new CatchLegacySkinTransformer(skin);

-        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new CatchPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator() => new CatchPerformanceCalculator();

        public int LegacyID => 2;

@@ -13,33 +13,29 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
    public class CatchPerformanceCalculator : PerformanceCalculator
    {
-        protected new CatchDifficultyAttributes Attributes => (CatchDifficultyAttributes)base.Attributes;
-
-        private Mod[] mods;
-
        private int fruitsHit;
        private int ticksHit;
        private int tinyTicksHit;
        private int tinyTicksMissed;
        private int misses;

-        public CatchPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
-            : base(ruleset, attributes, score)
+        public CatchPerformanceCalculator()
+            : base(new CatchRuleset())
        {
        }

-        public override PerformanceAttributes Calculate()
+        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
        {
-            mods = Score.Mods;
+            var catchAttributes = (CatchDifficultyAttributes)attributes;

-            fruitsHit = Score.Statistics.GetValueOrDefault(HitResult.Great);
-            ticksHit = Score.Statistics.GetValueOrDefault(HitResult.LargeTickHit);
-            tinyTicksHit = Score.Statistics.GetValueOrDefault(HitResult.SmallTickHit);
-            tinyTicksMissed = Score.Statistics.GetValueOrDefault(HitResult.SmallTickMiss);
-            misses = Score.Statistics.GetValueOrDefault(HitResult.Miss);
+            fruitsHit = score.Statistics.GetValueOrDefault(HitResult.Great);
+            ticksHit = score.Statistics.GetValueOrDefault(HitResult.LargeTickHit);
+            tinyTicksHit = score.Statistics.GetValueOrDefault(HitResult.SmallTickHit);
+            tinyTicksMissed = score.Statistics.GetValueOrDefault(HitResult.SmallTickMiss);
+            misses = score.Statistics.GetValueOrDefault(HitResult.Miss);

            // We are heavily relying on aim in catch the beat
-            double value = Math.Pow(5.0 * Math.Max(1.0, Attributes.StarRating / 0.0049) - 4.0, 2.0) / 100000.0;
+            double value = Math.Pow(5.0 * Math.Max(1.0, catchAttributes.StarRating / 0.0049) - 4.0, 2.0) / 100000.0;

            // Longer maps are worth more. "Longer" means how many hits there are which can contribute to combo
            int numTotalHits = totalComboHits();
@@ -52,10 +48,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty
            value *= Math.Pow(0.97, misses);

            // Combo scaling
-            if (Attributes.MaxCombo > 0)
-                value *= Math.Min(Math.Pow(Score.MaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
+            if (catchAttributes.MaxCombo > 0)
+                value *= Math.Min(Math.Pow(score.MaxCombo, 0.8) / Math.Pow(catchAttributes.MaxCombo, 0.8), 1.0);

-            double approachRate = Attributes.ApproachRate;
+            double approachRate = catchAttributes.ApproachRate;
            double approachRateFactor = 1.0;
            if (approachRate > 9.0)
                approachRateFactor += 0.1 * (approachRate - 9.0); // 10% for each AR above 9
@@ -66,7 +62,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty

            value *= approachRateFactor;

-            if (mods.Any(m => m is ModHidden))
+            if (score.Mods.Any(m => m is ModHidden))
            {
                // Hiddens gives almost nothing on max approach rate, and more the lower it is
                if (approachRate <= 10.0)
@@ -75,12 +71,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                    value *= 1.01 + 0.04 * (11.0 - Math.Min(11.0, approachRate)); // 5% at AR 10, 1% at AR 11
            }

-            if (mods.Any(m => m is ModFlashlight))
+            if (score.Mods.Any(m => m is ModFlashlight))
                value *= 1.35 * lengthBonus;

            value *= Math.Pow(accuracy(), 5.5);

-            if (mods.Any(m => m is ModNoFail))
+            if (score.Mods.Any(m => m is ModNoFail))
                value *= 0.90;

            return new CatchPerformanceAttributes
@@ -7,5 +7,11 @@ namespace osu.Game.Rulesets.Catch.Scoring
 {
    public class CatchScoreProcessor : ScoreProcessor
    {
+        public CatchScoreProcessor()
+            : base(new CatchRuleset())
+        {
+        }
+
+        protected override double ClassicScoreMultiplier => 28;
    }
 }
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Mania.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Mania.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -10,10 +10,10 @@ namespace osu.Game.Rulesets.Mania.Difficulty
    public class ManiaDifficultyAttributes : DifficultyAttributes
    {
        /// <summary>
-        /// The perceived hit window for a GREAT hit inclusive of rate-adjusting mods (DT/HT/etc).
+        /// The hit window for a GREAT hit inclusive of rate-adjusting mods (DT/HT/etc).
        /// </summary>
        /// <remarks>
-        /// Rate-adjusting mods don't directly affect the hit window, but have a perceived effect as a result of adjusting audio timing.
+        /// Rate-adjusting mods do not affect the hit window at all in osu-stable.
        /// </remarks>
        [JsonProperty("great_hit_window")]
        public double GreatHitWindow { get; set; }
@@ -48,7 +48,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            {
                StarRating = skills[0].DifficultyValue() * star_scaling_factor,
                Mods = mods,
-                GreatHitWindow = Math.Ceiling(getHitWindow300(mods) / clockRate),
+                // In osu-stable mania, rate-adjustment mods don't affect the hit window.
+                // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
+                GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
                ScoreMultiplier = getScoreMultiplier(mods),
                MaxCombo = beatmap.HitObjects.Sum(h => h is HoldNote ? 2 : 1),
            };
@@ -108,7 +110,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            }
        }

-        private int getHitWindow300(Mod[] mods)
+        private double getHitWindow300(Mod[] mods)
        {
            if (isForCurrentRuleset)
            {
@@ -121,19 +123,14 @@ namespace osu.Game.Rulesets.Mania.Difficulty

            return applyModAdjustments(47, mods);

-            static int applyModAdjustments(double value, Mod[] mods)
+            static double applyModAdjustments(double value, Mod[] mods)
            {
                if (mods.Any(m => m is ManiaModHardRock))
                    value /= 1.4;
                else if (mods.Any(m => m is ManiaModEasy))
                    value *= 1.4;

-                if (mods.Any(m => m is ManiaModDoubleTime))
-                    value *= 1.5;
-                else if (mods.Any(m => m is ManiaModHalfTime))
-                    value *= 0.75;
-
-                return (int)value;
+                return value;
            }
        }

@@ -13,10 +13,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 {
    public class ManiaPerformanceCalculator : PerformanceCalculator
    {
-        protected new ManiaDifficultyAttributes Attributes => (ManiaDifficultyAttributes)base.Attributes;
-
-        private Mod[] mods;
-
        // Score after being scaled by non-difficulty-increasing mods
        private double scaledScore;

@@ -27,39 +23,40 @@ namespace osu.Game.Rulesets.Mania.Difficulty
        private int countMeh;
        private int countMiss;

-        public ManiaPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
-            : base(ruleset, attributes, score)
+        public ManiaPerformanceCalculator()
+            : base(new ManiaRuleset())
        {
        }

-        public override PerformanceAttributes Calculate()
+        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
        {
-            mods = Score.Mods;
-            scaledScore = Score.TotalScore;
-            countPerfect = Score.Statistics.GetValueOrDefault(HitResult.Perfect);
-            countGreat = Score.Statistics.GetValueOrDefault(HitResult.Great);
-            countGood = Score.Statistics.GetValueOrDefault(HitResult.Good);
-            countOk = Score.Statistics.GetValueOrDefault(HitResult.Ok);
-            countMeh = Score.Statistics.GetValueOrDefault(HitResult.Meh);
-            countMiss = Score.Statistics.GetValueOrDefault(HitResult.Miss);
+            var maniaAttributes = (ManiaDifficultyAttributes)attributes;

-            if (Attributes.ScoreMultiplier > 0)
+            scaledScore = score.TotalScore;
+            countPerfect = score.Statistics.GetValueOrDefault(HitResult.Perfect);
+            countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
+            countGood = score.Statistics.GetValueOrDefault(HitResult.Good);
+            countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
+            countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
+            countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
+
+            if (maniaAttributes.ScoreMultiplier > 0)
            {
                // Scale score up, so it's comparable to other keymods
-                scaledScore *= 1.0 / Attributes.ScoreMultiplier;
+                scaledScore *= 1.0 / maniaAttributes.ScoreMultiplier;
            }

            // Arbitrary initial value for scaling pp in order to standardize distributions across game modes.
            // The specific number has no intrinsic meaning and can be adjusted as needed.
            double multiplier = 0.8;

-            if (mods.Any(m => m is ModNoFail))
+            if (score.Mods.Any(m => m is ModNoFail))
                multiplier *= 0.9;
-            if (mods.Any(m => m is ModEasy))
+            if (score.Mods.Any(m => m is ModEasy))
                multiplier *= 0.5;

-            double difficultyValue = computeDifficultyValue();
-            double accValue = computeAccuracyValue(difficultyValue);
+            double difficultyValue = computeDifficultyValue(maniaAttributes);
+            double accValue = computeAccuracyValue(difficultyValue, maniaAttributes);
            double totalValue =
                Math.Pow(
                    Math.Pow(difficultyValue, 1.1) +
@@ -75,12 +72,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            };
        }

-        private double computeDifficultyValue()
+        private double computeDifficultyValue(ManiaDifficultyAttributes attributes)
        {
-            if (Attributes.ScoreMultiplier <= 0)
-                return 0;
-
-            double difficultyValue = Math.Pow(5 * Math.Max(1, Attributes.StarRating / 0.2) - 4.0, 2.2) / 135.0;
+            double difficultyValue = Math.Pow(5 * Math.Max(1, attributes.StarRating / 0.2) - 4.0, 2.2) / 135.0;

            difficultyValue *= 1.0 + 0.1 * Math.Min(1.0, totalHits / 1500.0);

@@ -100,14 +94,14 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            return difficultyValue;
        }

-        private double computeAccuracyValue(double difficultyValue)
+        private double computeAccuracyValue(double difficultyValue, ManiaDifficultyAttributes attributes)
        {
-            if (Attributes.GreatHitWindow <= 0)
+            if (attributes.GreatHitWindow <= 0)
                return 0;

            // Lots of arbitrary values from testing.
            // Considering to use derivation from perfect accuracy in a probabilistic manner - assume normal distribution
-            double accuracyValue = Math.Max(0.0, 0.2 - (Attributes.GreatHitWindow - 34) * 0.006667)
+            double accuracyValue = Math.Max(0.0, 0.2 - (attributes.GreatHitWindow - 34) * 0.006667)
                                   * difficultyValue
                                   * Math.Pow(Math.Max(0.0, scaledScore - 960000) / 40000, 1.1);

@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania

        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);

-        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new ManiaPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator() => new ManiaPerformanceCalculator();

        public const string SHORT_NAME = "mania";

@@ -258,6 +258,7 @@ namespace osu.Game.Rulesets.Mania
                    {
                        new MultiMod(new ModWindUp(), new ModWindDown()),
                        new ManiaModMuted(),
+                        new ModAdaptiveSpeed()
                    };

                default:
@@ -394,6 +395,7 @@ namespace osu.Game.Rulesets.Mania
                {
                    new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                    {
+                        new AverageHitError(score.HitEvents),
                        new UnstableRate(score.HitEvents)
                    }), true)
                }
@@ -45,10 +45,5 @@ namespace osu.Game.Rulesets.Mania
                }
            };
        }
-
-        private class TimeSlider : OsuSliderBar<double>
-        {
-            public override LocalisableString TooltipText => Current.Value.ToString(@"N0") + "ms";
-        }
    }
 }
@@ -7,8 +7,15 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
    internal class ManiaScoreProcessor : ScoreProcessor
    {
+        public ManiaScoreProcessor()
+            : base(new ManiaRuleset())
+        {
+        }
+
        protected override double DefaultAccuracyPortion => 0.99;

        protected override double DefaultComboPortion => 0.01;
+
+        protected override double ClassicScoreMultiplier => 16;
    }
 }
@@ -98,8 +98,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, columnIndex)?.Value ?? 1;

                bool hasLeftLine = leftLineWidth > 0;
-                bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
-                                    || isLastColumn;
+                bool hasRightLine = (rightLineWidth > 0 && skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value >= 2.4m) || isLastColumn;

                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, columnIndex)?.Value ?? Color4.White;
                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, columnIndex)?.Value ?? Color4.Black;
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Osu.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Osu.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -7,6 +7,7 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;

@@ -72,7 +73,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                EditorClock.Seek(slider.StartTime);
                EditorBeatmap.SelectedHitObjects.Add(slider);
            });
-            AddStep("change beat divisor", () => beatDivisor.Value = 3);
+            AddStep("change beat divisor", () =>
+            {
+                beatDivisor.ValidDivisors.Value = BeatDivisorPresetCollection.TRIPLETS;
+                beatDivisor.Value = 3;
+            });

            convertToStream();

@@ -8,12 +8,15 @@ using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Rulesets.Scoring;
 using osuTK;

 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -23,13 +26,37 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
        protected override bool AllowFail => true;

        [Test]
-        public void TestSpinnerAutoCompleted() => CreateModTest(new ModTestData
+        public void TestSpinnerAutoCompleted()
        {
-            Mod = new OsuModSpunOut(),
-            Autoplay = false,
-            Beatmap = singleSpinnerBeatmap,
-            PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault()?.Progress >= 1
-        });
+            DrawableSpinner spinner = null;
+            JudgementResult lastResult = null;
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new OsuModSpunOut(),
+                Autoplay = false,
+                Beatmap = singleSpinnerBeatmap,
+                PassCondition = () =>
+                {
+                    // Bind to the first spinner's results for further tracking.
+                    if (spinner == null)
+                    {
+                        // We only care about the first spinner we encounter for this test.
+                        var nextSpinner = Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault();
+
+                        if (nextSpinner == null)
+                            return false;
+
+                        lastResult = null;
+
+                        spinner = nextSpinner;
+                        spinner.OnNewResult += (o, result) => lastResult = result;
+                    }
+
+                    return lastResult?.Type == HitResult.Great;
+                }
+            });
+        }

        [TestCase(null)]
        [TestCase(typeof(OsuModDoubleTime))]
@@ -48,7 +75,57 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                PassCondition = () =>
                {
                    var counter = Player.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
-                    return counter != null && Precision.AlmostEquals(counter.Result.Value, 286, 1);
+                    var spinner = Player.ChildrenOfType<DrawableSpinner>().FirstOrDefault();
+
+                    if (counter == null || spinner == null)
+                        return false;
+
+                    // ignore cases where the spinner hasn't started as these lead to false-positives
+                    if (Precision.AlmostEquals(counter.Result.Value, 0, 1))
+                        return false;
+
+                    float rotationSpeed = (float)(1.01 * spinner.HitObject.SpinsRequired / spinner.HitObject.Duration);
+
+                    return Precision.AlmostEquals(counter.Result.Value, rotationSpeed * 1000 * 60, 1);
+                }
+            });
+        }
+
+        [Test]
+        public void TestSpinnerGetsNoBonusScore()
+        {
+            DrawableSpinner spinner = null;
+            List<JudgementResult> results = new List<JudgementResult>();
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new OsuModSpunOut(),
+                Autoplay = false,
+                Beatmap = singleSpinnerBeatmap,
+                PassCondition = () =>
+                {
+                    // Bind to the first spinner's results for further tracking.
+                    if (spinner == null)
+                    {
+                        // We only care about the first spinner we encounter for this test.
+                        var nextSpinner = Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault();
+
+                        if (nextSpinner == null)
+                            return false;
+
+                        spinner = nextSpinner;
+                        spinner.OnNewResult += (o, result) => results.Add(result);
+
+                        results.Clear();
+                    }
+
+                    // we should only be checking the bonus/progress after the spinner has fully completed.
+                    if (results.OfType<OsuSpinnerJudgementResult>().All(r => r.TimeCompleted == null))
+                        return false;
+
+                    return
+                        results.Any(r => r.Type == HitResult.SmallBonus)
+                        && results.All(r => r.Type != HitResult.LargeBonus);
                }
            });
        }
@@ -147,7 +147,8 @@ namespace osu.Game.Rulesets.Osu.Tests

            AddAssert("player score matching expected bonus score", () =>
            {
-                double totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value;
+                // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
+                double totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
                return totalScore == (int)(drawableSpinner.Result.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
            });

@@ -3,7 +3,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Moq" Version="4.17.2" />
    <PackageReference Include="NUnit" Version="3.13.2" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -14,10 +13,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 {
    public class OsuPerformanceCalculator : PerformanceCalculator
    {
-        public new OsuDifficultyAttributes Attributes => (OsuDifficultyAttributes)base.Attributes;
-
-        private Mod[] mods;
-
        private double accuracy;
        private int scoreMaxCombo;
        private int countGreat;
@@ -27,31 +22,32 @@ namespace osu.Game.Rulesets.Osu.Difficulty

        private double effectiveMissCount;

-        public OsuPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
-            : base(ruleset, attributes, score)
+        public OsuPerformanceCalculator()
+            : base(new OsuRuleset())
        {
        }

-        public override PerformanceAttributes Calculate()
+        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
        {
-            mods = Score.Mods;
-            accuracy = Score.Accuracy;
-            scoreMaxCombo = Score.MaxCombo;
-            countGreat = Score.Statistics.GetValueOrDefault(HitResult.Great);
-            countOk = Score.Statistics.GetValueOrDefault(HitResult.Ok);
-            countMeh = Score.Statistics.GetValueOrDefault(HitResult.Meh);
-            countMiss = Score.Statistics.GetValueOrDefault(HitResult.Miss);
-            effectiveMissCount = calculateEffectiveMissCount();
+            var osuAttributes = (OsuDifficultyAttributes)attributes;
+
+            accuracy = score.Accuracy;
+            scoreMaxCombo = score.MaxCombo;
+            countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
+            countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
+            countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
+            countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
+            effectiveMissCount = calculateEffectiveMissCount(osuAttributes);

            double multiplier = 1.12; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things.

-            if (mods.Any(m => m is OsuModNoFail))
+            if (score.Mods.Any(m => m is OsuModNoFail))
                multiplier *= Math.Max(0.90, 1.0 - 0.02 * effectiveMissCount);

-            if (mods.Any(m => m is OsuModSpunOut) && totalHits > 0)
-                multiplier *= 1.0 - Math.Pow((double)Attributes.SpinnerCount / totalHits, 0.85);
+            if (score.Mods.Any(m => m is OsuModSpunOut) && totalHits > 0)
+                multiplier *= 1.0 - Math.Pow((double)osuAttributes.SpinnerCount / totalHits, 0.85);

-            if (mods.Any(h => h is OsuModRelax))
+            if (score.Mods.Any(h => h is OsuModRelax))
            {
                // As we're adding Oks and Mehs to an approximated number of combo breaks the result can be higher than total hits in specific scenarios (which breaks some calculations) so we need to clamp it.
                effectiveMissCount = Math.Min(effectiveMissCount + countOk + countMeh, totalHits);
@@ -59,10 +55,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                multiplier *= 0.6;
            }

-            double aimValue = computeAimValue();
-            double speedValue = computeSpeedValue();
-            double accuracyValue = computeAccuracyValue();
-            double flashlightValue = computeFlashlightValue();
+            double aimValue = computeAimValue(score, osuAttributes);
+            double speedValue = computeSpeedValue(score, osuAttributes);
+            double accuracyValue = computeAccuracyValue(score, osuAttributes);
+            double flashlightValue = computeFlashlightValue(score, osuAttributes);
            double totalValue =
                Math.Pow(
                    Math.Pow(aimValue, 1.1) +
@@ -82,11 +78,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            };
        }

-        private double computeAimValue()
+        private double computeAimValue(ScoreInfo score, OsuDifficultyAttributes attributes)
        {
-            double rawAim = Attributes.AimDifficulty;
+            double rawAim = attributes.AimDifficulty;

-            if (mods.Any(m => m is OsuModTouchDevice))
+            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;
@@ -99,44 +95,44 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            if (effectiveMissCount > 0)
                aimValue *= 0.97 * Math.Pow(1 - Math.Pow(effectiveMissCount / totalHits, 0.775), effectiveMissCount);

-            aimValue *= getComboScalingFactor();
+            aimValue *= getComboScalingFactor(attributes);

            double approachRateFactor = 0.0;
-            if (Attributes.ApproachRate > 10.33)
-                approachRateFactor = 0.3 * (Attributes.ApproachRate - 10.33);
-            else if (Attributes.ApproachRate < 8.0)
-                approachRateFactor = 0.1 * (8.0 - Attributes.ApproachRate);
+            if (attributes.ApproachRate > 10.33)
+                approachRateFactor = 0.3 * (attributes.ApproachRate - 10.33);
+            else if (attributes.ApproachRate < 8.0)
+                approachRateFactor = 0.1 * (8.0 - attributes.ApproachRate);

            aimValue *= 1.0 + approachRateFactor * lengthBonus; // Buff for longer maps with high AR.

-            if (mods.Any(m => m is OsuModBlinds))
-                aimValue *= 1.3 + (totalHits * (0.0016 / (1 + 2 * effectiveMissCount)) * Math.Pow(accuracy, 16)) * (1 - 0.003 * Attributes.DrainRate * Attributes.DrainRate);
-            else if (mods.Any(h => h is OsuModHidden))
+            if (score.Mods.Any(m => m is OsuModBlinds))
+                aimValue *= 1.3 + (totalHits * (0.0016 / (1 + 2 * effectiveMissCount)) * Math.Pow(accuracy, 16)) * (1 - 0.003 * attributes.DrainRate * attributes.DrainRate);
+            else if (score.Mods.Any(h => h is OsuModHidden))
            {
                // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
-                aimValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
+                aimValue *= 1.0 + 0.04 * (12.0 - attributes.ApproachRate);
            }

            // We assume 15% of sliders in a map are difficult since there's no way to tell from the performance calculator.
-            double estimateDifficultSliders = Attributes.SliderCount * 0.15;
+            double estimateDifficultSliders = attributes.SliderCount * 0.15;

-            if (Attributes.SliderCount > 0)
+            if (attributes.SliderCount > 0)
            {
-                double estimateSliderEndsDropped = Math.Clamp(Math.Min(countOk + countMeh + countMiss, Attributes.MaxCombo - scoreMaxCombo), 0, estimateDifficultSliders);
-                double sliderNerfFactor = (1 - Attributes.SliderFactor) * Math.Pow(1 - estimateSliderEndsDropped / estimateDifficultSliders, 3) + Attributes.SliderFactor;
+                double estimateSliderEndsDropped = Math.Clamp(Math.Min(countOk + countMeh + countMiss, attributes.MaxCombo - scoreMaxCombo), 0, estimateDifficultSliders);
+                double sliderNerfFactor = (1 - attributes.SliderFactor) * Math.Pow(1 - estimateSliderEndsDropped / estimateDifficultSliders, 3) + attributes.SliderFactor;
                aimValue *= sliderNerfFactor;
            }

            aimValue *= accuracy;
            // It is important to consider accuracy difficulty when scaling with accuracy.
-            aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            aimValue *= 0.98 + Math.Pow(attributes.OverallDifficulty, 2) / 2500;

            return aimValue;
        }

-        private double computeSpeedValue()
+        private double computeSpeedValue(ScoreInfo score, OsuDifficultyAttributes attributes)
        {
-            double speedValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.SpeedDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
+            double speedValue = Math.Pow(5.0 * Math.Max(1.0, attributes.SpeedDifficulty / 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);
@@ -146,27 +142,27 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            if (effectiveMissCount > 0)
                speedValue *= 0.97 * Math.Pow(1 - Math.Pow(effectiveMissCount / totalHits, 0.775), Math.Pow(effectiveMissCount, .875));

-            speedValue *= getComboScalingFactor();
+            speedValue *= getComboScalingFactor(attributes);

            double approachRateFactor = 0.0;
-            if (Attributes.ApproachRate > 10.33)
-                approachRateFactor = 0.3 * (Attributes.ApproachRate - 10.33);
+            if (attributes.ApproachRate > 10.33)
+                approachRateFactor = 0.3 * (attributes.ApproachRate - 10.33);

            speedValue *= 1.0 + approachRateFactor * lengthBonus; // Buff for longer maps with high AR.

-            if (mods.Any(m => m is OsuModBlinds))
+            if (score.Mods.Any(m => m is OsuModBlinds))
            {
                // Increasing the speed value by object count for Blinds isn't ideal, so the minimum buff is given.
                speedValue *= 1.12;
            }
-            else if (mods.Any(m => m is OsuModHidden))
+            else if (score.Mods.Any(m => m is OsuModHidden))
            {
                // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
-                speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
+                speedValue *= 1.0 + 0.04 * (12.0 - attributes.ApproachRate);
            }

            // Scale the speed value with accuracy and OD.
-            speedValue *= (0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
+            speedValue *= (0.95 + Math.Pow(attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(attributes.OverallDifficulty, 8)) / 2);

            // Scale the speed value with # of 50s to punish doubletapping.
            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
@@ -174,14 +170,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            return speedValue;
        }

-        private double computeAccuracyValue()
+        private double computeAccuracyValue(ScoreInfo score, OsuDifficultyAttributes attributes)
        {
-            if (mods.Any(h => h is OsuModRelax))
+            if (score.Mods.Any(h => h is OsuModRelax))
                return 0.0;

            // This percentage only considers HitCircles of any value - in this part of the calculation we focus on hitting the timing hit window.
            double betterAccuracyPercentage;
-            int amountHitObjectsWithAccuracy = Attributes.HitCircleCount;
+            int amountHitObjectsWithAccuracy = attributes.HitCircleCount;

            if (amountHitObjectsWithAccuracy > 0)
                betterAccuracyPercentage = ((countGreat - (totalHits - amountHitObjectsWithAccuracy)) * 6 + countOk * 2 + countMeh) / (double)(amountHitObjectsWithAccuracy * 6);
@@ -194,43 +190,43 @@ namespace osu.Game.Rulesets.Osu.Difficulty

            // Lots of arbitrary values from testing.
            // Considering to use derivation from perfect accuracy in a probabilistic manner - assume normal distribution.
-            double accuracyValue = Math.Pow(1.52163, Attributes.OverallDifficulty) * Math.Pow(betterAccuracyPercentage, 24) * 2.83;
+            double accuracyValue = Math.Pow(1.52163, attributes.OverallDifficulty) * Math.Pow(betterAccuracyPercentage, 24) * 2.83;

            // Bonus for many hitcircles - it's harder to keep good accuracy up for longer.
            accuracyValue *= Math.Min(1.15, Math.Pow(amountHitObjectsWithAccuracy / 1000.0, 0.3));

            // Increasing the accuracy value by object count for Blinds isn't ideal, so the minimum buff is given.
-            if (mods.Any(m => m is OsuModBlinds))
+            if (score.Mods.Any(m => m is OsuModBlinds))
                accuracyValue *= 1.14;
-            else if (mods.Any(m => m is OsuModHidden))
+            else if (score.Mods.Any(m => m is OsuModHidden))
                accuracyValue *= 1.08;

-            if (mods.Any(m => m is OsuModFlashlight))
+            if (score.Mods.Any(m => m is OsuModFlashlight))
                accuracyValue *= 1.02;

            return accuracyValue;
        }

-        private double computeFlashlightValue()
+        private double computeFlashlightValue(ScoreInfo score, OsuDifficultyAttributes attributes)
        {
-            if (!mods.Any(h => h is OsuModFlashlight))
+            if (!score.Mods.Any(h => h is OsuModFlashlight))
                return 0.0;

-            double rawFlashlight = Attributes.FlashlightDifficulty;
+            double rawFlashlight = attributes.FlashlightDifficulty;

-            if (mods.Any(m => m is OsuModTouchDevice))
+            if (score.Mods.Any(m => m is OsuModTouchDevice))
                rawFlashlight = Math.Pow(rawFlashlight, 0.8);

            double flashlightValue = Math.Pow(rawFlashlight, 2.0) * 25.0;

-            if (mods.Any(h => h is OsuModHidden))
+            if (score.Mods.Any(h => h is OsuModHidden))
                flashlightValue *= 1.3;

            // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
            if (effectiveMissCount > 0)
                flashlightValue *= 0.97 * Math.Pow(1 - Math.Pow(effectiveMissCount / totalHits, 0.775), Math.Pow(effectiveMissCount, .875));

-            flashlightValue *= getComboScalingFactor();
+            flashlightValue *= getComboScalingFactor(attributes);

            // Account for shorter maps having a higher ratio of 0 combo/100 combo flashlight radius.
            flashlightValue *= 0.7 + 0.1 * Math.Min(1.0, totalHits / 200.0) +
@@ -239,19 +235,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            // Scale the flashlight value with accuracy _slightly_.
            flashlightValue *= 0.5 + accuracy / 2.0;
            // It is important to also consider accuracy difficulty when doing that.
-            flashlightValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            flashlightValue *= 0.98 + Math.Pow(attributes.OverallDifficulty, 2) / 2500;

            return flashlightValue;
        }

-        private double calculateEffectiveMissCount()
+        private double calculateEffectiveMissCount(OsuDifficultyAttributes attributes)
        {
            // Guess the number of misses + slider breaks from combo
            double comboBasedMissCount = 0.0;

-            if (Attributes.SliderCount > 0)
+            if (attributes.SliderCount > 0)
            {
-                double fullComboThreshold = Attributes.MaxCombo - 0.1 * Attributes.SliderCount;
+                double fullComboThreshold = attributes.MaxCombo - 0.1 * attributes.SliderCount;
                if (scoreMaxCombo < fullComboThreshold)
                    comboBasedMissCount = fullComboThreshold / Math.Max(1.0, scoreMaxCombo);
            }
@@ -262,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            return Math.Max(countMiss, comboBasedMissCount);
        }

-        private double getComboScalingFactor() => Attributes.MaxCombo <= 0 ? 1.0 : Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(Attributes.MaxCombo, 0.8), 1.0);
+        private double getComboScalingFactor(OsuDifficultyAttributes attributes) => attributes.MaxCombo <= 0 ? 1.0 : Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(attributes.MaxCombo, 0.8), 1.0);
        private int totalHits => countGreat + countOk + countMeh + countMiss;
        private int totalSuccessfulHits => countGreat + countOk + countMeh;
    }
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
        public override ModType Type => ModType.Fun;
        public override string Description => "No need to chase the circle – the circle chases you!";
        public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax) };

        private IFrameStableClock gameplayClock;

@@ -1,8 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable enable
+
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
@@ -25,13 +28,14 @@ namespace osu.Game.Rulesets.Osu.Mods
        public override string Description => "It never gets boring!";

        private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
+        private static readonly Vector2 playfield_centre = OsuPlayfield.BASE_SIZE / 2;

        /// <summary>
        /// Number of previous hitobjects to be shifted together when another object is being moved.
        /// </summary>
        private const int preceding_hitobjects_to_shift = 10;

-        private Random rng;
+        private Random? rng;

        public void ApplyToBeatmap(IBeatmap beatmap)
        {
@@ -44,28 +48,79 @@ namespace osu.Game.Rulesets.Osu.Mods

            rng = new Random((int)Seed.Value);

-            RandomObjectInfo previous = null;
+            var randomObjects = randomiseObjects(hitObjects);

+            applyRandomisation(hitObjects, randomObjects);
+        }
+
+        /// <summary>
+        /// Randomise the position of each hit object and return a list of <see cref="RandomObjectInfo"/>s describing how each hit object should be placed.
+        /// </summary>
+        /// <param name="hitObjects">A list of <see cref="OsuHitObject"/>s to have their positions randomised.</param>
+        /// <returns>A list of <see cref="RandomObjectInfo"/>s describing how each hit object should be placed.</returns>
+        private List<RandomObjectInfo> randomiseObjects(IEnumerable<OsuHitObject> hitObjects)
+        {
+            Debug.Assert(rng != null, $"{nameof(ApplyToBeatmap)} was not called before randomising objects");
+
+            var randomObjects = new List<RandomObjectInfo>();
+            RandomObjectInfo? previous = null;
            float rateOfChangeMultiplier = 0;

-            for (int i = 0; i < hitObjects.Count; i++)
+            foreach (OsuHitObject hitObject in hitObjects)
            {
-                var hitObject = hitObjects[i];
-
                var current = new RandomObjectInfo(hitObject);
+                randomObjects.Add(current);

                // rateOfChangeMultiplier only changes every 5 iterations in a combo
                // to prevent shaky-line-shaped streams
                if (hitObject.IndexInCurrentCombo % 5 == 0)
                    rateOfChangeMultiplier = (float)rng.NextDouble() * 2 - 1;

+                if (previous == null)
+                {
+                    current.DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.X / 2);
+                    current.RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
+                }
+                else
+                {
+                    current.DistanceFromPrevious = Vector2.Distance(previous.EndPositionOriginal, current.PositionOriginal);
+
+                    // The max. angle (relative to the angle of the vector pointing from the 2nd last to the last hit object)
+                    // is proportional to the distance between the last and the current hit object
+                    // to allow jumps and prevent too sharp turns during streams.
+
+                    // Allow maximum jump angle when jump distance is more than half of playfield diagonal length
+                    current.RelativeAngle = rateOfChangeMultiplier * 2 * (float)Math.PI * Math.Min(1f, current.DistanceFromPrevious / (playfield_diagonal * 0.5f));
+                }
+
+                previous = current;
+            }
+
+            return randomObjects;
+        }
+
+        /// <summary>
+        /// Reposition the hit objects according to the information in <paramref name="randomObjects"/>.
+        /// </summary>
+        /// <param name="hitObjects">The hit objects to be repositioned.</param>
+        /// <param name="randomObjects">A list of <see cref="RandomObjectInfo"/> describing how each hit object should be placed.</param>
+        private void applyRandomisation(IReadOnlyList<OsuHitObject> hitObjects, IReadOnlyList<RandomObjectInfo> randomObjects)
+        {
+            RandomObjectInfo? previous = null;
+
+            for (int i = 0; i < hitObjects.Count; i++)
+            {
+                var hitObject = hitObjects[i];
+
+                var current = randomObjects[i];
+
                if (hitObject is Spinner)
                {
                    previous = null;
                    continue;
                }

-                applyRandomisation(rateOfChangeMultiplier, previous, current);
+                computeRandomisedPosition(current, previous, i > 1 ? randomObjects[i - 2] : null);

                // Move hit objects back into the playfield if they are outside of it
                Vector2 shift = Vector2.Zero;
@@ -102,44 +157,34 @@ namespace osu.Game.Rulesets.Osu.Mods
        }

        /// <summary>
-        /// Returns the final position of the hit object
+        /// Compute the randomised position of a hit object while attempting to keep it inside the playfield.
        /// </summary>
-        /// <returns>Final position of the hit object</returns>
-        private void applyRandomisation(float rateOfChangeMultiplier, RandomObjectInfo previous, RandomObjectInfo current)
+        /// <param name="current">The <see cref="RandomObjectInfo"/> representing the hit object to have the randomised position computed for.</param>
+        /// <param name="previous">The <see cref="RandomObjectInfo"/> representing the hit object immediately preceding the current one.</param>
+        /// <param name="beforePrevious">The <see cref="RandomObjectInfo"/> representing the hit object immediately preceding the <paramref name="previous"/> one.</param>
+        private void computeRandomisedPosition(RandomObjectInfo current, RandomObjectInfo? previous, RandomObjectInfo? beforePrevious)
        {
-            if (previous == null)
+            float previousAbsoluteAngle = 0f;
+
+            if (previous != null)
            {
-                var playfieldSize = OsuPlayfield.BASE_SIZE;
-
-                current.AngleRad = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
-                current.PositionRandomised = new Vector2((float)rng.NextDouble() * playfieldSize.X, (float)rng.NextDouble() * playfieldSize.Y);
-
-                return;
+                Vector2 earliestPosition = beforePrevious?.HitObject.EndPosition ?? playfield_centre;
+                Vector2 relativePosition = previous.HitObject.Position - earliestPosition;
+                previousAbsoluteAngle = (float)Math.Atan2(relativePosition.Y, relativePosition.X);
            }

-            float distanceToPrev = Vector2.Distance(previous.EndPositionOriginal, current.PositionOriginal);
-
-            // The max. angle (relative to the angle of the vector pointing from the 2nd last to the last hit object)
-            // is proportional to the distance between the last and the current hit object
-            // to allow jumps and prevent too sharp turns during streams.
-
-            // Allow maximum jump angle when jump distance is more than half of playfield diagonal length
-            double randomAngleRad = rateOfChangeMultiplier * 2 * Math.PI * Math.Min(1f, distanceToPrev / (playfield_diagonal * 0.5f));
-
-            current.AngleRad = (float)randomAngleRad + previous.AngleRad;
-            if (current.AngleRad < 0)
-                current.AngleRad += 2 * (float)Math.PI;
+            float absoluteAngle = previousAbsoluteAngle + current.RelativeAngle;

            var posRelativeToPrev = new Vector2(
-                distanceToPrev * (float)Math.Cos(current.AngleRad),
-                distanceToPrev * (float)Math.Sin(current.AngleRad)
+                current.DistanceFromPrevious * (float)Math.Cos(absoluteAngle),
+                current.DistanceFromPrevious * (float)Math.Sin(absoluteAngle)
            );

-            posRelativeToPrev = OsuHitObjectGenerationUtils.RotateAwayFromEdge(previous.EndPositionRandomised, posRelativeToPrev);
+            Vector2 lastEndPosition = previous?.EndPositionRandomised ?? playfield_centre;

-            current.AngleRad = (float)Math.Atan2(posRelativeToPrev.Y, posRelativeToPrev.X);
+            posRelativeToPrev = OsuHitObjectGenerationUtils.RotateAwayFromEdge(lastEndPosition, posRelativeToPrev);

-            current.PositionRandomised = previous.EndPositionRandomised + posRelativeToPrev;
+            current.PositionRandomised = lastEndPosition + posRelativeToPrev;
        }

        /// <summary>
@@ -287,7 +332,25 @@ namespace osu.Game.Rulesets.Osu.Mods

        private class RandomObjectInfo
        {
-            public float AngleRad { get; set; }
+            /// <summary>
+            /// The jump angle from the previous hit object to this one, relative to the previous hit object's jump angle.
+            /// </summary>
+            /// <remarks>
+            /// <see cref="RelativeAngle"/> of the first hit object in a beatmap represents the absolute angle from playfield center to the object.
+            /// </remarks>
+            /// <example>
+            /// If <see cref="RelativeAngle"/> is 0, the player's cursor doesn't need to change its direction of movement when passing
+            /// the previous object to reach this one.
+            /// </example>
+            public float RelativeAngle { get; set; }
+
+            /// <summary>
+            /// The jump distance from the previous hit object to this one.
+            /// </summary>
+            /// <remarks>
+            /// <see cref="DistanceFromPrevious"/> of the first hit object in a beatmap is relative to the playfield center.
+            /// </remarks>
+            public float DistanceFromPrevious { get; set; }

            public Vector2 PositionOriginal { get; }
            public Vector2 PositionRandomised { get; set; }
@@ -295,11 +358,13 @@ namespace osu.Game.Rulesets.Osu.Mods
            public Vector2 EndPositionOriginal { get; }
            public Vector2 EndPositionRandomised { get; set; }

+            public OsuHitObject HitObject { get; }
+
            public RandomObjectInfo(OsuHitObject hitObject)
            {
                PositionRandomised = PositionOriginal = hitObject.Position;
                EndPositionRandomised = EndPositionOriginal = hitObject.EndPosition;
-                AngleRad = 0;
+                HitObject = hitObject;
            }
        }
    }
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Mods
    public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToPlayer
    {
        public override string Description => @"You don't need to click. Give your clicking/tapping fingers a break from the heat of things.";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot), typeof(OsuModAimAssist) }).ToArray();

        /// <summary>
        /// How early before a hitobject's start time to trigger a hit.
@@ -45,7 +45,11 @@ namespace osu.Game.Rulesets.Osu.Mods
            // for that reason using ElapsedFrameTime directly leads to fewer SPM with Half Time and more SPM with Double Time.
            // for spinners we want the real (wall clock) elapsed time; to achieve that, unapply the clock rate locally here.
            double rateIndependentElapsedTime = spinner.Clock.ElapsedFrameTime / spinner.Clock.Rate;
-            spinner.RotationTracker.AddRotation(MathUtils.RadiansToDegrees((float)rateIndependentElapsedTime * 0.03f));
+
+            // multiply the SPM by 1.01 to ensure that the spinner is completed. if the calculation is left exact,
+            // some spinners may not complete due to very minor decimal loss during calculation
+            float rotationSpeed = (float)(1.01 * spinner.HitObject.SpinsRequired / spinner.HitObject.Duration);
+            spinner.RotationTracker.AddRotation(MathUtils.RadiansToDegrees((float)rateIndependentElapsedTime * rotationSpeed * MathF.PI * 2.0f));
        }
    }
 }
@@ -2,23 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
-using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using osuTK;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
-using osuTK.Graphics;
 using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;

 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -126,18 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
            }

            Samples.Samples = HitObject.TailSamples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
-
-            var slidingSamples = new List<ISampleInfo>();
-
-            var normalSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
-            if (normalSample != null)
-                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
-
-            var whistleSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
-            if (whistleSample != null)
-                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
-
-            slidingSample.Samples = slidingSamples.ToArray();
+            slidingSample.Samples = HitObject.CreateSlidingSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
        }

        public override void StopAllSamples()
@@ -74,6 +74,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
            ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
        }

+        protected override void LoadSamples()
+        {
+            // Tail models don't actually get samples, as the playback is handled by DrawableSlider.
+            // This override is only here for visibility in explaining this weird flow.
+        }
+
+        public override void PlaySamples()
+        {
+            // Tail models don't actually get samples, as the playback is handled by DrawableSlider.
+            // This override is only here for visibility in explaining this weird flow.
+        }
+
        protected override void UpdateInitialTransforms()
        {
            base.UpdateInitialTransforms();
@@ -121,15 +121,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
        {
            base.LoadSamples();

-            var firstSample = HitObject.Samples.FirstOrDefault();
-
-            if (firstSample != null)
-            {
-                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample).With("spinnerspin");
-
-                spinningSample.Samples = new ISampleInfo[] { clone };
-                spinningSample.Frequency.Value = spinning_sample_initial_frequency;
-            }
+            spinningSample.Samples = HitObject.CreateSpinningSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            spinningSample.Frequency.Value = spinning_sample_initial_frequency;
        }

        private void updateSpinningSample(ValueChangedEvent<bool> tracking)
@@ -29,6 +29,23 @@ namespace osu.Game.Rulesets.Osu.Objects
            set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
        }

+        public override IList<HitSampleInfo> AuxiliarySamples => CreateSlidingSamples().Concat(TailSamples).ToArray();
+
+        public IList<HitSampleInfo> CreateSlidingSamples()
+        {
+            var slidingSamples = new List<HitSampleInfo>();
+
+            var normalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            if (normalSample != null)
+                slidingSamples.Add(normalSample.With("sliderslide"));
+
+            var whistleSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
+            if (whistleSample != null)
+                slidingSamples.Add(whistleSample.With("sliderwhistle"));
+
+            return slidingSamples;
+        }
+
        private readonly Cached<Vector2> endPositionCache = new Cached<Vector2>();

        public override Vector2 EndPosition => endPositionCache.IsValid ? endPositionCache.Value : endPositionCache.Value = Position + this.CurvePositionAt(1);
@@ -1,7 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -73,5 +77,20 @@ namespace osu.Game.Rulesets.Osu.Objects
        public override Judgement CreateJudgement() => new OsuJudgement();

        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override IList<HitSampleInfo> AuxiliarySamples => CreateSpinningSamples();
+
+        public HitSampleInfo[] CreateSpinningSamples()
+        {
+            var referenceSample = Samples.FirstOrDefault();
+
+            if (referenceSample == null)
+                return Array.Empty<HitSampleInfo>();
+
+            return new[]
+            {
+                SampleControlPoint.ApplyTo(referenceSample).With("spinnerspin")
+            };
+        }
    }
 }
@@ -195,6 +195,7 @@ namespace osu.Game.Rulesets.Osu
                        new OsuModMuted(),
                        new OsuModNoScope(),
                        new OsuModAimAssist(),
+                        new ModAdaptiveSpeed()
                    };

                case ModType.System:
@@ -212,7 +213,7 @@ namespace osu.Game.Rulesets.Osu

        public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new OsuDifficultyCalculator(RulesetInfo, beatmap);

-        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new OsuPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator() => new OsuPerformanceCalculator();

        public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);

@@ -314,6 +315,7 @@ namespace osu.Game.Rulesets.Osu
                    {
                        new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                        {
+                            new AverageHitError(timedHitEvents),
                            new UnstableRate(timedHitEvents)
                        }), true)
                    }
@@ -11,6 +11,13 @@ namespace osu.Game.Rulesets.Osu.Scoring
 {
    public class OsuScoreProcessor : ScoreProcessor
    {
+        public OsuScoreProcessor()
+            : base(new OsuRuleset())
+        {
+        }
+
+        protected override double ClassicScoreMultiplier => 36;
+
        protected override HitEvent CreateHitEvent(JudgementResult result)
            => base.CreateHitEvent(result).With((result as OsuHitCircleJudgementResult)?.CursorPositionAtHit);

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
            Child
                .FadeTo(flash_opacity, EarlyActivationMilliseconds, Easing.OutQuint)
                .Then()
-                .FadeOut(timingPoint.BeatLength - fade_length, Easing.OutSine);
+                .FadeOut(Math.Max(fade_length, timingPoint.BeatLength - fade_length), Easing.OutSine);
        }
    }
 }
@@ -7,7 +7,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Taiko.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Taiko.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
@@ -14,37 +14,35 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 {
    public class TaikoPerformanceCalculator : PerformanceCalculator
    {
-        protected new TaikoDifficultyAttributes Attributes => (TaikoDifficultyAttributes)base.Attributes;
-
-        private Mod[] mods;
        private int countGreat;
        private int countOk;
        private int countMeh;
        private int countMiss;

-        public TaikoPerformanceCalculator(Ruleset ruleset, DifficultyAttributes attributes, ScoreInfo score)
-            : base(ruleset, attributes, score)
+        public TaikoPerformanceCalculator()
+            : base(new TaikoRuleset())
        {
        }

-        public override PerformanceAttributes Calculate()
+        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
        {
-            mods = Score.Mods;
-            countGreat = Score.Statistics.GetValueOrDefault(HitResult.Great);
-            countOk = Score.Statistics.GetValueOrDefault(HitResult.Ok);
-            countMeh = Score.Statistics.GetValueOrDefault(HitResult.Meh);
-            countMiss = Score.Statistics.GetValueOrDefault(HitResult.Miss);
+            var taikoAttributes = (TaikoDifficultyAttributes)attributes;
+
+            countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
+            countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
+            countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
+            countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);

            double multiplier = 1.1; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things

-            if (mods.Any(m => m is ModNoFail))
+            if (score.Mods.Any(m => m is ModNoFail))
                multiplier *= 0.90;

-            if (mods.Any(m => m is ModHidden))
+            if (score.Mods.Any(m => m is ModHidden))
                multiplier *= 1.10;

-            double difficultyValue = computeDifficultyValue();
-            double accuracyValue = computeAccuracyValue();
+            double difficultyValue = computeDifficultyValue(score, taikoAttributes);
+            double accuracyValue = computeAccuracyValue(score, taikoAttributes);
            double totalValue =
                Math.Pow(
                    Math.Pow(difficultyValue, 1.1) +
@@ -59,30 +57,30 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
            };
        }

-        private double computeDifficultyValue()
+        private double computeDifficultyValue(ScoreInfo score, TaikoDifficultyAttributes attributes)
        {
-            double difficultyValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.StarRating / 0.0075) - 4.0, 2.0) / 100000.0;
+            double difficultyValue = Math.Pow(5.0 * Math.Max(1.0, attributes.StarRating / 0.0075) - 4.0, 2.0) / 100000.0;

            double lengthBonus = 1 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
            difficultyValue *= lengthBonus;

            difficultyValue *= Math.Pow(0.985, countMiss);

-            if (mods.Any(m => m is ModHidden))
+            if (score.Mods.Any(m => m is ModHidden))
                difficultyValue *= 1.025;

-            if (mods.Any(m => m is ModFlashlight<TaikoHitObject>))
+            if (score.Mods.Any(m => m is ModFlashlight<TaikoHitObject>))
                difficultyValue *= 1.05 * lengthBonus;

-            return difficultyValue * Score.Accuracy;
+            return difficultyValue * score.Accuracy;
        }

-        private double computeAccuracyValue()
+        private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes attributes)
        {
-            if (Attributes.GreatHitWindow <= 0)
+            if (attributes.GreatHitWindow <= 0)
                return 0;

-            double accValue = Math.Pow(150.0 / Attributes.GreatHitWindow, 1.1) * Math.Pow(Score.Accuracy, 15) * 22.0;
+            double accValue = Math.Pow(150.0 / attributes.GreatHitWindow, 1.1) * Math.Pow(score.Accuracy, 15) * 22.0;

            // Bonus for many objects - it's harder to keep good accuracy up for longer
            return accValue * Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3));
@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
        public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
        {
            drawableTaikoRuleset = (DrawableTaikoRuleset)drawableRuleset;
+            drawableTaikoRuleset.LockPlayfieldAspect.Value = false;
        }

        public void Update(Playfield playfield)
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
        {
            get
            {
-                string scrollSpeed = ScrollSpeed.IsDefault ? string.Empty : $"Scroll x{ScrollSpeed.Value:N1}";
+                string scrollSpeed = ScrollSpeed.IsDefault ? string.Empty : $"Scroll x{ScrollSpeed.Value:N2}";

                return string.Join(", ", new[]
                {
@@ -7,8 +7,15 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 {
    internal class TaikoScoreProcessor : ScoreProcessor
    {
+        public TaikoScoreProcessor()
+            : base(new TaikoRuleset())
+        {
+        }
+
        protected override double DefaultAccuracyPortion => 0.75;

        protected override double DefaultComboPortion => 0.25;
+
+        protected override double ClassicScoreMultiplier => 22;
    }
 }
@@ -151,6 +151,7 @@ namespace osu.Game.Rulesets.Taiko
                    {
                        new MultiMod(new ModWindUp(), new ModWindDown()),
                        new TaikoModMuted(),
+                        new ModAdaptiveSpeed()
                    };

                default:
@@ -170,7 +171,7 @@ namespace osu.Game.Rulesets.Taiko

        public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new TaikoDifficultyCalculator(RulesetInfo, beatmap);

-        public override PerformanceCalculator CreatePerformanceCalculator(DifficultyAttributes attributes, ScoreInfo score) => new TaikoPerformanceCalculator(this, attributes, score);
+        public override PerformanceCalculator CreatePerformanceCalculator() => new TaikoPerformanceCalculator();

        public int LegacyID => 1;

@@ -237,6 +238,7 @@ namespace osu.Game.Rulesets.Taiko
                    {
                        new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                        {
+                            new AverageHitError(timedHitEvents),
                            new UnstableRate(timedHitEvents)
                        }), true)
                    }
@@ -29,6 +29,8 @@ namespace osu.Game.Rulesets.Taiko.UI
    {
        public new BindableDouble TimeRange => base.TimeRange;

+        public readonly BindableBool LockPlayfieldAspect = new BindableBool(true);
+
        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;

        protected override bool UserScrollSpeedAdjustment => false;
@@ -70,7 +72,10 @@ namespace osu.Game.Rulesets.Taiko.UI
            return ControlPoints[result];
        }

-        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer
+        {
+            LockPlayfieldAspect = { BindTarget = LockPlayfieldAspect }
+        };

        protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Taiko.UI
        /// <summary>
        /// Default height of a <see cref="TaikoPlayfield"/> when inside a <see cref="DrawableTaikoRuleset"/>.
        /// </summary>
-        public const float DEFAULT_HEIGHT = 212;
+        public const float DEFAULT_HEIGHT = 200;

        private Container<HitExplosion> hitExplosionContainer;
        private Container<KiaiHitExplosion> kiaiExplosionContainer;
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.UI;
-using osuTK;

 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -13,16 +13,22 @@ namespace osu.Game.Rulesets.Taiko.UI
        private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
        private const float default_aspect = 16f / 9f;

+        public readonly IBindable<bool> LockPlayfieldAspect = new BindableBool(true);
+
        protected override void Update()
        {
            base.Update();

-            float aspectAdjust = Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
-            Size = new Vector2(1, default_relative_height * aspectAdjust);
+            float height = default_relative_height;
+
+            if (LockPlayfieldAspect.Value)
+                height *= Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
+
+            Height = height;

            // Position the taiko playfield exactly one playfield from the top of the screen.
            RelativePositionAxes = Axes.Y;
-            Y = Size.Y;
+            Y = height;
        }
    }
 }
@@ -79,7 +79,7 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Moq" Version="4.17.2" />
    <PackageReference Include="System.Formats.Asn1">
      <Version>5.0.0</Version>
    </PackageReference>
@@ -48,7 +48,7 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Moq" Version="4.17.2" />
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
@@ -409,26 +409,26 @@ namespace osu.Game.Tests.Chat

            Assert.AreEqual(result.Content, result.DisplayContent);
            Assert.AreEqual(2, result.Links.Count);
-            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
-            Assert.AreEqual("osu://chan/#japanese", result.Links[1].Url);
+            Assert.AreEqual($"{OsuGameBase.OSU_PROTOCOL}chan/#english", result.Links[0].Url);
+            Assert.AreEqual($"{OsuGameBase.OSU_PROTOCOL}chan/#japanese", result.Links[1].Url);
        }

        [Test]
        public void TestOsuProtocol()
        {
-            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a custom protocol osu://chan/#english." });
+            Message result = MessageFormatter.FormatMessage(new Message { Content = $"This is a custom protocol {OsuGameBase.OSU_PROTOCOL}chan/#english." });

            Assert.AreEqual(result.Content, result.DisplayContent);
            Assert.AreEqual(1, result.Links.Count);
-            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
+            Assert.AreEqual($"{OsuGameBase.OSU_PROTOCOL}chan/#english", result.Links[0].Url);
            Assert.AreEqual(26, result.Links[0].Index);
            Assert.AreEqual(19, result.Links[0].Length);

-            result = MessageFormatter.FormatMessage(new Message { Content = "This is a [custom protocol](osu://chan/#english)." });
+            result = MessageFormatter.FormatMessage(new Message { Content = $"This is a [custom protocol]({OsuGameBase.OSU_PROTOCOL}chan/#english)." });

            Assert.AreEqual("This is a custom protocol.", result.DisplayContent);
            Assert.AreEqual(1, result.Links.Count);
-            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
+            Assert.AreEqual($"{OsuGameBase.OSU_PROTOCOL}chan/#english", result.Links[0].Url);
            Assert.AreEqual("#english", result.Links[0].Argument);
            Assert.AreEqual(10, result.Links[0].Index);
            Assert.AreEqual(15, result.Links[0].Length);
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using (var importer = new BeatmapModelManager(realm, storage))
-                using (new RulesetStore(realm, storage))
+                using (new RealmRulesetStore(realm, storage))
                {
                    Live<BeatmapSetInfo>? beatmapSet;

@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using (var importer = new BeatmapModelManager(realm, storage))
-                using (new RulesetStore(realm, storage))
+                using (new RealmRulesetStore(realm, storage))
                {
                    Live<BeatmapSetInfo>? beatmapSet;

@@ -142,7 +142,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using (var importer = new BeatmapModelManager(realm, storage))
-                using (new RulesetStore(realm, storage))
+                using (new RealmRulesetStore(realm, storage))
                {
                    Live<BeatmapSetInfo>? imported;

@@ -171,7 +171,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                await LoadOszIntoStore(importer, realm.Realm);
            });
@@ -183,7 +183,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -201,7 +201,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? tempPath = TestResources.GetTestBeatmapForImport();

@@ -245,7 +245,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);
                var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
@@ -265,7 +265,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -314,7 +314,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -366,7 +366,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -414,7 +414,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -463,7 +463,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -496,7 +496,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var progressNotification = new ImportProgressNotification();

@@ -532,7 +532,7 @@ namespace osu.Game.Tests.Database
                };

                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -582,7 +582,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -606,7 +606,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realmFactory, storage) =>
            {
                using var importer = new BeatmapModelManager(realmFactory, storage);
-                using var store = new RulesetStore(realmFactory, storage);
+                using var store = new RealmRulesetStore(realmFactory, storage);

                var imported = await LoadOszIntoStore(importer, realmFactory.Realm);

@@ -638,7 +638,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new NonOptimisedBeatmapImporter(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -662,7 +662,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var imported = await LoadOszIntoStore(importer, realm.Realm);

@@ -688,7 +688,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealm((realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                var metadata = new BeatmapMetadata
                {
@@ -734,7 +734,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();
                using (File.OpenRead(temp))
@@ -751,7 +751,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -787,7 +787,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -829,7 +829,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();

@@ -880,7 +880,7 @@ namespace osu.Game.Tests.Database
            RunTestWithRealmAsync(async (realm, storage) =>
            {
                using var importer = new BeatmapModelManager(realm, storage);
-                using var store = new RulesetStore(realm, storage);
+                using var store = new RealmRulesetStore(realm, storage);

                string? temp = TestResources.GetTestBeatmapForImport();
                await importer.Import(temp);
@@ -1,23 +1,129 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Tests.Resources;
 using Realms;

-#nullable enable
-
 namespace osu.Game.Tests.Database
 {
    [TestFixture]
    public class RealmSubscriptionRegistrationTests : RealmTest
    {
+        [Test]
+        public void TestSubscriptionCollectionAndPropertyChanges()
+        {
+            int collectionChanges = 0;
+            int propertyChanges = 0;
+
+            ChangeSet? lastChanges = null;
+
+            RunTestWithRealm((realm, _) =>
+            {
+                var registration = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>(), onChanged);
+
+                realm.Run(r => r.Refresh());
+
+                realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+                realm.Run(r => r.Refresh());
+
+                Assert.That(collectionChanges, Is.EqualTo(1));
+                Assert.That(propertyChanges, Is.EqualTo(0));
+                Assert.That(lastChanges?.InsertedIndices, Has.One.Items);
+                Assert.That(lastChanges?.ModifiedIndices, Is.Empty);
+                Assert.That(lastChanges?.NewModifiedIndices, Is.Empty);
+
+                realm.Write(r => r.All<BeatmapSetInfo>().First().Beatmaps.First().CountdownOffset = 5);
+                realm.Run(r => r.Refresh());
+
+                Assert.That(collectionChanges, Is.EqualTo(1));
+                Assert.That(propertyChanges, Is.EqualTo(1));
+                Assert.That(lastChanges?.InsertedIndices, Is.Empty);
+                Assert.That(lastChanges?.ModifiedIndices, Has.One.Items);
+                Assert.That(lastChanges?.NewModifiedIndices, Has.One.Items);
+
+                registration.Dispose();
+            });
+
+            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error)
+            {
+                lastChanges = changes;
+
+                if (changes == null)
+                    return;
+
+                if (changes.HasCollectionChanges())
+                {
+                    Interlocked.Increment(ref collectionChanges);
+                }
+                else
+                {
+                    Interlocked.Increment(ref propertyChanges);
+                }
+            }
+        }
+
+        [Test]
+        public void TestSubscriptionWithAsyncWrite()
+        {
+            ChangeSet? lastChanges = null;
+
+            RunTestWithRealm((realm, _) =>
+            {
+                var registration = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>(), onChanged);
+
+                realm.Run(r => r.Refresh());
+
+                // Without forcing the write onto its own thread, realm will internally run the operation synchronously, which can cause a deadlock with `WaitSafely`.
+                Task.Run(async () =>
+                {
+                    await realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+                }).WaitSafely();
+
+                realm.Run(r => r.Refresh());
+
+                Assert.That(lastChanges?.InsertedIndices, Has.One.Items);
+
+                registration.Dispose();
+            });
+
+            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error) => lastChanges = changes;
+        }
+
+        [Test]
+        public void TestPropertyChangedSubscription()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                bool? receivedValue = null;
+
+                realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+
+                using (realm.SubscribeToPropertyChanged(r => r.All<BeatmapSetInfo>().First(), setInfo => setInfo.Protected, val => receivedValue = val))
+                {
+                    Assert.That(receivedValue, Is.False);
+
+                    realm.Write(r => r.All<BeatmapSetInfo>().First().Protected = true);
+
+                    realm.Run(r => r.Refresh());
+
+                    Assert.That(receivedValue, Is.True);
+                }
+            });
+        }
+
        [Test]
        public void TestSubscriptionWithContextLoss()
        {
@@ -134,5 +240,41 @@ namespace osu.Game.Tests.Database
                Assert.That(beatmapSetInfo, Is.Null);
            });
        }
+
+        [Test]
+        public void TestPropertyChangedSubscriptionWithContextLoss()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                bool? receivedValue = null;
+
+                realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+
+                var subscription = realm.SubscribeToPropertyChanged(
+                    r => r.All<BeatmapSetInfo>().First(),
+                    setInfo => setInfo.Protected,
+                    val => receivedValue = val);
+
+                Assert.That(receivedValue, Is.Not.Null);
+                receivedValue = null;
+
+                using (realm.BlockAllOperations())
+                {
+                }
+
+                // re-registration after context restore.
+                realm.Run(r => r.Refresh());
+                Assert.That(receivedValue, Is.Not.Null);
+
+                subscription.Dispose();
+                receivedValue = null;
+
+                using (realm.BlockAllOperations())
+                    Assert.That(receivedValue, Is.Null);
+
+                realm.Run(r => r.Refresh());
+                Assert.That(receivedValue, Is.Null);
+            });
+        }
    }
 }
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Database
        {
            RunTestWithRealm((realm, storage) =>
            {
-                var rulesets = new RulesetStore(realm, storage);
+                var rulesets = new RealmRulesetStore(realm, storage);

                Assert.AreEqual(4, rulesets.AvailableRulesets.Count());
                Assert.AreEqual(4, realm.Realm.All<RulesetInfo>().Count());
@@ -26,8 +26,8 @@ namespace osu.Game.Tests.Database
        {
            RunTestWithRealm((realm, storage) =>
            {
-                var rulesets = new RulesetStore(realm, storage);
-                var rulesets2 = new RulesetStore(realm, storage);
+                var rulesets = new RealmRulesetStore(realm, storage);
+                var rulesets2 = new RealmRulesetStore(realm, storage);

                Assert.AreEqual(4, rulesets.AvailableRulesets.Count());
                Assert.AreEqual(4, rulesets2.AvailableRulesets.Count());
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Database
        {
            RunTestWithRealm((realm, storage) =>
            {
-                var rulesets = new RulesetStore(realm, storage);
+                var rulesets = new RealmRulesetStore(realm, storage);

                Assert.IsFalse(rulesets.AvailableRulesets.First().IsManaged);
                Assert.IsFalse(rulesets.GetRuleset(0)?.IsManaged);
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Gameplay
        {
            var beatmap = new Beatmap<HitObject> { HitObjects = { new HitObject() } };

-            var scoreProcessor = new ScoreProcessor();
+            var scoreProcessor = new ScoreProcessor(new OsuRuleset());
            scoreProcessor.ApplyBeatmap(beatmap);

            // Apply a miss judgement
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Gameplay
        {
            var beatmap = new Beatmap<HitObject> { HitObjects = { new HitObject() } };

-            var scoreProcessor = new ScoreProcessor();
+            var scoreProcessor = new ScoreProcessor(new OsuRuleset());
            scoreProcessor.ApplyBeatmap(beatmap);

            // Apply a judgement
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Gameplay
        {
            var beatmap = new Beatmap<HitObject> { HitObjects = { new HitCircle() } };

-            var scoreProcessor = new ScoreProcessor();
+            var scoreProcessor = new ScoreProcessor(new OsuRuleset());
            scoreProcessor.ApplyBeatmap(beatmap);

            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new TestJudgement(HitResult.Great)) { Type = HitResult.Great });
@@ -1,29 +1,23 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -118,59 +112,6 @@ namespace osu.Game.Tests.Gameplay
            AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
        }

-        [TestCase(typeof(OsuModDoubleTime), 1.5)]
-        [TestCase(typeof(OsuModHalfTime), 0.75)]
-        [TestCase(typeof(ModWindUp), 1.5)]
-        [TestCase(typeof(ModWindDown), 0.75)]
-        [TestCase(typeof(OsuModDoubleTime), 2)]
-        [TestCase(typeof(OsuModHalfTime), 0.5)]
-        [TestCase(typeof(ModWindUp), 2)]
-        [TestCase(typeof(ModWindDown), 0.5)]
-        public void TestSamplePlaybackWithRateMods(Type expectedMod, double expectedRate)
-        {
-            GameplayClockContainer gameplayContainer = null;
-            StoryboardSampleInfo sampleInfo = null;
-            TestDrawableStoryboardSample sample = null;
-
-            Mod testedMod = Activator.CreateInstance(expectedMod) as Mod;
-
-            switch (testedMod)
-            {
-                case ModRateAdjust m:
-                    m.SpeedChange.Value = expectedRate;
-                    break;
-
-                case ModTimeRamp m:
-                    m.FinalRate.Value = m.InitialRate.Value = expectedRate;
-                    break;
-            }
-
-            AddStep("setup storyboard sample", () =>
-            {
-                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, this);
-                SelectedMods.Value = new[] { testedMod };
-
-                var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
-
-                Add(gameplayContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
-                {
-                    Child = beatmapSkinSourceContainer
-                });
-
-                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(sampleInfo = new StoryboardSampleInfo("test-sample", 1, 1))
-                {
-                    Clock = gameplayContainer.GameplayClock
-                });
-            });
-
-            AddStep("start", () => gameplayContainer.Start());
-
-            AddAssert("sample playback rate matches mod rates", () =>
-                testedMod != null && Precision.AlmostEquals(
-                    sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value,
-                    ((IApplicableToRate)testedMod).ApplyToRate(sampleInfo.StartTime)));
-        }
-
        [Test]
        public void TestSamplePlaybackWithBeatmapHitsoundsOff()
        {
@@ -24,6 +24,20 @@ namespace osu.Game.Tests.Online
    [TestFixture]
    public class TestAPIModJsonSerialization
    {
+        [Test]
+        public void TestUnknownMod()
+        {
+            var apiMod = new APIMod { Acronym = "WNG" };
+
+            var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+
+            var converted = deserialized?.ToMod(new TestRuleset());
+
+            Assert.That(converted, Is.TypeOf(typeof(UnknownMod)));
+            Assert.That(converted?.Type, Is.EqualTo(ModType.System));
+            Assert.That(converted?.Acronym, Is.EqualTo("WNG??"));
+        }
+
        [Test]
        public void TestAcronymIsPreserved()
        {
@@ -121,6 +135,17 @@ namespace osu.Game.Tests.Online
            Assert.That((deserialised?.Mods[0])?.Settings["speed_change"], Is.EqualTo(2));
        }

+        [Test]
+        public void TestAPIModDetachedFromSource()
+        {
+            var mod = new OsuModDoubleTime { SpeedChange = { Value = 1.01 } };
+            var apiMod = new APIMod(mod);
+
+            mod.SpeedChange.Value = 1.5;
+
+            Assert.That(apiMod.Settings["speed_change"], Is.EqualTo(1.01d));
+        }
+
        private class TestRuleset : Ruleset
        {
            public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -12,6 +13,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Graphics;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -21,6 +23,8 @@ using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Tests.Resources;
@@ -45,7 +49,7 @@ namespace osu.Game.Tests.Online
        [BackgroundDependencyLoader]
        private void load(AudioManager audio, GameHost host)
        {
-            Dependencies.Cache(rulesets = new RulesetStore(Realm));
+            Dependencies.Cache(rulesets = new RealmRulesetStore(Realm));
            Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, Realm, rulesets, API, audio, Resources, host, Beatmap.Default));
            Dependencies.CacheAs<BeatmapModelDownloader>(beatmapDownloader = new TestBeatmapModelDownloader(beatmaps, API));
        }
@@ -53,6 +57,25 @@ namespace osu.Game.Tests.Online
        [SetUp]
        public void SetUp() => Schedule(() =>
        {
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case GetBeatmapsRequest beatmapsReq:
+                        var beatmap = CreateAPIBeatmap();
+                        beatmap.OnlineID = testBeatmapInfo.OnlineID;
+                        beatmap.OnlineBeatmapSetID = testBeatmapSet.OnlineID;
+                        beatmap.Checksum = testBeatmapInfo.MD5Hash;
+                        beatmap.BeatmapSet!.OnlineID = testBeatmapSet.OnlineID;
+
+                        beatmapsReq.TriggerSuccess(new GetBeatmapsResponse { Beatmaps = new List<APIBeatmap> { beatmap } });
+                        return true;
+
+                    default:
+                        return false;
+                }
+            };
+
            beatmaps.AllowImport = new TaskCompletionSource<bool>();

            testBeatmapFile = TestResources.GetQuickTestBeatmapForImport();
@@ -63,22 +86,39 @@ namespace osu.Game.Tests.Online
            Realm.Write(r => r.RemoveAll<BeatmapSetInfo>());
            Realm.Write(r => r.RemoveAll<BeatmapInfo>());

-            selectedItem.Value = new PlaylistItem
+            selectedItem.Value = new PlaylistItem(testBeatmapInfo)
            {
-                Beatmap = { Value = testBeatmapInfo },
                RulesetID = testBeatmapInfo.Ruleset.OnlineID,
            };

-            Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
-            {
-                SelectedItem = { BindTarget = selectedItem, }
-            };
+            recreateChildren();
        });

+        private void recreateChildren()
+        {
+            var beatmapLookupCache = new BeatmapLookupCache();
+
+            Child = new DependencyProvidingContainer
+            {
+                CachedDependencies = new[]
+                {
+                    (typeof(BeatmapLookupCache), (object)beatmapLookupCache)
+                },
+                Children = new Drawable[]
+                {
+                    beatmapLookupCache,
+                    availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
+                    {
+                        SelectedItem = { BindTarget = selectedItem, }
+                    }
+                }
+            };
+        }
+
        [Test]
        public void TestBeatmapDownloadingFlow()
        {
-            AddAssert("ensure beatmap unavailable", () => !beatmaps.IsAvailableLocally(testBeatmapSet));
+            AddUntilStep("ensure beatmap unavailable", () => !beatmaps.IsAvailableLocally(testBeatmapSet));
            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);

            AddStep("start downloading", () => beatmapDownloader.Download(testBeatmapSet));
@@ -92,7 +132,7 @@ namespace osu.Game.Tests.Online

            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
            AddUntilStep("wait for import", () => beatmaps.CurrentImport != null);
-            AddAssert("ensure beatmap available", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            AddUntilStep("ensure beatmap available", () => beatmaps.IsAvailableLocally(testBeatmapSet));
            addAvailabilityCheckStep("state is locally available", BeatmapAvailability.LocallyAvailable);
        }

@@ -123,10 +163,7 @@ namespace osu.Game.Tests.Online
            });
            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);

-            AddStep("recreate tracker", () => Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
-            {
-                SelectedItem = { BindTarget = selectedItem }
-            });
+            AddStep("recreate tracker", recreateChildren);
            addAvailabilityCheckStep("state not downloaded as well", BeatmapAvailability.NotDownloaded);

            AddStep("reimport original beatmap", () => beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely());
@@ -167,7 +204,8 @@ namespace osu.Game.Tests.Online

            public Live<BeatmapSetInfo> CurrentImport { get; private set; }

-            public TestBeatmapManager(Storage storage, RealmAccess realm, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host = null, WorkingBeatmap defaultBeatmap = null)
+            public TestBeatmapManager(Storage storage, RealmAccess realm, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources,
+                                      GameHost host = null, WorkingBeatmap defaultBeatmap = null)
                : base(storage, realm, rulesets, api, audioManager, resources, host, defaultBeatmap)
            {
            }
@@ -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 Newtonsoft.Json;
+using NUnit.Framework;
+using osu.Game.IO.Serialization;
+using osu.Game.Online.Solo;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Online
+{
+    /// <summary>
+    /// Basic testing to ensure our attribute-based naming is correctly working.
+    /// </summary>
+    [TestFixture]
+    public class TestSubmittableScoreJsonSerialization
+    {
+        [Test]
+        public void TestScoreSerialisationViaExtensionMethod()
+        {
+            var score = new SubmittableScore(TestResources.CreateTestScoreInfo());
+
+            string serialised = score.Serialize();
+
+            Assert.That(serialised, Contains.Substring("large_tick_hit"));
+            Assert.That(serialised, Contains.Substring("\"rank\": \"S\""));
+        }
+
+        [Test]
+        public void TestScoreSerialisationWithoutSettings()
+        {
+            var score = new SubmittableScore(TestResources.CreateTestScoreInfo());
+
+            string serialised = JsonConvert.SerializeObject(score);
+
+            Assert.That(serialised, Contains.Substring("large_tick_hit"));
+            Assert.That(serialised, Contains.Substring("\"rank\":\"S\""));
+        }
+    }
+}
@@ -3,6 +3,7 @@

 using System;
 using NUnit.Framework;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;

 namespace osu.Game.Tests.OnlinePlay
@@ -29,9 +30,9 @@ namespace osu.Game.Tests.OnlinePlay
        {
            var items = new[]
            {
-                new PlaylistItem { ID = 1, BeatmapID = 1001, PlaylistOrder = 1 },
-                new PlaylistItem { ID = 2, BeatmapID = 1002, PlaylistOrder = 2 },
-                new PlaylistItem { ID = 3, BeatmapID = 1003, PlaylistOrder = 3 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1001 }) { ID = 1, PlaylistOrder = 1 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1002 }) { ID = 2, PlaylistOrder = 2 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1003 }) { ID = 3, PlaylistOrder = 3 },
            };

            Assert.Multiple(() =>
@@ -47,9 +48,9 @@ namespace osu.Game.Tests.OnlinePlay
        {
            var items = new[]
            {
-                new PlaylistItem { ID = 2, BeatmapID = 1002, PlaylistOrder = 2 },
-                new PlaylistItem { ID = 1, BeatmapID = 1001, PlaylistOrder = 1 },
-                new PlaylistItem { ID = 3, BeatmapID = 1003, PlaylistOrder = 3 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1002 }) { ID = 2, PlaylistOrder = 2 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1001 }) { ID = 1, PlaylistOrder = 1 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1003 }) { ID = 3, PlaylistOrder = 3 },
            };

            Assert.Multiple(() =>
@@ -65,9 +66,9 @@ namespace osu.Game.Tests.OnlinePlay
        {
            var items = new[]
            {
-                new PlaylistItem { ID = 1, BeatmapID = 1001, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 55, 0, TimeSpan.Zero) },
-                new PlaylistItem { ID = 2, BeatmapID = 1002, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 53, 0, TimeSpan.Zero) },
-                new PlaylistItem { ID = 3, BeatmapID = 1003, PlaylistOrder = 3 },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1001 }) { ID = 1, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 55, 0, TimeSpan.Zero) },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1002 }) { ID = 2, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 53, 0, TimeSpan.Zero) },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1003 }) { ID = 3, PlaylistOrder = 3 },
            };

            Assert.Multiple(() =>
@@ -83,9 +84,9 @@ namespace osu.Game.Tests.OnlinePlay
        {
            var items = new[]
            {
-                new PlaylistItem { ID = 1, BeatmapID = 1001, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 55, 0, TimeSpan.Zero) },
-                new PlaylistItem { ID = 2, BeatmapID = 1002, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 53, 0, TimeSpan.Zero) },
-                new PlaylistItem { ID = 3, BeatmapID = 1002, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 57, 0, TimeSpan.Zero) },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1001 }) { ID = 1, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 55, 0, TimeSpan.Zero) },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1002 }) { ID = 2, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 53, 0, TimeSpan.Zero) },
+                new PlaylistItem(new APIBeatmap { OnlineID = 1002 }) { ID = 3, Expired = true, PlayedAt = new DateTimeOffset(2021, 12, 21, 7, 57, 0, TimeSpan.Zero) },
            };

            Assert.Multiple(() =>
@@ -133,6 +133,7 @@ namespace osu.Game.Tests.Resources
                        StarRating = diff,
                        Length = length,
                        BPM = bpm,
+                        MaxCombo = 1000,
                        Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
                        Ruleset = rulesetInfo,
                        Metadata = metadata,
@@ -6,11 +6,15 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Tests.Rulesets.Scoring
@@ -23,7 +27,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
        [SetUp]
        public void SetUp()
        {
-            scoreProcessor = new ScoreProcessor();
+            scoreProcessor = new ScoreProcessor(new TestRuleset());
            beatmap = new TestBeatmap(new RulesetInfo())
            {
                HitObjects = new List<HitObject>
@@ -36,9 +40,9 @@ namespace osu.Game.Tests.Rulesets.Scoring
        [TestCase(ScoringMode.Standardised, HitResult.Meh, 750_000)]
        [TestCase(ScoringMode.Standardised, HitResult.Ok, 800_000)]
        [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, 41)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, 46)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, 72)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 20)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 23)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, 36)]
        public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
        {
            scoreProcessor.Mode.Value = scoringMode;
@@ -86,17 +90,17 @@ namespace osu.Game.Tests.Rulesets.Scoring
        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
        [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 68)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 81)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 109)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 149)]
-        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 149)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 9)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 15)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 86)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 104)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 140)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 190)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 190)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 18)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 31)]
        [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 149)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 18)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 18)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 12)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 36)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 36)]
        public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
        {
            var minResult = new TestJudgement(hitResult).MinResult;
@@ -128,8 +132,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
        /// </remarks>
        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)] // (3 * 10 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)] // (3 * 0 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 69)] // (((3 * 10 + 100) / (4 * 10 + 100)) * 1 * 300) * (1 + 0 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 60)] // (((3 * 0 + 100) / (4 * 10 + 100)) * 1 * 300) * (1 + 0 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 34)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 30)]
        public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
        {
            IEnumerable<HitObject> hitObjects = Enumerable
@@ -300,7 +304,26 @@ namespace osu.Game.Tests.Rulesets.Scoring
                HitObjects = { new TestHitObject(result) }
            });

-            Assert.That(scoreProcessor.GetImmediateScore(ScoringMode.Standardised, result.AffectsCombo() ? 1 : 0, statistic), Is.EqualTo(expectedScore).Within(0.5d));
+            Assert.That(scoreProcessor.ComputeFinalScore(ScoringMode.Standardised, new ScoreInfo
+            {
+                Ruleset = new TestRuleset().RulesetInfo,
+                MaxCombo = result.AffectsCombo() ? 1 : 0,
+                Statistics = statistic
+            }), Is.EqualTo(expectedScore).Within(0.5d));
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => throw new System.NotImplementedException();
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override string Description => string.Empty;
+            public override string ShortName => string.Empty;
        }

        private class TestJudgement : Judgement
@@ -0,0 +1,132 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Utils
+{
+    [TestFixture]
+    public class NamingUtilsTest
+    {
+        [Test]
+        public void TestEmptySet()
+        {
+            string nextBestName = NamingUtils.GetNextBestName(Enumerable.Empty<string>(), "New Difficulty");
+
+            Assert.AreEqual("New Difficulty", nextBestName);
+        }
+
+        [Test]
+        public void TestNotTaken()
+        {
+            string[] existingNames =
+            {
+                "Something",
+                "Entirely",
+                "Different"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty", nextBestName);
+        }
+
+        [Test]
+        public void TestNotTakenButClose()
+        {
+            string[] existingNames =
+            {
+                "New Difficulty(1)",
+                "New Difficulty (abcd)",
+                "New Difficulty but not really"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty", nextBestName);
+        }
+
+        [Test]
+        public void TestAlreadyTaken()
+        {
+            string[] existingNames =
+            {
+                "New Difficulty"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty (1)", nextBestName);
+        }
+
+        [Test]
+        public void TestAlreadyTakenWithDifferentCase()
+        {
+            string[] existingNames =
+            {
+                "new difficulty"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty (1)", nextBestName);
+        }
+
+        [Test]
+        public void TestAlreadyTakenWithBrackets()
+        {
+            string[] existingNames =
+            {
+                "new difficulty (copy)"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty (copy)");
+
+            Assert.AreEqual("New Difficulty (copy) (1)", nextBestName);
+        }
+
+        [Test]
+        public void TestMultipleAlreadyTaken()
+        {
+            string[] existingNames =
+            {
+                "New Difficulty",
+                "New difficulty (1)",
+                "new Difficulty (2)",
+                "New DIFFICULTY (3)"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty (4)", nextBestName);
+        }
+
+        [Test]
+        public void TestEvenMoreAlreadyTaken()
+        {
+            string[] existingNames = Enumerable.Range(1, 30).Select(i => $"New Difficulty ({i})").Append("New Difficulty").ToArray();
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty (31)", nextBestName);
+        }
+
+        [Test]
+        public void TestMultipleAlreadyTakenWithGaps()
+        {
+            string[] existingNames =
+            {
+                "New Difficulty",
+                "New Difficulty (1)",
+                "New Difficulty (4)",
+                "New Difficulty (9)"
+            };
+
+            string nextBestName = NamingUtils.GetNextBestName(existingNames, "New Difficulty");
+
+            Assert.AreEqual("New Difficulty (2)", nextBestName);
+        }
+    }
+}
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Background
        [BackgroundDependencyLoader]
        private void load(GameHost host, AudioManager audio)
        {
-            Dependencies.Cache(rulesets = new RulesetStore(Realm));
+            Dependencies.Cache(rulesets = new RealmRulesetStore(Realm));
            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Realm, rulesets, null, audio, Resources, host, Beatmap.Default));
            Dependencies.Cache(new OsuConfigManager(LocalStorage));
            Dependencies.Cache(Realm);
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Collections
        [BackgroundDependencyLoader]
        private void load(GameHost host)
        {
-            Dependencies.Cache(rulesets = new RulesetStore(Realm));
+            Dependencies.Cache(rulesets = new RealmRulesetStore(Realm));
            Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Realm, rulesets, null, Audio, Resources, host, Beatmap.Default));
            Dependencies.Cache(Realm);

@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
@@ -20,30 +22,31 @@ namespace osu.Game.Tests.Visual.Editing
        private BeatDivisorControl beatDivisorControl;
        private BindableBeatDivisor bindableBeatDivisor;

-        private SliderBar<int> tickSliderBar;
-        private EquilateralTriangle tickMarkerHead;
+        private SliderBar<int> tickSliderBar => beatDivisorControl.ChildrenOfType<SliderBar<int>>().Single();
+        private EquilateralTriangle tickMarkerHead => tickSliderBar.ChildrenOfType<EquilateralTriangle>().Single();

        [SetUp]
        public void SetUp() => Schedule(() =>
        {
-            Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor(16))
+            Child = new PopoverContainer
            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(90, 90)
+                RelativeSizeAxes = Axes.Both,
+                Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor(16))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(90, 90)
+                }
            };
-
-            tickSliderBar = beatDivisorControl.ChildrenOfType<SliderBar<int>>().Single();
-            tickMarkerHead = tickSliderBar.ChildrenOfType<EquilateralTriangle>().Single();
        });

        [Test]
        public void TestBindableBeatDivisor()
        {
-            AddRepeatStep("move previous", () => bindableBeatDivisor.Previous(), 4);
+            AddRepeatStep("move previous", () => bindableBeatDivisor.Previous(), 2);
            AddAssert("divisor is 4", () => bindableBeatDivisor.Value == 4);
-            AddRepeatStep("move next", () => bindableBeatDivisor.Next(), 3);
-            AddAssert("divisor is 12", () => bindableBeatDivisor.Value == 12);
+            AddRepeatStep("move next", () => bindableBeatDivisor.Next(), 1);
+            AddAssert("divisor is 12", () => bindableBeatDivisor.Value == 8);
        }

        [Test]
@@ -79,5 +82,115 @@ namespace osu.Game.Tests.Visual.Editing
                sliderDrawQuad.Centre.Y
            );
        }
+
+        [Test]
+        public void TestBeatChevronNavigation()
+        {
+            switchBeatSnap(1);
+            assertBeatSnap(1);
+
+            switchBeatSnap(3);
+            assertBeatSnap(8);
+
+            switchBeatSnap(-1);
+            assertBeatSnap(4);
+
+            switchBeatSnap(-3);
+            assertBeatSnap(16);
+        }
+
+        [Test]
+        public void TestBeatPresetNavigation()
+        {
+            assertPreset(BeatDivisorType.Common);
+
+            switchPresets(1);
+            assertPreset(BeatDivisorType.Triplets);
+
+            switchPresets(1);
+            assertPreset(BeatDivisorType.Common);
+
+            switchPresets(-1);
+            assertPreset(BeatDivisorType.Triplets);
+
+            switchPresets(-1);
+            assertPreset(BeatDivisorType.Common);
+
+            setDivisorViaInput(3);
+            assertPreset(BeatDivisorType.Triplets);
+
+            setDivisorViaInput(8);
+            assertPreset(BeatDivisorType.Common);
+
+            setDivisorViaInput(15);
+            assertPreset(BeatDivisorType.Custom, 15);
+
+            switchBeatSnap(-1);
+            assertBeatSnap(5);
+
+            switchBeatSnap(-1);
+            assertBeatSnap(3);
+
+            setDivisorViaInput(5);
+            assertPreset(BeatDivisorType.Custom, 15);
+
+            switchPresets(1);
+            assertPreset(BeatDivisorType.Common);
+
+            switchPresets(-1);
+            assertPreset(BeatDivisorType.Triplets);
+        }
+
+        private void switchBeatSnap(int direction) => AddRepeatStep($"move snap {(direction > 0 ? "forward" : "backward")}", () =>
+        {
+            int chevronIndex = direction > 0 ? 1 : 0;
+            var chevronButton = beatDivisorControl.ChildrenOfType<BeatDivisorControl.ChevronButton>().ElementAt(chevronIndex);
+            InputManager.MoveMouseTo(chevronButton);
+            InputManager.Click(MouseButton.Left);
+        }, Math.Abs(direction));
+
+        private void assertBeatSnap(int expected) => AddAssert($"beat snap is {expected}",
+            () => bindableBeatDivisor.Value == expected);
+
+        private void switchPresets(int direction) => AddRepeatStep($"move presets {(direction > 0 ? "forward" : "backward")}", () =>
+        {
+            int chevronIndex = direction > 0 ? 3 : 2;
+            var chevronButton = beatDivisorControl.ChildrenOfType<BeatDivisorControl.ChevronButton>().ElementAt(chevronIndex);
+            InputManager.MoveMouseTo(chevronButton);
+            InputManager.Click(MouseButton.Left);
+        }, Math.Abs(direction));
+
+        private void assertPreset(BeatDivisorType type, int? maxDivisor = null)
+        {
+            AddAssert($"preset is {type}", () => bindableBeatDivisor.ValidDivisors.Value.Type == type);
+
+            if (type == BeatDivisorType.Custom)
+            {
+                Debug.Assert(maxDivisor != null);
+                AddAssert($"max divisor is {maxDivisor}", () => bindableBeatDivisor.ValidDivisors.Value.Presets.Max() == maxDivisor.Value);
+            }
+        }
+
+        private void setDivisorViaInput(int divisor)
+        {
+            AddStep("open divisor input popover", () =>
+            {
+                var button = beatDivisorControl.ChildrenOfType<BeatDivisorControl.DivisorDisplay>().Single();
+                InputManager.MoveMouseTo(button);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            BeatDivisorControl.CustomDivisorPopover popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<BeatDivisorControl.CustomDivisorPopover>().SingleOrDefault()) != null && popover.IsLoaded);
+            AddStep($"set divisor to {divisor}", () =>
+            {
+                var textBox = popover.ChildrenOfType<TextBox>().Single();
+                InputManager.MoveMouseTo(textBox);
+                InputManager.Click(MouseButton.Left);
+                textBox.Text = divisor.ToString();
+                InputManager.Key(Key.Enter);
+            });
+            AddUntilStep("wait for dismiss", () => !this.ChildrenOfType<BeatDivisorControl.CustomDivisorPopover>().Any());
+        }
    }
 }
@@ -269,11 +269,12 @@ namespace osu.Game.Tests.Visual.Editing
        }

        [Test]
-        public void TestCreateNewBeatmapFailsWithBlankNamedDifficulties()
+        public void TestCreateMultipleNewDifficultiesSucceeds()
        {
            Guid setId = Guid.Empty;

            AddStep("retrieve set ID", () => setId = EditorBeatmap.BeatmapInfo.BeatmapSet!.ID);
+            AddStep("set difficulty name", () => EditorBeatmap.BeatmapInfo.DifficultyName = "New Difficulty");
            AddStep("save beatmap", () => Editor.Save());
            AddAssert("new beatmap persisted", () =>
            {
@@ -282,15 +283,24 @@ namespace osu.Game.Tests.Visual.Editing
            });

            AddStep("try to create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
-            AddAssert("beatmap set unchanged", () =>
+            AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
+            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+
+            AddUntilStep("wait for created", () =>
+            {
+                string difficultyName = Editor.ChildrenOfType<EditorBeatmap>().SingleOrDefault()?.BeatmapInfo.DifficultyName;
+                return difficultyName != null && difficultyName != "New Difficulty";
+            });
+            AddAssert("new difficulty has correct name", () => EditorBeatmap.BeatmapInfo.DifficultyName == "New Difficulty (1)");
+            AddAssert("new difficulty persisted", () =>
            {
                var set = beatmapManager.QueryBeatmapSet(s => s.ID == setId);
-                return set != null && set.PerformRead(s => s.Beatmaps.Count == 1 && s.Files.Count == 1);
+                return set != null && set.PerformRead(s => s.Beatmaps.Count == 2 && s.Files.Count == 2);
            });
        }

        [Test]
-        public void TestCreateNewBeatmapFailsWithSameNamedDifficulties([Values] bool sameRuleset)
+        public void TestSavingBeatmapFailsWithSameNamedDifficulties([Values] bool sameRuleset)
        {
            Guid setId = Guid.Empty;
            const string duplicate_difficulty_name = "duplicate";
@@ -49,6 +49,8 @@ namespace osu.Game.Tests.Visual.Editing
            double originalTimelineZoom = 0;
            double changedTimelineZoom = 0;

+            AddUntilStep("wait for timeline load", () => Editor.ChildrenOfType<Timeline>().SingleOrDefault()?.IsLoaded == true);
+
            AddStep("Set beat divisor", () => Editor.Dependencies.Get<BindableBeatDivisor>().Value = 16);
            AddStep("Set timeline zoom", () =>
            {
@@ -4,11 +4,9 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Components.Menus;

 namespace osu.Game.Tests.Visual.Editing
 {
@@ -22,7 +20,7 @@ namespace osu.Game.Tests.Visual.Editing
            AddStep("switch between all screens at once", () =>
            {
                foreach (var screen in Enum.GetValues(typeof(EditorScreenMode)).Cast<EditorScreenMode>())
-                    Editor.ChildrenOfType<EditorMenuBar>().Single().Mode.Value = screen;
+                    Editor.Mode.Value = screen;
            });
        }
    }
@@ -0,0 +1,102 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Overlays.Settings;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Tests.Visual.Ranking;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneBeatmapOffsetControl : OsuTestScene
+    {
+        private BeatmapOffsetControl offsetControl;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create control", () =>
+            {
+                Child = new PlayerSettingsGroup("Some settings")
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        offsetControl = new BeatmapOffsetControl()
+                    }
+                };
+            });
+        }
+
+        [Test]
+        public void TestTooShortToDisplay()
+        {
+            AddStep("Set short reference score", () =>
+            {
+                offsetControl.ReferenceScore.Value = new ScoreInfo
+                {
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(0, 2)
+                };
+            });
+
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+        }
+
+        [Test]
+        public void TestCalibrationFromZero()
+        {
+            const double average_error = -4.5;
+
+            AddAssert("Offset is neutral", () => offsetControl.Current.Value == 0);
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+            AddStep("Set reference score", () =>
+            {
+                offsetControl.ReferenceScore.Value = new ScoreInfo
+                {
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error)
+                };
+            });
+
+            AddUntilStep("Has calibration button", () => offsetControl.ChildrenOfType<SettingsButton>().Any());
+            AddStep("Press button", () => offsetControl.ChildrenOfType<SettingsButton>().Single().TriggerClick());
+            AddAssert("Offset is adjusted", () => offsetControl.Current.Value == -average_error);
+
+            AddUntilStep("Button is disabled", () => !offsetControl.ChildrenOfType<SettingsButton>().Single().Enabled.Value);
+            AddStep("Remove reference score", () => offsetControl.ReferenceScore.Value = null);
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+        }
+
+        /// <summary>
+        /// When a beatmap offset was already set, the calibration should take it into account.
+        /// </summary>
+        [Test]
+        public void TestCalibrationFromNonZero()
+        {
+            const double average_error = -4.5;
+            const double initial_offset = -2;
+
+            AddStep("Set offset non-neutral", () => offsetControl.Current.Value = initial_offset);
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+            AddStep("Set reference score", () =>
+            {
+                offsetControl.ReferenceScore.Value = new ScoreInfo
+                {
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error)
+                };
+            });
+
+            AddUntilStep("Has calibration button", () => offsetControl.ChildrenOfType<SettingsButton>().Any());
+            AddStep("Press button", () => offsetControl.ChildrenOfType<SettingsButton>().Single().TriggerClick());
+            AddAssert("Offset is adjusted", () => offsetControl.Current.Value == initial_offset - average_error);
+
+            AddUntilStep("Button is disabled", () => !offsetControl.ChildrenOfType<SettingsButton>().Single().Enabled.Value);
+            AddStep("Remove reference score", () => offsetControl.ReferenceScore.Value = null);
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+        }
+    }
+}
@@ -18,9 +18,11 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
+using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -32,11 +34,17 @@ namespace osu.Game.Tests.Visual.Gameplay
        private SkinManager skinManager { get; set; }

        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());

        [Cached(typeof(HealthProcessor))]
        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);

+        [Cached]
+        private GameplayState gameplayState = new GameplayState(new TestBeatmap(new OsuRuleset().RulesetInfo), new OsuRuleset());
+
+        [Cached]
+        private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+
        protected override bool HasCustomSteps => true;

        [Test]
@@ -1,11 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
@@ -22,6 +25,8 @@ namespace osu.Game.Tests.Visual.Gameplay
        [Cached]
        private Storyboard storyboard { get; set; } = new Storyboard();

+        private IEnumerable<DrawableStoryboardSprite> sprites => this.ChildrenOfType<DrawableStoryboardSprite>();
+
        [Test]
        public void TestSkinSpriteDisallowedByDefault()
        {
@@ -41,9 +46,54 @@ namespace osu.Game.Tests.Visual.Gameplay

            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);

-            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.Centre, Vector2.Zero)));
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));

            assertSpritesFromSkin(true);
+
+            AddAssert("skinnable sprite has correct size", () => sprites.Any(s => Precision.AlmostEquals(s.ChildrenOfType<SkinnableSprite>().Single().Size, new Vector2(128, 128))));
+        }
+
+        [Test]
+        public void TestFlippedSprite()
+        {
+            const string lookup_name = "hitcircleoverlay";
+
+            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+            AddStep("flip sprites", () => sprites.ForEach(s =>
+            {
+                s.FlipH = true;
+                s.FlipV = true;
+            }));
+            AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
+        }
+
+        [Test]
+        public void TestNegativeScale()
+        {
+            const string lookup_name = "hitcircleoverlay";
+
+            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+            AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
+            AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
+        }
+
+        [Test]
+        public void TestNegativeScaleWithFlippedSprite()
+        {
+            const string lookup_name = "hitcircleoverlay";
+
+            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+            AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
+            AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
+            AddStep("flip sprites", () => sprites.ForEach(s =>
+            {
+                s.FlipH = true;
+                s.FlipV = true;
+            }));
+            AddAssert("origin back", () => sprites.All(s => s.Origin == Anchor.TopLeft));
        }

        private DrawableStoryboardSprite createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
@@ -57,7 +107,6 @@ namespace osu.Game.Tests.Visual.Gameplay

        private void assertSpritesFromSkin(bool fromSkin) =>
            AddAssert($"sprites are {(fromSkin ? "from skin" : "from storyboard")}",
-                () => this.ChildrenOfType<DrawableStoryboardSprite>()
-                          .All(sprite => sprite.ChildrenOfType<SkinnableSprite>().Any() == fromSkin));
+                () => sprites.All(sprite => sprite.ChildrenOfType<SkinnableSprite>().Any() == fromSkin));
    }
 }
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
            AddUntilStep("wait for multiple judgements", () => ((FailPlayer)Player).ScoreProcessor.JudgedHits > 1);
            AddAssert("total number of results == 1", () =>
            {
-                var score = new ScoreInfo();
+                var score = new ScoreInfo { Ruleset = Ruleset.Value };

                ((FailPlayer)Player).ScoreProcessor.PopulateScore(score);

@@ -8,11 +8,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using osu.Game.Tests.Beatmaps;
 using osuTK.Input;

 namespace osu.Game.Tests.Visual.Gameplay
@@ -24,11 +27,17 @@ namespace osu.Game.Tests.Visual.Gameplay
        private HUDOverlay hudOverlay;

        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());

        [Cached(typeof(HealthProcessor))]
        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);

+        [Cached]
+        private GameplayState gameplayState = new GameplayState(new TestBeatmap(new OsuRuleset().RulesetInfo), new OsuRuleset());
+
+        [Cached]
+        private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+
        // best way to check without exposing.
        private Drawable hideTarget => hudOverlay.KeyCounter;
        private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -48,7 +48,11 @@ namespace osu.Game.Tests.Visual.Gameplay
        {
            AddStep("create display", () => recreateDisplay(new OsuHitWindows(), 5));

-            AddRepeatStep("New random judgement", () => newJudgement(), 40);
+            AddRepeatStep("New random judgement", () =>
+            {
+                double offset = RNG.Next(-150, 150);
+                newJudgement(offset, drawableRuleset.HitWindows.ResultFor(offset));
+            }, 400);

            AddRepeatStep("New max negative", () => newJudgement(-drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
            AddRepeatStep("New max positive", () => newJudgement(drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
@@ -273,6 +277,11 @@ namespace osu.Game.Tests.Visual.Gameplay

        private class TestScoreProcessor : ScoreProcessor
        {
+            public TestScoreProcessor()
+                : base(new OsuRuleset())
+            {
+            }
+
            public void Reset() => base.Reset(false);
        }
    }
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
@@ -107,7 +108,7 @@ namespace osu.Game.Tests.Visual.Gameplay
        {
            AddStep("create player", () =>
            {
-                Beatmap.Value = CreateWorkingBeatmap(beatmap, storyboard);
+                Beatmap.Value = new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), Audio);
                LoadScreen(player = new LeadInPlayer());
            });

@@ -131,9 +132,9 @@ namespace osu.Game.Tests.Visual.Gameplay

            public double GameplayClockTime => GameplayClockContainer.GameplayClock.CurrentTime;

-            protected override void Update()
+            protected override void UpdateAfterChildren()
            {
-                base.Update();
+                base.UpdateAfterChildren();

                if (!FirstFrameClockTime.HasValue)
                {
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
            gameplayState = new GameplayState(beatmap, ruleset);
            gameplayState.LastJudgementResult.BindTo(lastJudgementResult);

-            scoreProcessor = new ScoreProcessor();
+            scoreProcessor = new ScoreProcessor(ruleset);

            Child = dependencyContainer = new DependencyProvidingContainer
            {
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.

 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning.Editor;
@@ -16,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay

        protected override bool Autoplay => true;

+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
        [SetUpSteps]
        public override void SetUpSteps()
        {
@@ -24,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
            AddStep("reload skin editor", () =>
            {
                skinEditor?.Expire();
-                Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);
+                Player.ScaleTo(0.8f);
                LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
            });
        }
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.

 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning.Editor;
@@ -11,13 +13,17 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
    public class TestSceneSkinEditorComponentsList : SkinnableTestScene
    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
        [Test]
        public void TestToggleEditor()
        {
-            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox(300)
+            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox
            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                Width = 0.6f,
            }));
        }

@@ -5,11 +5,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning.Editor;
+using osu.Game.Tests.Beatmaps;
 using osuTK.Input;

 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,11 +19,17 @@ namespace osu.Game.Tests.Visual.Gameplay
    public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
    {
        [Cached]
-        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());

        [Cached(typeof(HealthProcessor))]
        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);

+        [Cached]
+        private GameplayState gameplayState = new GameplayState(new TestBeatmap(new OsuRuleset().RulesetInfo), new OsuRuleset());
+
+        [Cached]
+        private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+
        [SetUpSteps]
        public void SetUpSteps()
        {
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
@@ -14,7 +15,7 @@ namespace osu.Game.Tests.Visual.Gameplay
    public class TestSceneSkinnableAccuracyCounter : SkinnableHUDComponentTestScene
    {
        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());

        protected override Drawable CreateDefaultImplementation() => new DefaultAccuracyCounter();
        protected override Drawable CreateLegacyImplementation() => new LegacyAccuracyCounter();
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;

@@ -13,7 +14,7 @@ namespace osu.Game.Tests.Visual.Gameplay
    public class TestSceneSkinnableComboCounter : SkinnableHUDComponentTestScene
    {
        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());

        protected override Drawable CreateDefaultImplementation() => new DefaultComboCounter();
        protected override Drawable CreateLegacyImplementation() => new LegacyComboCounter();
--- a/Show More
+++ b/Show More