Update deploy script

2026-05-14 04:22:34 +08:00 · 2018-06-05 19:55:01 +09:00
324 changed files with 5194 additions and 9612 deletions
@@ -1,8 +0,0 @@
-Add any details pertaining to developers above the break.
-
- [ ] Depends on #PR
- Closes #ISSUE
-
---
-
-Add a sentence or two describing this change in plain english. This will be displayed on the [changelog](https://osu.ppy.sh/home/changelog). A single screenshot or short gif is also welcomed.
@@ -1,3 +1,6 @@
+[submodule "osu-framework"]
+	path = osu-framework
+	url = https://github.com/ppy/osu-framework
 [submodule "osu-resources"]
 	path = osu-resources
-	url = https://github.com/ppy/osu-resources
+	url = https://github.com/ppy/osu-resources
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (catch)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (mania)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (osu!)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (taiko)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="VisualTests (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs />
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Tests/osu.Game.Tests.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <method />
+  </configuration>
+</component>
@@ -1,11 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests" type="DotNetProject" factoryName=".NET Project">
+  <configuration default="false" name="VisualTests (netcoreapp2.1)" type="DotNetProject" factoryName=".NET Project">
    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.1/osu.Game.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs />
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Tests/osu.Game.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="osu! (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net471/osu!.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs />
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <method />
+  </configuration>
+</component>
@@ -1,11 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project">
+  <configuration default="false" name="osu! (netcoreapp2.1)" type="DotNetProject" factoryName=".NET Project">
    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.1/osu!.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs />
    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
@@ -2,7 +2,63 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug)",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Release/net471/osu.Game.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "osu! (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net471/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "osu! (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net471/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
@@ -10,12 +66,12 @@
                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Debug)",
+            "preLaunchTask": "Build tests (Debug, dotnet)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
@@ -23,12 +79,12 @@
                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Release)",
+            "preLaunchTask": "Build tests (Release, dotnet)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Debug)",
+            "name": "osu! (Debug, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
@@ -36,12 +92,12 @@
                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.1/osu!.dll",
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build osu! (Debug)",
+            "preLaunchTask": "Build osu! (Debug, dotnet)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Release)",
+            "name": "osu! (Release, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
@@ -49,7 +105,7 @@
                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.1/osu!.dll",
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build osu! (Release)",
+            "preLaunchTask": "Build osu! (Release, dotnet)",
            "env": {},
            "console": "internalConsole"
        }
@@ -4,7 +4,34 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "Build osu! (Debug)",
+            "label": "Build (Debug, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build osu! (Debug, dotnet)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -20,7 +47,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Build osu! (Release)",
+            "label": "Build osu! (Release, dotnet)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -37,7 +64,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Build tests (Debug)",
+            "label": "Build tests (Debug, dotnet)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -53,7 +80,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Build tests (Release)",
+            "label": "Build tests (Release, dotnet)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -69,6 +96,15 @@
            "group": "build",
            "problemMatcher": "$msCompile"
        },
+        {
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
        {
            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
@@ -0,0 +1,36 @@
+# Linux
+### 1. Requirements:
+Mono >= 5.4.0 (>= 5.8.0 recommended)
+Please check [here](http://www.mono-project.com/download/) for stable or [here](http://www.mono-project.com/download/alpha/) for an alpha release.  
+NuGet >= 4.4.0  
+msbuild  
+git
+
+### 2. Cloning project
+Clone the entire repository with submodules using
+```
+git clone https://github.com/ppy/osu --recursive
+```
+Then restore NuGet packages from the repository
+```
+nuget restore
+```
+### 3. Compiling
+Simply run `msbuild` where `osu.sln` is located, this will create all binaries in `osu/osu.Desktop/bin/Debug`.
+### 4. Optimizing
+If you want additional performance you can change build type to Release with
+```
+msbuild -p:Configuration=Release
+```
+Additionally, mono provides an AOT utility which attempts to precompile binaries. You can utilize that by running
+```
+mono --aot ./osu\!.exe
+```
+### 5. Troubleshooting
+You may run into trouble with NuGet versioning, as the one in packaging system is almost always out of date. Simply run 
+```
+nuget
+sudo nuget update -self
+```
+**Warning** NuGet creates few config files when it's run for the first time.
+Do not run NuGet as root on the first run or you might run into very peculiar issues.
@@ -1,7 +1,12 @@
 clone_depth: 1
 version: '{branch}-{build}'
-image: Visual Studio 2017
+image: Visual Studio 2017 preview
 configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
 install:
  - cmd: git submodule update --init --recursive --depth=5
  - cmd: choco install resharper-clt -y
@@ -1,7 +1,9 @@
 clone_depth: 1
 version: '{build}'
-skip_non_tags: true
+# skip_non_tags: true
 image: Visual Studio 2017
+cache:
+  - '%USERPROFILE%\.nuget\packages -> **\*.csproj'
 install:
  - git clone https://github.com/ppy/osu-deploy
 before_build:
@@ -16,7 +18,7 @@ build_script:
  - cd osu-deploy
  - nuget restore -verbosity quiet
  - msbuild osu.Desktop.Deploy.csproj
-  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\net471\osu-deploy.exe.config
  - cd bin\Debug\net471\
  - osu.Desktop.Deploy.exe %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
 environment:
@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [{
+            "name": "Deploy (Debug)",
+            "request": "launch",
+            "type": "mono",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Desktop.Deploy.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "Deploy (Release)",
+            "request": "launch",
+            "type": "clr",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Desktop.Deploy.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
@@ -0,0 +1,64 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "command": "msbuild",
+    "type": "shell",
+    "suppressTaskName": true,
+    "args": [
+        "/property:GenerateFullPaths=true",
+        "/property:DebugType=portable",
+        "/verbosity:minimal",
+        "/m" //parallel compiling support.
+    ],
+    "tasks": [{
+            "taskName": "Build (Debug)",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
+        {
+            "taskName": "Build (Release)",
+            "group": "build",
+            "args": [
+                "/property:Configuration=Release"
+            ],
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
+        {
+            "taskName": "Clean (Debug)",
+            "args": [
+                "/target:Clean"
+            ],
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
+        {
+            "taskName": "Clean (Release)",
+            "args": [
+                "/target:Clean",
+                "/property:Configuration=Release"
+            ],
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
+        {
+            "taskName": "Clean All",
+            "dependsOn": [
+                "Clean (Debug)",
+                "Clean (Release)"
+            ],
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        }
+    ]
+}
@@ -73,7 +73,7 @@ namespace osu.Desktop
            }

            public StableStorage()
-                : base(string.Empty, null)
+                : base(string.Empty)
            {
            }
        }
@@ -1,20 +1,19 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Utils;
 using OpenTK;
 using OpenTK.Graphics;

@@ -25,18 +24,16 @@ namespace osu.Desktop.Overlays
        private OsuConfigManager config;
        private OsuGameBase game;
        private NotificationOverlay notificationOverlay;
-        private GameHost host;

        public override bool HandleKeyboardInput => false;
        public override bool HandleMouseInput => false;

        [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
+        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config)
        {
            notificationOverlay = notification;
            this.config = config;
            this.game = game;
-            this.host = host;

            AutoSizeAxes = Axes.Both;
            Anchor = Anchor.BottomCentre;
@@ -109,19 +106,19 @@ namespace osu.Desktop.Overlays

                // only show a notification if we've previously saved a version to the config file (ie. not the first run).
                if (!string.IsNullOrEmpty(lastVersion))
-                    notificationOverlay.Post(new UpdateCompleteNotification(version, host.OpenUrlExternally));
+                    notificationOverlay.Post(new UpdateCompleteNotification(version));
            }
        }

        private class UpdateCompleteNotification : SimpleNotification
        {
-            public UpdateCompleteNotification(string version, Action<string> openUrl = null)
+            public UpdateCompleteNotification(string version)
            {
                Text = $"You are now running osu!lazer {version}.\nClick to see what's new!";
                Icon = FontAwesome.fa_check_square;
                Activated = delegate
                {
-                    openUrl?.Invoke($"https://osu.ppy.sh/home/changelog/lazer/{version}");
+                    Process.Start($"https://github.com/ppy/osu/releases/tag/v{version}");
                    return true;
                };
            }
@@ -20,17 +20,17 @@
    <StartupObject>osu.Desktop.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
    <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.3" />
    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
  </ItemGroup>
  <ItemGroup Label="Resources">
@@ -3,7 +3,6 @@

 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Catch.Objects;
@@ -13,14 +12,11 @@ using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Rulesets.Catch.Tests
 {
-    [TestFixture]
-    public class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
+    internal class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
    {
        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";

-        [TestCase("basic")]
-        [TestCase("spinner")]
-        [TestCase("spinner-and-circles")]
+        [TestCase("basic"), Ignore("See: https://github.com/ppy/osu/issues/2232")]
        public new void Test(string name)
        {
            base.Test(name);
@@ -31,52 +27,36 @@ namespace osu.Game.Rulesets.Catch.Tests
            if (hitObject is JuiceStream stream)
            {
                foreach (var nested in stream.NestedHitObjects)
-                    yield return new ConvertValue((CatchHitObject)nested);
-            }
-            else if (hitObject is BananaShower shower)
-            {
-                foreach (var nested in shower.NestedHitObjects)
-                    yield return new ConvertValue((CatchHitObject)nested);
+                {
+                    yield return new ConvertValue
+                    {
+                        StartTime = nested.StartTime,
+                        Position = ((CatchHitObject)nested).X * CatchPlayfield.BASE_WIDTH
+                    };
+                }
            }
            else
-                yield return new ConvertValue((CatchHitObject)hitObject);
+            {
+                yield return new ConvertValue
+                {
+                    StartTime = hitObject.StartTime,
+                    Position = ((CatchHitObject)hitObject).X * CatchPlayfield.BASE_WIDTH
+                };
+            }
        }

        protected override Ruleset CreateRuleset() => new CatchRuleset();
    }

-    public struct ConvertValue : IEquatable<ConvertValue>
+    internal struct ConvertValue : IEquatable<ConvertValue>
    {
        /// <summary>
        /// A sane value to account for osu!stable using ints everwhere.
        /// </summary>
        private const float conversion_lenience = 2;

-        [JsonIgnore]
-        public readonly CatchHitObject HitObject;
-
-        public ConvertValue(CatchHitObject hitObject)
-        {
-            HitObject = hitObject;
-            startTime = 0;
-            position = 0;
-        }
-
-        private double startTime;
-
-        public double StartTime
-        {
-            get => HitObject?.StartTime ?? startTime;
-            set => startTime = value;
-        }
-
-        private float position;
-
-        public float Position
-        {
-            get => HitObject?.X * CatchPlayfield.BASE_WIDTH ?? position;
-            set => position = value;
-        }
+        public double StartTime;
+        public float Position;

        public bool Equals(ConvertValue other)
            => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
@@ -53,10 +53,10 @@ namespace osu.Game.Rulesets.Catch.Tests
            return beatmap;
        }

-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
        {
-            Beatmap.Value.Mods.Value = Beatmap.Value.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
-            return base.CreatePlayer(ruleset);
+            beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
+            return base.CreatePlayer(beatmap, ruleset);
        }
    }
 }
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Tests
            {
            }

-            public void ToggleHyperDash(bool status) => MovableCatcher.SetHyperdashState(status ? 2 : 1);
+            public void ToggleHyperDash(bool status) => MovableCatcher.HyperDashModifier = status ? 2 : 1;
        }
    }
 }
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestCasePerformancePoints : Game.Tests.Visual.TestCasePerformancePoints
+    {
+        public TestCasePerformancePoints()
+            : base(new CatchRuleset())
+        {
+        }
+    }
+}
@@ -26,7 +26,22 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
            var positionData = obj as IHasXPosition;
            var comboData = obj as IHasCombo;
            var endTime = obj as IHasEndTime;
-            var legacyOffset = obj as IHasLegacyLastTickOffset;
+
+            if (positionData == null)
+            {
+                if (endTime != null)
+                {
+                    yield return new BananaShower
+                    {
+                        StartTime = obj.StartTime,
+                        Samples = obj.Samples,
+                        Duration = endTime.Duration,
+                        NewCombo = comboData?.NewCombo ?? false
+                    };
+                }
+
+                yield break;
+            }

            if (curveData != null)
            {
@@ -39,31 +54,20 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                    Distance = curveData.Distance,
                    RepeatSamples = curveData.RepeatSamples,
                    RepeatCount = curveData.RepeatCount,
-                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH,
-                    NewCombo = comboData?.NewCombo ?? false,
-                    LegacyLastTickOffset = legacyOffset?.LegacyLastTickOffset ?? 0
-                };
-            }
-            else if (endTime != null)
-            {
-                yield return new BananaShower
-                {
-                    StartTime = obj.StartTime,
-                    Samples = obj.Samples,
-                    Duration = endTime.Duration,
+                    X = positionData.X / CatchPlayfield.BASE_WIDTH,
                    NewCombo = comboData?.NewCombo ?? false
                };
+
+                yield break;
            }
-            else
+
+            yield return new Fruit
            {
-                yield return new Fruit
-                {
-                    StartTime = obj.StartTime,
-                    Samples = obj.Samples,
-                    NewCombo = comboData?.NewCombo ?? false,
-                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH
-                };
-            }
+                StartTime = obj.StartTime,
+                Samples = obj.Samples,
+                NewCombo = comboData?.NewCombo ?? false,
+                X = positionData.X / CatchPlayfield.BASE_WIDTH
+            };
        }

        protected override Beatmap<CatchHitObject> CreateBeatmap() => new CatchBeatmap();
@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Types;
 using OpenTK;
-using osu.Game.Rulesets.Catch.MathUtils;

 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -22,54 +21,13 @@ namespace osu.Game.Rulesets.Catch.Beatmaps

        public override void PostProcess()
        {
-            applyPositionOffsets();
-
            initialiseHyperDash((List<CatchHitObject>)Beatmap.HitObjects);

            base.PostProcess();

            int index = 0;
            foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
-            {
                obj.IndexInBeatmap = index++;
-                if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
-                    lastNested.LastInCombo = true;
-            }
-        }
-
-        public const int RNG_SEED = 1337;
-
-        private void applyPositionOffsets()
-        {
-            var rng = new FastRandom(RNG_SEED);
-            // todo: HardRock displacement should be applied here
-
-            foreach (var obj in Beatmap.HitObjects)
-            {
-                switch (obj)
-                {
-                    case BananaShower bananaShower:
-                        foreach (var nested in bananaShower.NestedHitObjects)
-                        {
-                            ((BananaShower.Banana)nested).X = (float)rng.NextDouble();
-                            rng.Next(); // osu!stable retrieved a random banana type
-                            rng.Next(); // osu!stable retrieved a random banana rotation
-                            rng.Next(); // osu!stable retrieved a random banana colour
-                        }
-                        break;
-                    case JuiceStream juiceStream:
-                        foreach (var nested in juiceStream.NestedHitObjects)
-                        {
-                            var hitObject = (CatchHitObject)nested;
-                            if (hitObject is TinyDroplet)
-                                hitObject.X += rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH;
-                            else if (hitObject is Droplet)
-                                rng.Next(); // osu!stable retrieved a random droplet rotation
-                            hitObject.X = MathHelper.Clamp(hitObject.X, 0, 1);
-                        }
-                        break;
-                }
-            }
        }

        private void initialiseHyperDash(List<CatchHitObject> objects)
@@ -82,25 +82,56 @@ namespace osu.Game.Rulesets.Catch
                    {
                        new CatchModEasy(),
                        new CatchModNoFail(),
-                        new MultiMod(new CatchModHalfTime(), new CatchModDaycore())
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModHalfTime(),
+                                new CatchModDaycore(),
+                            },
+                        },
                    };
+
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
                        new CatchModHardRock(),
-                        new MultiMod(new CatchModSuddenDeath(), new CatchModPerfect()),
-                        new MultiMod(new CatchModDoubleTime(), new CatchModNightcore()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModSuddenDeath(),
+                                new CatchModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModDoubleTime(),
+                                new CatchModNightcore(),
+                            },
+                        },
                        new CatchModHidden(),
                        new CatchModFlashlight(),
                    };
+
                case ModType.Special:
                    return new Mod[]
                    {
                        new CatchModRelax(),
                        null,
                        null,
-                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
                    };
+
                default:
                    return new Mod[] { };
            }
@@ -112,7 +143,7 @@ namespace osu.Game.Rulesets.Catch

        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_fruits_o };

-        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);
+        public override DifficultyCalculator CreateDifficultyCalculator(IBeatmap beatmap, Mod[] mods = null) => new CatchDifficultyCalculator(beatmap);

        public override int? LegacyID => 2;

@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Catch.Difficulty
-{
-    public class CatchDifficultyAttributes : DifficultyAttributes
-    {
-        public double ApproachRate;
-        public int MaxCombo;
-
-        public CatchDifficultyAttributes(Mod[] mods, double starRating)
-            : base(mods, starRating)
-        {
-        }
-    }
-}
@@ -1,146 +1,18 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
    public class CatchDifficultyCalculator : DifficultyCalculator
    {
-
-        /// <summary>
-        /// In milliseconds. For difficulty calculation we will only look at the highest strain value in each time interval of size STRAIN_STEP.
-        /// This is to eliminate higher influence of stream over aim by simply having more HitObjects with high strain.
-        /// The higher this value, the less strains there will be, indirectly giving long beatmaps an advantage.
-        /// </summary>
-        private const double strain_step = 750;
-
-        /// <summary>
-        /// The weighting of each strain value decays to this number * it's previous value
-        /// </summary>
-        private const double decay_weight = 0.94;
-
-        private const double star_scaling_factor = 0.145;
-
-        public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
-            : base(ruleset, beatmap)
+        public CatchDifficultyCalculator(IBeatmap beatmap) : base(beatmap)
        {
        }

-        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
-        {
-            if (!beatmap.HitObjects.Any())
-                return new CatchDifficultyAttributes(mods, 0);
-
-            var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty);
-            float halfCatchWidth = catcher.CatchWidth * 0.5f;
-
-            var difficultyHitObjects = new List<CatchDifficultyHitObject>();
-
-            foreach (var hitObject in beatmap.HitObjects)
-            {
-                // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
-                if (hitObject is Fruit)
-                {
-                    difficultyHitObjects.Add(new CatchDifficultyHitObject((CatchHitObject)hitObject, halfCatchWidth));
-                }
-                if (hitObject is JuiceStream)
-                    difficultyHitObjects.AddRange(hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)).Select(o => new CatchDifficultyHitObject(o, halfCatchWidth)));
-            }
-
-            difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
-
-            if (!calculateStrainValues(difficultyHitObjects, timeRate))
-                return new CatchDifficultyAttributes(mods, 0);
-
-            // this is the same as osu!, so there's potential to share the implementation... maybe
-            double preEmpt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / timeRate;
-            double starRating = Math.Sqrt(calculateDifficulty(difficultyHitObjects, timeRate)) * star_scaling_factor;
-
-            return new CatchDifficultyAttributes(mods, starRating)
-            {
-                ApproachRate = preEmpt > 1200.0 ? -(preEmpt - 1800.0) / 120.0 : -(preEmpt - 1200.0) / 150.0 + 5.0,
-                MaxCombo = difficultyHitObjects.Count
-            };
-        }
-
-        private bool calculateStrainValues(List<CatchDifficultyHitObject> objects, double timeRate)
-        {
-            CatchDifficultyHitObject lastObject = null;
-
-            if (!objects.Any()) return false;
-
-            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
-            foreach (var currentObject in objects)
-            {
-                if (lastObject != null)
-                    currentObject.CalculateStrains(lastObject, timeRate);
-
-                lastObject = currentObject;
-            }
-
-            return true;
-        }
-
-        private double calculateDifficulty(List<CatchDifficultyHitObject> objects, double timeRate)
-        {
-            // The strain step needs to be adjusted for the algorithm to be considered equal with speed changing mods
-            double actualStrainStep = strain_step * timeRate;
-
-            // Find the highest strain value within each strain step
-            var highestStrains = new List<double>();
-            double intervalEndTime = actualStrainStep;
-            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval
-
-            CatchDifficultyHitObject previousHitObject = null;
-            foreach (CatchDifficultyHitObject hitObject in objects)
-            {
-                // While we are beyond the current interval push the currently available maximum to our strain list
-                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
-                {
-                    highestStrains.Add(maximumStrain);
-
-                    // The maximum strain of the next interval is not zero by default! We need to take the last hitObject we encountered, take its strain and apply the decay
-                    // until the beginning of the next interval.
-                    if (previousHitObject == null)
-                    {
-                        maximumStrain = 0;
-                    }
-                    else
-                    {
-                        double decay = Math.Pow(CatchDifficultyHitObject.DECAY_BASE, (intervalEndTime - previousHitObject.BaseHitObject.StartTime) / 1000);
-                        maximumStrain = previousHitObject.Strain * decay;
-                    }
-
-                    // Go to the next time interval
-                    intervalEndTime += actualStrainStep;
-                }
-
-                // Obtain maximum strain
-                maximumStrain = Math.Max(hitObject.Strain, maximumStrain);
-
-                previousHitObject = hitObject;
-            }
-
-            // Build the weighted sum over the highest strains for each interval
-            double difficulty = 0;
-            double weight = 1;
-            highestStrains.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.
-
-            foreach (double strain in highestStrains)
-            {
-                difficulty += weight * strain;
-                weight *= decay_weight;
-            }
-
-            return difficulty;
-        }
+        public override double Calculate(Dictionary<string, double> categoryDifficulty = null) => 0;
    }
 }
@@ -1,130 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
-using OpenTK;
-
-namespace osu.Game.Rulesets.Catch.Difficulty
-{
-    public class CatchDifficultyHitObject
-    {
-        internal static readonly double DECAY_BASE = 0.20;
-        private const float normalized_hitobject_radius = 41.0f;
-        private const float absolute_player_positioning_error = 16f;
-        private readonly float playerPositioningError;
-
-        internal CatchHitObject BaseHitObject;
-
-        /// <summary>
-        /// Measures jump difficulty. CtB doesn't have something like button pressing speed or accuracy
-        /// </summary>
-        internal double Strain = 1;
-
-        /// <summary>
-        /// This is required to keep track of lazy player movement (always moving only as far as necessary)
-        /// Without this quick repeat sliders / weirdly shaped streams might become ridiculously overrated
-        /// </summary>
-        internal float PlayerPositionOffset;
-        internal float LastMovement;
-
-        internal float NormalizedPosition;
-        internal float ActualNormalizedPosition => NormalizedPosition + PlayerPositionOffset;
-
-        internal CatchDifficultyHitObject(CatchHitObject baseHitObject, float catcherWidthHalf)
-        {
-            BaseHitObject = baseHitObject;
-
-            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
-            float scalingFactor = normalized_hitobject_radius / catcherWidthHalf;
-
-            playerPositioningError = absolute_player_positioning_error; // * scalingFactor;
-            NormalizedPosition = baseHitObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
-        }
-
-        private const double direction_change_bonus = 12.5;
-        internal void CalculateStrains(CatchDifficultyHitObject previousHitObject, double timeRate)
-        {
-            // Rather simple, but more specialized things are inherently inaccurate due to the big difference playstyles and opinions make.
-            // See Taiko feedback thread.
-            double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
-            double decay = Math.Pow(DECAY_BASE, timeElapsed / 1000);
-
-            // Update new position with lazy movement.
-            PlayerPositionOffset =
-                MathHelper.Clamp(
-                    previousHitObject.ActualNormalizedPosition,
-                    NormalizedPosition - (normalized_hitobject_radius - playerPositioningError),
-                    NormalizedPosition + (normalized_hitobject_radius - playerPositioningError)) // Obtain new lazy position, but be stricter by allowing for an error of a certain degree of the player.
-                - NormalizedPosition; // Subtract HitObject position to obtain offset
-
-            LastMovement = DistanceTo(previousHitObject);
-            double addition = spacingWeight(LastMovement);
-
-            if (NormalizedPosition < previousHitObject.NormalizedPosition)
-            {
-                LastMovement = -LastMovement;
-            }
-
-            CatchHitObject previousHitCircle = previousHitObject.BaseHitObject;
-
-            double additionBonus = 0;
-            double sqrtTime = Math.Sqrt(Math.Max(timeElapsed, 25));
-
-            // Direction changes give an extra point!
-            if (Math.Abs(LastMovement) > 0.1)
-            {
-                if (Math.Abs(previousHitObject.LastMovement) > 0.1 && Math.Sign(LastMovement) != Math.Sign(previousHitObject.LastMovement))
-                {
-                    double bonus = direction_change_bonus / sqrtTime;
-
-                    // Weight bonus by how
-                    double bonusFactor = Math.Min(playerPositioningError, Math.Abs(LastMovement)) / playerPositioningError;
-
-                    // We want time to play a role twice here!
-                    addition += bonus * bonusFactor;
-
-                    // Bonus for tougher direction switches and "almost" hyperdashes at this point
-                    if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
-                    {
-                        additionBonus += 0.3 * bonusFactor;
-                    }
-                }
-
-                // Base bonus for every movement, giving some weight to streams.
-                addition += 7.5 * Math.Min(Math.Abs(LastMovement), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtTime;
-            }
-
-            // Bonus for "almost" hyperdashes at corner points
-            if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
-            {
-                if (!previousHitCircle.HyperDash)
-                {
-                    additionBonus += 1.0;
-                }
-                else
-                {
-                    // After a hyperdash we ARE in the correct position. Always!
-                    PlayerPositionOffset = 0;
-                }
-
-                addition *= 1.0 + additionBonus * ((10 - previousHitCircle.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 10);
-            }
-
-            addition *= 850.0 / Math.Max(timeElapsed, 25);
-
-            Strain = previousHitObject.Strain * decay + addition;
-        }
-
-        private static double spacingWeight(float distance)
-        {
-            return Math.Pow(distance, 1.3) / 500;
-        }
-
-        internal float DistanceTo(CatchDifficultyHitObject other)
-        {
-            return Math.Abs(ActualNormalizedPosition - other.ActualNormalizedPosition);
-        }
-    }
-}
@@ -1,91 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-
-namespace osu.Game.Rulesets.Catch.MathUtils
-{
-    /// <summary>
-    /// A PRNG specified in http://heliosphan.org/fastrandom.html.
-    /// </summary>
-    public class FastRandom
-    {
-        private const double int_to_real = 1.0 / (int.MaxValue + 1.0);
-        private const uint int_mask = 0x7FFFFFFF;
-        private const uint y = 842502087;
-        private const uint z = 3579807591;
-        private const uint w = 273326509;
-        private uint _x, _y = y, _z = z, _w = w;
-
-        public FastRandom(int seed)
-        {
-            _x = (uint)seed;
-        }
-
-        public FastRandom()
-            : this(Environment.TickCount)
-        {
-        }
-
-        /// <summary>
-        /// Generates a random unsigned integer within the range [<see cref="uint.MinValue"/>, <see cref="uint.MaxValue"/>).
-        /// </summary>
-        /// <returns>The random value.</returns>
-        public uint NextUInt()
-        {
-            uint t = _x ^ _x << 11;
-            _x = _y;
-            _y = _z;
-            _z = _w;
-            return _w = _w ^ _w >> 19 ^ t ^ t >> 8;
-        }
-
-        /// <summary>
-        /// Generates a random integer value within the range [0, <see cref="int.MaxValue"/>).
-        /// </summary>
-        /// <returns>The random value.</returns>
-        public int Next() => (int)(int_mask & NextUInt());
-
-        /// <summary>
-        /// Generates a random integer value within the range [0, <paramref name="upperBound"/>).
-        /// </summary>
-        /// <param name="upperBound">The upper bound.</param>
-        /// <returns>The random value.</returns>
-        public int Next(int upperBound) => (int)(NextDouble() * upperBound);
-
-        /// <summary>
-        /// Generates a random integer value within the range [<paramref name="lowerBound"/>, <paramref name="upperBound"/>).
-        /// </summary>
-        /// <param name="lowerBound">The lower bound of the range.</param>
-        /// <param name="upperBound">The upper bound of the range.</param>
-        /// <returns>The random value.</returns>
-        public int Next(int lowerBound, int upperBound) => (int)(lowerBound + NextDouble() * (upperBound - lowerBound));
-
-        /// <summary>
-        /// Generates a random double value within the range [0, 1).
-        /// </summary>
-        /// <returns>The random value.</returns>
-        public double NextDouble() => int_to_real * Next();
-
-        private uint bitBuffer;
-        private int bitIndex = 32;
-
-        /// <summary>
-        /// Generates a reandom boolean value. Cached such that a random value is only generated once in every 32 calls.
-        /// </summary>
-        /// <returns>The random value.</returns>
-        public bool NextBool()
-        {
-            if (bitIndex == 32)
-            {
-                bitBuffer = NextUInt();
-                bitIndex = 1;
-
-                return (bitBuffer & 1) == 1;
-            }
-
-            bitIndex++;
-            return ((bitBuffer >>= 1) & 1) == 1;
-        }
-    }
-}
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Objects.Types;

 namespace osu.Game.Rulesets.Catch.Objects
@@ -30,7 +31,8 @@ namespace osu.Game.Rulesets.Catch.Objects
                AddNested(new Banana
                {
                    Samples = Samples,
-                    StartTime = i
+                    StartTime = i,
+                    X = RNG.NextSingle()
                });
        }

@@ -24,11 +24,6 @@ namespace osu.Game.Rulesets.Catch.Objects

        public int ComboIndex { get; set; }

-        /// <summary>
-        /// The distance for a fruit to to next hyper if it's not a hyper.
-        /// </summary>
-        public float DistanceToHyperDash { get; set; }
-
        /// <summary>
        /// The next fruit starts a new combo. Used for explodey.
        /// </summary>
@@ -42,8 +42,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        public virtual bool CanBePlated => false;

-        public virtual bool StaysOnPlate => CanBePlated;
-
        protected DrawableCatchHitObject(CatchHitObject hitObject)
            : base(hitObject)
        {
@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        private Pulp pulp;

-        public override bool StaysOnPlate => false;
-
        public DrawableDroplet(Droplet h)
            : base(h)
        {
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Catch.Objects
        protected override void CreateNestedHitObjects()
        {
            base.CreateNestedHitObjects();
+
            createTicks();
        }

@@ -77,13 +78,6 @@ namespace osu.Game.Rulesets.Catch.Objects

                    double time = spanStartTime + timeProgress * spanDuration;

-                    if (LegacyLastTickOffset != null)
-                    {
-                        // If we're the last tick, apply the legacy offset
-                        if (span == this.SpanCount() - 1 && d + tickDistance > length)
-                            time = Math.Max(StartTime + Duration / 2, time - LegacyLastTickOffset.Value);
-                    }
-
                    double tinyTickInterval = time - lastDropletTime;
                    while (tinyTickInterval > 100)
                        tinyTickInterval /= 2;
@@ -159,7 +153,5 @@ namespace osu.Game.Rulesets.Catch.Objects
            get { return Curve.CurveType; }
            set { Curve.CurveType = value; }
        }
-
-        public double? LegacyLastTickOffset { get; set; }
    }
 }
@@ -28,9 +28,9 @@ namespace osu.Game.Rulesets.Catch.Replays
            }
        }

-        public override List<IInput> GetPendingInputs()
+        public override List<InputState> GetPendingStates()
        {
-            if (!Position.HasValue) return new List<IInput>();
+            if (!Position.HasValue) return new List<InputState>();

            var actions = new List<CatchAction>();

@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Replays
            else if (Position.Value < CurrentFrame.Position)
                actions.Add(CatchAction.MoveLeft);

-            return new List<IInput>
+            return new List<InputState>
            {
                new CatchReplayState
                {
@@ -1,65 +0,0 @@
-{
-    "Mappings": [{
-            "StartTime": 2589,
-            "Objects": [{
-                "StartTime": 2589,
-                "Position": 256
-            }]
-        },
-        {
-            "StartTime": 2915,
-            "Objects": [{
-                    "StartTime": 2915,
-                    "Position": 65
-                },
-                {
-                    "StartTime": 2916,
-                    "Position": 482
-                }
-            ]
-        },
-        {
-            "StartTime": 3078,
-            "Objects": [{
-                    "StartTime": 3078,
-                    "Position": 164
-                },
-                {
-                    "StartTime": 3079,
-                    "Position": 315
-                }
-            ]
-        },
-        {
-            "StartTime": 3241,
-            "Objects": [{
-                    "StartTime": 3241,
-                    "Position": 145
-                },
-                {
-                    "StartTime": 3242,
-                    "Position": 159
-                }
-            ]
-        },
-        {
-            "StartTime": 3404,
-            "Objects": [{
-                    "StartTime": 3404,
-                    "Position": 310
-                },
-                {
-                    "StartTime": 3405,
-                    "Position": 441
-                }
-            ]
-        },
-        {
-            "StartTime": 5197,
-            "Objects": [{
-                "StartTime": 5197,
-                "Position": 256
-            }]
-        }
-    ]
-}
@@ -1,24 +0,0 @@
-osu file format v14
-
-[General]
-StackLeniency: 0.7
-Mode: 2
-
-[Difficulty]
-HPDrainRate:5
-CircleSize:2
-OverallDifficulty:5
-ApproachRate:8
-SliderMultiplier:1.4
-SliderTickRate:4
-
-[TimingPoints]
-2589,326.086956521739,4,2,1,70,1,0
-
-[HitObjects]
-256,192,2589,5,0,0:0:0:0:
-256,192,2915,12,0,2916,0:0:0:0:
-256,192,3078,12,0,3079,0:0:0:0:
-256,192,3241,12,0,3242,0:0:0:0:
-256,192,3404,12,0,3405,0:0:0:0:
-256,192,5197,5,0,0:0:0:0:
@@ -1,74 +0,0 @@
-{
-    "Mappings": [{
-        "StartTime": 18500,
-        "Objects": [{
-                "StartTime": 18500,
-                "Position": 65
-            },
-            {
-                "StartTime": 18559,
-                "Position": 482
-            },
-            {
-                "StartTime": 18618,
-                "Position": 164
-            },
-            {
-                "StartTime": 18678,
-                "Position": 315
-            },
-            {
-                "StartTime": 18737,
-                "Position": 145
-            },
-            {
-                "StartTime": 18796,
-                "Position": 159
-            },
-            {
-                "StartTime": 18856,
-                "Position": 310
-            },
-            {
-                "StartTime": 18915,
-                "Position": 441
-            },
-            {
-                "StartTime": 18975,
-                "Position": 428
-            },
-            {
-                "StartTime": 19034,
-                "Position": 243
-            },
-            {
-                "StartTime": 19093,
-                "Position": 422
-            },
-            {
-                "StartTime": 19153,
-                "Position": 481
-            },
-            {
-                "StartTime": 19212,
-                "Position": 104
-            },
-            {
-                "StartTime": 19271,
-                "Position": 473
-            },
-            {
-                "StartTime": 19331,
-                "Position": 135
-            },
-            {
-                "StartTime": 19390,
-                "Position": 360
-            },
-            {
-                "StartTime": 19450,
-                "Position": 123
-            }
-        ]
-    }]
-}
@@ -1,20 +0,0 @@
-osu file format v14
-
-[General]
-Mode: 2
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:1.6
-SliderTickRate:1
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-13426,-100,4,3,1,45,0,0
-14884,-100,4,2,1,50,0,0
-
-[HitObjects]
-256,192,18500,12,0,19450,0:0:0:0:
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.UI;
 using OpenTK;
 using OpenTK.Graphics;

@@ -49,16 +48,6 @@ namespace osu.Game.Rulesets.Catch.UI

        public void OnJudgement(DrawableCatchHitObject fruit, Judgement judgement)
        {
-            void runAfterLoaded(Action action)
-            {
-                // this is required to make this run after the last caught fruit runs UpdateState at least once.
-                // TODO: find a better alternative
-                if (lastPlateableFruit.IsLoaded)
-                    action();
-                else
-                    lastPlateableFruit.OnLoadComplete = _ => action();
-            }
-
            if (judgement.IsHit && fruit.CanBePlated)
            {
                var caughtFruit = (DrawableCatchHitObject)GetVisualRepresentation?.Invoke(fruit.HitObject);
@@ -74,17 +63,21 @@ namespace osu.Game.Rulesets.Catch.UI
                caughtFruit.LifetimeEnd = double.MaxValue;

                MovableCatcher.Add(caughtFruit);
+
                lastPlateableFruit = caughtFruit;
-
-                if (!fruit.StaysOnPlate)
-                    runAfterLoaded(() => MovableCatcher.Explode(caughtFruit));
-
            }

            if (fruit.HitObject.LastInCombo)
            {
                if (judgement.IsHit)
-                    runAfterLoaded(() => MovableCatcher.Explode());
+                {
+                    // this is required to make this run after the last caught fruit runs UpdateState at least once.
+                    // TODO: find a better alternative
+                    if (lastPlateableFruit.IsLoaded)
+                        MovableCatcher.Explode();
+                    else
+                        lastPlateableFruit.OnLoadComplete = _ => { MovableCatcher.Explode(); };
+                }
                else
                    MovableCatcher.Drop();
            }
@@ -94,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.UI
        {
            base.UpdateAfterChildren();

-            var state = (GetContainingInputManager().CurrentState as RulesetInputManagerInputState<CatchAction>)?.LastReplayState as CatchFramedReplayInputHandler.CatchReplayState;
+            var state = GetContainingInputManager().CurrentState as CatchFramedReplayInputHandler.CatchReplayState;

            if (state?.CatcherX != null)
                MovableCatcher.X = state.CatcherX.Value;
@@ -106,11 +99,6 @@ namespace osu.Game.Rulesets.Catch.UI

        public class Catcher : Container, IKeyBindingHandler<CatchAction>
        {
-            /// <summary>
-            /// Width of the area that can be used to attempt catches during gameplay.
-            /// </summary>
-            internal float CatchWidth => CATCHER_SIZE * Math.Abs(Scale.X);
-
            private Container<DrawableHitObject> caughtFruit;

            public Container ExplodingFruitTarget;
@@ -238,75 +226,64 @@ namespace osu.Game.Rulesets.Catch.UI
            /// <returns>Whether the catch is possible.</returns>
            public bool AttemptCatch(CatchHitObject fruit)
            {
-                float halfCatchWidth = CatchWidth * 0.5f;
+                double halfCatcherWidth = CATCHER_SIZE * Math.Abs(Scale.X) * 0.5f;

                // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
                var catchObjectPosition = fruit.X * CatchPlayfield.BASE_WIDTH;
                var catcherPosition = Position.X * CatchPlayfield.BASE_WIDTH;

                var validCatch =
-                    catchObjectPosition >= catcherPosition - halfCatchWidth &&
-                    catchObjectPosition <= catcherPosition + halfCatchWidth;
+                    catchObjectPosition >= catcherPosition - halfCatcherWidth &&
+                    catchObjectPosition <= catcherPosition + halfCatcherWidth;

                if (validCatch && fruit.HyperDash)
                {
-                    var target = fruit.HyperDashTarget;
-                    double timeDifference = target.StartTime - fruit.StartTime;
-                    double positionDifference = target.X * CatchPlayfield.BASE_WIDTH - catcherPosition;
-                    double velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
-
-                    SetHyperdashState(Math.Abs(velocity), target.X);
+                    HyperDashModifier = Math.Abs(fruit.HyperDashTarget.X - fruit.X) / Math.Abs(fruit.HyperDashTarget.StartTime - fruit.StartTime) / BASE_SPEED;
+                    HyperDashDirection = fruit.HyperDashTarget.X - fruit.X;
                }
                else
-                {
-                    SetHyperdashState();
-                }
+                    HyperDashModifier = 1;

                return validCatch;
            }

-            private double hyperDashModifier = 1;
-            private int hyperDashDirection;
-            private float hyperDashTargetPosition;
-
            /// <summary>
            /// Whether we are hypderdashing or not.
            /// </summary>
            public bool HyperDashing => hyperDashModifier != 1;

+            private double hyperDashModifier = 1;
+
            /// <summary>
-            /// Set hyperdash state.
+            /// The direction in which hyperdash is allowed. 0 allows both directions.
            /// </summary>
-            /// <param name="modifier">The speed multiplier. If this is less or equals to 1, this catcher will be non-hyperdashing state.</param>
-            /// <param name="targetPosition">When this catcher crosses this position, this catcher ends hyperdashing.</param>
-            public void SetHyperdashState(double modifier = 1, float targetPosition = -1)
+            public double HyperDashDirection;
+
+            /// <summary>
+            /// The speed modifier resultant from hyperdash. Will trigger hyperdash when not equal to 1.
+            /// </summary>
+            public double HyperDashModifier
            {
-                const float hyperdash_transition_length = 180;
-
-                bool previouslyHyperDashing = HyperDashing;
-                if (modifier <= 1 || X == targetPosition)
+                get { return hyperDashModifier; }
+                set
                {
-                    hyperDashModifier = 1;
-                    hyperDashDirection = 0;
+                    if (value == hyperDashModifier) return;
+                    hyperDashModifier = value;

-                    if (previouslyHyperDashing)
-                    {
-                        this.FadeColour(Color4.White, hyperdash_transition_length, Easing.OutQuint);
-                        this.FadeTo(1, hyperdash_transition_length, Easing.OutQuint);
-                    }
-                }
-                else
-                {
-                    hyperDashModifier = modifier;
-                    hyperDashDirection = Math.Sign(targetPosition - X);
-                    hyperDashTargetPosition = targetPosition;
+                    const float transition_length = 180;

-                    if (!previouslyHyperDashing)
+                    if (HyperDashing)
                    {
-                        this.FadeColour(Color4.OrangeRed, hyperdash_transition_length, Easing.OutQuint);
-                        this.FadeTo(0.2f, hyperdash_transition_length, Easing.OutQuint);
+                        this.FadeColour(Color4.OrangeRed, transition_length, Easing.OutQuint);
+                        this.FadeTo(0.2f, transition_length, Easing.OutQuint);
                        Trail = true;
                    }
+                    else
+                    {
+                        HyperDashDirection = 0;
+                        this.FadeColour(Color4.White, transition_length, Easing.OutQuint);
+                        this.FadeTo(1, transition_length, Easing.OutQuint);
+                    }
                }
            }

@@ -360,18 +337,12 @@ namespace osu.Game.Rulesets.Catch.UI
                var direction = Math.Sign(currentDirection);

                double dashModifier = Dashing ? 1 : 0.5;
-                double speed = BASE_SPEED * dashModifier * hyperDashModifier;
+
+                if (hyperDashModifier != 1 && (HyperDashDirection == 0 || direction == Math.Sign(HyperDashDirection)))
+                    dashModifier = hyperDashModifier;

                Scale = new Vector2(Math.Abs(Scale.X) * direction, Scale.Y);
-                X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * speed, 0, 1);
-
-                // Correct overshooting.
-                if (hyperDashDirection > 0 && hyperDashTargetPosition < X ||
-                    hyperDashDirection < 0 && hyperDashTargetPosition > X)
-                {
-                    X = hyperDashTargetPosition;
-                    SetHyperdashState();
-                }
+                X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * BASE_SPEED * dashModifier, 0, 1);
            }

            /// <summary>
@@ -407,31 +378,28 @@ namespace osu.Game.Rulesets.Catch.UI
                var fruit = caughtFruit.ToArray();

                foreach (var f in fruit)
-                    Explode(f);
-            }
-
-            public void Explode(DrawableHitObject fruit)
-            {
-                var originalX = fruit.X * Scale.X;
-
-                if (ExplodingFruitTarget != null)
                {
-                    fruit.Anchor = Anchor.TopLeft;
-                    fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
+                    var originalX = f.X * Scale.X;

-                    caughtFruit.Remove(fruit);
+                    if (ExplodingFruitTarget != null)
+                    {
+                        f.Anchor = Anchor.TopLeft;
+                        f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);

-                    ExplodingFruitTarget.Add(fruit);
+                        caughtFruit.Remove(f);
+
+                        ExplodingFruitTarget.Add(f);
+                    }
+
+                    f.MoveToY(f.Y - 50, 250, Easing.OutSine)
+                     .Then()
+                     .MoveToY(f.Y + 50, 500, Easing.InSine);
+
+                    f.MoveToX(f.X + originalX * 6, 1000);
+                    f.FadeOut(750);
+
+                    f.Expire();
                }
-
-                fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine)
-                 .Then()
-                 .MoveToY(fruit.Y + 50, 500, Easing.InSine);
-
-                fruit.MoveToX(fruit.X + originalX * 6, 1000);
-                fruit.FadeOut(750);
-
-                fruit.Expire();
            }

            private class CatcherSprite : Sprite
@@ -12,8 +12,7 @@ using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Rulesets.Mania.Tests
 {
-    [TestFixture]
-    public class ManiaBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
+    internal class ManiaBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
    {
        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";

@@ -37,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests
        protected override Ruleset CreateRuleset() => new ManiaRuleset();
    }

-    public struct ConvertValue : IEquatable<ConvertValue>
+    internal struct ConvertValue : IEquatable<ConvertValue>
    {
        /// <summary>
        /// A sane value to account for osu!stable using ints everwhere.
@@ -1,45 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Bindings;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    public abstract class ManiaInputTestCase : OsuTestCase
-    {
-        private readonly Container<Drawable> content;
-        protected override Container<Drawable> Content => content ?? base.Content;
-
-        protected ManiaInputTestCase(int keys)
-        {
-            base.Content.Add(content = new LocalInputManager(keys));
-        }
-
-        private class LocalInputManager : ManiaInputManager
-        {
-            public LocalInputManager(int variant)
-                : base(new ManiaRuleset().RulesetInfo, variant)
-            {
-            }
-
-            protected override RulesetKeyBindingContainer CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-                => new LocalKeyBindingContainer(ruleset, variant, unique);
-
-            private class LocalKeyBindingContainer : RulesetKeyBindingContainer
-            {
-                public LocalKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
-                    : base(ruleset, variant, unique)
-                {
-                }
-
-                protected override void ReloadMappings()
-                {
-                    KeyBindings = DefaultKeyBindings;
-                }
-            }
-        }
-    }
-}
@@ -1,37 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    /// <summary>
-    /// A container which provides a <see cref="IScrollingInfo"/> to children.
-    /// </summary>
-    public class ScrollingTestContainer : Container
-    {
-        private readonly ScrollingDirection direction;
-
-        public ScrollingTestContainer(ScrollingDirection direction)
-        {
-            this.direction = direction;
-        }
-
-        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
-            dependencies.CacheAs<IScrollingInfo>(new ScrollingInfo { Direction = { Value = direction }});
-            return dependencies;
-        }
-
-        private class ScrollingInfo : IScrollingInfo
-        {
-            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
-            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
-        }
-    }
-}
@@ -1,111 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mania.UI.Components;
-using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCaseColumn : ManiaInputTestCase
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Column),
-            typeof(ColumnBackground),
-            typeof(ColumnKeyArea),
-            typeof(ColumnHitObjectArea)
-        };
-
-        private readonly List<Column> columns = new List<Column>();
-
-        public TestCaseColumn()
-            : base(2)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Spacing = new Vector2(20, 0),
-                Children = new[]
-                {
-                    createColumn(ScrollingDirection.Up, ManiaAction.Key1),
-                    createColumn(ScrollingDirection.Down, ManiaAction.Key2)
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AddStep("note", createNote);
-            AddStep("hold note", createHoldNote);
-        }
-
-        private void createNote()
-        {
-            for (int i = 0; i < columns.Count; i++)
-            {
-                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
-                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                columns[i].Add(new DrawableNote(obj, columns[i].Action));
-            }
-        }
-
-        private void createHoldNote()
-        {
-            for (int i = 0; i < columns.Count; i++)
-            {
-                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
-                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                columns[i].Add(new DrawableHoldNote(obj, columns[i].Action));
-            }
-        }
-
-        private Drawable createColumn(ScrollingDirection direction, ManiaAction action)
-        {
-            var column = new Column(direction)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Height = 0.85f,
-                AccentColour = Color4.OrangeRed,
-                Action = action,
-                VisibleTimeRange = { Value = 2000 }
-            };
-
-            columns.Add(column);
-
-            return new ScrollingTestContainer(direction)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.X,
-                RelativeSizeAxes = Axes.Y,
-                Child = column
-            };
-        }
-    }
-}
@@ -0,0 +1,106 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Tests.Visual;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCaseManiaHitObjects : OsuTestCase
+    {
+        public TestCaseManiaHitObjects()
+        {
+            Note note1 = new Note();
+            Note note2 = new Note();
+            HoldNote holdNote = new HoldNote { StartTime = 1000 };
+
+            note1.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            note2.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                // Imagine that the containers containing the drawable notes are the "columns"
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Name = "Normal note column",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 50,
+                        Children = new[]
+                        {
+                            new Container
+                            {
+                                Name = "Timing section",
+                                RelativeSizeAxes = Axes.Both,
+                                RelativeChildSize = new Vector2(1, 10000),
+                                Children = new[]
+                                {
+                                    new DrawableNote(note1, ManiaAction.Key1)
+                                    {
+                                        Y = 5000,
+                                        LifetimeStart = double.MinValue,
+                                        LifetimeEnd = double.MaxValue,
+                                        AccentColour = Color4.Red
+                                    },
+                                    new DrawableNote(note2, ManiaAction.Key1)
+                                    {
+                                        Y = 6000,
+                                        LifetimeStart = double.MinValue,
+                                        LifetimeEnd = double.MaxValue,
+                                        AccentColour = Color4.Red
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "Hold note column",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 50,
+                        Children = new[]
+                        {
+                            new Container
+                            {
+                                Name = "Timing section",
+                                RelativeSizeAxes = Axes.Both,
+                                RelativeChildSize = new Vector2(1, 10000),
+                                Children = new[]
+                                {
+                                    new DrawableHoldNote(holdNote, ManiaAction.Key1)
+                                    {
+                                        Y = 5000,
+                                        Height = 1000,
+                                        LifetimeStart = double.MinValue,
+                                        LifetimeEnd = double.MaxValue,
+                                        AccentColour = Color4.Red,
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+    }
+}
@@ -0,0 +1,190 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCaseManiaPlayfield : OsuTestCase
+    {
+        private const double start_time = 500;
+        private const double duration = 500;
+
+        protected override double TimePerAction => 200;
+
+        private RulesetInfo maniaRuleset;
+
+        public TestCaseManiaPlayfield()
+        {
+            var rng = new Random(1337);
+
+            AddStep("1 column", () => createPlayfield(1));
+            AddStep("4 columns", () => createPlayfield(4));
+            AddStep("5 columns", () => createPlayfield(5));
+            AddStep("8 columns", () => createPlayfield(8));
+            AddStep("4 + 4 columns", () =>
+            {
+                var stages = new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 4 },
+                    new StageDefinition { Columns = 4 },
+                };
+                createPlayfield(stages);
+            });
+
+            AddStep("2 + 4 + 2 columns", () =>
+            {
+                var stages = new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 2 },
+                    new StageDefinition { Columns = 4 },
+                    new StageDefinition { Columns = 2 },
+                };
+                createPlayfield(stages);
+            });
+
+            AddStep("1 + 8 + 1 columns", () =>
+            {
+                var stages = new List<StageDefinition>
+                {
+                    new StageDefinition { Columns = 1 },
+                    new StageDefinition { Columns = 8 },
+                    new StageDefinition { Columns = 1 },
+                };
+                createPlayfield(stages);
+            });
+
+            AddStep("Reversed", () => createPlayfield(4, true));
+
+            AddStep("Notes with input", () => createPlayfieldWithNotes());
+            AddStep("Notes with input (reversed)", () => createPlayfieldWithNotes(true));
+            AddStep("Notes with gravity", () => createPlayfieldWithNotes());
+            AddStep("Notes with gravity (reversed)", () => createPlayfieldWithNotes(true));
+
+            AddStep("Hit explosion", () =>
+            {
+                var playfield = createPlayfield(4);
+
+                int col = rng.Next(0, 4);
+
+                var note = new Note { Column = col };
+                note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                var drawableNote = new DrawableNote(note, ManiaAction.Key1)
+                {
+                    AccentColour = playfield.Columns.ElementAt(col).AccentColour
+                };
+
+                playfield.OnJudgement(drawableNote, new ManiaJudgement { Result = HitResult.Perfect });
+                playfield.Columns[col].OnJudgement(drawableNote, new ManiaJudgement { Result = HitResult.Perfect });
+            });
+        }
+
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
+            => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets, SettingsStore settings)
+        {
+            maniaRuleset = rulesets.GetRuleset(3);
+
+            dependencies.Cache(new ManiaConfigManager(settings, maniaRuleset, 4));
+        }
+
+        private ManiaPlayfield createPlayfield(int cols, bool inverted = false)
+        {
+            var stages = new List<StageDefinition>
+            {
+                new StageDefinition { Columns = cols },
+            };
+
+            return createPlayfield(stages, inverted);
+        }
+
+        private ManiaPlayfield createPlayfield(List<StageDefinition> stages, bool inverted = false)
+        {
+            Clear();
+
+            var inputManager = new ManiaInputManager(maniaRuleset, stages.Sum(g => g.Columns)) { RelativeSizeAxes = Axes.Both };
+            Add(inputManager);
+
+            ManiaPlayfield playfield;
+
+            inputManager.Add(playfield = new ManiaPlayfield(stages)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            playfield.Inverted.Value = inverted;
+
+            return playfield;
+        }
+
+        private void createPlayfieldWithNotes(bool inverted = false)
+        {
+            Clear();
+
+            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
+
+            var inputManager = new ManiaInputManager(maniaRuleset, 4) { RelativeSizeAxes = Axes.Both };
+            Add(inputManager);
+
+            ManiaPlayfield playfield;
+            var stages = new List<StageDefinition>
+            {
+                new StageDefinition { Columns = 4 },
+            };
+
+            inputManager.Add(playfield = new ManiaPlayfield(stages)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Clock = new FramedClock(rateAdjustClock)
+            });
+
+            playfield.Inverted.Value = inverted;
+
+            for (double t = start_time; t <= start_time + duration; t += 100)
+            {
+                var note1 = new Note { StartTime = t, Column = 0 };
+                var note2 = new Note { StartTime = t, Column = 3 };
+
+                note1.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                note2.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                playfield.Add(new DrawableNote(note1, ManiaAction.Key1));
+                playfield.Add(new DrawableNote(note2, ManiaAction.Key4));
+            }
+
+            var holdNote1 = new HoldNote { StartTime = start_time, Duration = duration, Column = 1 };
+            var holdNote2 = new HoldNote { StartTime = start_time, Duration = duration, Column = 2 };
+
+            holdNote1.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            holdNote2.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            playfield.Add(new DrawableHoldNote(holdNote1, ManiaAction.Key2));
+            playfield.Add(new DrawableHoldNote(holdNote2, ManiaAction.Key3));
+        }
+    }
+}
@@ -1,168 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Tests.Visual;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCaseNotes : OsuTestCase
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DrawableNote),
-            typeof(DrawableHoldNote)
-        };
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = new FillFlowContainer
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(20),
-                Children = new[]
-                {
-                    createNoteDisplay(ScrollingDirection.Down),
-                    createNoteDisplay(ScrollingDirection.Up),
-                    createHoldNoteDisplay(ScrollingDirection.Down),
-                    createHoldNoteDisplay(ScrollingDirection.Up),
-                }
-            };
-        }
-
-        private Drawable createNoteDisplay(ScrollingDirection direction)
-        {
-            var note = new Note { StartTime = 999999999 };
-            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-            return new ScrollingTestContainer(direction)
-            {
-                AutoSizeAxes = Axes.Both,
-                Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLower()}")
-                {
-                    Child = new DrawableNote(note, ManiaAction.Key1) { AccentColour = Color4.OrangeRed }
-                }
-            };
-        }
-
-        private Drawable createHoldNoteDisplay(ScrollingDirection direction)
-        {
-            var note = new HoldNote { StartTime = 999999999, Duration = 1000 };
-            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-            return new ScrollingTestContainer(direction)
-            {
-                AutoSizeAxes = Axes.Both,
-                Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLower()}")
-                {
-                    Child = new DrawableHoldNote(note, ManiaAction.Key1)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        AccentColour = Color4.OrangeRed,
-                    }
-                }
-            };
-        }
-
-        private class NoteContainer : Container
-        {
-            private readonly Container content;
-            protected override Container<Drawable> Content => content;
-
-            private readonly ScrollingDirection direction;
-
-            public NoteContainer(ScrollingDirection direction, string description)
-            {
-                this.direction = direction;
-                AutoSizeAxes = Axes.Both;
-
-                InternalChild = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(0, 10),
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Width = 45,
-                            Height = 100,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 1.25f,
-                                    Colour = Color4.Black.Opacity(0.5f)
-                                },
-                                content = new Container { RelativeSizeAxes = Axes.Both }
-                            }
-                        },
-                        new SpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            TextSize = 14,
-                            Text = description
-                        }
-                    }
-                };
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                foreach (var obj in content.OfType<DrawableHitObject>())
-                {
-                    if (!(obj.HitObject is IHasEndTime endTime))
-                        continue;
-
-                    if (!obj.HasNestedHitObjects)
-                        continue;
-
-                    foreach (var nested in obj.NestedHitObjects)
-                    {
-                        double finalPosition = (nested.HitObject.StartTime - obj.HitObject.StartTime) / endTime.Duration;
-                        switch (direction)
-                        {
-                            case ScrollingDirection.Up:
-                                nested.Y = (float)(finalPosition * content.DrawHeight);
-                                break;
-                            case ScrollingDirection.Down:
-                                nested.Y = (float)(-finalPosition * content.DrawHeight);
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCasePerformancePoints : Game.Tests.Visual.TestCasePerformancePoints
+    {
+        public TestCasePerformancePoints()
+            : base(new ManiaRuleset())
+        {
+        }
+    }
+}
@@ -1,121 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCaseStage : ManiaInputTestCase
-    {
-        private const int columns = 4;
-
-        private readonly List<ManiaStage> stages = new List<ManiaStage>();
-
-        public TestCaseStage()
-            : base(columns)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Spacing = new Vector2(20, 0),
-                Children = new[]
-                {
-                    createStage(ScrollingDirection.Up, ManiaAction.Key1),
-                    createStage(ScrollingDirection.Down, ManiaAction.Key3)
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AddStep("note", createNote);
-            AddStep("hold note", createHoldNote);
-            AddStep("minor bar line", () => createBarLine(false));
-            AddStep("major bar line", () => createBarLine(true));
-        }
-
-        private void createNote()
-        {
-            foreach (var stage in stages)
-            {
-                for (int i = 0; i < stage.Columns.Count; i++)
-                {
-                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
-                    obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                    stage.Add(new DrawableNote(obj, stage.Columns[i].Action));
-                }
-            }
-        }
-
-        private void createHoldNote()
-        {
-            foreach (var stage in stages)
-            {
-                for (int i = 0; i < stage.Columns.Count; i++)
-                {
-                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
-                    obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                    stage.Add(new DrawableHoldNote(obj, stage.Columns[i].Action));
-                }
-            }
-        }
-
-        private void createBarLine(bool major)
-        {
-            foreach (var stage in stages)
-            {
-                var obj = new BarLine
-                {
-                    StartTime = Time.Current + 2000,
-                    ControlPoint = new TimingControlPoint(),
-                    BeatIndex = major ? 0 : 1
-                };
-
-                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                stage.Add(obj);
-            }
-        }
-
-        private Drawable createStage(ScrollingDirection direction, ManiaAction action)
-        {
-            var specialAction = ManiaAction.Special1;
-
-            var stage = new ManiaStage(direction, 0, new StageDefinition { Columns = 2 }, ref action, ref specialAction) { VisibleTimeRange = { Value = 2000 } };
-            stages.Add(stage);
-
-            return new ScrollingTestContainer(direction)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Y,
-                AutoSizeAxes = Axes.X,
-                Child = stage
-            };
-        }
-    }
-}
@@ -58,13 +58,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy

        public override Pattern Generate()
        {
-            if (TotalColumns == 1)
-            {
-                var pattern = new Pattern();
-                addToPattern(pattern, 0, HitObject.StartTime, endTime);
-                return pattern;
-            }
-
            if (spanCount > 1)
            {
                if (segmentDuration <= 90)
@@ -329,7 +322,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                    break;
            }

-            bool isDoubleSample(SampleInfo sample) => sample.Name == SampleInfo.HIT_CLAP || sample.Name == SampleInfo.HIT_FINISH;
+            bool isDoubleSample(SampleInfo sample) => sample.Name == SampleInfo.HIT_CLAP && sample.Name == SampleInfo.HIT_FINISH;

            bool canGenerateTwoNotes = (convertType & PatternType.LowProbability) == 0;
            canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(HitObject.StartTime).Any(isDoubleSample);
@@ -77,25 +77,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
            }
            else
                convertType |= PatternType.LowProbability;
-
-            if ((convertType & PatternType.KeepSingle) == 0)
-            {
-                if (HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && TotalColumns != 8)
-                    convertType |= PatternType.Mirror;
-                else
-                    convertType |= PatternType.Gathered;
-            }
        }

        public override Pattern Generate()
        {
-            if (TotalColumns == 1)
-            {
-                var pattern = new Pattern();
-                addToPattern(pattern, 0);
-                return pattern;
-            }
-
            int lastColumn = PreviousPattern.HitObjects.FirstOrDefault()?.Column ?? 0;

            if ((convertType & PatternType.Reverse) > 0 && PreviousPattern.HitObjects.Any())
@@ -361,7 +346,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
            addToCentre = false;

            if ((convertType & PatternType.ForceNotStack) > 0)
-                return getRandomNoteCount(1 / 2f + p2 / 2, p2, (p2 + p3) / 2, p3);
+                return getRandomNoteCount(p2 / 2, p2, (p2 + p3) / 2, p3);

            switch (TotalColumns)
            {
@@ -4,13 +4,12 @@
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Configuration;
-using osu.Game.Rulesets.Mania.UI;

 namespace osu.Game.Rulesets.Mania.Configuration
 {
    public class ManiaConfigManager : RulesetConfigManager<ManiaSetting>
    {
-        public ManiaConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
+        public ManiaConfigManager(SettingsStore settings, RulesetInfo ruleset, int variant)
            : base(settings, ruleset, variant)
        {
        }
@@ -20,7 +19,6 @@ namespace osu.Game.Rulesets.Mania.Configuration
            base.InitialiseDefaults();

            Set(ManiaSetting.ScrollTime, 1500.0, 50.0, 10000.0, 50.0);
-            Set(ManiaSetting.ScrollDirection, ManiaScrollingDirection.Down);
        }

        public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -31,7 +29,6 @@ namespace osu.Game.Rulesets.Mania.Configuration

    public enum ManiaSetting
    {
-        ScrollTime,
-        ScrollDirection
+        ScrollTime
    }
 }
@@ -1,18 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Mania.Difficulty
-{
-    public class ManiaDifficultyAttributes : DifficultyAttributes
-    {
-        public double GreatHitWindow;
-
-        public ManiaDifficultyAttributes(Mod[] mods, double starRating)
-            : base(mods, starRating)
-        {
-        }
-    }
-}
@@ -7,7 +7,6 @@ using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mods;

@@ -29,44 +28,47 @@ namespace osu.Game.Rulesets.Mania.Difficulty
        /// </summary>
        private const double decay_weight = 0.9;

-        private readonly bool isForCurrentRuleset;
+        /// <summary>
+        /// HitObjects are stored as a member variable.
+        /// </summary>
+        private readonly List<ManiaHitObjectDifficulty> difficultyHitObjects = new List<ManiaHitObjectDifficulty>();

-        public ManiaDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
-            : base(ruleset, beatmap)
+        public ManiaDifficultyCalculator(IBeatmap beatmap)
+            : base(beatmap)
        {
-            isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
        }

-        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
+        public ManiaDifficultyCalculator(IBeatmap beatmap, Mod[] mods)
+            : base(beatmap, mods)
        {
-            if (!beatmap.HitObjects.Any())
-                return new ManiaDifficultyAttributes(mods, 0);
+        }

-            var difficultyHitObjects = new List<ManiaHitObjectDifficulty>();
+        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
+        {
+            // Fill our custom DifficultyHitObject class, that carries additional information
+            difficultyHitObjects.Clear();

-            int columnCount = ((ManiaBeatmap)beatmap).TotalColumns;
+            int columnCount = (Beatmap as ManiaBeatmap)?.TotalColumns ?? 7;

            // Sort DifficultyHitObjects by StartTime of the HitObjects - just to make sure.
            // Note: Stable sort is done so that the ordering of hitobjects with equal start times doesn't change
-            difficultyHitObjects.AddRange(beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime));
+            difficultyHitObjects.AddRange(Beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime));

-            if (!calculateStrainValues(difficultyHitObjects, timeRate))
-                return new DifficultyAttributes(mods, 0);
+            if (!calculateStrainValues())
+                return 0;

+            double starRating = calculateDifficulty() * star_scaling_factor;

-            double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor;
+            if (categoryDifficulty != null)
+                categoryDifficulty["Strain"] = starRating;

-            return new ManiaDifficultyAttributes(mods, starRating)
-            {
-                // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be remoevd in the future
-                GreatHitWindow = (int)(beatmap.HitObjects.First().HitWindows.Great / 2) / timeRate
-            };
+            return starRating;
        }

-        private bool calculateStrainValues(List<ManiaHitObjectDifficulty> objects, double timeRate)
+        private bool calculateStrainValues()
        {
            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
-            using (var hitObjectsEnumerator = objects.GetEnumerator())
+            using (List<ManiaHitObjectDifficulty>.Enumerator hitObjectsEnumerator = difficultyHitObjects.GetEnumerator())
            {
                if (!hitObjectsEnumerator.MoveNext())
                    return false;
@@ -77,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                while (hitObjectsEnumerator.MoveNext())
                {
                    var next = hitObjectsEnumerator.Current;
-                    next?.CalculateStrains(current, timeRate);
+                    next?.CalculateStrains(current, TimeRate);
                    current = next;
                }

@@ -85,9 +87,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            }
        }

-        private double calculateDifficulty(List<ManiaHitObjectDifficulty> objects, double timeRate)
+        private double calculateDifficulty()
        {
-            double actualStrainStep = strain_step * timeRate;
+            double actualStrainStep = strain_step * TimeRate;

            // Find the highest strain value within each strain step
            List<double> highestStrains = new List<double>();
@@ -95,7 +97,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval

            ManiaHitObjectDifficulty previousHitObject = null;
-            foreach (var hitObject in objects)
+            foreach (var hitObject in difficultyHitObjects)
            {
                // While we are beyond the current interval push the currently available maximum to our strain list
                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
@@ -139,36 +141,5 @@ namespace osu.Game.Rulesets.Mania.Difficulty

            return difficulty;
        }
-
-        protected override Mod[] DifficultyAdjustmentMods
-        {
-            get
-            {
-                var mods = new Mod[]
-                {
-                    new ManiaModDoubleTime(),
-                    new ManiaModHalfTime(),
-                    new ManiaModEasy(),
-                    new ManiaModHardRock(),
-                };
-
-                if (isForCurrentRuleset)
-                    return mods;
-
-                // if we are a convert, we can be played in any key mod.
-                return mods.Concat(new Mod[]
-                {
-                    new ManiaModKey1(),
-                    new ManiaModKey2(),
-                    new ManiaModKey3(),
-                    new ManiaModKey4(),
-                    new ManiaModKey5(),
-                    new ManiaModKey6(),
-                    new ManiaModKey7(),
-                    new ManiaModKey8(),
-                    new ManiaModKey9(),
-                }).ToArray();
-            }
-        }
    }
 }
@@ -13,8 +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
@@ -27,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
        private int countMeh;
        private int countMiss;

-        public ManiaPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, Score score)
+        public ManiaPerformanceCalculator(Ruleset ruleset, IBeatmap beatmap, Score score)
            : base(ruleset, beatmap, score)
        {
        }
@@ -84,7 +82,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
        private double computeStrainValue()
        {
            // Obtain strain difficulty
-            double strainValue = Math.Pow(5 * Math.Max(1, Attributes.StarRating / 0.2) - 4.0, 2.2) / 135.0;
+            double strainValue = Math.Pow(5 * Math.Max(1, Attributes["Strain"] / 0.2) - 4.0, 2.2) / 135.0;

            // Longer maps are worth more
            strainValue *= 1.0 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
@@ -107,12 +105,14 @@ namespace osu.Game.Rulesets.Mania.Difficulty

        private double computeAccuracyValue(double strainValue)
        {
-            if (Attributes.GreatHitWindow <= 0)
+            // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be remoevd in the future
+            double hitWindowGreat = (int)(Beatmap.HitObjects.First().HitWindows.Great / 2) / TimeRate;
+            if (hitWindowGreat <= 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 - (hitWindowGreat - 34) * 0.006667)
                                       * strainValue
                                       * Math.Pow(Math.Max(0.0, scaledScore - 960000) / 40000, 1.1);

@@ -15,12 +15,8 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Beatmaps.Legacy;
-using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Difficulty;
 using osu.Game.Rulesets.Scoring;

@@ -30,7 +26,7 @@ namespace osu.Game.Rulesets.Mania
    {
        public override RulesetContainer CreateRulesetContainerWith(WorkingBeatmap beatmap) => new ManiaRulesetContainer(this, beatmap);
        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap);
-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, Score score) => new ManiaPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(IBeatmap beatmap, Score score) => new ManiaPerformanceCalculator(this, beatmap, score);

        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
        {
@@ -109,34 +105,78 @@ namespace osu.Game.Rulesets.Mania
                    {
                        new ManiaModEasy(),
                        new ManiaModNoFail(),
-                        new MultiMod(new ManiaModHalfTime(), new ManiaModDaycore()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModHalfTime(),
+                                new ManiaModDaycore(),
+                            },
+                        },
                    };
+
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
                        new ManiaModHardRock(),
-                        new MultiMod(new ManiaModSuddenDeath(), new ManiaModPerfect()),
-                        new MultiMod(new ManiaModDoubleTime(), new ManiaModNightcore()),
-                        new MultiMod(new ManiaModFadeIn(), new ManiaModHidden()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModSuddenDeath(),
+                                new ManiaModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModDoubleTime(),
+                                new ManiaModNightcore(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModFadeIn(),
+                                new ManiaModHidden(),
+                            }
+                        },
                        new ManiaModFlashlight(),
                    };
+
                case ModType.Special:
                    return new Mod[]
                    {
-                        new MultiMod(new ManiaModKey4(),
-                            new ManiaModKey5(),
-                            new ManiaModKey6(),
-                            new ManiaModKey7(),
-                            new ManiaModKey8(),
-                            new ManiaModKey9(),
-                            new ManiaModKey1(),
-                            new ManiaModKey2(),
-                            new ManiaModKey3()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModKey4(),
+                                new ManiaModKey5(),
+                                new ManiaModKey6(),
+                                new ManiaModKey7(),
+                                new ManiaModKey8(),
+                                new ManiaModKey9(),
+                                new ManiaModKey1(),
+                                new ManiaModKey2(),
+                                new ManiaModKey3(),
+                            },
+                        },
                        new ManiaModRandom(),
                        new ManiaModDualStages(),
                        new ManiaModMirror(),
-                        new MultiMod(new ManiaModAutoplay(), new ModCinema()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
                    };
+
                default:
                    return new Mod[] { };
            }
@@ -148,16 +188,12 @@ namespace osu.Game.Rulesets.Mania

        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_mania_o };

-        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(this, beatmap);
+        public override DifficultyCalculator CreateDifficultyCalculator(IBeatmap beatmap, Mod[] mods = null) => new ManiaDifficultyCalculator(beatmap, mods);

        public override int? LegacyID => 3;

        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();

-        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new ManiaConfigManager(settings, RulesetInfo);
-
-        public override RulesetSettingsSubsection CreateSettings() => new ManiaSettingsSubsection(this);
-
        public ManiaRuleset(RulesetInfo rulesetInfo = null)
            : base(rulesetInfo)
        {
@@ -1,34 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
-
-namespace osu.Game.Rulesets.Mania
-{
-    public class ManiaSettingsSubsection : RulesetSettingsSubsection
-    {
-        protected override string Header => "osu!mania";
-
-        public ManiaSettingsSubsection(ManiaRuleset ruleset)
-            : base(ruleset)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(ManiaConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new SettingsEnumDropdown<ManiaScrollingDirection>
-                {
-                    LabelText = "Scrolling direction",
-                    Bindable = config.GetBindable<ManiaScrollingDirection>(ManiaSetting.ScrollDirection)
-                }
-            };
-        }
-    }
-}
@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -26,18 +24,5 @@ namespace osu.Game.Rulesets.Mania.Mods

            mbc.TargetColumns = KeyCount;
        }
-
-        public override Type[] IncompatibleMods => new[]
-        {
-            typeof(ManiaModKey1),
-            typeof(ManiaModKey2),
-            typeof(ManiaModKey3),
-            typeof(ManiaModKey4),
-            typeof(ManiaModKey5),
-            typeof(ManiaModKey6),
-            typeof(ManiaModKey7),
-            typeof(ManiaModKey8),
-            typeof(ManiaModKey9),
-        }.Except(new[] { GetType() }).ToArray();
    }
 }
@@ -5,7 +5,6 @@ using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects.Drawables;
-using OpenTK.Graphics;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            : base(barLine)
        {
            RelativeSizeAxes = Axes.X;
-            Height = 2f;
+            Height = 1;

            AddInternal(new Box
            {
@@ -37,7 +36,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                Anchor = Anchor.BottomCentre,
                Origin = Anchor.BottomCentre,
                RelativeSizeAxes = Axes.Both,
-                Colour = new Color4(255, 204, 33, 255),
            });

            bool isMajor = barLine.BeatIndex % (int)barLine.ControlPoint.TimeSignature == 0;
@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using OpenTK.Graphics;
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -24,7 +23,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
        private readonly DrawableNote head;
        private readonly DrawableNote tail;

+        private readonly GlowPiece glowPiece;
        private readonly BodyPiece bodyPiece;
+        private readonly Container fullHeightContainer;

        /// <summary>
        /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -36,17 +37,25 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
        /// </summary>
        private bool hasBroken;

-        private readonly Container<DrawableHoldNoteTick> tickContainer;
-
        public DrawableHoldNote(HoldNote hitObject, ManiaAction action)
            : base(hitObject, action)
        {
+            Container<DrawableHoldNoteTick> tickContainer;
            RelativeSizeAxes = Axes.X;

            InternalChildren = new Drawable[]
            {
+                // The hit object itself cannot be used for various elements because the tail overshoots it
+                // So a specialized container that is updated to contain the tail height is used
+                fullHeightContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Child = glowPiece = new GlowPiece()
+                },
                bodyPiece = new BodyPiece
                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                    RelativeSizeAxes = Axes.X,
                },
                tickContainer = new Container<DrawableHoldNoteTick>
@@ -76,13 +85,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddNested(tail);
        }

-        protected override void OnDirectionChanged(ScrollingDirection direction)
-        {
-            base.OnDirectionChanged(direction);
-
-            bodyPiece.Anchor = bodyPiece.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-        }
-
        public override Color4 AccentColour
        {
            get { return base.AccentColour; }
@@ -90,10 +92,21 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            {
                base.AccentColour = value;

+                glowPiece.AccentColour = value;
                bodyPiece.AccentColour = value;
                head.AccentColour = value;
                tail.AccentColour = value;
-                tickContainer.ForEach(t => t.AccentColour = value);
+            }
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    // Good enough for now, we just want them to have a lifetime end
+                    this.Delay(2000).Expire();
+                    break;
            }
        }

@@ -108,8 +121,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            base.Update();

            // Make the body piece not lie under the head note
-            bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * head.Height / 2;
-            bodyPiece.Height = DrawHeight - head.Height / 2 + tail.Height / 2;
+            bodyPiece.Y = head.Height;
+            bodyPiece.Height = DrawHeight - head.Height;
+
+            // Make the fullHeightContainer "contain" the height of the tail note, keeping in mind
+            // that the tail note overshoots the height of this hit object
+            fullHeightContainer.Height = DrawHeight + tail.Height;
        }

        public bool OnPressed(ManiaAction action)
@@ -158,6 +175,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                : base(holdNote.HitObject.Head, action)
            {
                this.holdNote = holdNote;
+
+                GlowPiece.Alpha = 0;
            }

            public override bool OnPressed(ManiaAction action)
@@ -175,6 +194,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables

                return true;
            }
+
+            protected override void UpdateState(ArmedState state)
+            {
+                // The holdnote keeps scrolling through for now, so having the head disappear looks weird
+            }
        }

        /// <summary>
@@ -195,6 +219,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                : base(holdNote.HitObject.Tail, action)
            {
                this.holdNote = holdNote;
+
+                GlowPiece.Alpha = 0;
            }

            protected override void CheckForJudgements(bool userTriggered, double timeOffset)
@@ -227,6 +253,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                });
            }

+            protected override void UpdateState(ArmedState state)
+            {
+                // The holdnote keeps scrolling through, so having the tail disappear looks weird
+            }
+
            public override bool OnPressed(ManiaAction action) => false; // Tail doesn't handle key down

            public override bool OnReleased(ManiaAction action)
@@ -8,6 +8,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Scoring;

@@ -86,6 +87,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddJudgement(new HoldNoteTickJudgement { Result = HitResult.Perfect });
        }

+        protected override void UpdateState(ArmedState state)
+        {
+            switch (State.Value)
+            {
+                case ArmedState.Hit:
+                    AccentColour = Color4.Green;
+                    break;
+            }
+        }
+
        protected override void Update()
        {
            if (AllJudged)
@@ -1,12 +1,8 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -20,40 +16,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables

        public new TObject HitObject;

-        protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
-
        protected DrawableManiaHitObject(TObject hitObject, ManiaAction? action = null)
            : base(hitObject)
        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
            HitObject = hitObject;

            if (action != null)
                Action = action.Value;
        }
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            Direction.BindTo(scrollingInfo.Direction);
-            Direction.BindValueChanged(OnDirectionChanged, true);
-        }
-
-        protected virtual void OnDirectionChanged(ScrollingDirection direction)
-        {
-            Anchor = Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-            switch (state)
-            {
-                case ArmedState.Miss:
-                    this.FadeOut(150, Easing.In).Expire();
-                    break;
-                case ArmedState.Hit:
-                    this.FadeOut(150, Easing.OutQuint).Expire();
-                    break;
-            }
-        }
    }
 }
@@ -1,15 +1,13 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.Extensions.Color4Extensions;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -18,6 +16,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
    /// </summary>
    public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
    {
+        protected readonly GlowPiece GlowPiece;
+
+        private readonly LaneGlowPiece laneGlowPiece;
        private readonly NotePiece headPiece;

        public DrawableNote(Note hitObject, ManiaAction action)
@@ -26,17 +27,20 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            RelativeSizeAxes = Axes.X;
            AutoSizeAxes = Axes.Y;

-            CornerRadius = 5;
-            Masking = true;
-
-            InternalChild = headPiece = new NotePiece();
-        }
-
-        protected override void OnDirectionChanged(ScrollingDirection direction)
-        {
-            base.OnDirectionChanged(direction);
-
-            headPiece.Anchor = headPiece.Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            InternalChildren = new Drawable[]
+            {
+                laneGlowPiece = new LaneGlowPiece
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                },
+                GlowPiece = new GlowPiece(),
+                headPiece = new NotePiece
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre
+                }
+            };
        }

        public override Color4 AccentColour
@@ -45,14 +49,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            set
            {
                base.AccentColour = value;
+                laneGlowPiece.AccentColour = AccentColour;
+                GlowPiece.AccentColour = AccentColour;
                headPiece.AccentColour = AccentColour;
-
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Colour = AccentColour.Lighten(1f).Opacity(0.6f),
-                    Radius = 10,
-                };
            }
        }

@@ -72,6 +71,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddJudgement(new ManiaJudgement { Result = result });
        }

+        protected override void UpdateState(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                case ArmedState.Miss:
+                    this.FadeOut(100).Expire();
+                    break;
+            }
+        }
+
        public virtual bool OnPressed(ManiaAction action)
        {
            if (action != Action)
@@ -123,8 +123,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
            if (!IsLoaded)
                return;

-            foreground.Colour = AccentColour.Opacity(0.9f);
-            background.Colour = AccentColour.Opacity(0.6f);
+            foreground.Colour = AccentColour.Opacity(0.4f);
+            background.Colour = AccentColour.Opacity(0.2f);

            subtractionCache.Invalidate();
        }
@@ -1,16 +1,12 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
 {
@@ -19,17 +15,15 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
    /// </summary>
    internal class NotePiece : Container, IHasAccentColour
    {
-        public const float NOTE_HEIGHT = 10;
+        private const float head_height = 10;
        private const float head_colour_height = 6;

-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
        private readonly Box colouredBox;

        public NotePiece()
        {
            RelativeSizeAxes = Axes.X;
-            Height = NOTE_HEIGHT;
+            Height = head_height;

            Children = new[]
            {
@@ -39,6 +33,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                },
                colouredBox = new Box
                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                    RelativeSizeAxes = Axes.X,
                    Height = head_colour_height,
                    Alpha = 0.2f
@@ -46,16 +42,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
            };
        }

-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(direction =>
-            {
-                colouredBox.Anchor = colouredBox.Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-            }, true);
-        }
-
        private Color4 accentColour;
        public Color4 AccentColour
        {
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Mania.Replays

        protected override bool IsImportant(ManiaReplayFrame frame) => frame.Actions.Any();

-        public override List<IInput> GetPendingInputs() => new List<IInput> { new ReplayState<ManiaAction> { PressedActions = CurrentFrame.Actions } };
+        public override List<InputState> GetPendingStates() => new List<InputState> { new ReplayState<ManiaAction> { PressedActions = CurrentFrame.Actions } };
    }
 }
@@ -1,73 +1,111 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
+using System;
 using System.Linq;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class Column : ManiaScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
+    public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
    {
+        private const float key_icon_size = 10;
+        private const float key_icon_corner_radius = 3;
+        private const float key_icon_border_radius = 2;
+
+        private const float hit_target_height = 10;
+        private const float hit_target_bar_height = 2;
+
        private const float column_width = 45;
        private const float special_column_width = 70;

-        private ManiaAction action;
+        public ManiaAction Action;

-        public ManiaAction Action
-        {
-            get => action;
-            set
-            {
-                if (action == value)
-                    return;
-                action = value;
-
-                background.Action = value;
-                keyArea.Action = value;
-            }
-        }
-
-        private readonly ColumnBackground background;
-        private readonly ColumnKeyArea keyArea;
-        private readonly ColumnHitObjectArea hitObjectArea;
+        private readonly Box background;
+        private readonly Container hitTargetBar;
+        private readonly Container keyIcon;

        internal readonly Container TopLevelContainer;
        private readonly Container explosionContainer;

-        protected override Container<Drawable> Content => hitObjectArea;
+        protected override Container<Drawable> Content => content;
+        private readonly Container<Drawable> content;

-        public Column(ScrollingDirection direction)
-            : base(direction)
+        private const float opacity_released = 0.1f;
+        private const float opacity_pressed = 0.25f;
+
+        public Column()
+            : base(ScrollingDirection.Up)
        {
            RelativeSizeAxes = Axes.Y;
            Width = column_width;

-            Masking = true;
-            CornerRadius = 5;
-
-            background = new ColumnBackground { RelativeSizeAxes = Axes.Both };
-
-            Container hitTargetContainer;
-
-            InternalChildren = new[]
+            InternalChildren = new Drawable[]
            {
-                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
-                background.CreateProxy(),
-                hitTargetContainer = new Container
+                background = new Box
+                {
+                    Name = "Background",
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = opacity_released
+                },
+                new Container
                {
                    Name = "Hit target + hit objects",
                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Top = ManiaStage.HIT_TARGET_POSITION },
                    Children = new Drawable[]
                    {
-                        hitObjectArea = new ColumnHitObjectArea { RelativeSizeAxes = Axes.Both },
+                        new Container
+                        {
+                            Name = "Hit target",
+                            RelativeSizeAxes = Axes.X,
+                            Height = hit_target_height,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Name = "Background",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Black
+                                },
+                                hitTargetBar = new Container
+                                {
+                                    Name = "Bar",
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = hit_target_bar_height,
+                                    Masking = true,
+                                    Children = new[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        content = new Container
+                        {
+                            Name = "Hit objects",
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        // For column lighting, we need to capture input events before the notes
+                        new InputTarget
+                        {
+                            Pressed = onPressed,
+                            Released = onReleased
+                        },
                        explosionContainer = new Container
                        {
                            Name = "Hit explosions",
@@ -75,27 +113,46 @@ namespace osu.Game.Rulesets.Mania.UI
                        }
                    }
                },
-                keyArea = new ColumnKeyArea
+                new Container
                {
+                    Name = "Key",
                    RelativeSizeAxes = Axes.X,
                    Height = ManiaStage.HIT_TARGET_POSITION,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Name = "Key gradient",
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
+                            Alpha = 0.5f
+                        },
+                        keyIcon = new Container
+                        {
+                            Name = "Key icon",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(key_icon_size),
+                            Masking = true,
+                            CornerRadius = key_icon_corner_radius,
+                            BorderThickness = 2,
+                            BorderColour = Color4.White, // Not true
+                            Children = new[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    AlwaysPresent = true
+                                }
+                            }
+                        }
+                    }
                },
-                background,
                TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
            };

            TopLevelContainer.Add(explosionContainer.CreateProxy());
-
-            Direction.BindValueChanged(d =>
-            {
-                hitTargetContainer.Padding = new MarginPadding
-                {
-                    Top = d == ScrollingDirection.Up ? ManiaStage.HIT_TARGET_POSITION : 0,
-                    Bottom = d == ScrollingDirection.Down ? ManiaStage.HIT_TARGET_POSITION : 0,
-                };
-
-                keyArea.Anchor = keyArea.Origin= d == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-            }, true);
        }

        public override Axes RelativeSizeAxes => Axes.Y;
@@ -124,9 +181,21 @@ namespace osu.Game.Rulesets.Mania.UI
                    return;
                accentColour = value;

-                background.AccentColour = value;
-                keyArea.AccentColour = value;
-                hitObjectArea.AccentColour = value;
+                background.Colour = accentColour;
+
+                hitTargetBar.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = accentColour.Opacity(0.5f),
+                };
+
+                keyIcon.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = accentColour.Opacity(0.5f),
+                };
            }
        }

@@ -147,10 +216,48 @@ namespace osu.Game.Rulesets.Mania.UI
            if (!judgement.IsHit || !judgedObject.DisplayJudgement)
                return;

-            explosionContainer.Add(new HitExplosion(judgedObject)
+            explosionContainer.Add(new HitExplosion(judgedObject));
+        }
+
+        private bool onPressed(ManiaAction action)
+        {
+            if (action == Action)
            {
-                Anchor = Direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre
-            });
+                background.FadeTo(opacity_pressed, 50, Easing.OutQuint);
+                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint);
+            }
+
+            return false;
+        }
+
+        private bool onReleased(ManiaAction action)
+        {
+            if (action == Action)
+            {
+                background.FadeTo(opacity_released, 800, Easing.OutQuart);
+                keyIcon.ScaleTo(1f, 400, Easing.OutQuart);
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// This is a simple container which delegates various input events that have to be captured before the notes.
+        /// </summary>
+        private class InputTarget : Container, IKeyBindingHandler<ManiaAction>
+        {
+            public Func<ManiaAction, bool> Pressed;
+            public Func<ManiaAction, bool> Released;
+
+            public InputTarget()
+            {
+                RelativeSizeAxes = Axes.Both;
+                AlwaysPresent = true;
+                Alpha = 0;
+            }
+
+            public bool OnPressed(ManiaAction action) => Pressed?.Invoke(action) ?? false;
+            public bool OnReleased(ManiaAction action) => Released?.Invoke(action) ?? false;
        }

        public bool OnPressed(ManiaAction action)
@@ -158,13 +265,8 @@ namespace osu.Game.Rulesets.Mania.UI
            if (action != Action)
                return false;

-            var nextObject =
-                HitObjects.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
-                // fallback to non-alive objects to find next off-screen object
-                HitObjects.Objects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
-                HitObjects.Objects.LastOrDefault();
-
-            nextObject?.PlaySamples();
+            var hitObject = HitObjects.Objects.LastOrDefault(h => h.HitObject.StartTime > Time.Current) ?? HitObjects.Objects.FirstOrDefault();
+            hitObject?.PlaySamples();

            return true;
        }
@@ -1,106 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI.Components
-{
-    public class ColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
-    {
-        public ManiaAction Action;
-
-        private Box background;
-        private Box backgroundOverlay;
-
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            InternalChildren = new[]
-            {
-                background = new Box
-                {
-                    Name = "Background",
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.3f
-                },
-                backgroundOverlay = new Box
-                {
-                    Name = "Background Gradient Overlay",
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
-                    Blending = BlendingMode.Additive,
-                    Alpha = 0
-                }
-            };
-
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(direction =>
-            {
-                backgroundOverlay.Anchor = backgroundOverlay.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-                updateColours();
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-                accentColour = value;
-
-                updateColours();
-            }
-        }
-
-        private void updateColours()
-        {
-            if (!IsLoaded)
-                return;
-
-            background.Colour = AccentColour;
-
-            var brightPoint = AccentColour.Opacity(0.6f);
-            var dimPoint = AccentColour.Opacity(0);
-
-            backgroundOverlay.Colour = ColourInfo.GradientVertical(
-                direction.Value == ScrollingDirection.Up ? brightPoint : dimPoint,
-                direction.Value == ScrollingDirection.Up ? dimPoint : brightPoint);
-        }
-
-        public bool OnPressed(ManiaAction action)
-        {
-            if (action == Action)
-                backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
-            return false;
-        }
-
-        public bool OnReleased(ManiaAction action)
-        {
-            if (action == Action)
-                backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
-            return false;
-        }
-    }
-}
@@ -1,99 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI.Components
-{
-    public class ColumnHitObjectArea : Container, IHasAccentColour
-    {
-        private const float hit_target_height = 10;
-        private const float hit_target_bar_height = 2;
-
-        private Container<Drawable> content;
-        protected override Container<Drawable> Content => content;
-
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        private Container hitTargetLine;
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            Drawable hitTargetBar;
-
-            InternalChildren = new[]
-            {
-                hitTargetBar = new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = hit_target_height,
-                    Colour = Color4.Black
-                },
-                hitTargetLine = new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = hit_target_bar_height,
-                    Masking = true,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                },
-                content = new Container
-                {
-                    Name = "Hit objects",
-                    RelativeSizeAxes = Axes.Both,
-                },
-            };
-
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(direction =>
-            {
-                Anchor anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-
-                hitTargetBar.Anchor = hitTargetBar.Origin = anchor;
-                hitTargetLine.Anchor = hitTargetLine.Origin = anchor;
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-                accentColour = value;
-
-                updateColours();
-            }
-        }
-
-        private void updateColours()
-        {
-            if (!IsLoaded)
-                return;
-
-            hitTargetLine.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Radius = 5,
-                Colour = accentColour.Opacity(0.5f),
-            };
-        }
-    }
-}
@@ -1,122 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI.Components
-{
-    public class ColumnKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
-    {
-        private const float key_icon_size = 10;
-        private const float key_icon_corner_radius = 3;
-
-        public ManiaAction Action;
-
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        private Container keyIcon;
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            Drawable gradient;
-
-            InternalChildren = new[]
-            {
-                gradient = new Box
-                {
-                    Name = "Key gradient",
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.5f
-                },
-                keyIcon = new Container
-                {
-                    Name = "Key icon",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(key_icon_size),
-                    Masking = true,
-                    CornerRadius = key_icon_corner_radius,
-                    BorderThickness = 2,
-                    BorderColour = Color4.White, // Not true
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
-                    }
-                }
-            };
-
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(direction =>
-            {
-                gradient.Colour = ColourInfo.GradientVertical(
-                    direction == ScrollingDirection.Up ? Color4.Black : Color4.Black.Opacity(0),
-                    direction == ScrollingDirection.Up ? Color4.Black.Opacity(0) : Color4.Black);
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-                accentColour = value;
-
-                updateColours();
-            }
-        }
-
-        private void updateColours()
-        {
-            if (!IsLoaded)
-                return;
-
-            keyIcon.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Radius = 5,
-                Colour = accentColour.Opacity(0.5f),
-            };
-        }
-
-        public bool OnPressed(ManiaAction action)
-        {
-            if (action == Action)
-                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint).Then().ScaleTo(1.3f, 250, Easing.OutQuint);
-            return false;
-        }
-
-        public bool OnReleased(ManiaAction action)
-        {
-            if (action == Action)
-                keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
-            return false;
-        }
-    }
-}
@@ -1,56 +1,54 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
-using OpenTK;

 namespace osu.Game.Rulesets.Mania.UI
 {
    internal class HitExplosion : CompositeDrawable
    {
-        public override bool RemoveWhenNotAlive => true;
-
-        private readonly CircularContainer circle;
+        private readonly Box inner;

        public HitExplosion(DrawableHitObject judgedObject)
        {
            bool isTick = judgedObject is DrawableHoldNoteTick;

+            Anchor = Anchor.TopCentre;
            Origin = Anchor.Centre;

-            RelativeSizeAxes = Axes.X;
-            Y = NotePiece.NOTE_HEIGHT / 2;
-            Height = NotePiece.NOTE_HEIGHT;
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(isTick ? 0.5f : 1);
+            FillMode = FillMode.Fit;

-            // scale roughly in-line with visual appearance of notes
-            Scale = new Vector2(isTick ? 0.4f : 0.8f);
+            Blending = BlendingMode.Additive;

-            InternalChild = circle = new CircularContainer
+            Color4 accent = isTick ? Color4.White : judgedObject.AccentColour;
+
+            InternalChild = new CircularContainer
            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
                RelativeSizeAxes = Axes.Both,
                Masking = true,
-                // we want our size to be very small so the glow dominates it.
-                Size = new Vector2(0.1f),
+                BorderThickness = 1,
+                BorderColour = accent,
                EdgeEffect = new EdgeEffectParameters
                {
                    Type = EdgeEffectType.Glow,
-                    Colour = Interpolation.ValueAt(0.1f, judgedObject.AccentColour, Color4.White, 0, 1),
-                    Radius = 100,
+                    Colour = accent,
+                    Radius = 10,
+                    Hollow = true
                },
-                Child = new Box
+                Child = inner = new Box
                {
-                    Alpha = 0,
                    RelativeSizeAxes = Axes.Both,
-                    AlwaysPresent = true
+                    Colour = accent,
+                    Alpha = 1,
+                    AlwaysPresent = true,
                }
            };
        }
@@ -59,8 +57,8 @@ namespace osu.Game.Rulesets.Mania.UI
        {
            base.LoadComplete();

-            circle.ResizeTo(circle.Size * new Vector2(4, 20), 1000, Easing.OutQuint);
-            this.FadeIn(16).Then().FadeOut(500, Easing.OutQuint);
+            this.ScaleTo(2f, 600, Easing.OutQuint).FadeOut(500);
+            inner.FadeOut(250);

            Expire(true);
        }
@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Configuration;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.UI.Scrolling;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public interface IScrollingInfo
-    {
-        /// <summary>
-        /// The direction <see cref="HitObject"/>s should scroll in.
-        /// </summary>
-        IBindable<ScrollingDirection> Direction { get; }
-    }
-}
@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -16,13 +17,18 @@ using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class ManiaPlayfield : ManiaScrollingPlayfield
+    public class ManiaPlayfield : ScrollingPlayfield
    {
+        /// <summary>
+        /// Whether this playfield should be inverted. This flips everything inside the playfield.
+        /// </summary>
+        public readonly Bindable<bool> Inverted = new Bindable<bool>(true);
+
        public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList();
        private readonly List<ManiaStage> stages = new List<ManiaStage>();

-        public ManiaPlayfield(ScrollingDirection direction, List<StageDefinition> stageDefinitions)
-            : base(direction)
+        public ManiaPlayfield(List<StageDefinition> stageDefinitions)
+            : base(ScrollingDirection.Up)
        {
            if (stageDefinitions == null)
                throw new ArgumentNullException(nameof(stageDefinitions));
@@ -30,6 +36,8 @@ namespace osu.Game.Rulesets.Mania.UI
            if (stageDefinitions.Count <= 0)
                throw new ArgumentException("Can't have zero or fewer stages.");

+            Inverted.Value = true;
+
            GridContainer playfieldGrid;
            InternalChild = playfieldGrid = new GridContainer
            {
@@ -42,8 +50,9 @@ namespace osu.Game.Rulesets.Mania.UI
            int firstColumnIndex = 0;
            for (int i = 0; i < stageDefinitions.Count; i++)
            {
-                var newStage = new ManiaStage(direction, firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
+                var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
                newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
+                newStage.Inverted.BindTo(Inverted);

                playfieldGrid.Content[0][i] = newStage;

@@ -4,17 +4,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
+using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
@@ -35,9 +36,6 @@ namespace osu.Game.Rulesets.Mania.UI

        public IEnumerable<BarLine> BarLines;

-        private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
-        private ScrollingInfo scrollingInfo;
-
        public ManiaRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
            : base(ruleset, beatmap)
        {
@@ -70,24 +68,12 @@ namespace osu.Game.Rulesets.Mania.UI
        }

        [BackgroundDependencyLoader]
-        private void load(ManiaConfigManager config)
+        private void load()
        {
            BarLines.ForEach(Playfield.Add);
-
-            config.BindWith(ManiaSetting.ScrollDirection, configDirection);
-            configDirection.BindValueChanged(d => scrollingInfo.Direction.Value = (ScrollingDirection)d, true);
        }

-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
-        {
-            dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
-            dependencies.CacheAs<IScrollingInfo>(scrollingInfo = new ScrollingInfo());
-            return dependencies;
-        }
-
-        protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(scrollingInfo.Direction, Beatmap.Stages)
+        protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages)
        {
            Anchor = Anchor.Centre,
            Origin = Anchor.Centre,
@@ -118,10 +104,6 @@ namespace osu.Game.Rulesets.Mania.UI

        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);

-        private class ScrollingInfo : IScrollingInfo
-        {
-            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
-            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
-        }
+        protected override IRulesetConfigManager CreateConfig(Ruleset ruleset, SettingsStore settings) => new ManiaConfigManager(settings, Ruleset.RulesetInfo, Variant);
    }
 }
@@ -1,13 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.UI.Scrolling;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public enum ManiaScrollingDirection
-    {
-        Up = ScrollingDirection.Up,
-        Down = ScrollingDirection.Down
-    }
-}
@@ -1,26 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Game.Rulesets.UI.Scrolling;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public class ManiaScrollingPlayfield : ScrollingPlayfield
-    {
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        public ManiaScrollingPlayfield(ScrollingDirection direction)
-            : base(direction)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(direction => Direction.Value = direction, true);
-        }
-    }
-}
@@ -5,9 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -23,15 +25,20 @@ namespace osu.Game.Rulesets.Mania.UI
    /// <summary>
    /// A collection of <see cref="Column"/>s.
    /// </summary>
-    internal class ManiaStage : ManiaScrollingPlayfield
+    internal class ManiaStage : ScrollingPlayfield
    {
        public const float HIT_TARGET_POSITION = 50;

+        /// <summary>
+        /// Whether this playfield should be inverted. This flips everything inside the playfield.
+        /// </summary>
+        public readonly Bindable<bool> Inverted = new Bindable<bool>(true);
+
        public IReadOnlyList<Column> Columns => columnFlow.Children;
        private readonly FillFlowContainer<Column> columnFlow;

-        protected override Container<Drawable> Content => barLineContainer;
-        private readonly Container<Drawable> barLineContainer;
+        protected override Container<Drawable> Content => content;
+        private readonly Container<Drawable> content;

        public Container<DrawableManiaJudgement> Judgements => judgements;
        private readonly JudgementContainer<DrawableManiaJudgement> judgements;
@@ -43,8 +50,8 @@ namespace osu.Game.Rulesets.Mania.UI

        private readonly int firstColumnIndex;

-        public ManiaStage(ScrollingDirection direction, int firstColumnIndex, StageDefinition definition, ref ManiaAction normalColumnStartAction, ref ManiaAction specialColumnStartAction)
-            : base(direction)
+        public ManiaStage(int firstColumnIndex, StageDefinition definition, ref ManiaAction normalColumnStartAction, ref ManiaAction specialColumnStartAction)
+            : base(ScrollingDirection.Up)
        {
            this.firstColumnIndex = firstColumnIndex;

@@ -71,7 +78,6 @@ namespace osu.Game.Rulesets.Mania.UI
                            RelativeSizeAxes = Axes.Y,
                            AutoSizeAxes = Axes.X,
                            Masking = true,
-                            CornerRadius = 5,
                            Children = new Drawable[]
                            {
                                new Box
@@ -100,12 +106,13 @@ namespace osu.Game.Rulesets.Mania.UI
                            Width = 1366, // Bar lines should only be masked on the vertical axis
                            BypassAutoSizeAxes = Axes.Both,
                            Masking = true,
-                            Child = barLineContainer = new Container
+                            Child = content = new Container
                            {
                                Name = "Bar lines",
                                Anchor = Anchor.TopCentre,
                                Origin = Anchor.TopCentre,
                                RelativeSizeAxes = Axes.Y,
+                                Padding = new MarginPadding { Top = HIT_TARGET_POSITION }
                            }
                        },
                        judgements = new JudgementContainer<DrawableManiaJudgement>
@@ -124,7 +131,7 @@ namespace osu.Game.Rulesets.Mania.UI
            for (int i = 0; i < definition.Columns; i++)
            {
                var isSpecial = definition.IsSpecialColumn(i);
-                var column = new Column(direction)
+                var column = new Column
                {
                    IsSpecial = isSpecial,
                    Action = isSpecial ? specialColumnStartAction++ : normalColumnStartAction++
@@ -133,14 +140,14 @@ namespace osu.Game.Rulesets.Mania.UI
                AddColumn(column);
            }

-            Direction.BindValueChanged(d =>
-            {
-                barLineContainer.Padding = new MarginPadding
-                {
-                    Top = d == ScrollingDirection.Up ? HIT_TARGET_POSITION : 0,
-                    Bottom = d == ScrollingDirection.Down ? HIT_TARGET_POSITION : 0,
-                };
-            }, true);
+            Inverted.ValueChanged += invertedChanged;
+            Inverted.TriggerChange();
+        }
+
+        private void invertedChanged(bool newValue)
+        {
+            Scale = new Vector2(1, newValue ? -1 : 1);
+            Judgements.Scale = Scale;
        }

        public void AddColumn(Column c)
@@ -176,15 +183,15 @@ namespace osu.Game.Rulesets.Mania.UI
        }

        [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
        {
            normalColumnColours = new List<Color4>
            {
-                new Color4(94, 0, 57, 255),
-                new Color4(6, 84, 0, 255)
+                colours.RedDark,
+                colours.GreenDark
            };

-            specialColumnColour = new Color4(0, 48, 63, 255);
+            specialColumnColour = colours.BlueDark;

            // Set the special column + colour + key
            foreach (var column in Columns)
@@ -211,7 +218,7 @@ namespace osu.Game.Rulesets.Mania.UI
        {
            // Due to masking differences, it is not possible to get the width of the columns container automatically
            // While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually
-            barLineContainer.Width = columnFlow.Width;
+            content.Width = columnFlow.Width;
        }
    }
 }
@@ -8,19 +8,17 @@ using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Tests.Beatmaps;
+using OpenTK;

 namespace osu.Game.Rulesets.Osu.Tests
 {
-    [TestFixture]
-    public class OsuBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
+    internal class OsuBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
    {
        protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";

        [TestCase("basic")]
        [TestCase("colinear-perfect-curve")]
-        [TestCase("slider-ticks")]
        public new void Test(string name)
        {
            base.Test(name);
@@ -28,30 +26,24 @@ namespace osu.Game.Rulesets.Osu.Tests

        protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
        {
-            switch (hitObject)
-            {
-                case Slider slider:
-                    foreach (var nested in slider.NestedHitObjects)
-                        yield return createConvertValue(nested);
-                    break;
-                default:
-                    yield return createConvertValue(hitObject);
-                    break;
-            }
+            var startPosition = (hitObject as IHasPosition)?.Position ?? new Vector2(256, 192);
+            var endPosition = (hitObject as Slider)?.EndPosition ?? startPosition;

-            ConvertValue createConvertValue(HitObject obj) => new ConvertValue
+            yield return new ConvertValue
            {
-                StartTime = obj.StartTime,
-                EndTime = (obj as IHasEndTime)?.EndTime ?? obj.StartTime,
-                X = (obj as IHasPosition)?.X ?? OsuPlayfield.BASE_SIZE.X / 2,
-                Y = (obj as IHasPosition)?.Y ?? OsuPlayfield.BASE_SIZE.Y / 2,
+                StartTime = hitObject.StartTime,
+                EndTime = (hitObject as IHasEndTime)?.EndTime ?? hitObject.StartTime,
+                StartX = startPosition.X,
+                StartY = startPosition.Y,
+                EndX = endPosition.X,
+                EndY = endPosition.Y
            };
        }

        protected override Ruleset CreateRuleset() => new OsuRuleset();
    }

-    public struct ConvertValue : IEquatable<ConvertValue>
+    internal struct ConvertValue : IEquatable<ConvertValue>
    {
        /// <summary>
        /// A sane value to account for osu!stable using ints everwhere.
@@ -60,13 +52,17 @@ namespace osu.Game.Rulesets.Osu.Tests

        public double StartTime;
        public double EndTime;
-        public float X;
-        public float Y;
+        public float StartX;
+        public float StartY;
+        public float EndX;
+        public float EndY;

        public bool Equals(ConvertValue other)
-            => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
+            => Precision.AlmostEquals(StartTime, other.StartTime)
               && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
-               && Precision.AlmostEquals(X, other.X, conversion_lenience)
-               && Precision.AlmostEquals(Y, other.Y, conversion_lenience);
+               && Precision.AlmostEquals(StartX, other.StartX)
+               && Precision.AlmostEquals(StartY, other.StartY, conversion_lenience)
+               && Precision.AlmostEquals(EndX, other.EndX, conversion_lenience)
+               && Precision.AlmostEquals(EndY, other.EndY, conversion_lenience);
    }
 }
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestCasePerformancePoints : Game.Tests.Visual.TestCasePerformancePoints
+    {
+        public TestCasePerformancePoints()
+            : base(new OsuRuleset())
+        {
+        }
+    }
+}
@@ -27,7 +27,6 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
            var endTimeData = original as IHasEndTime;
            var positionData = original as IHasPosition;
            var comboData = original as IHasCombo;
-            var legacyOffset = original as IHasLegacyLastTickOffset;

            if (curveData != null)
            {
@@ -41,8 +40,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                    RepeatSamples = curveData.RepeatSamples,
                    RepeatCount = curveData.RepeatCount,
                    Position = positionData?.Position ?? Vector2.Zero,
-                    NewCombo = comboData?.NewCombo ?? false,
-                    LegacyLastTickOffset = legacyOffset?.LegacyLastTickOffset
+                    NewCombo = comboData?.NewCombo ?? false
                };
            }
            else if (endTimeData != null)
@@ -1,22 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Osu.Difficulty
-{
-    public class OsuDifficultyAttributes : DifficultyAttributes
-    {
-        public double AimStrain;
-        public double SpeedStrain;
-        public double ApproachRate;
-        public double OverallDifficulty;
-        public int MaxCombo;
-
-        public OsuDifficultyAttributes(Mod[] mods, double starRating)
-            : base(mods, starRating)
-        {
-        }
-    }
-}
@@ -2,13 +2,12 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System;
-using System.Linq;
+using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Skills;
-using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;

 namespace osu.Game.Rulesets.Osu.Difficulty
@@ -18,29 +17,31 @@ namespace osu.Game.Rulesets.Osu.Difficulty
        private const int section_length = 400;
        private const double difficulty_multiplier = 0.0675;

-        public OsuDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
-            : base(ruleset, beatmap)
+        public OsuDifficultyCalculator(IBeatmap beatmap)
+            : base(beatmap)
        {
        }

-        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
+        public OsuDifficultyCalculator(IBeatmap beatmap, Mod[] mods)
+            : base(beatmap, mods)
        {
-            if (!beatmap.HitObjects.Any())
-                return new OsuDifficultyAttributes(mods, 0);
+        }

-            OsuDifficultyBeatmap difficultyBeatmap = new OsuDifficultyBeatmap(beatmap.HitObjects.Cast<OsuHitObject>().ToList(), timeRate);
+        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
+        {
+            OsuDifficultyBeatmap beatmap = new OsuDifficultyBeatmap((List<OsuHitObject>)Beatmap.HitObjects, TimeRate);
            Skill[] skills =
            {
                new Aim(),
                new Speed()
            };

-            double sectionLength = section_length * timeRate;
+            double sectionLength = section_length * TimeRate;

            // The first object doesn't generate a strain, so we begin with an incremented section end
            double currentSectionEnd = 2 * sectionLength;

-            foreach (OsuDifficultyHitObject h in difficultyBeatmap)
+            foreach (OsuDifficultyHitObject h in beatmap)
            {
                while (h.BaseObject.StartTime > currentSectionEnd)
                {
@@ -59,32 +60,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty

            double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
            double speedRating = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
+
            double starRating = aimRating + speedRating + Math.Abs(aimRating - speedRating) / 2;

-            // Todo: These int casts are temporary to achieve 1:1 results with osu!stable, and should be remoevd in the future
-            double hitWindowGreat = (int)(beatmap.HitObjects.First().HitWindows.Great / 2) / timeRate;
-            double preEmpt = (int)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / timeRate;
-
-            int maxCombo = beatmap.HitObjects.Count();
-            // Add the ticks + tail of the slider. 1 is subtracted because the "headcircle" would be counted twice (once for the slider itself in the line above)
-            maxCombo += beatmap.HitObjects.OfType<Slider>().Sum(s => s.NestedHitObjects.Count - 1);
-
-            return new OsuDifficultyAttributes(mods, starRating)
+            if (categoryDifficulty != null)
            {
-                AimStrain = aimRating,
-                SpeedStrain = speedRating,
-                ApproachRate = preEmpt > 1200 ? (1800 - preEmpt) / 120 : (1200 - preEmpt) / 150 + 5,
-                OverallDifficulty = (80 - hitWindowGreat) / 6,
-                MaxCombo = maxCombo
-            };
-        }
+                categoryDifficulty.Add("Aim", aimRating);
+                categoryDifficulty.Add("Speed", speedRating);
+            }

-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
-        {
-            new OsuModDoubleTime(),
-            new OsuModHalfTime(),
-            new OsuModEasy(),
-            new OsuModHardRock(),
-        };
+            return starRating;
+        }
    }
 }
@@ -15,13 +15,21 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 {
    public class OsuPerformanceCalculator : PerformanceCalculator
    {
-        public new OsuDifficultyAttributes Attributes => (OsuDifficultyAttributes)base.Attributes;
-
        private readonly int countHitCircles;
        private readonly int beatmapMaxCombo;

        private Mod[] mods;

+        /// <summary>
+        /// Approach rate adjusted by mods.
+        /// </summary>
+        private double realApproachRate;
+
+        /// <summary>
+        /// Overall difficulty adjusted by mods.
+        /// </summary>
+        private double realOverallDifficulty;
+
        private double accuracy;
        private int scoreMaxCombo;
        private int countGreat;
@@ -29,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
        private int countMeh;
        private int countMiss;

-        public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, Score score)
+        public OsuPerformanceCalculator(Ruleset ruleset, IBeatmap beatmap, Score score)
            : base(ruleset, beatmap, score)
        {
            countHitCircles = Beatmap.HitObjects.Count(h => h is HitCircle);
@@ -53,6 +61,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            if (mods.Any(m => !m.Ranked))
                return 0;

+            // Todo: These int casts are temporary to achieve 1:1 results with osu!stable, and should be remoevd in the future
+            double hitWindowGreat = (int)(Beatmap.HitObjects.First().HitWindows.Great / 2) / TimeRate;
+            double preEmpt = (int)BeatmapDifficulty.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / TimeRate;
+
+            realApproachRate = preEmpt > 1200 ? (1800 - preEmpt) / 120 : (1200 - preEmpt) / 150 + 5;
+            realOverallDifficulty = (80 - hitWindowGreat) / 6;
+
            // Custom multipliers for NoFail and SpunOut.
            double multiplier = 1.12f; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things

@@ -77,8 +92,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                categoryRatings.Add("Aim", aimValue);
                categoryRatings.Add("Speed", speedValue);
                categoryRatings.Add("Accuracy", accuracyValue);
-                categoryRatings.Add("OD", Attributes.OverallDifficulty);
-                categoryRatings.Add("AR", Attributes.ApproachRate);
+                categoryRatings.Add("OD", realOverallDifficulty);
+                categoryRatings.Add("AR", realApproachRate);
                categoryRatings.Add("Max Combo", beatmapMaxCombo);
            }

@@ -87,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty

        private double computeAimValue()
        {
-            double aimValue = Math.Pow(5.0f * Math.Max(1.0f, Attributes.AimStrain / 0.0675f) - 4.0f, 3.0f) / 100000.0f;
+            double aimValue = Math.Pow(5.0f * Math.Max(1.0f, Attributes["Aim"] / 0.0675f) - 4.0f, 3.0f) / 100000.0f;

            // Longer maps are worth more
            double lengthBonus = 0.95f + 0.4f * Math.Min(1.0f, totalHits / 2000.0f) +
@@ -103,22 +118,22 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                aimValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8f) / Math.Pow(beatmapMaxCombo, 0.8f), 1.0f);

            double approachRateFactor = 1.0f;
-            if (Attributes.ApproachRate > 10.33f)
-                approachRateFactor += 0.45f * (Attributes.ApproachRate - 10.33f);
-            else if (Attributes.ApproachRate < 8.0f)
+            if (realApproachRate > 10.33f)
+                approachRateFactor += 0.45f * (realApproachRate - 10.33f);
+            else if (realApproachRate < 8.0f)
            {
                // HD is worth more with lower ar!
                if (mods.Any(h => h is OsuModHidden))
-                    approachRateFactor += 0.02f * (8.0f - Attributes.ApproachRate);
+                    approachRateFactor += 0.02f * (8.0f - realApproachRate);
                else
-                    approachRateFactor += 0.01f * (8.0f - Attributes.ApproachRate);
+                    approachRateFactor += 0.01f * (8.0f - realApproachRate);
            }

            aimValue *= approachRateFactor;

            // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
            if (mods.Any(h => h is OsuModHidden))
-                aimValue *= 1.02 + (11.0f - Attributes.ApproachRate) / 50.0; // Gives a 1.04 bonus for AR10, a 1.06 bonus for AR9, a 1.02 bonus for AR11.
+                aimValue *= 1.02 + (11.0f - realApproachRate) / 50.0; // Gives a 1.04 bonus for AR10, a 1.06 bonus for AR9, a 1.02 bonus for AR11.

            if (mods.Any(h => h is OsuModFlashlight))
            {
@@ -129,14 +144,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            // Scale the aim value with accuracy _slightly_
            aimValue *= 0.5f + accuracy / 2.0f;
            // It is important to also consider accuracy difficulty when doing that
-            aimValue *= 0.98f + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            aimValue *= 0.98f + Math.Pow(realOverallDifficulty, 2) / 2500;

            return aimValue;
        }

        private double computeSpeedValue()
        {
-            double speedValue = Math.Pow(5.0f * Math.Max(1.0f, Attributes.SpeedStrain / 0.0675f) - 4.0f, 3.0f) / 100000.0f;
+            double speedValue = Math.Pow(5.0f * Math.Max(1.0f, Attributes["Speed"] / 0.0675f) - 4.0f, 3.0f) / 100000.0f;

            // Longer maps are worth more
            speedValue *= 0.95f + 0.4f * Math.Min(1.0f, totalHits / 2000.0f) +
@@ -155,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
            // Scale the speed value with accuracy _slightly_
            speedValue *= 0.5f + accuracy / 2.0f;
            // It is important to also consider accuracy difficulty when doing that
-            speedValue *= 0.98f + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            speedValue *= 0.98f + Math.Pow(realOverallDifficulty, 2) / 2500;

            return speedValue;
        }
@@ -177,7 +192,7 @@ 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.52163f, Attributes.OverallDifficulty) * Math.Pow(betterAccuracyPercentage, 24) * 2.83f;
+            double accuracyValue = Math.Pow(1.52163f, realOverallDifficulty) * Math.Pow(betterAccuracyPercentage, 24) * 2.83f;

            // Bonus for many hitcircles - it's harder to keep good accuracy up for longer
            accuracyValue *= Math.Min(1.15f, Math.Pow(amountHitObjectsWithAccuracy / 1000.0f, 0.3f));
@@ -7,34 +7,33 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;

 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModHidden : ModHidden
+    public class OsuModHidden : ModHidden, IApplicableToDrawableHitObjects
    {
        public override string Description => @"Play with no approach circles and fading circles/sliders.";
        public override double ScoreMultiplier => 1.06;
+
        private const double fade_in_duration_multiplier = 0.4;
        private const double fade_out_duration_multiplier = 0.3;

-        public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
        {
-            void adjustFadeIn(OsuHitObject h) => h.TimeFadein = h.TimePreempt * fade_in_duration_multiplier;
-
            foreach (var d in drawables.OfType<DrawableOsuHitObject>())
            {
-                adjustFadeIn(d.HitObject);
-                foreach (var h in d.HitObject.NestedHitObjects.OfType<OsuHitObject>())
-                    adjustFadeIn(h);
-            }
+                d.ApplyCustomUpdateState += ApplyHiddenState;

-            base.ApplyToDrawableHitObjects(drawables);
+                d.HitObject.TimeFadein = d.HitObject.TimePreempt * fade_in_duration_multiplier;
+                foreach (var h in d.HitObject.NestedHitObjects.OfType<OsuHitObject>())
+                    h.TimeFadein = h.TimePreempt * fade_in_duration_multiplier;
+            }
        }

-        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
+        protected void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
        {
            if (!(drawable is DrawableOsuHitObject d))
                return;
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Objects.Drawables;
 using OpenTK;
 using osu.Game.Graphics;
@@ -90,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
            // find the next vector2 in the curve which is not equal to our current position to infer a rotation.
            for (int i = searchStart; i >= 0 && i < curve.Count; i += direction)
            {
-                if (Precision.AlmostEquals(curve[i], Position))
+                if (curve[i] == Position)
                    continue;

                Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(curve[i].Y - Position.Y, curve[i].X - Position.X));
@@ -139,8 +139,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
            var texture = new Texture(textureWidth, 1);

            //initialise background
-            var raw = new RawTexture(textureWidth, 1);
-            var bytes = raw.Data;
+            var upload = new TextureUpload(textureWidth * 4);
+            var bytes = upload.Data;

            const float aa_portion = 0.02f;
            const float border_portion = 0.128f;
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                }
            }

-            texture.SetData(new TextureUpload(raw));
+            texture.SetData(upload);
            path.Texture = texture;

            container.ForceRedraw();
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
 using OpenTK;
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
@@ -46,8 +45,6 @@ namespace osu.Game.Rulesets.Osu.Objects
            set { Curve.Distance = value; }
        }

-        public double? LegacyLastTickOffset { get; set; }
-
        /// <summary>
        /// The position of the cursor at the point of completion of this <see cref="Slider"/> if it was hit
        /// with as few movements as possible. This is set and used by difficulty calculation.
@@ -94,9 +91,6 @@ namespace osu.Game.Rulesets.Osu.Objects
            createSliderEnds();
            createTicks();
            createRepeatPoints();
-
-            if (LegacyLastTickOffset != null)
-                TailCircle.StartTime = Math.Max(StartTime + Duration / 2, TailCircle.StartTime - LegacyLastTickOffset.Value);
        }

        private void createSliderEnds()
@@ -93,26 +93,57 @@ namespace osu.Game.Rulesets.Osu
                    {
                        new OsuModEasy(),
                        new OsuModNoFail(),
-                        new MultiMod(new OsuModHalfTime(), new OsuModDaycore()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModHalfTime(),
+                                new OsuModDaycore(),
+                            },
+                        },
                    };
+
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
                        new OsuModHardRock(),
-                        new MultiMod(new OsuModSuddenDeath(), new OsuModPerfect()),
-                        new MultiMod(new OsuModDoubleTime(), new OsuModNightcore()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModSuddenDeath(),
+                                new OsuModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModDoubleTime(),
+                                new OsuModNightcore(),
+                            },
+                        },
                        new OsuModHidden(),
                        new OsuModFlashlight(),
                    };
+
                case ModType.Special:
                    return new Mod[]
                    {
                        new OsuModRelax(),
                        new OsuModAutopilot(),
                        new OsuModSpunOut(),
-                        new MultiMod(new OsuModAutoplay(), new ModCinema()),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
                        new OsuModTarget(),
                    };
+
                default:
                    return new Mod[] { };
            }
@@ -120,9 +151,9 @@ namespace osu.Game.Rulesets.Osu

        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_osu_o };

-        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(this, beatmap);
+        public override DifficultyCalculator CreateDifficultyCalculator(IBeatmap beatmap, Mod[] mods = null) => new OsuDifficultyCalculator(beatmap, mods);

-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, Score score) => new OsuPerformanceCalculator(this, beatmap, score);
+        public override PerformanceCalculator CreatePerformanceCalculator(IBeatmap beatmap, Score score) => new OsuPerformanceCalculator(this, beatmap, score);

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

@@ -130,7 +161,7 @@ namespace osu.Game.Rulesets.Osu

        public override string ShortName => "osu";

-        public override RulesetSettingsSubsection CreateSettings() => new OsuSettings(this);
+        public override SettingsSubsection CreateSettings() => new OsuSettings();

        public override int? LegacyID => 0;

@@ -6,7 +6,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using System;
 using System.Collections.Generic;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Users;

@@ -19,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Replays
        /// <summary>
        /// Constants (for spinners).
        /// </summary>
-        protected static readonly Vector2 SPINNER_CENTRE = OsuPlayfield.BASE_SIZE / 2;
+        protected static readonly Vector2 SPINNER_CENTRE = new Vector2(256, 192);
        protected const float SPIN_RADIUS = 50;

        /// <summary>
@@ -30,16 +30,13 @@ namespace osu.Game.Rulesets.Osu.Replays
            }
        }

-        public override List<IInput> GetPendingInputs()
+        public override List<InputState> GetPendingStates()
        {
-            return new List<IInput>
+            return new List<InputState>
            {
-                new MousePositionAbsoluteInput
-                {
-                    Position = GamefieldToScreenSpace(Position ?? Vector2.Zero)
-                },
                new ReplayState<OsuAction>
                {
+                    Mouse = new ReplayMouseState(GamefieldToScreenSpace(Position ?? Vector2.Zero)),
                    PressedActions = CurrentFrame.Actions
                }
            };
@@ -1,256 +1,124 @@
 {
    "Mappings": [{
-        "StartTime": 500.0,
-        "Objects": [{
-            "StartTime": 500.0,
-            "EndTime": 500.0,
-            "X": 96.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 1000.0,
-            "EndTime": 1000.0,
-            "X": 256.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 1500.0,
-            "EndTime": 1500.0,
-            "X": 416.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 2000.0,
-            "EndTime": 2000.0,
-            "X": 256.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 2464.0,
-            "EndTime": 2464.0,
-            "X": 96.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 3000.0,
-        "Objects": [{
-            "StartTime": 3000.0,
-            "EndTime": 4000.0,
-            "X": 256.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 4500.0,
-        "Objects": [{
-            "StartTime": 4500.0,
-            "EndTime": 5500.0,
-            "X": 256.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 6000.0,
-        "Objects": [{
-            "StartTime": 6000.0,
-            "EndTime": 6500.0,
-            "X": 256.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 7000.0,
-        "Objects": [{
-            "StartTime": 7000.0,
-            "EndTime": 7000.0,
-            "X": 256.0,
-            "Y": 128.0
-        }, {
-            "StartTime": 7250.0,
-            "EndTime": 7250.0,
-            "X": 336.0,
-            "Y": 128.0
-        }, {
-            "StartTime": 7500.0,
-            "EndTime": 7500.0,
-            "X": 256.0,
-            "Y": 128.0
-        }, {
-            "StartTime": 7750.0,
-            "EndTime": 7750.0,
-            "X": 336.0,
-            "Y": 128.0
-        }, {
-            "StartTime": 7964.0,
-            "EndTime": 7964.0,
-            "X": 256.0,
-            "Y": 128.0
-        }]
-    }, {
-        "StartTime": 8500.0,
-        "Objects": [{
-            "StartTime": 8500.0,
-            "EndTime": 8500.0,
-            "X": 32.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 9000.0,
-            "EndTime": 9000.0,
-            "X": 101.81015,
-            "Y": 326.4915
-        }, {
-            "StartTime": 9500.0,
-            "EndTime": 9500.0,
-            "X": 237.2304,
-            "Y": 276.282928
-        }, {
-            "StartTime": 10000.0,
-            "EndTime": 10000.0,
-            "X": 270.339874,
-            "Y": 121.1423
-        }, {
-            "StartTime": 10500.0,
-            "EndTime": 10500.0,
-            "X": 401.0588,
-            "Y": 49.1515045
-        }, {
-            "StartTime": 10964.0,
-            "EndTime": 10964.0,
-            "X": 508.166229,
-            "Y": 153.299271
-        }]
-    }, {
-        "StartTime": 11500.0,
-        "Objects": [{
-            "StartTime": 11500.0,
-            "EndTime": 12000.0,
-            "X": 256.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 12500.0,
-        "Objects": [{
-            "StartTime": 12500.0,
-            "EndTime": 12500.0,
-            "X": 512.0,
-            "Y": 320.0
-        }, {
-            "StartTime": 13000.0,
-            "EndTime": 13000.0,
-            "X": 353.235535,
-            "Y": 300.154449
-        }, {
-            "StartTime": 13500.0,
-            "EndTime": 13500.0,
-            "X": 194.471069,
-            "Y": 280.3089
-        }, {
-            "StartTime": 14000.0,
-            "EndTime": 14000.0,
-            "X": 35.7066345,
-            "Y": 260.463318
-        }, {
-            "StartTime": 14500.0,
-            "EndTime": 14500.0,
-            "X": 118.370323,
-            "Y": 219.009277
-        }, {
-            "StartTime": 15000.0,
-            "EndTime": 15000.0,
-            "X": 271.087128,
-            "Y": 171.285278
-        }, {
-            "StartTime": 15500.0,
-            "EndTime": 15500.0,
-            "X": 423.803925,
-            "Y": 123.561279
-        }, {
-            "StartTime": 16000.0,
-            "EndTime": 16000.0,
-            "X": 446.420532,
-            "Y": 79.60513
-        }, {
-            "StartTime": 16464.0,
-            "EndTime": 16464.0,
-            "X": 291.1977,
-            "Y": 40.799427
-        }]
-    }, {
-        "StartTime": 17000.0,
-        "Objects": [{
-            "StartTime": 17000.0,
-            "EndTime": 17000.0,
-            "X": 256.0,
-            "Y": 256.0
-        }, {
-            "StartTime": 17250.0,
-            "EndTime": 17250.0,
-            "X": 176.0,
-            "Y": 256.0
-        }, {
-            "StartTime": 17500.0,
-            "EndTime": 17500.0,
-            "X": 256.0,
-            "Y": 256.0
-        }, {
-            "StartTime": 17750.0,
-            "EndTime": 17750.0,
-            "X": 176.0,
-            "Y": 256.0
-        }, {
-            "StartTime": 17964.0,
-            "EndTime": 17964.0,
-            "X": 256.0,
-            "Y": 256.0
-        }]
-    }, {
-        "StartTime": 18500.0,
-        "Objects": [{
-            "StartTime": 18500.0,
-            "EndTime": 19450.0,
-            "X": 256.0,
-            "Y": 192.0
-        }]
-    }, {
-        "StartTime": 19875.0,
-        "Objects": [{
-            "StartTime": 19875.0,
-            "EndTime": 19875.0,
-            "X": 216.0,
-            "Y": 231.0
-        }, {
-            "StartTime": 20375.0,
-            "EndTime": 20375.0,
-            "X": 317.446747,
-            "Y": 171.345245
-        }, {
-            "StartTime": 20875.0,
-            "EndTime": 20875.0,
-            "X": 270.3294,
-            "Y": 310.4395
-        }, {
-            "StartTime": 21375.0,
-            "EndTime": 21375.0,
-            "X": 119.121056,
-            "Y": 322.8657
-        }, {
-            "StartTime": 21875.0,
-            "EndTime": 21875.0,
-            "X": 124.28746,
-            "Y": 165.224731
-        }, {
-            "StartTime": 22375.0,
-            "EndTime": 22375.0,
-            "X": 240.4715,
-            "Y": 62.65587
-        }, {
-            "StartTime": 22875.0,
-            "EndTime": 22875.0,
-            "X": 398.054047,
-            "Y": 39.064167
-        }, {
-            "StartTime": 23375.0,
-            "EndTime": 23375.0,
-            "X": 439.749878,
-            "Y": 183.668091
-        }, {
-            "StartTime": 23839.0,
-            "EndTime": 23839.0,
-            "X": 408.720825,
-            "Y": 339.810455
-        }]
-    }]
+            "StartTime": 500,
+            "Objects": [{
+                "StartTime": 500,
+                "EndTime": 2500,
+                "StartX": 96,
+                "StartY": 192,
+                "EndX": 96,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 3000,
+            "Objects": [{
+                "StartTime": 3000,
+                "EndTime": 4000,
+                "StartX": 256,
+                "StartY": 192,
+                "EndX": 256,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 4500,
+            "Objects": [{
+                "StartTime": 4500,
+                "EndTime": 5500,
+                "StartX": 256,
+                "StartY": 192,
+                "EndX": 256,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 6000,
+            "Objects": [{
+                "StartTime": 6000,
+                "EndTime": 6500,
+                "StartX": 256,
+                "StartY": 192,
+                "EndX": 256,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 7000,
+            "Objects": [{
+                "StartTime": 7000,
+                "EndTime": 8000,
+                "StartX": 256,
+                "StartY": 128,
+                "EndX": 256,
+                "EndY": 128
+            }]
+        },
+        {
+            "StartTime": 8500,
+            "Objects": [{
+                "StartTime": 8500,
+                "EndTime": 10999,
+                "StartX": 32,
+                "StartY": 192,
+                "EndX": 508.166229,
+                "EndY": 153.299271
+            }]
+        },
+        {
+            "StartTime": 11500,
+            "Objects": [{
+                "StartTime": 11500,
+                "EndTime": 12000,
+                "StartX": 256,
+                "StartY": 192,
+                "EndX": 256,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 12500,
+            "Objects": [{
+                "StartTime": 12500,
+                "EndTime": 16500,
+                "StartX": 512,
+                "StartY": 320,
+                "EndX": 291.1977,
+                "EndY": 40.799427
+            }]
+        },
+        {
+            "StartTime": 17000,
+            "Objects": [{
+                "StartTime": 17000,
+                "EndTime": 18000,
+                "StartX": 256,
+                "StartY": 256,
+                "EndX": 256,
+                "EndY": 256
+            }]
+        },
+        {
+            "StartTime": 18500,
+            "Objects": [{
+                "StartTime": 18500,
+                "EndTime": 19450,
+                "StartX": 256,
+                "StartY": 192,
+                "EndX": 256,
+                "EndY": 192
+            }]
+        },
+        {
+            "StartTime": 19875,
+            "Objects": [{
+                "StartTime": 19875,
+                "EndTime": 23874,
+                "StartX": 216,
+                "StartY": 231,
+                "EndX": 408.720825,
+                "EndY": 339.810455
+            }]
+        }
+    ]
 }
@@ -1,16 +1,13 @@
 {
-    "Mappings": [{
-        "StartTime": 118858.0,
-        "Objects": [{
-            "StartTime": 118858.0,
-            "EndTime": 118858.0,
-            "X": 219.0,
-            "Y": 215.0
-        }, {
-            "StartTime": 119052.0,
-            "EndTime": 119052.0,
-            "X": 239.6507,
-            "Y": 29.1437378
-        }]
+  "Mappings": [{
+    "StartTime": 118858,
+    "Objects": [{
+      "StartTime": 118858,
+      "EndTime": 119088,
+      "StartX": 219,
+      "StartY": 215,
+      "EndX": 239.6507,
+      "EndY": 29.1437378
    }]
+  }]
 }
@@ -1,331 +0,0 @@
-{
-    "Mappings": [{
-        "StartTime": 500.0,
-        "Objects": [{
-            "StartTime": 500.0,
-            "EndTime": 500.0,
-            "X": 96.0,
-            "Y": 192.0
-        }, {
-            "StartTime": 624.0,
-            "EndTime": 624.0,
-            "X": 105.921242,
-            "Y": 192.0
-        }, {
-            "StartTime": 749.0,
-            "EndTime": 749.0,
-            "X": 115.922493,
-            "Y": 192.0
-        }, {
-            "StartTime": 874.0,
-            "EndTime": 874.0,
-            "X": 125.923737,
-            "Y": 192.0
-        }, {
-            "StartTime": 999.0,
-            "EndTime": 999.0,
-            "X": 135.924988,
-            "Y": 192.0
-        }, {
-            "StartTime": 1124.0,
-            "EndTime": 1124.0,
-            "X": 145.926239,
-            "Y": 192.0
-        }, {
-            "StartTime": 1249.0,
-            "EndTime": 1249.0,
-            "X": 155.92749,
-            "Y": 192.0
-        }, {
-            "StartTime": 1374.0,
-            "EndTime": 1374.0,
-            "X": 165.928741,
-            "Y": 192.0
-        }, {
-            "StartTime": 1499.0,
-            "EndTime": 1499.0,
-            "X": 175.93,
-            "Y": 192.0
-        }, {
-            "StartTime": 1624.0,
-            "EndTime": 1624.0,
-            "X": 185.931244,
-            "Y": 192.0
-        }, {
-            "StartTime": 1749.0,
-            "EndTime": 1749.0,
-            "X": 195.9325,
-            "Y": 192.0
-        }, {
-            "StartTime": 1874.0,
-            "EndTime": 1874.0,
-            "X": 205.933746,
-            "Y": 192.0
-        }, {
-            "StartTime": 1999.0,
-            "EndTime": 1999.0,
-            "X": 215.935,
-            "Y": 192.0
-        }, {
-            "StartTime": 2124.0,
-            "EndTime": 2124.0,
-            "X": 225.936234,
-            "Y": 192.0
-        }, {
-            "StartTime": 2249.0,
-            "EndTime": 2249.0,
-            "X": 235.9375,
-            "Y": 192.0
-        }, {
-            "StartTime": 2374.0,
-            "EndTime": 2374.0,
-            "X": 245.938751,
-            "Y": 192.0
-        }, {
-            "StartTime": 2499.0,
-            "EndTime": 2499.0,
-            "X": 255.94,
-            "Y": 192.0
-        }, {
-            "StartTime": 2624.0,
-            "EndTime": 2624.0,
-            "X": 265.941223,
-            "Y": 192.0
-        }, {
-            "StartTime": 2749.0,
-            "EndTime": 2749.0,
-            "X": 275.9425,
-            "Y": 192.0
-        }, {
-            "StartTime": 2874.0,
-            "EndTime": 2874.0,
-            "X": 285.943756,
-            "Y": 192.0
-        }, {
-            "StartTime": 2999.0,
-            "EndTime": 2999.0,
-            "X": 295.945,
-            "Y": 192.0
-        }, {
-            "StartTime": 3124.0,
-            "EndTime": 3124.0,
-            "X": 305.946259,
-            "Y": 192.0
-        }, {
-            "StartTime": 3249.0,
-            "EndTime": 3249.0,
-            "X": 315.9475,
-            "Y": 192.0
-        }, {
-            "StartTime": 3374.0,
-            "EndTime": 3374.0,
-            "X": 325.94873,
-            "Y": 192.0
-        }, {
-            "StartTime": 3499.0,
-            "EndTime": 3499.0,
-            "X": 335.949982,
-            "Y": 192.0
-        }, {
-            "StartTime": 3624.0,
-            "EndTime": 3624.0,
-            "X": 345.951233,
-            "Y": 192.0
-        }, {
-            "StartTime": 3749.0,
-            "EndTime": 3749.0,
-            "X": 355.952484,
-            "Y": 192.0
-        }, {
-            "StartTime": 3874.0,
-            "EndTime": 3874.0,
-            "X": 365.953766,
-            "Y": 192.0
-        }, {
-            "StartTime": 3999.0,
-            "EndTime": 3999.0,
-            "X": 375.955,
-            "Y": 192.0
-        }, {
-            "StartTime": 4124.0,
-            "EndTime": 4124.0,
-            "X": 385.956238,
-            "Y": 192.0
-        }, {
-            "StartTime": 4249.0,
-            "EndTime": 4249.0,
-            "X": 395.9575,
-            "Y": 192.0
-        }, {
-            "StartTime": 4374.0,
-            "EndTime": 4374.0,
-            "X": 405.95874,
-            "Y": 192.0
-        }, {
-            "StartTime": 4499.0,
-            "EndTime": 4499.0,
-            "X": 415.960022,
-            "Y": 192.0
-        }, {
-            "StartTime": 4624.0,
-            "EndTime": 4624.0,
-            "X": 406.038757,
-            "Y": 192.0
-        }, {
-            "StartTime": 4749.0,
-            "EndTime": 4749.0,
-            "X": 396.0375,
-            "Y": 192.0
-        }, {
-            "StartTime": 4874.0,
-            "EndTime": 4874.0,
-            "X": 386.036255,
-            "Y": 192.0
-        }, {
-            "StartTime": 4999.0,
-            "EndTime": 4999.0,
-            "X": 376.035034,
-            "Y": 192.0
-        }, {
-            "StartTime": 5124.0,
-            "EndTime": 5124.0,
-            "X": 366.033752,
-            "Y": 192.0
-        }, {
-            "StartTime": 5249.0,
-            "EndTime": 5249.0,
-            "X": 356.0325,
-            "Y": 192.0
-        }, {
-            "StartTime": 5374.0,
-            "EndTime": 5374.0,
-            "X": 346.03125,
-            "Y": 192.0
-        }, {
-            "StartTime": 5499.0,
-            "EndTime": 5499.0,
-            "X": 336.030029,
-            "Y": 192.0
-        }, {
-            "StartTime": 5624.0,
-            "EndTime": 5624.0,
-            "X": 326.028748,
-            "Y": 192.0
-        }, {
-            "StartTime": 5749.0,
-            "EndTime": 5749.0,
-            "X": 316.0275,
-            "Y": 192.0
-        }, {
-            "StartTime": 5874.0,
-            "EndTime": 5874.0,
-            "X": 306.026245,
-            "Y": 192.0
-        }, {
-            "StartTime": 5999.0,
-            "EndTime": 5999.0,
-            "X": 296.025,
-            "Y": 192.0
-        }, {
-            "StartTime": 6124.0,
-            "EndTime": 6124.0,
-            "X": 286.023773,
-            "Y": 192.0
-        }, {
-            "StartTime": 6249.0,
-            "EndTime": 6249.0,
-            "X": 276.022522,
-            "Y": 192.0
-        }, {
-            "StartTime": 6374.0,
-            "EndTime": 6374.0,
-            "X": 266.02124,
-            "Y": 192.0
-        }, {
-            "StartTime": 6499.0,
-            "EndTime": 6499.0,
-            "X": 256.02,
-            "Y": 192.0
-        }, {
-            "StartTime": 6624.0,
-            "EndTime": 6624.0,
-            "X": 246.018768,
-            "Y": 192.0
-        }, {
-            "StartTime": 6749.0,
-            "EndTime": 6749.0,
-            "X": 236.017517,
-            "Y": 192.0
-        }, {
-            "StartTime": 6874.0,
-            "EndTime": 6874.0,
-            "X": 226.016251,
-            "Y": 192.0
-        }, {
-            "StartTime": 6999.0,
-            "EndTime": 6999.0,
-            "X": 216.014984,
-            "Y": 192.0
-        }, {
-            "StartTime": 7124.0,
-            "EndTime": 7124.0,
-            "X": 206.013733,
-            "Y": 192.0
-        }, {
-            "StartTime": 7249.0,
-            "EndTime": 7249.0,
-            "X": 196.012512,
-            "Y": 192.0
-        }, {
-            "StartTime": 7374.0,
-            "EndTime": 7374.0,
-            "X": 186.011261,
-            "Y": 192.0
-        }, {
-            "StartTime": 7499.0,
-            "EndTime": 7499.0,
-            "X": 176.01,
-            "Y": 192.0
-        }, {
-            "StartTime": 7624.0,
-            "EndTime": 7624.0,
-            "X": 166.008728,
-            "Y": 192.0
-        }, {
-            "StartTime": 7749.0,
-            "EndTime": 7749.0,
-            "X": 156.0075,
-            "Y": 192.0
-        }, {
-            "StartTime": 7874.0,
-            "EndTime": 7874.0,
-            "X": 146.006256,
-            "Y": 192.0
-        }, {
-            "StartTime": 7999.0,
-            "EndTime": 7999.0,
-            "X": 136.005,
-            "Y": 192.0
-        }, {
-            "StartTime": 8124.0,
-            "EndTime": 8124.0,
-            "X": 126.003738,
-            "Y": 192.0
-        }, {
-            "StartTime": 8249.0,
-            "EndTime": 8249.0,
-            "X": 116.002518,
-            "Y": 192.0
-        }, {
-            "StartTime": 8374.0,
-            "EndTime": 8374.0,
-            "X": 106.001259,
-            "Y": 192.0
-        }, {
-            "StartTime": 8463.0,
-            "EndTime": 8463.0,
-            "X": 96.0,
-            "Y": 192.0
-        }]
-    }]
-}
@@ -1,20 +0,0 @@
-osu file format v14
-
-[General]
-StackLeniency: 0.7
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:0.400000005960464
-SliderTickRate:4
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-13426,-100,4,3,1,45,0,0
-14884,-100,4,2,1,50,0,0
-
-[HitObjects]
-96,192,500,6,0,L|416:192,2,320.000004768372
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor

            private Bindable<double> cursorScale;
            private Bindable<bool> autoCursorScale;
-            private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+            private Bindable<WorkingBeatmap> beatmap;

            public OsuCursor()
            {
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
            }

            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config, IBindableBeatmap beatmap)
+            private void load(OsuConfigManager config, OsuGameBase game)
            {
                Child = cursorContainer = new SkinnableDrawable("cursor", _ => new CircularContainer
                {
@@ -160,8 +160,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                    RelativeSizeAxes = Axes.Both,
                };

-                this.beatmap.BindTo(beatmap);
-                this.beatmap.ValueChanged += v => calculateScale();
+                beatmap = game.Beatmap.GetBoundCopy();
+                beatmap.ValueChanged += v => calculateScale();

                cursorScale = config.GetBindable<double>(OsuSetting.GameplayCursorSize);
                cursorScale.ValueChanged += v => calculateScale();
@@ -64,7 +64,9 @@ namespace osu.Game.Rulesets.Osu.UI

        public override void PostProcess()
        {
-            connectionLayer.HitObjects = HitObjects.Objects.Select(d => d.HitObject).OfType<OsuHitObject>();
+            connectionLayer.HitObjects = HitObjects.Objects
+                .Select(d => d.HitObject)
+                .OrderBy(h => h.StartTime).OfType<OsuHitObject>();
        }

        private void onJudgement(DrawableHitObject judgedObject, Judgement judgement)
--- a/Show More
+++ b/Show More