Merge remote-tracking branch 'origin/open-downloaded-beatmas' into release

Update framework
2026-05-15 07:02:36 +08:00 · 2018-07-30 13:00:35 +09:00 · 2018-07-30 13:00:24 +09:00
1504 changed files with 15701 additions and 32924 deletions
@@ -15,7 +15,6 @@ App.config text eol=crlf
 *.cmd text eol=crlf
 *.snippet text eol=crlf
 *.manifest text eol=crlf
-*.licenseheader text eol=crlf

 # Check out with lf (UNIX) line endings
 *.sh text eol=lf
@@ -1,14 +0,0 @@
---
-name: Bug Report
-about: For issues regarding encountered game bugs
---
-
-<!-- After you fill in all information, delete all comments in the issue -->
-
-**Describe your problem:** <!-- Provide any information you believe could be useful -->
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** <!-- Provide the version of your osu!lazer, you can find it at the bottom of the screen  -->
-
-**Logs:** <!-- Attach your osu!lazer logs, you can find them under %appdata%\osu\logs in Windows, or under ~/.local/share/osu/ in Linux and macOS -->
@@ -1,16 +0,0 @@
---
-name: Crash Report
-about: For issues regarding game crashes or permanent freezes
---
-
-<!-- After you fill in all information, delete all comments in the issue -->
-
-**Describe your problem:** <!-- Provide any information you believe could be useful -->
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** <!-- Provide the version of your osu!lazer, you can find it at the bottom of the screen  -->
-
-**Logs:** <!-- Attach your osu!lazer logs, you can find them under %appdata%\osu\logs in Windows, or under ~/.local/share/osu/ in Linux and macOS -->
-
-**Computer Specifications:** <!-- Attach your computer specifications, you can find them by using System Information in Windows, System Monitor in Linux, or About This Mac in macOS -->
@@ -1,10 +0,0 @@
---
-name: Feature Request
-about: Let us know what you would like to see in the game!
---
-
-<!-- After you fill in all information, delete all comments in the issue -->
-
-**Describe the feature:** <!-- Describe the feature you would like to see in the game -->
-
-**Proposal designs of the feature:** <!-- Attach screenshots of how the feature should look like according to you -->
@@ -1,10 +0,0 @@
---
-name: Missing for Live
-about: Let us know the features you need which are available in osu-stable but not lazer
---
-
-<!-- After you fill in all information, delete all comments in the issue -->
-
-**Describe the feature:** <!-- Describe the missing game feature -->
-
-**Designs:** <!-- Attach screenshots of how the feature is supposed to look like. For illustrative purpose only; final designs are usually re-imagined from scratch. -->
@@ -10,10 +10,6 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

-### Cake ###
-tools/*
-!tools/cakebuild.csproj
-
 # Build results
 bin/[Dd]ebug/
 [Dd]ebugPublic/
@@ -102,7 +98,6 @@ $tf/
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
-inspectcode

 # JustCode is a .NET coding add-in
 .JustCode
@@ -252,11 +247,7 @@ paket-files/
 .fake/

 # JetBrains Rider
-.idea/.idea.osu/.idea/*.xml
-.idea/.idea.osu/.idea/codeStyles/*.xml
-.idea/.idea.osu/.idea/dataSources/*.xml
-.idea/.idea.osu/.idea/dictionaries/*.xml
-.idea/.idea.osu/*.iml
+.idea/
 *.sln.iml

 # CodeRush
@@ -266,5 +257,3 @@ paket-files/
 __pycache__/
 *.pyc
 Staging/
-
-inspectcodereport.xml
@@ -0,0 +1,3 @@
+[submodule "osu-resources"]
+	path = osu-resources
+	url = https://github.com/ppy/osu-resources
@@ -1,6 +1,6 @@
 <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.2/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -1,6 +1,6 @@
 <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.2/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -1,6 +1,6 @@
 <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.2/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Osu.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -1,6 +1,6 @@
 <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.2/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Taiko.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="VisualTests" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll" />
+    <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" />
@@ -1,20 +1,17 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll" />
+    <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" />
    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
-    <method v="2">
-      <option name="Build" enabled="true" />
-    </method>
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
+    <method />
  </configuration>
 </component>
@@ -7,13 +7,13 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build tests (Debug)",
            "linux": {
                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
                }
            },
            "console": "internalConsole"
@@ -24,13 +24,13 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build tests (Release)",
            "linux": {
                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
                }
            },
            "console": "internalConsole"
@@ -41,13 +41,13 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.1/osu!.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build osu! (Debug)",
            "linux": {
                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
                }
            },
            "console": "internalConsole"
@@ -58,13 +58,13 @@
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.1/osu!.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build osu! (Release)",
            "linux": {
                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
                }
            },
            "console": "internalConsole"
@@ -11,6 +11,7 @@
                "build",
                "--no-restore",
                "osu.Desktop",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -26,6 +27,7 @@
                "build",
                "--no-restore",
                "osu.Desktop",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -42,6 +44,7 @@
                "build",
                "--no-restore",
                "osu.Game.Tests",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -57,6 +60,7 @@
                "build",
                "--no-restore",
                "osu.Game.Tests",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -66,7 +70,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (netcoreapp2.2)",
+            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -1,4 +1,4 @@
-Copyright (c) 2019 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10,72 +10,23 @@ We are accepting bug reports (please report with as much detail as possible). Fe

 # Requirements

- A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed.
- When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2017+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
- Note that there are **[additional requirements for Windows 7 and Windows 8.1](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)** which you may need to manually install if your operating system is not up-to-date.
+- A desktop platform with the [.NET Core SDK 2.1](https://www.microsoft.com/net/learn/get-started) or higher installed.
+- When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio Code](https://code.visualstudio.com/) (with the C# plugin installed) or [Jetbrains Rider](https://www.jetbrains.com/rider/) (commercial).

-# Running osu!
+# Building and running

-## Releases
+If you are not interested in developing the game, please head over to the [releases](https://github.com/ppy/osu/releases) to download a precompiled build with automatic updating enabled (download and run the install executable for your platform).

-If you are not interested in developing the game, please head over to the [releases](https://github.com/ppy/osu/releases) to download a precompiled build with automatic updating enabled.
+Clone the repository including submodules

- Windows (x64) users should download and run `install.exe`.
- macOS users (10.12 "Sierra" and higher) should download and run `osu.app.zip`.
- iOS users can join the [TestFlight beta program](https://t.co/xQJmHkfC18).
+`git clone --recurse-submodules https://github.com/ppy/osu`

-If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
+Build and run

-## Downloading the source code
+- Using Visual Studio 2017, Rider or Visual Studio Code (configurations are included)
+- From command line using `dotnet run --project osu.Desktop --framework netcoreapp2.1`

-Clone the repository **including submodules**:
-
-```shell
-git clone https://github.com/ppy/osu
-cd osu
-```
-
-To update the source code to the latest commit, run the following command inside the `osu` directory:
-
-```shell
-git pull
-```
-
-## Building
-
-Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this provided below.
-
-> Visual Studio Code users must run the `Restore` task before any build attempt.
-
-You can also build and run osu! from the command-line with a single command:
-
-```shell
-dotnet run --project osu.Desktop
-```
-
-If you are not interested in debugging osu!, you can add `-c Release` to gain performance. In this case, you must replace `Debug` with `Release` in any commands mentioned in this document.
-
-If the build fails, try to restore nuget packages with `dotnet restore`.
-
-### A note for Linux users
-
-On Linux, the environment variable `LD_LIBRARY_PATH` must point to the build directory, located at `osu.Desktop/bin/Debug/$NETCORE_VERSION`.
-
-`$NETCORE_VERSION` is the version of .NET Core SDK. You can have it with `grep TargetFramework osu.Desktop/osu.Desktop.csproj | sed -r 's/.*>(.*)<\/.*/\1/'`.
-
-For example, you can run osu! with the following command:
-
-```shell
-LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp2.2" dotnet run --project osu.Desktop
-```
-
-## Testing with resource/framework modifications
-
-Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be achieved by running some commands as documented on the [osu-resources](https://github.com/ppy/osu-resources/wiki/Testing-local-resources-checkout-with-other-projects) and [osu-framework](https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects) wiki pages.
-
-## Code analysis
-
-Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternative, you can install resharper or use rider to get inline support in your IDE of choice.
+If you run into issues building you may need to restore nuget packages (commonly via `dotnet restore`). Visual Studio Code users must run `Restore` task from debug tab before attempt to build.

 # Contributing

@@ -1,8 +1,24 @@
 clone_depth: 1
 version: '{branch}-{build}'
 image: Visual Studio 2017
-test: off
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
 install:
  - cmd: git submodule update --init --recursive --depth=5
-build_script:
-  - cmd: PowerShell -Version 2.0 .\build.ps1
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.5/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore -verbosity quiet
+environment:
+  TargetFramework: net471
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
+  - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors
@@ -0,0 +1,32 @@
+clone_depth: 1
+version: '{build}'
+skip_non_tags: true
+image: Visual Studio 2017
+install:
+  - git clone https://github.com/ppy/osu-deploy
+before_build:
+  - ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
+  - cmd: git submodule update --init --recursive --depth=5
+  - cmd: nuget restore -verbosity quiet
+build_script:
+  - ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
+  - appveyor DownloadFile https://puu.sh/A6g5K/4d08705438.enc # signing certificate
+  - cmd: appveyor-tools\secure-file -decrypt 4d08705438.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
+  - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
+  - 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
+  - cd bin\Debug\net471\
+  - osu.Desktop.Deploy.exe %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
+environment:
+  TargetFramework: net471
+  decode_secret:
+    secure: i67IC2xj6DjjxmA6Oj2jing3+MwzLkq6CbGsjfZ7rdY=
+  code_signing_password:
+    secure: 34tLNqvjmmZEi97MLKfrnQ==
+artifacts:
+  - path: 'Releases\*'
+deploy:
+  - provider: Environment
+    name: github
@@ -1,72 +0,0 @@
-#addin "nuget:?package=CodeFileSanity&version=0.0.21"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.2.2"
-#tool "nuget:?package=NVika.MSBuild&version=1.0.1"
-
-///////////////////////////////////////////////////////////////////////////////
-// ARGUMENTS
-///////////////////////////////////////////////////////////////////////////////
-
-var target = Argument("target", "Build");
-var configuration = Argument("configuration", "Release");
-
-var osuSolution = new FilePath("./osu.sln");
-
-///////////////////////////////////////////////////////////////////////////////
-// TASKS
-///////////////////////////////////////////////////////////////////////////////
-
-Task("Restore")
-    .Does(() => {
-        DotNetCoreRestore(osuSolution.FullPath);
-    });
-
-Task("Compile")
-    .IsDependentOn("Restore")
-    .Does(() => {
-        DotNetCoreBuild(osuSolution.FullPath, new DotNetCoreBuildSettings {
-            Configuration = configuration,
-            NoRestore = true,
-        });
-    });
-
-Task("Test")
-    .IsDependentOn("Compile")
-    .Does(() => {
-        var testAssemblies = GetFiles("**/*.Tests/bin/**/*.Tests.dll");
-
-        DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings {
-            Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx",
-            Parallel = true,
-            ToolTimeout = TimeSpan.FromMinutes(10),
-        });
-    });
-
-// windows only because both inspectcore and nvika depend on net45
-Task("InspectCode")
-    .WithCriteria(IsRunningOnWindows())
-    .IsDependentOn("Compile")
-    .Does(() => {
-        var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
-
-        InspectCode(osuSolution, new InspectCodeSettings {
-            CachesHome = "inspectcode",
-            OutputFile = "inspectcodereport.xml",
-        });
-
-        StartProcess(nVikaToolPath, @"parsereport ""inspectcodereport.xml"" --treatwarningsaserrors");
-    });
-
-Task("CodeFileSanity")
-    .Does(() => {
-        ValidateCodeSanity(new ValidateCodeSanitySettings {
-            RootDirectory = ".",
-            IsAppveyorBuild = AppVeyor.IsRunningOnAppVeyor
-        });
-    });
-
-Task("Build")
-    .IsDependentOn("CodeFileSanity")
-    .IsDependentOn("InspectCode")
-    .IsDependentOn("Test");
-
-RunTarget(target);
@@ -1,79 +0,0 @@
-##########################################################################
-# This is a customized Cake bootstrapper script for PowerShell.
-##########################################################################
-
-<#
-
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-
-.DESCRIPTION
-This Powershell script restores NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-
-.LINK
-https://cakebuild.net
-
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build.cake",
-    [string]$Target,
-    [string]$Configuration,
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity,
-    [switch]$ShowDescription,
-    [Alias("WhatIf", "Noop")]
-    [switch]$DryRun,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$ScriptArgs
-)
-
-Write-Host "Preparing to run build script..."
-
-# Determine the script root for resolving other paths.
-if(!$PSScriptRoot){
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-# Resolve the paths for resources used for debugging.
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
-$CAKE_CSPROJ = Join-Path $TOOLS_DIR "cakebuild.csproj"
-
-# Install the required tools locally.
-Write-Host "Restoring cake tools..."
-Invoke-Expression "dotnet restore `"$CAKE_CSPROJ`" --packages `"$TOOLS_DIR`"" | Out-Null
-
-# Find the Cake executable
-$CAKE_EXECUTABLE = (Get-ChildItem -Path ./tools/cake.coreclr/ -Filter Cake.dll -Recurse).FullName
-
-# Build Cake arguments
-$cakeArguments = @("$Script");
-if ($Target) { $cakeArguments += "-target=$Target" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-if ($Experimental) { $cakeArguments += "-experimental" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments"
-exit $LASTEXITCODE
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-##########################################################################
-# This is a customized Cake bootstrapper script for Shell.
-##########################################################################
-
-echo "Preparing to run build script..."
-
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-TOOLS_DIR=$SCRIPT_DIR/tools
-CAKE_BINARY_PATH=$TOOLS_DIR/"cake.coreclr"
-
-SCRIPT="build.cake"
-CAKE_CSPROJ=$TOOLS_DIR/"cakebuild.csproj"
-
-# Parse arguments.
-CAKE_ARGUMENTS=()
-for i in "$@"; do
-    case $1 in
-        -s|--script) SCRIPT="$2"; shift ;;
-        --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
-        *) CAKE_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
-# Install the required tools locally.
-echo "Restoring cake tools..."
-dotnet restore $CAKE_CSPROJ --packages $TOOLS_DIR > /dev/null 2>&1
-
-# Search for the CakeBuild binary.
-CAKE_BINARY=$(find $CAKE_BINARY_PATH -name "Cake.dll")
-
-# Start Cake
-echo "Running build script..."
-
-dotnet "$CAKE_BINARY" $SCRIPT "${CAKE_ARGUMENTS[@]}"
@@ -1,5 +0,0 @@
-
-[Nuget]
-Source=https://api.nuget.org/v3/index.json
-UseInProcessClient=true
-LoadDependencies=true
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.IO;
@@ -10,20 +10,16 @@ using osu.Desktop.Overlays;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game;
-using osuTK.Input;
+using OpenTK.Input;
 using Microsoft.Win32;
 using osu.Desktop.Updater;
-using osu.Framework;
 using osu.Framework.Platform.Windows;
-using osu.Framework.Screens;
-using osu.Game.Screens.Menu;

 namespace osu.Desktop
 {
    internal class OsuGameDesktop : OsuGame
    {
        private readonly bool noVersionOverlay;
-        private VersionManager versionManager;

        public OsuGameDesktop(string[] args = null)
            : base(args)
@@ -49,34 +45,17 @@ namespace osu.Desktop

            if (!noVersionOverlay)
            {
-                LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, v =>
+                LoadComponentAsync(new VersionManager { Depth = int.MinValue }, v =>
                {
                    Add(v);
                    v.State = Visibility.Visible;
                });

-                if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                    Add(new SquirrelUpdateManager());
-                else
-                    Add(new SimpleUpdateManager());
-            }
-        }
-
-        protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
-        {
-            base.ScreenChanged(lastScreen, newScreen);
-
-            switch (newScreen)
-            {
-                case Intro _:
-                case MainMenu _:
-                    if (versionManager != null)
-                        versionManager.State = Visibility.Visible;
-                    break;
-                default:
-                    if (versionManager != null)
-                        versionManager.State = Visibility.Hidden;
-                    break;
+#if NET_FRAMEWORK
+                Add(new SquirrelUpdateManager());
+#else
+                Add(new SimpleUpdateManager());
+#endif
            }
        }

@@ -97,7 +76,7 @@ namespace osu.Desktop

        private void fileDrop(object sender, FileDropEventArgs e)
        {
-            var filePaths = e.FileNames;
+            var filePaths = new[] { e.FileName };

            var firstExtension = Path.GetExtension(filePaths.First());

@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Framework.Allocation;
@@ -15,8 +15,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
-using osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;

 namespace osu.Desktop.Overlays
 {
@@ -27,6 +27,9 @@ namespace osu.Desktop.Overlays
        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)
        {
@@ -128,12 +131,11 @@ namespace osu.Desktop.Overlays

        protected override void PopIn()
        {
-            this.FadeIn(1400, Easing.OutQuint);
+            this.FadeIn(1000);
        }

        protected override void PopOut()
        {
-            this.FadeOut(500, Easing.OutQuint);
        }
    }
 }
@@ -1,17 +1,17 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.IO;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework;
-using osu.Framework.Development;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IPC;

+#if NET_FRAMEWORK
+using System.Runtime;
+#endif
+
 namespace osu.Desktop
 {
    public static class Program
@@ -19,13 +19,13 @@ namespace osu.Desktop
        [STAThread]
        public static int Main(string[] args)
        {
+            useMultiCoreJit();
+
            // Back up the cwd before DesktopGameHost changes it
            var cwd = Environment.CurrentDirectory;

            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
            {
-                host.ExceptionThrown += handleException;
-
                if (!host.IsPrimaryInstance)
                {
                    var importer = new ArchiveImportIPCChannel(host);
@@ -52,23 +52,13 @@ namespace osu.Desktop
            }
        }

-        private static int allowableExceptions = DebugUtils.IsDebugBuild ? 0 : 1;
-
-        /// <summary>
-        /// Allow a maximum of one unhandled exception, per second of execution.
-        /// </summary>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        private static bool handleException(Exception arg)
+        private static void useMultiCoreJit()
        {
-            bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
-
-            Logger.Log($"Unhandled exception has been {(continueExecution ? $"allowed with {allowableExceptions} more allowable exceptions" : "denied")} .");
-
-            // restore the stock of allowable exceptions after a short delay.
-            Task.Delay(1000).ContinueWith(_ => Interlocked.Increment(ref allowableExceptions));
-
-            return continueExecution;
+#if NET_FRAMEWORK
+            var directory = Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Profiles"));
+            ProfileOptimization.SetProfileRoot(directory.FullName);
+            ProfileOptimization.StartProfile("Startup.Profile");
+#endif
        }
    }
 }
@@ -1,7 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework;
@@ -40,32 +41,24 @@ namespace osu.Desktop.Updater

        private async void checkForUpdateAsync()
        {
-            try
+            var releases = new JsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
+            await releases.PerformAsync();
+
+            var latest = releases.ResponseObject;
+
+            if (latest.TagName != version)
            {
-                var releases = new JsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
-
-                await releases.PerformAsync();
-
-                var latest = releases.ResponseObject;
-
-                if (latest.TagName != version)
+                notificationOverlay.Post(new SimpleNotification
                {
-                    notificationOverlay.Post(new SimpleNotification
+                    Text = $"A newer release of osu! has been found ({version} → {latest.TagName}).\n\n"
+                           + "Click here to download the new version, which can be installed over the top of your existing installation",
+                    Icon = FontAwesome.fa_upload,
+                    Activated = () =>
                    {
-                        Text = $"A newer release of osu! has been found ({version} → {latest.TagName}).\n\n"
-                               + "Click here to download the new version, which can be installed over the top of your existing installation",
-                        Icon = FontAwesome.fa_upload,
-                        Activated = () =>
-                        {
-                            host.OpenUrlExternally(getBestUrl(latest));
-                            return true;
-                        }
-                    });
-                }
-            }
-            catch
-            {
-                // we shouldn't crash on a web failure. or any failure for the matter.
+                        host.OpenUrlExternally(getBestUrl(latest));
+                        return true;
+                    }
+                });
            }
        }

@@ -76,10 +69,10 @@ namespace osu.Desktop.Updater
            switch (RuntimeInfo.OS)
            {
                case RuntimeInfo.Platform.Windows:
-                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe"));
+                    bestAsset = release.Assets?.FirstOrDefault(f => f.Name.EndsWith(".exe"));
                    break;
                case RuntimeInfo.Platform.MacOsx:
-                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
+                    bestAsset = release.Assets?.FirstOrDefault(f => f.Name.EndsWith(".app.zip"));
                    break;
            }

@@ -1,9 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+#if NET_FRAMEWORK
 using System;
-using System.IO;
-using System.Reflection;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -14,10 +13,9 @@ using osu.Game;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
 using Squirrel;
-using LogLevel = Splat.LogLevel;

 namespace osu.Desktop.Updater
 {
@@ -38,10 +36,7 @@ namespace osu.Desktop.Updater
            notificationOverlay = notification;

            if (game.IsDeployedBuild)
-            {
-                Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
                Schedule(() => Task.Run(() => checkForUpdateAsync()));
-            }
        }

        private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
@@ -165,31 +160,6 @@ namespace osu.Desktop.Updater
                });
            }
        }
-
-        private class SquirrelLogger : Splat.ILogger, IDisposable
-        {
-            private readonly string path;
-            private readonly object locker = new object();
-            public LogLevel Level { get; set; } = LogLevel.Info;
-
-            public SquirrelLogger()
-            {
-                var file = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "SquirrelSetupUpdater.log");
-                if (File.Exists(file)) File.Delete(file);
-                path = file;
-            }
-
-            public void Write(string message, LogLevel logLevel)
-            {
-                if (logLevel < Level)
-                    return;
-
-                lock (locker) File.AppendAllText(path, message + "\r\n");
-            }
-
-            public void Dispose()
-            {
-            }
-        }
    }
 }
+#endif
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Game.props" />
  <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -13,6 +13,9 @@
    <Version>0.0.0</Version>
    <FileVersion>0.0.0</FileVersion>
  </PropertyGroup>
+  <PropertyGroup Label="Defines">
+    <DefineConstants Condition="'$(TargetFramework)' == 'net471'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
+  </PropertyGroup>
  <PropertyGroup>
    <StartupObject>osu.Desktop.Program</StartupObject>
  </PropertyGroup>
@@ -22,15 +25,15 @@
    <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" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="4.5.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
+    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
  </ItemGroup>
-</Project>
+</Project>
@@ -3,7 +3,7 @@
    <metadata>
        <id>osulazer</id>
        <version>0.0.0</version>
-        <title>osu!lazer</title>
+        <title>osulazer</title>
        <authors>ppy Pty Ltd</authors>
        <owners>Dean Herbert</owners>
        <projectUrl>https://osu.ppy.sh/</projectUrl>
@@ -12,7 +12,7 @@
        <description>click the circles. to the beat.</description>
        <summary>click the circles.</summary>
        <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2019 ppy Pty Ltd</copyright>
+        <copyright>Copyright ppy Pty Ltd 2007-2018</copyright>
        <language>en-AU</language>
    </metadata>
    <files>
@@ -1,15 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Catch.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}
@@ -1,15 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using UIKit;
-
-namespace osu.Game.Rulesets.Catch.Tests.iOS
-{
-    public class Application
-    {
-        public static void Main(string[] args)
-        {
-            UIApplication.Main(args, null, "AppDelegate");
-        }
-    }
-}
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>osu.Game.Rulesets.Catch.Tests.iOS</string>
-	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Rulesets-Catch-Tests-iOS</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>MinimumOSVersion</key>
-	<string>10.0</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/AppIcon.appiconset</string>
-</dict>
-</plist>
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{4004C7B7-1A62-43F1-9DF2-52450FA67E70}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>osu.Game.Rulesets.Catch.Tests</RootNamespace>
-    <AssemblyName>osu.Game.Rulesets.Catch.Tests.iOS</AssemblyName>
-  </PropertyGroup>
-  <Import Project="..\osu.iOS.props" />
-  <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <LinkDescription Include="..\osu.iOS\Linker.xml">
-      <Link>Linker.xml</Link>
-    </LinkDescription>
-    <Compile Include="Application.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <Compile Include="..\osu.Game.Rulesets.Catch.Tests\**\*.cs" Exclude="**\obj\**">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
-      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
-      <Name>osu.Game</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
-      <Project>{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}</Project>
-      <Name>osu.Game.Rulesets.Catch</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
-</Project>
@@ -2,28 +2,56 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug)",
-            "type": "coreclr",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
            "request": "launch",
-            "program": "dotnet",
-            "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll"
-            ],
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Catch.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Debug, dotnet)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, netcoreapp2.1)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, dotnet)",
            "env": {},
            "console": "internalConsole"
        }
@@ -4,13 +4,12 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "Build (Debug)",
+            "label": "Build (Debug, msbuild)",
            "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
            "args": [
-                "build",
-                "--no-restore",
                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -19,13 +18,45 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Build (Release)",
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Debug, dotnet)",
            "type": "shell",
            "command": "dotnet",
            "args": [
                "build",
                "--no-restore",
                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -35,7 +66,16 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore",
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -21,7 +21,6 @@ namespace osu.Game.Rulesets.Catch.Tests
        [TestCase("basic")]
        [TestCase("spinner")]
        [TestCase("spinner-and-circles")]
-        [TestCase("slider")]
        public new void Test(string name)
        {
            base.Test(name);
@@ -1,15 +1,15 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
-using osuTK;
+using OpenTK;

 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -38,11 +38,13 @@ namespace osu.Game.Rulesets.Catch.Tests
                beatmap.HitObjects.Add(new JuiceStream
                {
                    X = 0.5f - width / 2,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    ControlPoints = new List<Vector2>
                    {
                        Vector2.Zero,
                        new Vector2(width * CatchPlayfield.BASE_WIDTH, 0)
-                    }),
+                    },
+                    CurveType = CurveType.Linear,
+                    Distance = width * CatchPlayfield.BASE_WIDTH,
                    StartTime = i * 2000,
                    NewCombo = i % 8 == 0
                });
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;

@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Game.Beatmaps;
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                }
            };

+
            for (int i = 0; i < 512; i++)
                beatmap.HitObjects.Add(new Fruit { X = 0.5f + i / 2048f * (i % 10 - 5), StartTime = i * 100, NewCombo = i % 8 == 0 });

@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Tests.Visual;
-using osuTK;
+using OpenTK;

 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Game.Beatmaps;
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Catch.Tests
        {
            var beatmap = new Beatmap { BeatmapInfo = { Ruleset = ruleset.RulesetInfo } };

+
            for (int i = 0; i < 512; i++)
                if (i % 5 < 3)
                    beatmap.HitObjects.Add(new Fruit { X = i % 10 < 5 ? 0.02f : 0.98f, StartTime = i * 100, NewCombo = i % 8 == 0 });
@@ -1,15 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-  </ItemGroup>
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 System.Linq;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
@@ -34,12 +34,13 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                {
                    StartTime = obj.StartTime,
                    Samples = obj.Samples,
-                    Path = curveData.Path,
-                    NodeSamples = curveData.NodeSamples,
+                    ControlPoints = curveData.ControlPoints,
+                    CurveType = curveData.CurveType,
+                    Distance = curveData.Distance,
+                    RepeatSamples = curveData.RepeatSamples,
                    RepeatCount = curveData.RepeatCount,
                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH,
                    NewCombo = comboData?.NewCombo ?? false,
-                    ComboOffset = comboData?.ComboOffset ?? 0,
                    LegacyLastTickOffset = legacyOffset?.LegacyLastTickOffset ?? 0
                };
            }
@@ -50,8 +51,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                    StartTime = obj.StartTime,
                    Samples = obj.Samples,
                    Duration = endTime.Duration,
-                    NewCombo = comboData?.NewCombo ?? false,
-                    ComboOffset = comboData?.ComboOffset ?? 0,
+                    NewCombo = comboData?.NewCombo ?? false
                };
            }
            else
@@ -61,7 +61,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                    StartTime = obj.StartTime,
                    Samples = obj.Samples,
                    NewCombo = comboData?.NewCombo ?? false,
-                    ComboOffset = comboData?.ComboOffset ?? 0,
                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH
                };
            }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Types;
-using osuTK;
+using OpenTK;
 using osu.Game.Rulesets.Catch.MathUtils;

 namespace osu.Game.Rulesets.Catch.Beatmaps
@@ -74,42 +74,42 @@ namespace osu.Game.Rulesets.Catch.Beatmaps

        private void initialiseHyperDash(List<CatchHitObject> objects)
        {
-            List<CatchHitObject> objectWithDroplets = new List<CatchHitObject>();
+            // todo: add difficulty adjust.
+            double halfCatcherWidth = CatcherArea.CATCHER_SIZE * (objects.FirstOrDefault()?.Scale ?? 1) / CatchPlayfield.BASE_WIDTH / 2;

-            foreach (var currentObject in objects)
-            {
-                if (currentObject is Fruit)
-                    objectWithDroplets.Add(currentObject);
-                if (currentObject is JuiceStream)
-                    foreach (var currentJuiceElement in currentObject.NestedHitObjects)
-                        if (!(currentJuiceElement is TinyDroplet))
-                            objectWithDroplets.Add((CatchHitObject)currentJuiceElement);
-            }
-
-            objectWithDroplets.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
-
-            double halfCatcherWidth = CatcherArea.GetCatcherSize(Beatmap.BeatmapInfo.BaseDifficulty) / 2;
            int lastDirection = 0;
            double lastExcess = halfCatcherWidth;

-            for (int i = 0; i < objectWithDroplets.Count - 1; i++)
+            int objCount = objects.Count;
+
+            for (int i = 0; i < objCount - 1; i++)
            {
-                CatchHitObject currentObject = objectWithDroplets[i];
-                CatchHitObject nextObject = objectWithDroplets[i + 1];
+                CatchHitObject currentObject = objects[i];
+
+                // not needed?
+                // if (currentObject is TinyDroplet) continue;
+
+                CatchHitObject nextObject = objects[i + 1];
+
+                // while (nextObject is TinyDroplet)
+                // {
+                //     if (++i == objCount - 1) break;
+                //     nextObject = objects[i + 1];
+                // }

                int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
-                double timeToNext = nextObject.StartTime - currentObject.StartTime;
+                double timeToNext = nextObject.StartTime - ((currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime) - 4;
                double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
-                float distanceToHyper = (float)(timeToNext * CatcherArea.Catcher.BASE_SPEED - distanceToNext);
-                if (distanceToHyper < 0)
+
+                if (timeToNext * CatcherArea.Catcher.BASE_SPEED < distanceToNext)
                {
                    currentObject.HyperDashTarget = nextObject;
                    lastExcess = halfCatcherWidth;
                }
                else
                {
-                    currentObject.DistanceToHyperDash = distanceToHyper;
-                    lastExcess = MathHelper.Clamp(distanceToHyper, 0, halfCatcherWidth);
+                    //currentObject.DistanceToHyperDash = timeToNext - distanceToNext;
+                    lastExcess = MathHelper.Clamp(timeToNext - distanceToNext, 0, halfCatcherWidth);
                }

                lastDirection = thisDirection;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.ComponentModel;
 using osu.Framework.Input.Bindings;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Beatmaps;
 using osu.Game.Graphics;
@@ -93,11 +93,13 @@ namespace osu.Game.Rulesets.Catch
                        new CatchModHidden(),
                        new CatchModFlashlight(),
                    };
-                case ModType.Automation:
+                case ModType.Special:
                    return new Mod[]
                    {
-                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                        new CatchModRelax(),
+                        null,
+                        null,
+                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                    };
                default:
                    return new Mod[] { };
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -14,6 +14,7 @@ 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.
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 osuTK;
+using OpenTK;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -1,7 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Judgements;
 using osu.Game.Rulesets.Scoring;

 namespace osu.Game.Rulesets.Catch.Judgements
@@ -10,6 +9,8 @@ namespace osu.Game.Rulesets.Catch.Judgements
    {
        public override bool AffectsCombo => false;

+        public override bool ShouldExplode => true;
+
        protected override int NumericResultFor(HitResult result)
        {
            switch (result)
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
            }
        }

-        protected override double HealthIncreaseFor(HitResult result)
+        protected override float HealthIncreaseFor(HitResult result)
        {
            switch (result)
            {
@@ -31,7 +32,5 @@ namespace osu.Game.Rulesets.Catch.Judgements
                    return 8;
            }
        }
-
-        public override bool ShouldExplodeFor(JudgementResult result) => true;
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Scoring;

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
            }
        }

-        protected override double HealthIncreaseFor(HitResult result)
+        protected override float HealthIncreaseFor(HitResult result)
        {
            switch (result)
            {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Judgements;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,21 +22,31 @@ namespace osu.Game.Rulesets.Catch.Judgements
            }
        }

-        protected override double HealthIncreaseFor(HitResult result)
+        /// <summary>
+        /// The base health increase for the result achieved.
+        /// </summary>
+        public float HealthIncrease => HealthIncreaseFor(Result);
+
+        /// <summary>
+        /// Whether fruit on the platter should explode or drop.
+        /// Note that this is only checked if the owning object is also <see cref="IHasComboInformation.LastInCombo" />
+        /// </summary>
+        public virtual bool ShouldExplode => IsHit;
+
+        /// <summary>
+        /// Convert a <see cref="HitResult"/> to a base health increase.
+        /// </summary>
+        /// <param name="result">The value to convert.</param>
+        /// <returns>The base health increase.</returns>
+        protected virtual float HealthIncreaseFor(HitResult result)
        {
            switch (result)
            {
                default:
                    return 0;
                case HitResult.Perfect:
-                    return 10.2;
+                    return 10.2f;
            }
        }
-
-        /// <summary>
-        /// Whether fruit on the platter should explode or drop.
-        /// Note that this is only checked if the owning object is also <see cref="IHasComboInformation.LastInCombo" />
-        /// </summary>
-        public virtual bool ShouldExplodeFor(JudgementResult result) => result.IsHit;
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Scoring;

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
            }
        }

-        protected override double HealthIncreaseFor(HitResult result)
+        protected override float HealthIncreaseFor(HitResult result)
        {
            switch (result)
            {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;

@@ -1,21 +1,24 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Scoring;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;

 namespace osu.Game.Rulesets.Catch.Mods
 {
    public class CatchModAutoplay : ModAutoplay<CatchHitObject>
    {
-        protected override Score CreateReplayScore(Beatmap<CatchHitObject> beatmap) => new Score
+        protected override Score CreateReplayScore(Beatmap<CatchHitObject> beatmap)
        {
-            ScoreInfo = new ScoreInfo { User = new User { Username = "osu!salad!" } },
-            Replay = new CatchAutoGenerator(beatmap).Generate(),
-        };
+            return new Score
+            {
+                User = new User { Username = "osu!salad!" },
+                Replay = new CatchAutoGenerator(beatmap).Generate(),
+            };
+        }
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Mods;

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

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

@@ -1,66 +1,12 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
-using osuTK;

 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModFlashlight : ModFlashlight<CatchHitObject>
+    public class CatchModFlashlight : ModFlashlight
    {
        public override double ScoreMultiplier => 1.12;
-
-        private const float default_flashlight_size = 350;
-
-        public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield);
-
-        private CatchPlayfield playfield;
-
-        public override void ApplyToRulesetContainer(RulesetContainer<CatchHitObject> rulesetContainer)
-        {
-            playfield = (CatchPlayfield)rulesetContainer.Playfield;
-            base.ApplyToRulesetContainer(rulesetContainer);
-        }
-
-        private class CatchFlashlight : Flashlight
-        {
-            private readonly CatchPlayfield playfield;
-
-            public CatchFlashlight(CatchPlayfield playfield)
-            {
-                this.playfield = playfield;
-                FlashlightSize = new Vector2(0, getSizeFor(0));
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                var catcherArea = playfield.CatcherArea;
-
-                FlashlightPosition = catcherArea.ToSpaceOfOtherDrawable(catcherArea.MovableCatcher.DrawPosition, this);
-            }
-
-            private float getSizeFor(int combo)
-            {
-                if (combo > 200)
-                    return default_flashlight_size * 0.8f;
-                else if (combo > 100)
-                    return default_flashlight_size * 0.9f;
-                else
-                    return default_flashlight_size;
-            }
-
-            protected override void OnComboChange(int newCombo)
-            {
-                this.TransformTo(nameof(FlashlightSize), new Vector2(0, getSizeFor(newCombo)), FLASHLIGHT_FADE_DURATION);
-            }
-
-            protected override string FragmentShader => "CircularFlashlight";
-        }
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Mods;

@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Catch.Objects;
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Mods;

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

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

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

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

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

@@ -1,15 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Judgements;
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 namespace osu.Game.Rulesets.Catch.Objects
 {
    public class Banana : Fruit
    {
        public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
-
-        public override Judgement CreateJudgement() => new CatchBananaJudgement();
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Objects.Types;

@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -16,20 +16,16 @@ namespace osu.Game.Rulesets.Catch.Objects

        public int IndexInBeatmap { get; set; }

-        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
+        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);

        public virtual bool NewCombo { get; set; }

-        public int ComboOffset { get; set; }
-
        public int IndexInCurrentCombo { get; set; }

        public int ComboIndex { get; set; }

        /// <summary>
-        /// Difference between the distance to the next object
-        /// and the distance that would have triggered a hyper dash.
-        /// A value close to 0 indicates a difficult jump (for difficulty calculation).
+        /// The distance for a fruit to to next hyper if it's not a hyper.
        /// </summary>
        public float DistanceToHyperDash { get; set; }

@@ -1,23 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Catch.Objects
-{
-    public class CatchHitWindows : HitWindows
-    {
-        public override bool IsHitResultAllowed(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Perfect:
-                case HitResult.Miss:
-                    return true;
-            }
-
-            return false;
-        }
-    }
-}
@@ -1,5 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Catch.Judgements;

 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -9,5 +11,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            : base(h)
        {
        }
+
+        protected override CatchJudgement CreateJudgement() => new CatchBananaJudgement();
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                AddNested(getVisualRepresentation?.Invoke(b));
        }

+        protected override bool ProvidesJudgement => false;
+
        protected override void AddNested(DrawableHitObject h)
        {
            ((DrawableCatchHitObject)h).CheckPosition = o => CheckPosition?.Invoke(o) ?? false;
@@ -1,10 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -52,20 +53,26 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable

        public Func<CatchHitObject, bool> CheckPosition;

-        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        protected override void CheckForJudgements(bool userTriggered, double timeOffset)
        {
            if (CheckPosition == null) return;

-            if (timeOffset >= 0 && Result != null)
-                ApplyResult(r => r.Type = CheckPosition.Invoke(HitObject) ? HitResult.Perfect : HitResult.Miss);
+            if (timeOffset >= 0)
+            {
+                var judgement = CreateJudgement();
+                judgement.Result = CheckPosition.Invoke(HitObject) ? HitResult.Perfect : HitResult.Miss;
+                AddJudgement(judgement);
+            }
        }

+        protected virtual CatchJudgement CreateJudgement() => new CatchJudgement();
+
        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
        {
            base.SkinChanged(skin, allowFallback);

            if (HitObject is IHasComboInformation combo)
-                AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White);
+                AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White;
        }

        private const float preempt = 1000;
@@ -1,11 +1,12 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Rulesets.Catch.Objects.Drawable.Pieces;
-using osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Game.Rulesets.Catch.Judgements;

 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -23,6 +24,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            Masking = false;
        }

+        protected override CatchJudgement CreateJudgement() => new CatchDropletJudgement();
+
        [BackgroundDependencyLoader]
        private void load()
        {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Framework.Allocation;
@@ -9,8 +9,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
-using osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;

 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
        private void load()
        {
            // todo: this should come from the skin.
-            AccentColour = colourForRepresentation(HitObject.VisualRepresentation);
+            AccentColour = colourForRrepesentation(HitObject.VisualRepresentation);

            InternalChildren = new[]
            {
@@ -275,7 +275,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            border.Alpha = (float)MathHelper.Clamp((HitObject.StartTime - Time.Current) / 500, 0, 1);
        }

-        private Color4 colourForRepresentation(FruitVisualRepresentation representation)
+        private Color4 colourForRrepesentation(FruitVisualRepresentation representation)
        {
            switch (representation)
            {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                AddNested(getVisualRepresentation?.Invoke(o));
        }

+        protected override bool ProvidesJudgement => false;
+
        protected override void AddNested(DrawableHitObject h)
        {
            var catchObject = (DrawableCatchHitObject)h;
@@ -1,16 +1,19 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osuTK;
+using OpenTK;
+using osu.Game.Rulesets.Catch.Judgements;

 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
    public class DrawableTinyDroplet : DrawableDroplet
    {
-        public DrawableTinyDroplet(TinyDroplet h)
+        public DrawableTinyDroplet(Droplet h)
            : base(h)
        {
            Size = new Vector2((float)CatchHitObject.OBJECT_RADIUS) / 8;
        }
+
+        protected override CatchJudgement CreateJudgement() => new CatchTinyDropletJudgement();
    }
 }
@@ -1,12 +1,12 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osuTK.Graphics;
+using OpenTK.Graphics;

 namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
 {
@@ -1,13 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Judgements;
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 namespace osu.Game.Rulesets.Catch.Objects
 {
    public class Droplet : CatchHitObject
    {
-        public override Judgement CreateJudgement() => new CatchDropletJudgement();
    }
 }
@@ -1,13 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Judgements;
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 namespace osu.Game.Rulesets.Catch.Objects
 {
    public class Fruit : CatchHitObject
    {
-        public override Judgement CreateJudgement() => new CatchJudgement();
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using OpenTK;

 namespace osu.Game.Rulesets.Catch.Objects
 {
@@ -49,19 +50,12 @@ namespace osu.Game.Rulesets.Catch.Objects
            if (TickDistance == 0)
                return;

-            var length = Path.Distance;
+            var length = Curve.Distance;
            var tickDistance = Math.Min(TickDistance, length);
            var spanDuration = length / Velocity;

            var minDistanceFromEnd = Velocity * 0.01;

-            var tickSamples = Samples.Select(s => new SampleInfo
-            {
-                Bank = s.Bank,
-                Name = @"slidertick",
-                Volume = s.Volume
-            }).ToList();
-
            AddNested(new Fruit
            {
                Samples = Samples,
@@ -69,22 +63,15 @@ namespace osu.Game.Rulesets.Catch.Objects
                X = X
            });

-            double lastTickTime = StartTime;
+            double lastDropletTime = StartTime;

            for (int span = 0; span < this.SpanCount(); span++)
            {
                var spanStartTime = StartTime + span * spanDuration;
                var reversed = span % 2 == 1;

-                for (double d = tickDistance;; d += tickDistance)
+                for (double d = 0; d <= length; d += tickDistance)
                {
-                    bool isLastTick = false;
-                    if (d + minDistanceFromEnd >= length)
-                    {
-                        d = length;
-                        isLastTick = true;
-                    }
-
                    var timeProgress = d / length;
                    var distanceProgress = reversed ? 1 - timeProgress : timeProgress;

@@ -93,70 +80,85 @@ namespace osu.Game.Rulesets.Catch.Objects
                    if (LegacyLastTickOffset != null)
                    {
                        // If we're the last tick, apply the legacy offset
-                        if (span == this.SpanCount() - 1 && isLastTick)
+                        if (span == this.SpanCount() - 1 && d + tickDistance > length)
                            time = Math.Max(StartTime + Duration / 2, time - LegacyLastTickOffset.Value);
                    }

-                    int tinyTickCount = 1;
-                    double tinyTickInterval = time - lastTickTime;
-                    while (tinyTickInterval > 100 && tinyTickCount < 10000)
-                    {
+                    double tinyTickInterval = time - lastDropletTime;
+                    while (tinyTickInterval > 100)
                        tinyTickInterval /= 2;
-                        tinyTickCount *= 2;
-                    }

-                    for (int tinyTickIndex = 0; tinyTickIndex < tinyTickCount - 1; tinyTickIndex++)
+                    for (double t = lastDropletTime + tinyTickInterval; t < time; t += tinyTickInterval)
                    {
-                        var t = lastTickTime + (tinyTickIndex + 1) * tinyTickInterval;
                        double progress = reversed ? 1 - (t - spanStartTime) / spanDuration : (t - spanStartTime) / spanDuration;

                        AddNested(new TinyDroplet
                        {
                            StartTime = t,
-                            X = X + Path.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
-                            Samples = tickSamples
+                            X = X + Curve.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
+                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
+                            {
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
                        });
                    }

-                    lastTickTime = time;
-
-                    if (isLastTick)
-                        break;
-
-                    AddNested(new Droplet
+                    if (d > minDistanceFromEnd && Math.Abs(d - length) > minDistanceFromEnd)
                    {
-                        StartTime = time,
-                        X = X + Path.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
-                        Samples = tickSamples
-                    });
+                        AddNested(new Droplet
+                        {
+                            StartTime = time,
+                            X = X + Curve.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
+                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
+                            {
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
+                        });
+                    }
+
+                    lastDropletTime = time;
                }

                AddNested(new Fruit
                {
                    Samples = Samples,
                    StartTime = spanStartTime + spanDuration,
-                    X = X + Path.PositionAt(reversed ? 0 : 1).X / CatchPlayfield.BASE_WIDTH
+                    X = X + Curve.PositionAt(reversed ? 0 : 1).X / CatchPlayfield.BASE_WIDTH
                });
            }
        }

-        public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
+        public double EndTime => StartTime + this.SpanCount() * Curve.Distance / Velocity;

        public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;

        public double Duration => EndTime - StartTime;

-        private SliderPath path;
-
-        public SliderPath Path
+        public double Distance
        {
-            get => path;
-            set => path = value;
+            get { return Curve.Distance; }
+            set { Curve.Distance = value; }
        }

-        public double Distance => Path.Distance;
+        public SliderCurve Curve { get; } = new SliderCurve();

-        public List<List<SampleInfo>> NodeSamples { get; set; } = new List<List<SampleInfo>>();
+        public List<Vector2> ControlPoints
+        {
+            get { return Curve.ControlPoints; }
+            set { Curve.ControlPoints = value; }
+        }
+
+        public List<List<SampleInfo>> RepeatSamples { get; set; } = new List<List<SampleInfo>>();
+
+        public CurveType CurveType
+        {
+            get { return Curve.CurveType; }
+            set { Curve.CurveType = value; }
+        }

        public double? LegacyLastTickOffset { get; set; }
    }
@@ -1,13 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Judgements;
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 namespace osu.Game.Rulesets.Catch.Objects
 {
    public class TinyDroplet : Droplet
    {
-        public override Judgement CreateJudgement() => new CatchTinyDropletJudgement();
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Runtime.CompilerServices;

@@ -9,4 +9,3 @@ using System.Runtime.CompilerServices;

 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests.Dynamic")]
-[assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests.iOS")]
@@ -1,14 +1,14 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Framework.MathUtils;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Users;

 namespace osu.Game.Rulesets.Catch.Replays
 {
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Replays
        public CatchAutoGenerator(Beatmap<CatchHitObject> beatmap)
            : base(beatmap)
        {
-            Replay = new Replay();
+            Replay = new Replay { User = new User { Username = @"Autoplay" } };
        }

        protected Replay Replay;
@@ -1,10 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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 osu.Framework.Input.StateChanges;
 using osu.Framework.MathUtils;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;

 namespace osu.Game.Rulesets.Catch.Replays
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Beatmaps;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Legacy;
 using osu.Game.Rulesets.Replays.Types;

 namespace osu.Game.Rulesets.Catch.Replays
@@ -1 +0,0 @@
-{"Mappings":[{"StartTime":19184.0,"Objects":[{"StartTime":19184.0,"Position":320.0},{"StartTime":19263.0,"Position":311.730255},{"StartTime":19343.0,"Position":324.6205},{"StartTime":19423.0,"Position":343.0907},{"StartTime":19503.0,"Position":372.2917},{"StartTime":19582.0,"Position":385.194733},{"StartTime":19662.0,"Position":379.0426},{"StartTime":19742.0,"Position":385.1066},{"StartTime":19822.0,"Position":391.624664},{"StartTime":19919.0,"Position":386.27832},{"StartTime":20016.0,"Position":380.117035},{"StartTime":20113.0,"Position":381.664154},{"StartTime":20247.0,"Position":370.872864}]}]}
@@ -1,18 +0,0 @@
-osu file format v14
-
-[General]
-Mode: 2
-
-[Difficulty]
-HPDrainRate:3
-CircleSize:2
-OverallDifficulty:4
-ApproachRate:4
-SliderMultiplier:0.9
-SliderTickRate:1
-
-[TimingPoints]
-35.4473684210527,638.298947368422,4,2,1,60,1,0
-
-[HitObjects]
-320,176,19184,2,8,P|384:168|368:232,1,150
@@ -1,11 +1,12 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;

@@ -20,29 +21,55 @@ namespace osu.Game.Rulesets.Catch.Scoring

        private float hpDrainRate;

-        protected override void ApplyBeatmap(Beatmap<CatchHitObject> beatmap)
+        protected override void SimulateAutoplay(Beatmap<CatchHitObject> beatmap)
        {
-            base.ApplyBeatmap(beatmap);
-
            hpDrainRate = beatmap.BeatmapInfo.BaseDifficulty.DrainRate;
+
+            foreach (var obj in beatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case JuiceStream stream:
+                        foreach (var nestedObject in stream.NestedHitObjects)
+                            switch (nestedObject)
+                            {
+                                case TinyDroplet _:
+                                    AddJudgement(new CatchTinyDropletJudgement { Result = HitResult.Perfect });
+                                    break;
+                                case Droplet _:
+                                    AddJudgement(new CatchDropletJudgement { Result = HitResult.Perfect });
+                                    break;
+                                case Fruit _:
+                                    AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+                                    break;
+                            }
+                        break;
+                    case BananaShower shower:
+                        foreach (var _ in shower.NestedHitObjects.Cast<CatchHitObject>())
+                            AddJudgement(new CatchBananaJudgement { Result = HitResult.Perfect });
+                        break;
+                    case Fruit _:
+                        AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+                        break;
+                }
+            }
        }

        private const double harshness = 0.01;

-        protected override void ApplyResult(JudgementResult result)
+        protected override void OnNewJudgement(Judgement judgement)
        {
-            base.ApplyResult(result);
+            base.OnNewJudgement(judgement);

-            if (result.Type == HitResult.Miss)
+            if (judgement.Result == HitResult.Miss)
            {
-                if (!result.Judgement.IsBonus)
+                if (!judgement.IsBonus)
                    Health.Value -= hpDrainRate * (harshness * 2);
                return;
            }

-            Health.Value += Math.Max(result.Judgement.HealthIncreaseFor(result) - hpDrainRate, 0) * harshness;
+            if (judgement is CatchJudgement catchJudgement)
+                Health.Value += Math.Max(catchJudgement.HealthIncrease - hpDrainRate, 0) * harshness;
        }
-
-        protected override HitWindows CreateHitWindows() => new CatchHitWindows();
    }
 }
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Framework.Graphics;
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;

 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -18,43 +17,49 @@ namespace osu.Game.Rulesets.Catch.UI
    {
        public const float BASE_WIDTH = 512;

-        internal readonly CatcherArea CatcherArea;
+        protected override Container<Drawable> Content => content;
+        private readonly Container<Drawable> content;
+
+        private readonly CatcherArea catcherArea;

        public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation)
+            : base(BASE_WIDTH)
        {
+            Direction.Value = ScrollingDirection.Down;
+
            Container explodingFruitContainer;

            Anchor = Anchor.TopCentre;
            Origin = Anchor.TopCentre;

-            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+            base.Content.Anchor = Anchor.BottomLeft;
+            base.Content.Origin = Anchor.BottomLeft;

-            InternalChild = new PlayfieldAdjustmentContainer
+            base.Content.AddRange(new Drawable[]
            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
+                explodingFruitContainer = new Container
                {
-                    explodingFruitContainer = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    CatcherArea = new CatcherArea(difficulty)
-                    {
-                        GetVisualRepresentation = getVisualRepresentation,
-                        ExplodingFruitTarget = explodingFruitContainer,
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.TopLeft,
-                    },
-                    HitObjectContainer
-                }
-            };
+                    RelativeSizeAxes = Axes.Both,
+                },
+                catcherArea = new CatcherArea(difficulty)
+                {
+                    GetVisualRepresentation = getVisualRepresentation,
+                    ExplodingFruitTarget = explodingFruitContainer,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.TopLeft,
+                },
+                content = new Container<Drawable>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+            });
        }

-        public bool CheckIfWeCanCatch(CatchHitObject obj) => CatcherArea.AttemptCatch(obj);
+        public bool CheckIfWeCanCatch(CatchHitObject obj) => catcherArea.AttemptCatch(obj);

        public override void Add(DrawableHitObject h)
        {
-            h.OnNewResult += onNewResult;
+            h.OnJudgement += onJudgement;

            base.Add(h);

@@ -62,7 +67,6 @@ namespace osu.Game.Rulesets.Catch.UI
            fruit.CheckPosition = CheckIfWeCanCatch;
        }

-        private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
-            => CatcherArea.OnResult((DrawableCatchHitObject)judgedObject, result);
+        private void onJudgement(DrawableHitObject judgedObject, Judgement judgement) => catcherArea.OnJudgement((DrawableCatchHitObject)judgedObject, judgement);
    }
 }
@@ -1,33 +1,27 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Input;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;

 namespace osu.Game.Rulesets.Catch.UI
 {
    public class CatchRulesetContainer : ScrollingRulesetContainer<CatchPlayfield, CatchHitObject>
    {
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
-
-        protected override bool UserScrollSpeedAdjustment => false;
-
        public CatchRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
            : base(ruleset, beatmap)
        {
-            Direction.Value = ScrollingDirection.Down;
-            TimeRange.Value = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450);
        }

        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor(this);
@@ -38,7 +32,9 @@ namespace osu.Game.Rulesets.Catch.UI

        public override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);

-        public override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
+        protected override Vector2 PlayfieldArea => new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+
+        protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
        {
            switch (h)
            {
@@ -1,5 +1,5 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
@@ -18,16 +18,16 @@ using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
-using osuTK;
-using osuTK.Graphics;
+using OpenTK;
+using OpenTK.Graphics;

 namespace osu.Game.Rulesets.Catch.UI
 {
    public class CatcherArea : Container
    {
-        public const float CATCHER_SIZE = 100;
+        public const float CATCHER_SIZE = 84;

-        protected internal readonly Catcher MovableCatcher;
+        protected readonly Catcher MovableCatcher;

        public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> GetVisualRepresentation;

@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Catch.UI

        private DrawableCatchHitObject lastPlateableFruit;

-        public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
+        public void OnJudgement(DrawableCatchHitObject fruit, Judgement judgement)
        {
            void runAfterLoaded(Action action)
            {
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Catch.UI
                    lastPlateableFruit.OnLoadComplete = _ => action();
            }

-            if (result.IsHit && fruit.CanBePlated)
+            if (judgement.IsHit && fruit.CanBePlated)
            {
                var caughtFruit = (DrawableCatchHitObject)GetVisualRepresentation?.Invoke(fruit.HitObject);

@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Catch.UI

            if (fruit.HitObject.LastInCombo)
            {
-                if (((CatchJudgement)result.Judgement).ShouldExplodeFor(result))
+                if (((CatchJudgement)judgement).ShouldExplode)
                    runAfterLoaded(() => MovableCatcher.Explode());
                else
                    MovableCatcher.Drop();
@@ -107,11 +107,6 @@ namespace osu.Game.Rulesets.Catch.UI

        public bool AttemptCatch(CatchHitObject obj) => MovableCatcher.AttemptCatch(obj);

-        public static float GetCatcherSize(BeatmapDifficulty difficulty)
-        {
-            return CATCHER_SIZE / CatchPlayfield.BASE_WIDTH * (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
-        }
-
        public class Catcher : Container, IKeyBindingHandler<CatchAction>
        {
            /// <summary>
@@ -412,7 +407,9 @@ namespace osu.Game.Rulesets.Catch.UI
            /// </summary>
            public void Explode()
            {
-                foreach (var f in caughtFruit.ToArray())
+                var fruit = caughtFruit.ToArray();
+
+                foreach (var f in fruit)
                    Explode(f);
            }

@@ -425,15 +422,15 @@ namespace osu.Game.Rulesets.Catch.UI
                    fruit.Anchor = Anchor.TopLeft;
                    fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);

-                    if (!caughtFruit.Remove(fruit))
-                        // we may have already been removed by a previous operation (due to the weird OnLoadComplete scheduling).
-                        // this avoids a crash on potentially attempting to Add a fruit to ExplodingFruitTarget twice.
-                        return;
+                    caughtFruit.Remove(fruit);

                    ExplodingFruitTarget.Add(fruit);
                }

-                fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine).Then().MoveToY(fruit.Y + 50, 500, Easing.InSine);
+                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);

@@ -1,42 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.UI
-{
-    public class PlayfieldAdjustmentContainer : Container
-    {
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
-
-        public PlayfieldAdjustmentContainer()
-        {
-            InternalChild = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                FillMode = FillMode.Fit,
-                FillAspectRatio = 4f / 3,
-                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
-            };
-        }
-
-        /// <summary>
-        /// A <see cref="Container"/> which scales its content relative to a target width.
-        /// </summary>
-        private class ScalingContainer : Container
-        {
-            protected override void Update()
-            {
-                base.Update();
-
-                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.BASE_WIDTH);
-                Size = Vector2.Divide(Vector2.One, Scale);
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				{"Mappings":[{"StartTime":19184.0,"Objects":[{"StartTime":19184.0,"Position":320.0},{"StartTime":19263.0,"Position":311.730255},{"StartTime":19343.0,"Position":324.6205},{"StartTime":19423.0,"Position":343.0907},{"StartTime":19503.0,"Position":372.2917},{"StartTime":19582.0,"Position":385.194733},{"StartTime":19662.0,"Position":379.0426},{"StartTime":19742.0,"Position":385.1066},{"StartTime":19822.0,"Position":391.624664},{"StartTime":19919.0,"Position":386.27832},{"StartTime":20016.0,"Position":380.117035},{"StartTime":20113.0,"Position":381.664154},{"StartTime":20247.0,"Position":370.872864}]}]}