Remove empty files

Update framework
Revert values on lease end
2026-05-19 04:32:11 +08:00 · 2019-01-21 16:37:20 +09:00 · 2019-01-21 16:37:20 +09:00 · 2019-01-21 16:37:20 +09:00 · 2019-01-21 16:37:20 +09:00
1608 changed files with 17813 additions and 34759 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 +0,0 @@
-custom: https://osu.ppy.sh/home/support
@@ -1,11 +1,14 @@
 ---
 name: Bug Report
-about: Issues regarding encountered bugs.
+about: For issues regarding encountered game bugs
 ---
-**Describe the bug:** 
+
+<!-- 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:** 
+**osu!lazer version:** <!-- Provide the version of your osu!lazer, you can find it at the bottom of the screen  -->

-**Logs:** 
+**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,13 +1,16 @@
 ---
 name: Crash Report
-about: Issues regarding crashes or permanent freezes.
+about: For issues regarding game crashes or permanent freezes
 ---
-**Describe the crash:** 
+
+<!-- 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:** 
+**osu!lazer version:** <!-- Provide the version of your osu!lazer, you can find it at the bottom of the screen  -->

-**Logs:** 
+**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:** 
+**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,7 +1,10 @@
 ---
 name: Feature Request
-about: Features you would like to see in the game!
+about: Let us know what you would like to see in the game!
 ---
-**Describe the new feature:** 

-**Proposal designs of the feature:** 
+<!-- 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,7 +1,10 @@
 ---
 name: Missing for Live
-about: Features which are available in osu!stable but not yet in osu!lazer.
+about: Let us know the features you need which are available in osu-stable but not lazer
 ---
-**Describe the missing feature:** 

-**Proposal designs of the feature:** 
+<!-- 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. -->
@@ -0,0 +1,8 @@
+Add any details pertaining to developers above the break.
+
+- [ ] Depends on #PR
+- Closes #ISSUE
+
+---
+
+Add a sentence or two describing this change in plain english. This will be displayed on the [changelog](https://osu.ppy.sh/home/changelog). A single screenshot or short gif is also welcomed.
@@ -11,10 +11,8 @@
 *.userprefs

 ### Cake ###
-tools/**
-build/tools/**
-
-fastlane/report.xml
+tools/*
+!tools/cakebuild.csproj

 # Build results
 bin/[Dd]ebug/
@@ -0,0 +1,3 @@
+[submodule "osu-resources"]
+	path = osu-resources
+	url = https://github.com/ppy/osu-resources
@@ -68,20 +68,6 @@
                }
            },
            "console": "internalConsole"
-        },
-        {
-            "name": "Cake: Debug Script",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/tools/Cake.CoreCLR/0.30.0/Cake.dll",
-            "args": [
-                "${workspaceRoot}/build/build.cake",
-                "--debug",
-                "--verbosity=diagnostic"
-            ],
-            "cwd": "${workspaceRoot}/build",
-            "stopAtEntry": true,
-            "externalConsole": false
        }
    ]
 }
@@ -70,8 +70,7 @@
            "type": "shell",
            "command": "dotnet",
            "args": [
-                "restore",
-                "osu.sln"
+                "restore"
            ],
            "problemMatcher": []
        }
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"
-
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)
@@ -1,173 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    atomos (0.1.3)
-    babosa (1.0.2)
-    claide (1.0.2)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    digest-crc (0.4.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.1)
-    emoji_regex (1.0.1)
-    excon (0.62.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
-      http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.5)
-    fastlane (2.117.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      babosa (>= 1.0.2, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
-      faraday (~> 0.9)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
-      json (< 3.0.0)
-      mini_magick (~> 4.5.1)
-      multi_json
-      multi_xml (~> 0.5)
-      multipart-post (~> 2.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.2, < 2.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 1.6.2, < 2.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.6.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-clean_testflight_testers (0.2.0)
-    fastlane-plugin-souyuz (0.8.1)
-      souyuz (>= 0.8.1)
-    fastlane-plugin-xamarin (0.6.3)
-    gh_inspector (1.1.3)
-    google-api-client (0.23.9)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    google-cloud-core (1.3.0)
-      google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
-      faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
-      google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    highline (1.7.10)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    json (2.2.0)
-    jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_magick (4.5.1)
-    mini_portile2 (2.4.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nanaimo (0.2.6)
-    naturally (2.2.0)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    os (1.0.0)
-    plist (3.5.0)
-    public_suffix (2.0.5)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rouge (2.0.7)
-    rubyzip (1.2.2)
-    security (0.1.3)
-    signet (0.11.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.5)
-      CFPropertyList
-      naturally
-    slack-notifier (2.3.2)
-    souyuz (0.8.1)
-      fastlane (>= 2.29.0)
-      highline (~> 1.7)
-      nokogiri (~> 1.7)
-    terminal-notifier (1.8.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-cursor (0.6.1)
-    tty-screen (0.6.5)
-    tty-spinner (0.9.0)
-      tty-cursor (~> 0.6.0)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
-    word_wrap (1.0.0)
-    xcodeproj (1.8.1)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fastlane
-  fastlane-plugin-clean_testflight_testers
-  fastlane-plugin-souyuz
-  fastlane-plugin-xamarin
-
-BUNDLED WITH
-   2.0.1
@@ -0,0 +1,11 @@
+osu!lazer is currently still under heavy development!
+
+Please ensure that you are making an issue for one of the following:
+
+- A bug with currently implemented features (not features that don't exist)
+- A feature you are considering adding, so we can collaborate on feedback and design.
+- Discussions about technical design decisions
+
+If your issue qualifies, replace this text with a detailed description of your issue with as much relevant information as you can provide.
+
+Screenshots and log files are highly welcomed.
@@ -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
@@ -1,60 +1,52 @@
-# osu!
-
-[![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)  [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
+# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)  [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)

 Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commonly known by the codename "osu!lazer". Pew pew.

-## Status
+# Status

 This project is still heavily under development, but is in a state where users are encouraged to try it out and keep it installed alongside the stable osu! client. It will continue to evolve over the coming months and hopefully bring some new unique features to the table.

 We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.

-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
-
-## Requirements
+# 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.

-## Running osu!
+# Running osu!

-### Releases
+## Releases

-![](https://puu.sh/DCmvA/f6a74f5fbb.png)
+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.

-If you are not interested in developing the game, you can consume our [binary releases](https://github.com/ppy/osu/releases).
-
-**Latest build:***
-
-| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) |
-| ------------- | ------------- |
-
- **Linux** users are recommended to self-compile until we have official deployment in place.
- **iOS** users can join the [TestFlight beta program](https://t.co/PasE1zrHhw) (note that due to high demand this is regularly full).
- **Android** users can self-compile, and expect a public beta soon.
+- 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).

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

-### Downloading the source code
+## Downloading the source code

-Clone the repository:
+Clone the repository **including submodules**:

 ```shell
-git clone https://github.com/ppy/osu
+git clone --recurse-submodules https://github.com/ppy/osu
 cd osu
 ```

+> If you forgot the `--recurse-submodules` option, run this command inside the `osu` directory:
+>
+> `git submodule update --init --recursive`
+
 To update the source code to the latest commit, run the following command inside the `osu` directory:

 ```shell
-git pull
+git pull --recurse-submodules
 ```

-### Building
+## 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](#contributing).
+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.

@@ -68,7 +60,7 @@ If you are not interested in debugging osu!, you can add `-c Release` to gain pe

 If the build fails, try to restore nuget packages with `dotnet restore`.

-#### A note for Linux users
+### 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`.

@@ -80,15 +72,11 @@ For example, you can run osu! with the following command:
 LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp2.2" dotnet run --project osu.Desktop
 ```

-### Testing with resource/framework modifications
+## Code analysis

-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 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.

-### 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). Alternatively, you can install resharper or use rider to get inline support in your IDE of choice.
-
-## Contributing
+# Contributing

 We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention on having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time, to ensure no effort is wasted.

@@ -98,7 +86,7 @@ Contributions can be made via pull requests to this repository. We hope to credi

 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. I welcome all feedback so we can make contributing to this project as pain-free as possible.

-## Licence
+# Licence

 The osu! client code and framework are licensed under the [MIT licence](https://opensource.org/licenses/MIT). Please see [the licence file](LICENCE) for more information. [tl;dr](https://tldrlegal.com/license/mit-license) you can do whatever you want as long as you include the original copyright and license notice in any copy of the software/source.

@@ -1,6 +1,6 @@
 clone_depth: 1
 version: '{branch}-{build}'
-image: Previous Visual Studio 2017
+image: Visual Studio 2017
 test: off
 install:
  - cmd: git submodule update --init --recursive --depth=5
@@ -1,7 +1,6 @@
 #addin "nuget:?package=CodeFileSanity&version=0.0.21"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.1.1"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.2.2"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
-var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();

 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -10,24 +9,30 @@ var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 var target = Argument("target", "Build");
 var configuration = Argument("configuration", "Release");

-var rootDirectory = new DirectoryPath("..");
-var solution = rootDirectory.CombineWithFilePath("osu.sln");
+var osuSolution = new FilePath("./osu.sln");

 ///////////////////////////////////////////////////////////////////////////////
 // TASKS
 ///////////////////////////////////////////////////////////////////////////////

-Task("Compile")
+Task("Restore")
    .Does(() => {
-        DotNetCoreBuild(solution.FullPath, new DotNetCoreBuildSettings {
+        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(rootDirectory + "/**/*.Tests/bin/**/*.Tests.dll");
+        var testAssemblies = GetFiles("**/*.Tests/bin/**/*.Tests.dll");

        DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings {
            Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx",
@@ -41,20 +46,20 @@ Task("InspectCode")
    .WithCriteria(IsRunningOnWindows())
    .IsDependentOn("Compile")
    .Does(() => {
-        InspectCode(solution, new InspectCodeSettings {
+        var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
+
+        InspectCode(osuSolution, new InspectCodeSettings {
            CachesHome = "inspectcode",
            OutputFile = "inspectcodereport.xml",
        });

-        int returnCode = StartProcess(nVikaToolPath, $@"parsereport ""inspectcodereport.xml"" --treatwarningsaserrors");
-        if (returnCode != 0)
-            throw new Exception($"inspectcode failed with return code {returnCode}");
+        StartProcess(nVikaToolPath, @"parsereport ""inspectcodereport.xml"" --treatwarningsaserrors");
    });

 Task("CodeFileSanity")
    .Does(() => {
        ValidateCodeSanity(new ValidateCodeSanitySettings {
-            RootDirectory = rootDirectory.FullPath,
+            RootDirectory = ".",
            IsAppveyorBuild = AppVeyor.IsRunningOnAppVeyor
        });
    });
@@ -41,28 +41,27 @@ Param(
    [switch]$ShowDescription,
    [Alias("WhatIf", "Noop")]
    [switch]$DryRun,
-    [Parameter(Position = 0, Mandatory = $false, ValueFromRemainingArguments = $true)]
+    [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) {
+if(!$PSScriptRoot){
    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 }

 # Resolve the paths for resources used for debugging.
-$BUILD_DIR = Join-Path $PSScriptRoot "build"
-$TOOLS_DIR = Join-Path $BUILD_DIR "tools"
-$CAKE_CSPROJ = Join-Path $BUILD_DIR "cakebuild.csproj"
+$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_DIR/cake.coreclr/" -Filter Cake.dll -Recurse).FullName
+$CAKE_EXECUTABLE = (Get-ChildItem -Path ./tools/cake.coreclr/ -Filter Cake.dll -Recurse).FullName

 # Build Cake arguments
 $cakeArguments = @("$Script");
@@ -76,7 +75,5 @@ $cakeArguments += $ScriptArgs

 # Start Cake
 Write-Host "Running build script..."
-Push-Location -Path $BUILD_DIR
 Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments"
-Pop-Location
 exit $LASTEXITCODE
@@ -6,13 +6,12 @@

 echo "Preparing to run build script..."

-cd build
 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=$SCRIPT_DIR/"cakebuild.csproj"
+CAKE_CSPROJ=$TOOLS_DIR/"cakebuild.csproj"

 # Parse arguments.
 CAKE_ARGUMENTS=()
@@ -1,2 +0,0 @@
-app_identifier("sh.ppy.osulazer") # The bundle identifier of your app
-apple_id("apple-dev@ppy.sh") # Your Apple email address
@@ -1,65 +0,0 @@
-update_fastlane
-
-default_platform(:ios)
-
-platform :ios do
-  lane :testflight_prune_dry do
-    clean_testflight_testers(days_of_inactivity:45, dry_run: true)
-  end
-
-  # Specify a custom number for what's "inactive"
-  lane :testflight_prune do
-    clean_testflight_testers(days_of_inactivity: 45) # 120 days, so about 4 months
-  end
-
-  lane :update_version do |options|
-    options[:plist_path] = '../osu.iOS/Info.plist'
-    app_version(options)
-  end
-
-  desc 'Deploy to testflight'
-  lane :beta do |options|
-    update_version(options)
-
-    provision(
-      type: 'appstore'
-    )
-
-    build(
-      build_configuration: 'Release', 
-      build_platform: 'iPhone'
-    )
-
-    client = HTTPClient.new
-    changelog = client.get_content 'https://gist.githubusercontent.com/peppy/ab89c29dcc0dce95f39eb218e8fad197/raw'
-    changelog.gsub!('$BUILD_ID', options[:build])
-
-    pilot(
-      wait_processing_interval: 1800,
-      changelog: changelog,
-      ipa: './osu.iOS/bin/iPhone/Release/osu.iOS.ipa'
-    )
-  end
-
-  desc 'Compile the project'
-  lane :build do
-    nuget_restore(
-      project_path: 'osu.iOS.sln'
-    )
-
-    souyuz(
-      platform: "ios",
-      build_target: "osu_iOS",
-      plist_path: "../osu.iOS/Info.plist"
-    )
-  end
-
-  desc 'Install provisioning profiles using match'
-  lane :provision do |options|
-    if Helper.is_ci?
-      options[:readonly] = true
-    end
-
-    match(options)
-  end
-end
@@ -1 +0,0 @@
-git_url('https://github.com/peppy/apple-certificates')
@@ -1,7 +0,0 @@
-# Autogenerated by fastlane
-#
-# Ensure this file is checked in to source control!
-
-gem 'fastlane-plugin-clean_testflight_testers'
-gem 'fastlane-plugin-souyuz'
-gem 'fastlane-plugin-xamarin'
@@ -1,54 +0,0 @@
-fastlane documentation
-================
-# Installation
-
-Make sure you have the latest version of the Xcode command line tools installed:
-
-```
-xcode-select --install
-```
-
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew cask install fastlane`
-
-# Available Actions
-## iOS
-### ios testflight_prune_dry
-```
-fastlane ios testflight_prune_dry
-```
-
-### ios testflight_prune
-```
-fastlane ios testflight_prune
-```
-
-### ios update_version
-```
-fastlane ios update_version
-```
-
-### ios beta
-```
-fastlane ios beta
-```
-Deploy to testflight
-### ios build
-```
-fastlane ios build
-```
-Compile the project
-### ios provision
-```
-fastlane ios provision
-```
-Install provisioning profiles using match
-
----
-
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
@@ -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;
@@ -7,15 +7,16 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using osu.Desktop.Overlays;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game;
 using osuTK.Input;
 using Microsoft.Win32;
 using osu.Desktop.Updater;
 using osu.Framework;
-using osu.Framework.Logging;
 using osu.Framework.Platform.Windows;
 using osu.Framework.Screens;
+using osu.Game.Screens;
 using osu.Game.Screens.Menu;

 namespace osu.Desktop
@@ -35,15 +36,12 @@ namespace osu.Desktop
        {
            try
            {
-                if (Host is DesktopGameHost desktopHost)
-                    return new StableStorage(desktopHost);
+                return new StableStorage();
            }
-            catch (Exception e)
+            catch
            {
-                Logger.Error(e, "Error while searching for stable install");
+                return null;
            }
-
-            return null;
        }

        protected override void LoadComplete()
@@ -55,7 +53,7 @@ namespace osu.Desktop
                LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, v =>
                {
                    Add(v);
-                    v.Show();
+                    v.State = Visibility.Visible;
                });

                if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
@@ -65,19 +63,19 @@ namespace osu.Desktop
            }
        }

-        protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
+        protected override void ScreenChanged(OsuScreen current, Screen newScreen)
        {
-            base.ScreenChanged(lastScreen, newScreen);
-
+            base.ScreenChanged(current, newScreen);
            switch (newScreen)
            {
                case Intro _:
                case MainMenu _:
-                    versionManager?.Show();
+                    if (versionManager != null)
+                        versionManager.State = Visibility.Visible;
                    break;
-
                default:
-                    versionManager?.Hide();
+                    if (versionManager != null)
+                        versionManager.State = Visibility.Hidden;
                    break;
            }
        }
@@ -85,8 +83,8 @@ namespace osu.Desktop
        public override void SetHost(GameHost host)
        {
            base.SetHost(host);
-
-            if (host.Window is DesktopGameWindow desktopWindow)
+            var desktopWindow = host.Window as DesktopGameWindow;
+            if (desktopWindow != null)
            {
                desktopWindow.CursorState |= CursorState.Hidden;

@@ -142,8 +140,8 @@ namespace osu.Desktop
                return null;
            }

-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
+            public StableStorage()
+                : base(string.Empty, null)
            {
            }
        }
@@ -1,11 +1,13 @@
-// 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;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -23,13 +25,15 @@ namespace osu.Desktop.Overlays
        private OsuConfigManager config;
        private OsuGameBase game;
        private NotificationOverlay notificationOverlay;
+        private GameHost host;

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

            AutoSizeAxes = Axes.Both;
            Anchor = Anchor.BottomCentre;
@@ -56,7 +60,7 @@ namespace osu.Desktop.Overlays
                            {
                                new OsuSpriteText
                                {
-                                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                                    Font = @"Exo2.0-Bold",
                                    Text = game.Name
                                },
                                new OsuSpriteText
@@ -70,8 +74,9 @@ namespace osu.Desktop.Overlays
                        {
                            Anchor = Anchor.TopCentre,
                            Origin = Anchor.TopCentre,
-                            Font = OsuFont.Numeric.With(size: 12),
+                            TextSize = 12,
                            Colour = colours.Yellow,
+                            Font = @"Venera",
                            Text = @"Development Build"
                        },
                        new Sprite
@@ -91,38 +96,33 @@ namespace osu.Desktop.Overlays

            var version = game.Version;
            var lastVersion = config.Get<string>(OsuSetting.Version);
-
            if (game.IsDeployedBuild && version != lastVersion)
            {
                config.Set(OsuSetting.Version, version);

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

        private class UpdateCompleteNotification : SimpleNotification
        {
-            private readonly string version;
-
-            public UpdateCompleteNotification(string version)
+            public UpdateCompleteNotification(string version, Action<string> openUrl = null)
            {
-                this.version = version;
                Text = $"You are now running osu!lazer {version}.\nClick to see what's new!";
+                Icon = FontAwesome.fa_check_square;
+                Activated = delegate
+                {
+                    openUrl?.Invoke($"https://osu.ppy.sh/home/changelog/lazer/{version}");
+                    return true;
+                };
            }

            [BackgroundDependencyLoader]
-            private void load(OsuColour colours, ChangelogOverlay changelog)
+            private void load(OsuColour colours)
            {
-                Icon = FontAwesome.Solid.CheckSquare;
                IconBackgound.Colour = colours.BlueDark;
-
-                Activated = delegate
-                {
-                    changelog.ShowBuild(OsuGameBase.CLIENT_STREAM_NAME, version);
-                    return 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;
@@ -31,7 +31,6 @@ namespace osu.Desktop
                    var importer = new ArchiveImportIPCChannel(host);
                    // Restore the cwd so relative paths given at the command line work correctly
                    Directory.SetCurrentDirectory(cwd);
-
                    foreach (var file in args)
                    {
                        Console.WriteLine(@"Importing {0}", file);
@@ -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.Threading.Tasks;
@@ -7,10 +7,10 @@ using Newtonsoft.Json;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.IO.Network;
 using osu.Framework.Platform;
 using osu.Game;
+using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

@@ -54,7 +54,7 @@ namespace osu.Desktop.Updater
                    {
                        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.Solid.Upload,
+                        Icon = FontAwesome.fa_upload,
                        Activated = () =>
                        {
                            host.OpenUrlExternally(getBestUrl(latest));
@@ -78,7 +78,6 @@ namespace osu.Desktop.Updater
                case RuntimeInfo.Platform.Windows:
                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe"));
                    break;
-
                case RuntimeInfo.Platform.MacOsx:
                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
                    break;
@@ -1,13 +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.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Game;
 using osu.Game.Graphics;
@@ -157,7 +158,7 @@ namespace osu.Desktop.Updater
                    {
                        Anchor = Anchor.Centre,
                        Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Upload,
+                        Icon = FontAwesome.fa_upload,
                        Colour = Color4.White,
                        Size = new Vector2(20),
                    }
@@ -167,19 +168,23 @@ 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;

-            private Logger logger;
+            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;

-                if (logger == null)
-                    logger = Logger.GetLogger("updater");
-
-                logger.Add(message);
+                lock (locker) File.AppendAllText(path, message + "\r\n");
            }

            public void Dispose()
@@ -22,13 +22,14 @@
    <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.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
+    <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" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
@@ -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>
@@ -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);
@@ -34,18 +33,13 @@ namespace osu.Game.Rulesets.Catch.Tests
                case JuiceStream stream:
                    foreach (var nested in stream.NestedHitObjects)
                        yield return new ConvertValue((CatchHitObject)nested);
-
                    break;
-
                case BananaShower shower:
                    foreach (var nested in shower.NestedHitObjects)
                        yield return new ConvertValue((CatchHitObject)nested);
-
                    break;
-
                default:
                    yield return new ConvertValue((CatchHitObject)hitObject);
-
                    break;
            }
        }
@@ -1,24 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Difficulty;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Tests.Beatmaps;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    public class CatchDifficultyCalculatorTest : DifficultyCalculatorTest
-    {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
-
-        [TestCase(4.2058561036909863d, "diffcalc-test")]
-        public void Test(double expected, string name)
-            => base.Test(expected, name);
-
-        protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(new CatchRuleset(), beatmap);
-
-        protected override Ruleset CreateRuleset() => new CatchRuleset();
-    }
-}
@@ -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.Linq;
 using osu.Game.Beatmaps;
@@ -13,21 +13,21 @@ using osuTK;

 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneAutoJuiceStream : PlayerTestScene
+    public class TestCaseAutoJuiceStream : TestCasePlayer
    {
-        public TestSceneAutoJuiceStream()
+        public TestCaseAutoJuiceStream()
            : base(new CatchRuleset())
        {
        }

-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
        {
            var beatmap = new Beatmap
            {
                BeatmapInfo = new BeatmapInfo
                {
                    BaseDifficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
-                    Ruleset = ruleset
+                    Ruleset = ruleset.RulesetInfo
                }
            };

@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Catch.Tests

        protected override Player CreatePlayer(Ruleset ruleset)
        {
-            Mods.Value = Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
+            Beatmap.Value.Mods.Value = Beatmap.Value.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
            return base.CreatePlayer(ruleset);
        }
    }
@@ -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,12 +8,11 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Tests.Visual;

 namespace osu.Game.Rulesets.Catch.Tests
 {
    [TestFixture]
-    public class TestSceneBananaShower : PlayerTestScene
+    public class TestCaseBananaShower : Game.Tests.Visual.TestCasePlayer
    {
        public override IReadOnlyList<Type> RequiredTypes => new[]
        {
@@ -21,22 +20,22 @@ namespace osu.Game.Rulesets.Catch.Tests
            typeof(DrawableBananaShower),

            typeof(CatchRuleset),
-            typeof(DrawableCatchRuleset),
+            typeof(CatchRulesetContainer),
        };

-        public TestSceneBananaShower()
+        public TestCaseBananaShower()
            : base(new CatchRuleset())
        {
        }

-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
        {
            var beatmap = new Beatmap
            {
                BeatmapInfo = new BeatmapInfo
                {
                    BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
-                    Ruleset = ruleset
+                    Ruleset = ruleset.RulesetInfo
                }
            };

@@ -0,0 +1,15 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestCaseCatchPlayer : Game.Tests.Visual.TestCasePlayer
+    {
+        public TestCaseCatchPlayer() : base(new CatchRuleset())
+        {
+        }
+    }
+}
@@ -1,29 +1,28 @@
-// 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;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Tests.Visual;

 namespace osu.Game.Rulesets.Catch.Tests
 {
    [TestFixture]
-    public class TestSceneCatchStacker : PlayerTestScene
+    public class TestCaseCatchStacker : Game.Tests.Visual.TestCasePlayer
    {
-        public TestSceneCatchStacker()
+        public TestCaseCatchStacker()
            : base(new CatchRuleset())
        {
        }

-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
        {
            var beatmap = new Beatmap
            {
                BeatmapInfo = new BeatmapInfo
                {
                    BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
-                    Ruleset = ruleset
+                    Ruleset = ruleset.RulesetInfo
                }
            };

@@ -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;
@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
    [TestFixture]
-    public class TestSceneCatcherArea : OsuTestScene
+    public class TestCaseCatcherArea : OsuTestCase
    {
        private RulesetInfo catchRuleset;
        private TestCatcherArea catcherArea;
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Tests
            typeof(CatcherArea),
        };

-        public TestSceneCatcherArea()
+        public TestCaseCatcherArea()
        {
            AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
            AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));
@@ -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;
@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
    [TestFixture]
-    public class TestSceneFruitObjects : OsuTestScene
+    public class TestCaseFruitObjects : OsuTestCase
    {
        public override IReadOnlyList<Type> RequiredTypes => new[]
        {
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
            typeof(Pulp),
        };

-        public TestSceneFruitObjects()
+        public TestCaseFruitObjects()
        {
            Add(new GridContainer
            {
@@ -0,0 +1,29 @@
+// 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;
+using osu.Game.Rulesets.Catch.Objects;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestCaseHyperDash : Game.Tests.Visual.TestCasePlayer
+    {
+        public TestCaseHyperDash()
+            : base(new CatchRuleset())
+        {
+        }
+
+        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        {
+            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 });
+
+            return beatmap;
+        }
+    }
+}
@@ -1,17 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneCatchPlayer : PlayerTestScene
-    {
-        public TestSceneCatchPlayer()
-            : base(new CatchRuleset())
-        {
-        }
-    }
-}
@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneHyperDash : PlayerTestScene
-    {
-        public TestSceneHyperDash()
-            : base(new CatchRuleset())
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
-        }
-
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
-        {
-            var beatmap = new Beatmap
-            {
-                BeatmapInfo =
-                {
-                    Ruleset = ruleset,
-                    BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
-                }
-            };
-
-            // Should produce a hyper-dash
-            beatmap.HitObjects.Add(new Fruit { StartTime = 816, X = 308 / 512f, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1008, X = 56 / 512f, });
-
-            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 = 2000 + i * 100, NewCombo = i % 8 == 0 });
-
-            return beatmap;
-        }
-    }
-}
@@ -2,9 +2,9 @@
  <Import Project="..\osu.TestProject.props" />
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.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">
@@ -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.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Catch.Objects;

 namespace osu.Game.Rulesets.Catch.Beatmaps
@@ -23,19 +23,19 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                {
                    Name = @"Fruit Count",
                    Content = fruits.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    Icon = FontAwesome.fa_circle_o
                },
                new BeatmapStatistic
                {
                    Name = @"Juice Stream Count",
                    Content = juiceStreams.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    Icon = FontAwesome.fa_circle
                },
                new BeatmapStatistic
                {
                    Name = @"Banana Shower Count",
                    Content = bananaShowers.ToString(),
-                    Icon = FontAwesome.Regular.Circle
+                    Icon = FontAwesome.fa_circle
                }
            };
        }
@@ -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;
@@ -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;
@@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
            initialiseHyperDash((List<CatchHitObject>)Beatmap.HitObjects);

            int index = 0;
-
            foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
            {
                obj.IndexInBeatmap = index++;
@@ -57,9 +56,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                            rng.Next(); // osu!stable retrieved a random banana rotation
                            rng.Next(); // osu!stable retrieved a random banana colour
                        }
-
                        break;
-
                    case JuiceStream juiceStream:
                        foreach (var nested in juiceStream.NestedHitObjects)
                        {
@@ -70,7 +67,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                                rng.Next(); // osu!stable retrieved a random droplet rotation
                            hitObject.X = MathHelper.Clamp(hitObject.X, 0, 1);
                        }
-
                        break;
                }
            }
@@ -102,10 +98,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                CatchHitObject nextObject = objectWithDroplets[i + 1];

                int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
-                double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
+                double timeToNext = nextObject.StartTime - currentObject.StartTime;
                double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                float distanceToHyper = (float)(timeToNext * CatcherArea.Catcher.BASE_SPEED - distanceToNext);
-
                if (distanceToHyper < 0)
                {
                    currentObject.HyperDashTarget = nextObject;
@@ -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;
@@ -19,10 +19,8 @@ namespace osu.Game.Rulesets.Catch
    {
        [Description("Move left")]
        MoveLeft,
-
        [Description("Move right")]
        MoveRight,
-
        [Description("Engage dash")]
        Dash,
    }
@@ -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;
@@ -9,22 +9,19 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Difficulty;
-using osu.Game.Scoring;

 namespace osu.Game.Rulesets.Catch
 {
    public class CatchRuleset : Ruleset
    {
-        public override DrawableRuleset CreateDrawableRulesetWith(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods) => new DrawableCatchRuleset(this, beatmap, mods);
+        public override RulesetContainer CreateRulesetContainerWith(WorkingBeatmap beatmap) => new CatchRulesetContainer(this, beatmap);
        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new CatchBeatmapConverter(beatmap);
        public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new CatchBeatmapProcessor(beatmap);

@@ -87,7 +84,6 @@ namespace osu.Game.Rulesets.Catch
                        new CatchModNoFail(),
                        new MultiMod(new CatchModHalfTime(), new CatchModDaycore())
                    };
-
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
@@ -97,20 +93,12 @@ namespace osu.Game.Rulesets.Catch
                        new CatchModHidden(),
                        new CatchModFlashlight(),
                    };
-
                case ModType.Automation:
                    return new Mod[]
                    {
                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                        new CatchModRelax(),
                    };
-
-                case ModType.Fun:
-                    return new Mod[]
-                    {
-                        new MultiMod(new ModWindUp<CatchHitObject>(), new ModWindDown<CatchHitObject>())
-                    };
-
                default:
                    return new Mod[] { };
            }
@@ -120,12 +108,10 @@ namespace osu.Game.Rulesets.Catch

        public override string ShortName => "fruits";

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

        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);

-        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
-
        public override int? LegacyID => 2;

        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
@@ -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 osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -9,5 +10,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty
    {
        public double ApproachRate;
        public int MaxCombo;
+
+        public CatchDifficultyAttributes(Mod[] mods, double starRating)
+            : base(mods, starRating)
+        {
+        }
    }
 }
@@ -1,91 +1,148 @@
-// 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;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Catch.Difficulty.Skills;
-using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Mods;

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

-        protected override int SectionLength => 750;
+        /// <summary>
+        /// The weighting of each strain value decays to this number * it's previous value
+        /// </summary>
+        private const double decay_weight = 0.94;
+
+        private const double star_scaling_factor = 0.145;

        public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
            : base(ruleset, beatmap)
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
        {
-            if (beatmap.HitObjects.Count == 0)
-                return new CatchDifficultyAttributes { Mods = mods, Skills = skills };
+            if (!beatmap.HitObjects.Any())
+                return new CatchDifficultyAttributes(mods, 0);
+
+            var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty);
+            float halfCatchWidth = catcher.CatchWidth * 0.5f;
+
+            var difficultyHitObjects = new List<CatchDifficultyHitObject>();
+
+            foreach (var hitObject in beatmap.HitObjects)
+            {
+                switch (hitObject)
+                {
+                    // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
+                    case Fruit fruit:
+                        difficultyHitObjects.Add(new CatchDifficultyHitObject(fruit, halfCatchWidth));
+                        break;
+                    case JuiceStream _:
+                        difficultyHitObjects.AddRange(hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)).Select(o => new CatchDifficultyHitObject(o, halfCatchWidth)));
+                        break;
+                }
+            }
+
+            difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
+
+            if (!calculateStrainValues(difficultyHitObjects, timeRate))
+                return new CatchDifficultyAttributes(mods, 0);

            // this is the same as osu!, so there's potential to share the implementation... maybe
-            double preempt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / clockRate;
+            double preempt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / timeRate;
+            double starRating = Math.Sqrt(calculateDifficulty(difficultyHitObjects, timeRate)) * star_scaling_factor;

-            return new CatchDifficultyAttributes
+            return new CatchDifficultyAttributes(mods, starRating)
            {
-                StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
-                Mods = mods,
                ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
-                MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
-                Skills = skills
+                MaxCombo = difficultyHitObjects.Count
            };
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
+        private bool calculateStrainValues(List<CatchDifficultyHitObject> objects, double timeRate)
        {
-            float halfCatchWidth;
+            CatchDifficultyHitObject lastObject = null;

-            using (var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty))
+            if (!objects.Any()) return false;
+
+            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
+            foreach (var currentObject in objects)
            {
-                halfCatchWidth = catcher.CatchWidth * 0.5f;
-                halfCatchWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
-            }
-
-            CatchHitObject lastObject = null;
-
-            // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
-            foreach (var hitObject in beatmap.HitObjects
-                                             .SelectMany(obj => obj is JuiceStream stream ? stream.NestedHitObjects : new[] { obj })
-                                             .Cast<CatchHitObject>()
-                                             .OrderBy(x => x.StartTime))
-            {
-                // We want to only consider fruits that contribute to the combo.
-                if (hitObject is BananaShower || hitObject is TinyDroplet)
-                    continue;
-
                if (lastObject != null)
-                    yield return new CatchDifficultyHitObject(hitObject, lastObject, clockRate, halfCatchWidth);
+                    currentObject.CalculateStrains(lastObject, timeRate);

-                lastObject = hitObject;
+                lastObject = currentObject;
            }
+
+            return true;
        }

-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        private double calculateDifficulty(List<CatchDifficultyHitObject> objects, double timeRate)
        {
-            new Movement(),
-        };
+            // The strain step needs to be adjusted for the algorithm to be considered equal with speed changing mods
+            double actualStrainStep = strain_step * timeRate;

-        protected override Mod[] DifficultyAdjustmentMods => new Mod[]
-        {
-            new CatchModDoubleTime(),
-            new CatchModHalfTime(),
-            new CatchModHardRock(),
-            new CatchModEasy(),
-        };
+            // Find the highest strain value within each strain step
+            var highestStrains = new List<double>();
+            double intervalEndTime = actualStrainStep;
+            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval
+
+            CatchDifficultyHitObject previousHitObject = null;
+            foreach (CatchDifficultyHitObject hitObject in objects)
+            {
+                // While we are beyond the current interval push the currently available maximum to our strain list
+                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
+                {
+                    highestStrains.Add(maximumStrain);
+
+                    // The maximum strain of the next interval is not zero by default! We need to take the last hitObject we encountered, take its strain and apply the decay
+                    // until the beginning of the next interval.
+                    if (previousHitObject == null)
+                    {
+                        maximumStrain = 0;
+                    }
+                    else
+                    {
+                        double decay = Math.Pow(CatchDifficultyHitObject.DECAY_BASE, (intervalEndTime - previousHitObject.BaseHitObject.StartTime) / 1000);
+                        maximumStrain = previousHitObject.Strain * decay;
+                    }
+
+                    // Go to the next time interval
+                    intervalEndTime += actualStrainStep;
+                }
+
+                // Obtain maximum strain
+                maximumStrain = Math.Max(hitObject.Strain, maximumStrain);
+
+                previousHitObject = hitObject;
+            }
+
+            // Build the weighted sum over the highest strains for each interval
+            double difficulty = 0;
+            double weight = 1;
+            highestStrains.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.
+
+            foreach (double strain in highestStrains)
+            {
+                difficulty += weight * strain;
+                weight *= decay_weight;
+            }
+
+            return difficulty;
+        }
    }
 }
@@ -0,0 +1,130 @@
+// 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;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    public class CatchDifficultyHitObject
+    {
+        internal static readonly double DECAY_BASE = 0.20;
+        private const float normalized_hitobject_radius = 41.0f;
+        private const float absolute_player_positioning_error = 16f;
+        private readonly float playerPositioningError;
+
+        internal CatchHitObject BaseHitObject;
+
+        /// <summary>
+        /// Measures jump difficulty. CtB doesn't have something like button pressing speed or accuracy
+        /// </summary>
+        internal double Strain = 1;
+
+        /// <summary>
+        /// This is required to keep track of lazy player movement (always moving only as far as necessary)
+        /// Without this quick repeat sliders / weirdly shaped streams might become ridiculously overrated
+        /// </summary>
+        internal float PlayerPositionOffset;
+        internal float LastMovement;
+
+        internal float NormalizedPosition;
+        internal float ActualNormalizedPosition => NormalizedPosition + PlayerPositionOffset;
+
+        internal CatchDifficultyHitObject(CatchHitObject baseHitObject, float catcherWidthHalf)
+        {
+            BaseHitObject = baseHitObject;
+
+            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
+            float scalingFactor = normalized_hitobject_radius / catcherWidthHalf;
+
+            playerPositioningError = absolute_player_positioning_error; // * scalingFactor;
+            NormalizedPosition = baseHitObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
+        }
+
+        private const double direction_change_bonus = 12.5;
+        internal void CalculateStrains(CatchDifficultyHitObject previousHitObject, double timeRate)
+        {
+            // Rather simple, but more specialized things are inherently inaccurate due to the big difference playstyles and opinions make.
+            // See Taiko feedback thread.
+            double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
+            double decay = Math.Pow(DECAY_BASE, timeElapsed / 1000);
+
+            // Update new position with lazy movement.
+            PlayerPositionOffset =
+                MathHelper.Clamp(
+                    previousHitObject.ActualNormalizedPosition,
+                    NormalizedPosition - (normalized_hitobject_radius - playerPositioningError),
+                    NormalizedPosition + (normalized_hitobject_radius - playerPositioningError)) // Obtain new lazy position, but be stricter by allowing for an error of a certain degree of the player.
+                - NormalizedPosition; // Subtract HitObject position to obtain offset
+
+            LastMovement = DistanceTo(previousHitObject);
+            double addition = spacingWeight(LastMovement);
+
+            if (NormalizedPosition < previousHitObject.NormalizedPosition)
+            {
+                LastMovement = -LastMovement;
+            }
+
+            CatchHitObject previousHitCircle = previousHitObject.BaseHitObject;
+
+            double additionBonus = 0;
+            double sqrtTime = Math.Sqrt(Math.Max(timeElapsed, 25));
+
+            // Direction changes give an extra point!
+            if (Math.Abs(LastMovement) > 0.1)
+            {
+                if (Math.Abs(previousHitObject.LastMovement) > 0.1 && Math.Sign(LastMovement) != Math.Sign(previousHitObject.LastMovement))
+                {
+                    double bonus = direction_change_bonus / sqrtTime;
+
+                    // Weight bonus by how
+                    double bonusFactor = Math.Min(playerPositioningError, Math.Abs(LastMovement)) / playerPositioningError;
+
+                    // We want time to play a role twice here!
+                    addition += bonus * bonusFactor;
+
+                    // Bonus for tougher direction switches and "almost" hyperdashes at this point
+                    if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
+                    {
+                        additionBonus += 0.3 * bonusFactor;
+                    }
+                }
+
+                // Base bonus for every movement, giving some weight to streams.
+                addition += 7.5 * Math.Min(Math.Abs(LastMovement), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtTime;
+            }
+
+            // Bonus for "almost" hyperdashes at corner points
+            if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
+            {
+                if (!previousHitCircle.HyperDash)
+                {
+                    additionBonus += 1.0;
+                }
+                else
+                {
+                    // After a hyperdash we ARE in the correct position. Always!
+                    PlayerPositionOffset = 0;
+                }
+
+                addition *= 1.0 + additionBonus * ((10 - previousHitCircle.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 10);
+            }
+
+            addition *= 850.0 / Math.Max(timeElapsed, 25);
+
+            Strain = previousHitObject.Strain * decay + addition;
+        }
+
+        private static double spacingWeight(float distance)
+        {
+            return Math.Pow(distance, 1.3) / 500;
+        }
+
+        internal float DistanceTo(CatchDifficultyHitObject other)
+        {
+            return Math.Abs(ActualNormalizedPosition - other.ActualNormalizedPosition);
+        }
+    }
+}
@@ -1,104 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osu.Game.Scoring.Legacy;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.Difficulty
-{
-    public class CatchPerformanceCalculator : PerformanceCalculator
-    {
-        protected new CatchDifficultyAttributes Attributes => (CatchDifficultyAttributes)base.Attributes;
-
-        private Mod[] mods;
-
-        private int fruitsHit;
-        private int ticksHit;
-        private int tinyTicksHit;
-        private int tinyTicksMissed;
-        private int misses;
-
-        public CatchPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
-            : base(ruleset, beatmap, score)
-        {
-        }
-
-        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
-        {
-            mods = Score.Mods;
-
-            var legacyScore = Score as LegacyScoreInfo;
-
-            fruitsHit = legacyScore?.Count300 ?? Score.Statistics[HitResult.Perfect];
-            ticksHit = legacyScore?.Count100 ?? 0;
-            tinyTicksHit = legacyScore?.Count50 ?? 0;
-            tinyTicksMissed = legacyScore?.CountKatu ?? 0;
-            misses = Score.Statistics[HitResult.Miss];
-
-            // Don't count scores made with supposedly unranked mods
-            if (mods.Any(m => !m.Ranked))
-                return 0;
-
-            // We are heavily relying on aim in catch the beat
-            double value = Math.Pow(5.0f * Math.Max(1.0f, Attributes.StarRating / 0.0049f) - 4.0f, 2.0f) / 100000.0f;
-
-            // Longer maps are worth more. "Longer" means how many hits there are which can contribute to combo
-            int numTotalHits = totalComboHits();
-
-            // Longer maps are worth more
-            float lengthBonus =
-                0.95f + 0.4f * Math.Min(1.0f, numTotalHits / 3000.0f) +
-                (numTotalHits > 3000 ? (float)Math.Log10(numTotalHits / 3000.0f) * 0.5f : 0.0f);
-
-            // Longer maps are worth more
-            value *= lengthBonus;
-
-            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
-            value *= Math.Pow(0.97f, misses);
-
-            // Combo scaling
-            float beatmapMaxCombo = Attributes.MaxCombo;
-            if (beatmapMaxCombo > 0)
-                value *= Math.Min(Math.Pow(Attributes.MaxCombo, 0.8f) / Math.Pow(beatmapMaxCombo, 0.8f), 1.0f);
-
-            float approachRate = (float)Attributes.ApproachRate;
-            float approachRateFactor = 1.0f;
-            if (approachRate > 9.0f)
-                approachRateFactor += 0.1f * (approachRate - 9.0f); // 10% for each AR above 9
-            else if (approachRate < 8.0f)
-                approachRateFactor += 0.025f * (8.0f - approachRate); // 2.5% for each AR below 8
-
-            value *= approachRateFactor;
-
-            if (mods.Any(m => m is ModHidden))
-                // Hiddens gives nothing on max approach rate, and more the lower it is
-                value *= 1.05f + 0.075f * (10.0f - Math.Min(10.0f, approachRate)); // 7.5% for each AR below 10
-
-            if (mods.Any(m => m is ModFlashlight))
-                // Apply length bonus again if flashlight is on simply because it becomes a lot harder on longer maps.
-                value *= 1.35f * lengthBonus;
-
-            // Scale the aim value with accuracy _slightly_
-            value *= Math.Pow(accuracy(), 5.5f);
-
-            // Custom multipliers for NoFail. SpunOut is not applicable.
-            if (mods.Any(m => m is ModNoFail))
-                value *= 0.90f;
-
-            return value;
-        }
-
-        private float accuracy() => totalHits() == 0 ? 0 : MathHelper.Clamp((float)totalSuccessfulHits() / totalHits(), 0f, 1f);
-        private int totalHits() => tinyTicksHit + ticksHit + fruitsHit + misses + tinyTicksMissed;
-        private int totalSuccessfulHits() => tinyTicksHit + ticksHit + fruitsHit;
-        private int totalComboHits() => misses + ticksHit + fruitsHit;
-    }
-}
@@ -1,41 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
-{
-    public class CatchDifficultyHitObject : DifficultyHitObject
-    {
-        private const float normalized_hitobject_radius = 41.0f;
-
-        public new CatchHitObject BaseObject => (CatchHitObject)base.BaseObject;
-
-        public new CatchHitObject LastObject => (CatchHitObject)base.LastObject;
-
-        public readonly float NormalizedPosition;
-        public readonly float LastNormalizedPosition;
-
-        /// <summary>
-        /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 25ms.
-        /// </summary>
-        public readonly double StrainTime;
-
-        public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
-            : base(hitObject, lastObject, clockRate)
-        {
-            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
-            var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
-
-            NormalizedPosition = BaseObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
-            LastNormalizedPosition = LastObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
-
-            // Every strain interval is hard capped at the equivalent of 600 BPM streaming speed as a safety measure
-            StrainTime = Math.Max(25, DeltaTime);
-        }
-    }
-}
@@ -1,85 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Skills;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.Difficulty.Skills
-{
-    public class Movement : Skill
-    {
-        private const float absolute_player_positioning_error = 16f;
-        private const float normalized_hitobject_radius = 41.0f;
-        private const double direction_change_bonus = 12.5;
-
-        protected override double SkillMultiplier => 850;
-        protected override double StrainDecayBase => 0.2;
-
-        protected override double DecayWeight => 0.94;
-
-        private float? lastPlayerPosition;
-        private float lastDistanceMoved;
-
-        protected override double StrainValueOf(DifficultyHitObject current)
-        {
-            var catchCurrent = (CatchDifficultyHitObject)current;
-
-            if (lastPlayerPosition == null)
-                lastPlayerPosition = catchCurrent.LastNormalizedPosition;
-
-            float playerPosition = MathHelper.Clamp(
-                lastPlayerPosition.Value,
-                catchCurrent.NormalizedPosition - (normalized_hitobject_radius - absolute_player_positioning_error),
-                catchCurrent.NormalizedPosition + (normalized_hitobject_radius - absolute_player_positioning_error)
-            );
-
-            float distanceMoved = playerPosition - lastPlayerPosition.Value;
-
-            double distanceAddition = Math.Pow(Math.Abs(distanceMoved), 1.3) / 500;
-            double sqrtStrain = Math.Sqrt(catchCurrent.StrainTime);
-
-            double bonus = 0;
-
-            // Direction changes give an extra point!
-            if (Math.Abs(distanceMoved) > 0.1)
-            {
-                if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
-                {
-                    double bonusFactor = Math.Min(absolute_player_positioning_error, Math.Abs(distanceMoved)) / absolute_player_positioning_error;
-
-                    distanceAddition += direction_change_bonus / sqrtStrain * bonusFactor;
-
-                    // Bonus for tougher direction switches and "almost" hyperdashes at this point
-                    if (catchCurrent.LastObject.DistanceToHyperDash <= 10 / CatchPlayfield.BASE_WIDTH)
-                        bonus = 0.3 * bonusFactor;
-                }
-
-                // Base bonus for every movement, giving some weight to streams.
-                distanceAddition += 7.5 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
-            }
-
-            // Bonus for "almost" hyperdashes at corner points
-            if (catchCurrent.LastObject.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
-            {
-                if (!catchCurrent.LastObject.HyperDash)
-                    bonus += 1.0;
-                else
-                {
-                    // After a hyperdash we ARE in the correct position. Always!
-                    playerPosition = catchCurrent.NormalizedPosition;
-                }
-
-                distanceAddition *= 1.0 + bonus * ((10 - catchCurrent.LastObject.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 10);
-            }
-
-            lastPlayerPosition = playerPosition;
-            lastDistanceMoved = distanceMoved;
-
-            return distanceAddition / catchCurrent.StrainTime;
-        }
-    }
-}
@@ -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.Scoring;
@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
                    return 1100;
            }
@@ -28,9 +27,8 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
-                    return 0.008;
+                    return 8;
            }
        }

@@ -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;

@@ -13,7 +13,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
                    return 30;
            }
@@ -24,10 +23,9 @@ namespace osu.Game.Rulesets.Catch.Judgements
            switch (result)
            {
                default:
-                    return base.HealthIncreaseFor(result);
-
+                    return 0;
                case HitResult.Perfect:
-                    return 0.007;
+                    return 7;
            }
        }
    }
@@ -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;
@@ -17,7 +17,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
                    return 300;
            }
@@ -28,10 +27,9 @@ namespace osu.Game.Rulesets.Catch.Judgements
            switch (result)
            {
                default:
-                    return -0.02;
-
+                    return 0;
                case HitResult.Perfect:
-                    return 0.01;
+                    return 10.2;
            }
        }

@@ -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;

@@ -15,7 +15,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
                    return 10;
            }
@@ -27,9 +26,8 @@ namespace osu.Game.Rulesets.Catch.Judgements
            {
                default:
                    return 0;
-
                case HitResult.Perfect:
-                    return 0.004;
+                    return 4;
            }
        }
    }
@@ -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;

@@ -33,11 +33,11 @@ namespace osu.Game.Rulesets.Catch.MathUtils
        /// <returns>The random value.</returns>
        public uint NextUInt()
        {
-            uint t = _x ^ (_x << 11);
+            uint t = _x ^ _x << 11;
            _x = _y;
            _y = _z;
            _z = _w;
-            return _w = _w ^ (_w >> 19) ^ t ^ (t >> 8);
+            return _w = _w ^ _w >> 19 ^ t ^ t >> 8;
        }

        /// <summary>
@@ -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;
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
    public class CatchModAutoplay : ModAutoplay<CatchHitObject>
    {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        protected override Score CreateReplayScore(Beatmap<CatchHitObject> beatmap) => new Score
        {
            ScoreInfo = new ScoreInfo { 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,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.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -21,10 +20,10 @@ namespace osu.Game.Rulesets.Catch.Mods

        private CatchPlayfield playfield;

-        public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
+        public override void ApplyToRulesetContainer(RulesetContainer<CatchHitObject> rulesetContainer)
        {
-            playfield = (CatchPlayfield)drawableRuleset.Playfield;
-            base.ApplyToDrawableRuleset(drawableRuleset);
+            playfield = (CatchPlayfield)rulesetContainer.Playfield;
+            base.ApplyToRulesetContainer(rulesetContainer);
        }

        private class CatchFlashlight : Flashlight
@@ -56,9 +55,9 @@ namespace osu.Game.Rulesets.Catch.Mods
                    return default_flashlight_size;
            }

-            protected override void OnComboChange(ValueChangedEvent<int> e)
+            protected override void OnComboChange(int newCombo)
            {
-                this.TransformTo(nameof(FlashlightSize), new Vector2(0, getSizeFor(e.NewValue)), FLASHLIGHT_FADE_DURATION);
+                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;
@@ -15,107 +15,77 @@ namespace osu.Game.Rulesets.Catch.Mods
        public override double ScoreMultiplier => 1.12;
        public override bool Ranked => true;

-        private float? lastPosition;
-        private double lastStartTime;
+        private float lastStartX;
+        private int lastStartTime;

        public void ApplyToHitObject(HitObject hitObject)
        {
-            if (hitObject is JuiceStream stream)
-            {
-                lastPosition = stream.EndX;
-                lastStartTime = stream.EndTime;
-                return;
-            }
-
-            if (!(hitObject is Fruit))
-                return;
-
            var catchObject = (CatchHitObject)hitObject;

            float position = catchObject.X;
-            double startTime = hitObject.StartTime;
+            int startTime = (int)hitObject.StartTime;

-            if (lastPosition == null)
+            if (lastStartX == 0)
            {
-                lastPosition = position;
+                lastStartX = position;
                lastStartTime = startTime;
-
                return;
            }

-            float positionDiff = position - lastPosition.Value;
-            double timeDiff = startTime - lastStartTime;
+            float diff = lastStartX - position;
+            int timeDiff = startTime - lastStartTime;

            if (timeDiff > 1000)
            {
-                lastPosition = position;
+                lastStartX = position;
                lastStartTime = startTime;
                return;
            }

-            if (positionDiff == 0)
+            if (diff == 0)
            {
-                applyRandomOffset(ref position, timeDiff / 4d);
+                bool right = RNG.NextBool();
+
+                float rand = Math.Min(20, (float)RNG.NextDouble(0, timeDiff / 4d)) / CatchPlayfield.BASE_WIDTH;
+
+                if (right)
+                {
+                    if (position + rand <= 1)
+                        position += rand;
+                    else
+                        position -= rand;
+                }
+                else
+                {
+                    if (position - rand >= 0)
+                        position -= rand;
+                    else
+                        position += rand;
+                }
+
                catchObject.X = position;
+
                return;
            }

-            if (Math.Abs(positionDiff * CatchPlayfield.BASE_WIDTH) < timeDiff / 3d)
-                applyOffset(ref position, positionDiff);
+            if (Math.Abs(diff) < timeDiff / 3d)
+            {
+                if (diff > 0)
+                {
+                    if (position - diff > 0)
+                        position -= diff;
+                }
+                else
+                {
+                    if (position - diff < 1)
+                        position -= diff;
+                }
+            }

            catchObject.X = position;

-            lastPosition = position;
+            lastStartX = position;
            lastStartTime = startTime;
        }
-
-        /// <summary>
-        /// Applies a random offset in a random direction to a position, ensuring that the final position remains within the boundary of the playfield.
-        /// </summary>
-        /// <param name="position">The position which the offset should be applied to.</param>
-        /// <param name="maxOffset">The maximum offset, cannot exceed 20px.</param>
-        private void applyRandomOffset(ref float position, double maxOffset)
-        {
-            bool right = RNG.NextBool();
-            float rand = Math.Min(20, (float)RNG.NextDouble(0, Math.Max(0, maxOffset))) / CatchPlayfield.BASE_WIDTH;
-
-            if (right)
-            {
-                // Clamp to the right bound
-                if (position + rand <= 1)
-                    position += rand;
-                else
-                    position -= rand;
-            }
-            else
-            {
-                // Clamp to the left bound
-                if (position - rand >= 0)
-                    position -= rand;
-                else
-                    position += rand;
-            }
-        }
-
-        /// <summary>
-        /// Applies an offset to a position, ensuring that the final position remains within the boundary of the playfield.
-        /// </summary>
-        /// <param name="position">The position which the offset should be applied to.</param>
-        /// <param name="amount">The amount to offset by.</param>
-        private void applyOffset(ref float position, float amount)
-        {
-            if (amount > 0)
-            {
-                // Clamp to the right bound
-                if (position + amount < 1)
-                    position += amount;
-            }
-            else
-            {
-                // Clamp to the left bound
-                if (position + amount > 0)
-                    position += amount;
-            }
-        }
    }
 }
@@ -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,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.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
@@ -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;
@@ -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;
 using osu.Game.Rulesets.Scoring;
@@ -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

 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -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;
@@ -13,17 +13,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        private readonly Container bananaContainer;

-        public DrawableBananaShower(BananaShower s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation = null)
+        public DrawableBananaShower(BananaShower s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation = null)
            : base(s)
        {
            RelativeSizeAxes = Axes.X;
            Origin = Anchor.BottomLeft;
            X = 0;

-            AddInternal(bananaContainer = new Container { RelativeSizeAxes = Axes.Both });
+            InternalChild = bananaContainer = new Container { RelativeSizeAxes = Axes.Both };

            foreach (var b in s.NestedHitObjects.Cast<Banana>())
-                AddNested(createDrawableRepresentation?.Invoke(b));
+                AddNested(getVisualRepresentation?.Invoke(b));
        }

        protected override void AddNested(DrawableHitObject 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 osuTK;
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            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?)null) ?? Color4.White;
+                AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White);
        }

        private const float preempt = 1000;
@@ -84,7 +84,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                    case ArmedState.Miss:
                        this.FadeOut(250).RotateTo(Rotation * 2, 250, Easing.Out).Expire();
                        break;
-
                    case ArmedState.Hit:
                        this.FadeOut().Expire();
                        break;
@@ -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.Allocation;
 using osu.Framework.Graphics;
@@ -26,12 +26,15 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
        [BackgroundDependencyLoader]
        private void load()
        {
-            AddInternal(pulp = new Pulp { Size = Size });
+            InternalChild = pulp = new Pulp
+            {
+                Size = Size
+            };
        }

        public override Color4 AccentColour
        {
-            get => base.AccentColour;
+            get { return base.AccentColour; }
            set
            {
                base.AccentColour = value;
@@ -1,12 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
@@ -43,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            // todo: this should come from the skin.
            AccentColour = colourForRepresentation(HitObject.VisualRepresentation);

-            AddRangeInternal(new[]
+            InternalChildren = new[]
            {
                createPulp(HitObject.VisualRepresentation),
                border = new Circle
@@ -71,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        }
                    }
                },
-            });
+            };

            if (HitObject.HyperDash)
            {
@@ -106,7 +105,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
            {
                default:
                    return new Container();
-
                case FruitVisualRepresentation.Raspberry:
                    return new Container
                    {
@@ -145,7 +143,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                            },
                        }
                    };
-
                case FruitVisualRepresentation.Pineapple:
                    return new Container
                    {
@@ -184,7 +181,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                            },
                        }
                    };
-
                case FruitVisualRepresentation.Pear:
                    return new Container
                    {
@@ -217,7 +213,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                            },
                        }
                    };
-
                case FruitVisualRepresentation.Grape:
                    return new Container
                    {
@@ -250,7 +245,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                            },
                        }
                    };
-
                case FruitVisualRepresentation.Banana:
                    return new Container
                    {
@@ -288,25 +282,19 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                default:
                case FruitVisualRepresentation.Pear:
                    return new Color4(17, 136, 170, 255);
-
                case FruitVisualRepresentation.Grape:
                    return new Color4(204, 102, 0, 255);
-
                case FruitVisualRepresentation.Raspberry:
                    return new Color4(121, 9, 13, 255);
-
                case FruitVisualRepresentation.Pineapple:
                    return new Color4(102, 136, 0, 255);
-
                case FruitVisualRepresentation.Banana:
                    switch (RNG.Next(0, 3))
                    {
                        default:
                            return new Color4(255, 240, 0, 255);
-
                        case 1:
                            return new Color4(255, 192, 0, 255);
-
                        case 2:
                            return new Color4(214, 221, 28, 255);
                    }
@@ -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;
@@ -13,17 +13,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        private readonly Container dropletContainer;

-        public DrawableJuiceStream(JuiceStream s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation = null)
+        public DrawableJuiceStream(JuiceStream s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation = null)
            : base(s)
        {
            RelativeSizeAxes = Axes.Both;
            Origin = Anchor.BottomLeft;
            X = 0;

-            AddInternal(dropletContainer = new Container { RelativeSizeAxes = Axes.Both, });
+            InternalChild = dropletContainer = new Container { RelativeSizeAxes = Axes.Both, };

            foreach (var o in s.NestedHitObjects.Cast<CatchHitObject>())
-                AddNested(createDrawableRepresentation?.Invoke(o));
+                AddNested(getVisualRepresentation?.Invoke(o));
        }

        protected override void AddNested(DrawableHitObject 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 osuTK;

@@ -1,9 +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 osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osuTK.Graphics;
@@ -23,10 +23,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
        }

        private Color4 accentColour;
-
        public Color4 AccentColour
        {
-            get => accentColour;
+            get { return accentColour; }
            set
            {
                accentColour = value;
@@ -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.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
@@ -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.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
@@ -1,6 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Audio;
@@ -24,11 +25,6 @@ namespace osu.Game.Rulesets.Catch.Objects
        public double Velocity;
        public double TickDistance;

-        /// <summary>
-        /// The length of one span of this <see cref="JuiceStream"/>.
-        /// </summary>
-        public double SpanDuration => Duration / this.SpanCount();
-
        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
        {
            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -45,68 +41,93 @@ namespace osu.Game.Rulesets.Catch.Objects
        protected override void CreateNestedHitObjects()
        {
            base.CreateNestedHitObjects();
+            createTicks();
+        }

-            var tickSamples = Samples.Select(s => new SampleInfo
+        private void createTicks()
+        {
+            if (TickDistance == 0)
+                return;
+
+            var length = Path.Distance;
+            var tickDistance = Math.Min(TickDistance, length);
+            var spanDuration = length / Velocity;
+
+            var minDistanceFromEnd = Velocity * 0.01;
+
+            AddNested(new Fruit
            {
-                Bank = s.Bank,
-                Name = @"slidertick",
-                Volume = s.Volume
-            }).ToList();
+                Samples = Samples,
+                StartTime = StartTime,
+                X = X
+            });

-            SliderEventDescriptor? lastEvent = null;
+            double lastDropletTime = StartTime;

-            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
+            for (int span = 0; span < this.SpanCount(); span++)
            {
-                // generate tiny droplets since the last point
-                if (lastEvent != null)
+                var spanStartTime = StartTime + span * spanDuration;
+                var reversed = span % 2 == 1;
+
+                for (double d = 0; d <= length; d += tickDistance)
                {
-                    double sinceLastTick = e.Time - lastEvent.Value.Time;
+                    var timeProgress = d / length;
+                    var distanceProgress = reversed ? 1 - timeProgress : timeProgress;

-                    if (sinceLastTick > 80)
+                    double time = spanStartTime + timeProgress * spanDuration;
+
+                    if (LegacyLastTickOffset != null)
                    {
-                        double timeBetweenTiny = sinceLastTick;
-                        while (timeBetweenTiny > 100)
-                            timeBetweenTiny /= 2;
-
-                        for (double t = timeBetweenTiny; t < sinceLastTick; t += timeBetweenTiny)
-                        {
-                            AddNested(new TinyDroplet
-                            {
-                                Samples = tickSamples,
-                                StartTime = t + lastEvent.Value.Time,
-                                X = X + Path.PositionAt(
-                                        lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
-                            });
-                        }
+                        // If we're the last tick, apply the legacy offset
+                        if (span == this.SpanCount() - 1 && d + tickDistance > length)
+                            time = Math.Max(StartTime + Duration / 2, time - LegacyLastTickOffset.Value);
                    }
-                }

-                // this also includes LegacyLastTick and this is used for TinyDroplet generation above.
-                // this means that the final segment of TinyDroplets are increasingly mistimed where LegacyLastTickOffset is being applied.
-                lastEvent = e;
+                    double tinyTickInterval = time - lastDropletTime;
+                    while (tinyTickInterval > 100)
+                        tinyTickInterval /= 2;

-                switch (e.Type)
-                {
-                    case SliderEventType.Tick:
+                    for (double t = lastDropletTime + tinyTickInterval; t < time; t += 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 = new List<SampleInfo>(Samples.Select(s => new SampleInfo
+                            {
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
+                        });
+                    }
+
+                    if (d > minDistanceFromEnd && Math.Abs(d - length) > minDistanceFromEnd)
+                    {
                        AddNested(new Droplet
                        {
-                            Samples = tickSamples,
-                            StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
+                            StartTime = time,
+                            X = X + Path.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
+                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
+                            {
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
                        });
-                        break;
+                    }

-                    case SliderEventType.Head:
-                    case SliderEventType.Tail:
-                    case SliderEventType.Repeat:
-                        AddNested(new Fruit
-                        {
-                            Samples = Samples,
-                            StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
-                        });
-                        break;
+                    lastDropletTime = time;
                }
+
+                AddNested(new Fruit
+                {
+                    Samples = Samples,
+                    StartTime = spanStartTime + spanDuration,
+                    X = X + Path.PositionAt(reversed ? 0 : 1).X / 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 osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
@@ -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,25 +1,22 @@
-// 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.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Replays;

 namespace osu.Game.Rulesets.Catch.Replays
 {
-    internal class CatchAutoGenerator : AutoGenerator
+    internal class CatchAutoGenerator : AutoGenerator<CatchHitObject>
    {
        public const double RELEASE_DELAY = 20;

-        public new CatchBeatmap Beatmap => (CatchBeatmap)base.Beatmap;
-
-        public CatchAutoGenerator(IBeatmap beatmap)
+        public CatchAutoGenerator(Beatmap<CatchHitObject> beatmap)
            : base(beatmap)
        {
            Replay = new Replay();
@@ -1,8 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
+// 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.Diagnostics;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.MathUtils;
 using osu.Game.Replays;
@@ -23,14 +22,10 @@ namespace osu.Game.Rulesets.Catch.Replays
        {
            get
            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
+                if (!HasFrames)
                    return null;

-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return Interpolation.ValueAt(CurrentTime, CurrentFrame.Position, NextFrame.Position, CurrentFrame.Time, NextFrame.Time);
            }
        }

@@ -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.Replays.Legacy;
@@ -1,138 +0,0 @@
-osu file format v14
-
-[General]
-StackLeniency: 0.3
-Mode: 2
-
-[Difficulty]
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:1.6
-SliderTickRate:1
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-34500,-50,4,2,1,50,0,0
-
-[HitObjects]
-// fruits spaced 1/1 beat apart
-32,128,0,5,0,0:0:0:0:
-96,128,500,1,0,0:0:0:0:
-160,128,1000,1,0,0:0:0:0:
-224,128,1500,1,0,0:0:0:0:
-288,128,2000,1,0,0:0:0:0:
-352,128,2500,1,0,0:0:0:0:
-416,128,3000,1,0,0:0:0:0:
-480,128,3500,1,0,0:0:0:0:
-
-// fruits spaced 1/2 beat apart
-32,160,4500,1,0,0:0:0:0:
-64,160,4750,1,0,0:0:0:0:
-96,160,5000,1,0,0:0:0:0:
-128,160,5250,1,0,0:0:0:0:
-160,160,5500,1,0,0:0:0:0:
-192,160,5750,1,0,0:0:0:0:
-224,160,6000,1,0,0:0:0:0:
-256,160,6250,1,0,0:0:0:0:
-288,160,6500,1,0,0:0:0:0:
-
-// fruits spaced 1/4 beat apart
-96,128,7500,1,0,0:0:0:0:
-128,128,7625,1,0,0:0:0:0:
-160,128,7750,1,0,0:0:0:0:
-192,128,7875,1,0,0:0:0:0:
-224,128,8000,1,0,0:0:0:0:
-256,128,8125,1,0,0:0:0:0:
-288,128,8250,1,0,0:0:0:0:
-320,128,8375,1,0,0:0:0:0:
-352,128,8500,1,0,0:0:0:0:
-
-// fruit hyperdashes, spaced 1/2 beat apart
-32,160,9500,1,0,0:0:0:0:
-480,160,9750,1,0,0:0:0:0:
-32,160,10000,1,0,0:0:0:0:
-480,160,10250,1,0,0:0:0:0:
-32,160,10500,1,0,0:0:0:0:
-480,160,10750,1,0,0:0:0:0:
-32,160,11000,1,0,0:0:0:0:
-
-// fruit hyperdashes, spaced 1/4 beat apart
-32,192,12000,1,0,0:0:0:0:
-480,192,12125,1,0,0:0:0:0:
-32,192,12250,1,0,0:0:0:0:
-480,192,12375,1,0,0:0:0:0:
-32,192,12500,1,0,0:0:0:0:
-480,192,12625,1,0,0:0:0:0:
-32,192,12750,1,0,0:0:0:0:
-480,192,12875,1,0,0:0:0:0:
-32,192,13000,1,0,0:0:0:0:
-
-// stream + hyperdash + stream, spaced 1/4 beat apart
-32,192,14000,1,0,0:0:0:0:
-64,192,14125,1,0,0:0:0:0:
-96,192,14250,1,0,0:0:0:0:
-128,192,14375,1,0,0:0:0:0:
-480,192,14500,1,0,0:0:0:0:
-448,192,14625,1,0,0:0:0:0:
-416,192,14750,1,0,0:0:0:0:
-384,192,14875,1,0,0:0:0:0:
-32,192,15000,1,0,0:0:0:0:
-
-// basic sliders
-32,192,16000,2,0,L|192:192,1,160
-224,192,17000,2,0,L|384:192,1,160
-416,192,17875,2,0,L|480:192,1,40
-
-// slider hyperdashes, spaced 1/4 beat apart
-32,192,19000,2,0,L|128:192,1,80
-480,192,19375,2,0,L|384:192,1,80
-352,192,19750,2,0,L|256:192,1,80
-0,192,20125,2,0,L|128:192,1,120
-
-// stream + slider hyperdashes, spaced 1/4 beat apart
-32,192,21500,1,0,0:0:0:0:
-64,192,21625,1,0,0:0:0:0:
-96,192,21750,1,0,0:0:0:0:
-512,192,21875,2,0,L|320:192,1,160
-320,192,22500,1,0,0:0:0:0:
-288,192,22625,1,0,0:0:0:0:
-256,192,22750,1,0,0:0:0:0:
-0,192,22875,2,0,L|64:192,1,40
-
-// streams, spaced 1/4 beat apart
-64,192,24000,1,0,0:0:0:0:
-160,192,24125,1,0,0:0:0:0:
-64,192,24250,1,0,0:0:0:0:
-160,192,24375,1,0,0:0:0:0:
-64,192,24500,1,0,0:0:0:0:
-160,192,24625,1,0,0:0:0:0:
-64,192,24750,1,0,0:0:0:0:
-160,192,24875,1,0,0:0:0:0:
-64,192,25000,1,0,0:0:0:0:
-160,192,25125,1,0,0:0:0:0:
-64,192,25250,1,0,0:0:0:0:
-160,192,25375,1,0,0:0:0:0:
-64,192,25500,1,0,0:0:0:0:
-
-// stream + spinner combo, spaced 1/4 beat apart
-256,192,26500,12,0,27000,0:0:0:0:
-128,192,27250,5,0,0:0:0:0:
-128,192,27375,1,0,0:0:0:0:
-160,192,27500,1,0,0:0:0:0:
-192,192,27625,1,0,0:0:0:0:
-256,192,27750,12,0,28500,0:0:0:0:
-192,192,28625,5,0,0:0:0:0:
-224,192,28750,1,0,0:0:0:0:
-256,192,28875,1,0,0:0:0:0:
-256,192,29000,1,0,0:0:0:0:
-256,192,29125,12,0,29500,0:0:0:0:
-
-// long slow slider
-0,192,30500,6,0,B|480:192|480:192|0:192,2,960
-
-// long fast slider
-0,192,37500,6,0,B|480:192|480:192|0:192,2,960
-
-// long hyperdash slider
-0,192,41500,2,0,P|544:192|544:192,5,480
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`git_url('https://github.com/peppy/apple-certificates')`