Merge pull request #542 from smoogipooo/taiko_drumroll_tick_judgements

Add DrumRoll tick judgement info.

appveyor.yml

@@ -0,0 +1,23 @@
+clone_depth: 1
+version: '{branch}-{build}'
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.1/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode /o="inspectcodereport.xml" /caches-home="inspectcode" osu.sln
+  - cmd: NVika parsereport "inspectcodereport.xml"

osu.Desktop.Deploy/App.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <appSettings>
     <add key="StagingFolder" value="Staging" />
@@ -17,16 +21,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

osu.Desktop.Deploy/GitHubObject.cs

@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubObject
+    public class GitHubObject
     {
         [JsonProperty(@"id")]
         public int Id;

osu.Desktop.Deploy/GitHubRelease.cs

@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubRelease
+    public class GitHubRelease
     {
         [JsonProperty(@"id")]
         public int Id;

osu.Desktop.Deploy/Program.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.GitHubusercontent.com/ppy/osu-framework/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
 using System.Collections.Generic;
@@ -53,7 +53,7 @@ namespace osu.Desktop.Deploy
         private static string nupkgFilename(string ver) => $"{PackageName}.{ver}.nupkg";
         private static string nupkgDistroFilename(string ver) => $"{PackageName}-{ver}-full.nupkg";
 
-        private static Stopwatch sw = new Stopwatch();
+        private static readonly Stopwatch sw = new Stopwatch();
 
         private static string codeSigningPassword;
 
@@ -198,7 +198,7 @@ namespace osu.Desktop.Deploy
             write($"- Creating release {version}...", ConsoleColor.Yellow);
             var req = new JsonWebRequest<GitHubRelease>($"{GitHubApiEndpoint}")
             {
-                Method = HttpMethod.POST
+                Method = HttpMethod.POST,
             };
             req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease
             {
@@ -215,6 +215,7 @@ namespace osu.Desktop.Deploy
                 var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a))
                 {
                     Method = HttpMethod.POST,
+                    Timeout = 240000,
                     ContentType = "application/octet-stream",
                 };
 
@@ -261,7 +262,7 @@ namespace osu.Desktop.Deploy
 
             if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name))))
             {
-                write("Last verion's package not found locally.", ConsoleColor.Red);
+                write("Last version's package not found locally.", ConsoleColor.Red);
                 requireDownload = true;
             }
             else
@@ -282,6 +283,8 @@ namespace osu.Desktop.Deploy
 
             foreach (var a in assets)
             {
+                if (a.Name.EndsWith(".exe")) continue;
+
                 write($"- Downloading {a.Name}...", ConsoleColor.Yellow);
                 new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform();
             }
@@ -337,6 +340,7 @@ namespace osu.Desktop.Deploy
                 WorkingDirectory = solutionPath,
                 CreateNoWindow = true,
                 RedirectStandardOutput = true,
+                RedirectStandardError = true,
                 UseShellExecute = false,
                 WindowStyle = ProcessWindowStyle.Hidden
             };
@@ -345,6 +349,7 @@ namespace osu.Desktop.Deploy
             if (p == null) return false;
 
             string output = p.StandardOutput.ReadToEnd();
+            output += p.StandardError.ReadToEnd();
 
             if (p.ExitCode == 0) return true;
 

osu.Desktop.Deploy/Properties/AssemblyInfo.cs

@@ -1,4 +1,7 @@
-using System.Reflection;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

osu.Desktop.Deploy/osu.Desktop.Deploy.csproj

@@ -101,7 +101,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

osu.Desktop.Deploy/packages.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <packages>
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />

osu.Desktop.Tests/app.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -100,12 +100,14 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

osu.Desktop.Tests/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private readonly Beatmap beatmap;
+        
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}

osu.Desktop.VisualTests/Benchmark.cs

@@ -10,7 +10,7 @@ namespace osu.Desktop.VisualTests
 {
     public class Benchmark : OsuGameBase
     {
-        private double timePerTest = 200;
+        private const double time_per_test = 200;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -27,7 +27,7 @@ namespace osu.Desktop.VisualTests
             TestBrowser f = new TestBrowser();
             Add(f);
 
-            Console.WriteLine($@"{Time}: Running {f.TestCount} tests for {timePerTest}ms each...");
+            Console.WriteLine($@"{Time}: Running {f.TestCount} tests for {time_per_test}ms each...");
 
             for (int i = 1; i < f.TestCount; i++)
             {
@@ -36,10 +36,10 @@ namespace osu.Desktop.VisualTests
                 {
                     f.LoadTest(loadableCase);
                     Console.WriteLine($@"{Time}: Switching to test #{loadableCase}");
-                }, loadableCase * timePerTest);
+                }, loadableCase * time_per_test);
             }
 
-            Scheduler.AddDelayed(Host.Exit, f.TestCount * timePerTest);
+            Scheduler.AddDelayed(Host.Exit, f.TestCount * time_per_test);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetailArea.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Screens.Testing;
+using osu.Game.Screens.Select;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapDetailArea : TestCase
+    {
+        public override string Description => @"Beatmap details in song select";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(new BeatmapDetailArea
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(550f, 450f),
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs

@@ -1,7 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK.Graphics;
+using OpenTK.Input;
 using osu.Framework.Screens.Testing;
+using osu.Game.Graphics;
 using osu.Game.Screens.Select.Options;
 
 namespace osu.Desktop.VisualTests.Tests
@@ -16,6 +19,11 @@ namespace osu.Desktop.VisualTests.Tests
 
             var overlay = new BeatmapOptionsOverlay();
 
+            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, Color4.Purple, null, Key.Number1);
+            overlay.AddButton(@"Clear", @"local scores", FontAwesome.fa_eraser, Color4.Purple, null, Key.Number2);
+            overlay.AddButton(@"Edit", @"Beatmap", FontAwesome.fa_pencil, Color4.Yellow, null, Key.Number3);
+            overlay.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, Color4.Pink, null, Key.Number4, float.MaxValue);
+
             Add(overlay);
 
             AddButton(@"Toggle", overlay.ToggleVisibility);

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

@@ -1,10 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
 using osu.Framework.Screens.Testing;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
+using osu.Game.Users;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -24,57 +25,57 @@ namespace osu.Desktop.VisualTests.Tests
 
         private class TestTeamList : ITeamList
         {
-            public IEnumerable<Team> Teams { get; } = new[]
+            public IEnumerable<Country> Teams { get; } = new[]
             {
-                new Team
+                new Country
                 {
                     FlagName = "GB",
                     FullName = "United Kingdom",
                     Acronym = "UK"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "FR",
                     FullName = "France",
                     Acronym = "FRA"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "CN",
                     FullName = "China",
                     Acronym = "CHN"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "AU",
                     FullName = "Australia",
                     Acronym = "AUS"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "JP",
                     FullName = "Japan",
                     Acronym = "JPN"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "RO",
                     FullName = "Romania",
                     Acronym = "ROM"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "IT",
                     FullName = "Italy",
                     Acronym = "PIZZA"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "VE",
                     FullName = "Venezuela",
                     Acronym = "VNZ"
                 },
-                new Team
+                new Country
                 {
                     FlagName = "US",
                     FullName = "United States of America",

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -1,20 +1,22 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
-using OpenTK;
+using System.Collections.Generic;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -41,10 +43,20 @@ namespace osu.Desktop.VisualTests.Tests
                 time += RNG.Next(50, 500);
             }
 
-            Beatmap beatmap = new Beatmap
+            WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap
             {
-                HitObjects = objects
-            };
+                HitObjects = objects,
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Difficulty = new BeatmapDifficulty(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        Author = @"peppy",
+                    }
+                }
+            });
 
             Add(new Drawable[]
             {
@@ -55,30 +67,26 @@ namespace osu.Desktop.VisualTests.Tests
                     Clock = new FramedClock(),
                     Children = new Drawable[]
                     {
-                        new OsuHitRenderer
+                        new OsuHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopLeft,
                             Origin = Anchor.TopLeft
                         },
-                        new TaikoHitRenderer
+                        new TaikoHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight
                         },
-                        new CatchHitRenderer
+                        new CatchHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft
                         },
-                        new ManiaHitRenderer
+                        new ManiaHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -1,39 +1,40 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
-using osu.Framework.Graphics;
-using osu.Framework.Timing;
 using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Configuration;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using OpenTK.Graphics;
+using osu.Framework.Screens.Testing;
+using osu.Framework.Timing;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Judgements;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.Osu.Objects.Drawables;
+using System.Collections.Generic;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseHitObjects : TestCase
     {
-        private StopwatchClock rateAdjustClock;
-        private FramedClock framedClock;
+        private readonly FramedClock framedClock;
 
         private bool auto;
 
         public TestCaseHitObjects()
         {
-            rateAdjustClock = new StopwatchClock(true);
+            var rateAdjustClock = new StopwatchClock(true);
             framedClock = new FramedClock(rateAdjustClock);
             playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
         }
 
         private HitObjectType mode = HitObjectType.Slider;
 
-        private BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
+        private readonly BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
         private Container playfieldContainer;
         private Container approachContainer;
 
@@ -61,12 +62,15 @@ namespace osu.Desktop.VisualTests.Tests
                     add(new DrawableSlider(new Slider
                     {
                         StartTime = framedClock.CurrentTime + 600,
-                        ControlPoints = new List<Vector2>
+                        CurveObject = new CurvedHitObject
                         {
-                            new Vector2(-200, 0),
-                            new Vector2(400, 0),
+                            ControlPoints = new List<Vector2>
+                            {
+                                new Vector2(-200, 0),
+                                new Vector2(400, 0),
+                            },
+                            Distance = 400
                         },
-                        Length = 400,
                         Position = new Vector2(-200, 0),
                         Velocity = 1,
                         TickDistance = 100,
@@ -76,7 +80,7 @@ namespace osu.Desktop.VisualTests.Tests
                     add(new DrawableSpinner(new Spinner
                     {
                         StartTime = framedClock.CurrentTime + 600,
-                        Length = 1000,
+                        EndTime = framedClock.CurrentTime + 1600,
                         Position = new Vector2(0, 0),
                     }));
                     break;
@@ -124,7 +128,7 @@ namespace osu.Desktop.VisualTests.Tests
 
         private int depth;
 
-        private void add(DrawableHitObject h)
+        private void add(DrawableOsuHitObject h)
         {
             h.Anchor = Anchor.Centre;
             h.Depth = depth++;
@@ -132,7 +136,7 @@ namespace osu.Desktop.VisualTests.Tests
             if (auto)
             {
                 h.State = ArmedState.Hit;
-                h.Judgement = new OsuJudgementInfo { Result = HitResult.Hit };
+                h.Judgement = new OsuJudgement { Result = HitResult.Hit };
             }
 
             playfieldContainer.Add(h);
@@ -140,5 +144,12 @@ namespace osu.Desktop.VisualTests.Tests
             if (proxyable != null)
                 approachContainer.Add(proxyable.ProxiedLayer.CreateProxy());
         }
+
+        private enum HitObjectType
+        {
+            Circle,
+            Slider,
+            Spinner
+        }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -0,0 +1,225 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Screens.Testing;
+using osu.Game.Modes;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu.Mods;
+using osu.Game.Screens.Select.Leaderboards;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseLeaderboard : TestCase
+    {
+        public override string Description => @"From song select";
+
+        private Leaderboard leaderboard;
+
+        private void newScores()
+        {
+            var scores = new[]
+            {
+                new Score
+                {
+                    Rank = ScoreRank.XH,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6602580,
+                        Username = @"waaiiru",
+                        Country = new Country
+                        {
+                            FullName = @"Spain",
+                            FlagName = @"ES",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.X,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 4608074,
+                        Username = @"Skycries",
+                        Country = new Country
+                        {
+                            FullName = @"Brazil",
+                            FlagName = @"BR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.SH,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1014222,
+                        Username = @"eLy",
+                        Country = new Country
+                        {
+                            FullName = @"Japan",
+                            FlagName = @"JP",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.S,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1541390,
+                        Username = @"Toukai",
+                        Country = new Country
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.A,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2243452,
+                        Username = @"Satoruu",
+                        Country = new Country
+                        {
+                            FullName = @"Venezuela",
+                            FlagName = @"VE",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.B,
+                    Accuracy = 98.26,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2705430,
+                        Username = @"Mooha",
+                        Country = new Country
+                        {
+                            FullName = @"France",
+                            FlagName = @"FR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.C,
+                    Accuracy = 96.54,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 7151382,
+                        Username = @"Mayuri Hana",
+                        Country = new Country
+                        {
+                            FullName = @"Thailand",
+                            FlagName = @"TH",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 60.25,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2051389,
+                        Username = @"FunOrange",
+                        Country = new Country
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 51.40,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6169483,
+                        Username = @"-Hebel-",
+                        Country = new Country
+                        {
+                            FullName = @"Mexico",
+                            FlagName = @"MX",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 42.22,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6702666,
+                        Username = @"prhtnsm",
+                        Country = new Country
+                        {
+                            FullName = @"Germany",
+                            FlagName = @"DE",
+                        },
+                    },
+                },
+            };
+
+            leaderboard.Scores = scores;
+        }
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(leaderboard = new Leaderboard
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Size = new Vector2(550f, 450f),
+            });
+
+            AddButton(@"New Scores", newScores);
+            newScores();
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -95,7 +95,7 @@ namespace osu.Desktop.VisualTests.Tests
             progressingNotifications.Add(n);
         }
 
-        private List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
+        private readonly List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
 
         private void sendProgress1()
         {

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -8,6 +8,7 @@ using osu.Framework.MathUtils;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -39,10 +40,10 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(songSelect = new PlaySongSelect());
 
-            AddButton(@"Sort by Artist", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Artist; });
-            AddButton(@"Sort by Title", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Title; });
-            AddButton(@"Sort by Author", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Author; });
-            AddButton(@"Sort by Difficulty", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Difficulty; });
+            AddButton(@"Sort by Artist", delegate { songSelect.FilterControl.Sort = SortMode.Artist; });
+            AddButton(@"Sort by Title", delegate { songSelect.FilterControl.Sort = SortMode.Title; });
+            AddButton(@"Sort by Author", delegate { songSelect.FilterControl.Sort = SortMode.Author; });
+            AddButton(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
         }
 
         protected override void Dispose(bool isDisposing)
@@ -79,7 +80,7 @@ namespace osu.Desktop.VisualTests.Tests
                         Mode = PlayMode.Osu,
                         Path = "normal.osu",
                         Version = "Normal",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 3.5f,
                         }
@@ -90,7 +91,7 @@ namespace osu.Desktop.VisualTests.Tests
                         Mode = PlayMode.Osu,
                         Path = "hard.osu",
                         Version = "Hard",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 5,
                         }
@@ -101,7 +102,7 @@ namespace osu.Desktop.VisualTests.Tests
                         Mode = PlayMode.Osu,
                         Path = "insane.osu",
                         Version = "Insane",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 7,
                         }

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -2,19 +2,19 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -23,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
         protected Player Player;
         private BeatmapDatabase db;
 
-
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
@@ -38,7 +37,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             WorkingBeatmap beatmap = null;
 
-            var beatmapInfo = db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault();
+            var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.Mode == PlayMode.Osu);
             if (beatmapInfo != null)
                 beatmap = db.GetWorkingBeatmap(beatmapInfo);
 
@@ -60,13 +59,12 @@ namespace osu.Desktop.VisualTests.Tests
                     time += 500;
                 }
 
-                var decoder = new ConstructableBeatmapDecoder();
-
                 Beatmap b = new Beatmap
                 {
                     HitObjects = objects,
                     BeatmapInfo = new BeatmapInfo
                     {
+                        Difficulty = new BeatmapDifficulty(),
                         Metadata = new BeatmapMetadata
                         {
                             Artist = @"Unknown",
@@ -76,8 +74,6 @@ namespace osu.Desktop.VisualTests.Tests
                     }
                 };
 
-                decoder.Process(b);
-
                 beatmap = new TestWorkingBeatmap(b);
             }
 
@@ -100,16 +96,5 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap
             };
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

@@ -1,40 +1,31 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Input.Handlers;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu.Mods;
+using osu.Game.Screens.Play;
 using System;
 using System.IO;
-using osu.Framework.Allocation;
-using osu.Framework.Input.Handlers;
-using osu.Framework.Platform;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Modes;
-using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseReplay : TestCasePlayer
+    internal class TestCaseReplay : TestCasePlayer
     {
         private WorkingBeatmap beatmap;
 
         private InputHandler replay;
 
         private Func<Stream> getReplayStream;
-        private ScoreDatabase scoreDatabase;
 
         public override string Description => @"Testing replay playback.";
 
-        [BackgroundDependencyLoader]
-        private void load(Storage storage)
-        {
-            scoreDatabase = new ScoreDatabase(storage);
-        }
-
         protected override Player CreatePlayer(WorkingBeatmap beatmap)
         {
-            var player = base.CreatePlayer(beatmap);
-            player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler();
-            return player;
+            beatmap.Mods.Value = new Mod[] { new OsuModAutoplay() };
+
+            return base.CreatePlayer(beatmap);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -1,20 +1,14 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
+using osu.Framework.Screens.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Graphics.Primitives;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -35,58 +29,26 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 TextSize = 40,
-                Count = 0,
                 Margin = new MarginPadding(20),
             };
             Add(score);
 
-            ComboCounter standardCombo = new OsuComboCounter
+            ComboCounter comboCounter = new StandardComboCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Margin = new MarginPadding(10),
-                Count = 0,
                 TextSize = 40,
             };
-            Add(standardCombo);
+            Add(comboCounter);
 
-            CatchComboCounter catchCombo = new CatchComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(catchCombo);
-
-            ComboCounter taikoCombo = new TaikoComboCounter
-            {
-                Origin = Anchor.BottomCentre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -160),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(taikoCombo);
-
-            ManiaComboCounter maniaCombo = new ManiaComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -80),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(maniaCombo);
-
-
-            PercentageCounter accuracyCombo = new PercentageCounter
+            PercentageCounter accuracyCounter = new PercentageCounter
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 Position = new Vector2(-20, 60),
             };
-            Add(accuracyCombo);
+            Add(accuracyCounter);
 
             StarCounter stars = new StarCounter
             {
@@ -108,50 +70,27 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddButton(@"Reset all", delegate
             {
-                score.Count = 0;
-                standardCombo.Count = 0;
-                taikoCombo.Count = 0;
-                maniaCombo.Count = 0;
-                catchCombo.Count = 0;
+                score.Current.Value = 0;
+                comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
-                accuracyCombo.SetFraction(0, 0);
+                accuracyCounter.SetFraction(0, 0);
                 stars.Count = 0;
                 starsLabel.Text = stars.Count.ToString("0.00");
             });
 
             AddButton(@"Hit! :D", delegate
             {
-                score.Count += 300 + (ulong)(300.0 * (standardCombo.Count > 0 ? standardCombo.Count - 1 : 0) / 25.0);
-                standardCombo.Count++;
-                taikoCombo.Count++;
-                maniaCombo.Count++;
-                catchCombo.CatchFruit(new Color4(
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    1)
-                );
+                score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
+                comboCounter.Increment();
                 numerator++; denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
             AddButton(@"miss...", delegate
             {
-                standardCombo.Roll();
-                taikoCombo.Roll();
-                maniaCombo.Roll();
-                catchCombo.Roll();
+                comboCounter.Current.Value = 0;
                 denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
-            });
-
-            AddButton(@"mania hold", delegate
-            {
-                if (!maniaHold)
-                    maniaCombo.HoldStart();
-                else
-                    maniaCombo.HoldEnd();
-                maniaHold = !maniaHold;
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
             AddButton(@"Alter stars", delegate
@@ -163,11 +102,8 @@ namespace osu.Desktop.VisualTests.Tests
             AddButton(@"Stop counters", delegate
             {
                 score.StopRolling();
-                standardCombo.StopRolling();
-                catchCombo.StopRolling();
-                taikoCombo.StopRolling();
-                maniaCombo.StopRolling();
-                accuracyCombo.StopRolling();
+                comboCounter.StopRolling();
+                accuracyCounter.StopRolling();
                 stars.StopAnimation();
             });
         }

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -0,0 +1,45 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Screens.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseTabControl : TestCase
+    {
+        public override string Description => @"Filter for song select";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            OsuSpriteText text;
+            OsuTabControl<GroupMode> filter;
+            Add(filter = new OsuTabControl<GroupMode>
+            {
+                Margin = new MarginPadding(4),
+                Size = new Vector2(229, 24),
+                AutoSort = true
+            });
+            Add(text = new OsuSpriteText
+            {
+                Text = "None",
+                Margin = new MarginPadding(4),
+                Position = new Vector2(275, 5)
+            });
+
+            filter.PinItem(GroupMode.All);
+            filter.PinItem(GroupMode.RecentlyPlayed);
+
+            filter.ItemChanged += (sender, mode) =>
+            {
+                text.Text = "Currently Selected: " + mode.ToString();
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -0,0 +1,77 @@
+// Copyright (c) 2007-2017 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.Framework.Screens.Testing;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.Taiko.UI;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseTaikoPlayfield : TestCase
+    {
+        public override string Description => "Taiko playfield";
+
+        private TaikoPlayfield playfield;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            AddButton("Hit!", addHitJudgement);
+            AddButton("Miss :(", addMissJudgement);
+
+            Add(playfield = new TaikoPlayfield
+            {
+                Y = 200
+            });
+        }
+
+        private void addHitJudgement()
+        {
+            TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
+
+            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            {
+                X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
+                Judgement = new TaikoJudgement
+                {
+                    Result = HitResult.Hit,
+                    TaikoResult = hitResult,
+                    TimeOffset = 0,
+                    ComboAtHit = 1,
+                    SecondHit = RNG.Next(10) == 0
+                }
+            });
+        }
+
+        private void addMissJudgement()
+        {
+            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            {
+                Judgement = new TaikoJudgement
+                {
+                    Result = HitResult.Miss,
+                    TimeOffset = 0,
+                    ComboAtHit = 0
+                }
+            });
+        }
+
+        private class DrawableTestHit : DrawableHitObject<TaikoHitObject, TaikoJudgement>
+        {
+            public DrawableTestHit(TaikoHitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            protected override TaikoJudgement CreateJudgement() => new TaikoJudgement();
+
+            protected override void UpdateState(ArmedState state)
+            {
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Platform;
 using osu.Framework.Screens.Testing;
 using osu.Game;
 using osu.Game.Screens.Backgrounds;
@@ -19,5 +20,11 @@ namespace osu.Desktop.VisualTests
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
         }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState = CursorState.Hidden;
+        }
     }
 }

osu.Desktop.VisualTests/app.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -23,6 +23,7 @@
     <SignAssembly>false</SignAssembly>
     <TargetZone>LocalIntranet</TargetZone>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -114,7 +115,6 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="OpenTK.dll.config" />
   </ItemGroup>
@@ -193,6 +193,8 @@
     <Compile Include="Tests\TestCaseMenuButtonSystem.cs" />
     <Compile Include="Tests\TestCaseReplay.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
+    <Compile Include="Tests\TestCaseTabControl.cs" />
+    <Compile Include="Tests\TestCaseTaikoPlayfield.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
     <Compile Include="Tests\TestCaseTwoLayerButton.cs" />
@@ -203,9 +205,15 @@
     <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
+    <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
+    <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Beatmaps\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

osu.Desktop/OsuGameDesktop.cs

@@ -17,7 +17,7 @@ namespace osu.Desktop
 {
     internal class OsuGameDesktop : OsuGame
     {
-        private VersionManager versionManager;
+        private readonly VersionManager versionManager;
 
         public OsuGameDesktop(string[] args = null)
             : base(args)
@@ -30,9 +30,9 @@ namespace osu.Desktop
             base.LoadComplete();
 
             versionManager.LoadAsync(this);
-            ModeChanged += m =>
+            ScreenChanged += s =>
             {
-                if (!versionManager.IsAlive && m is Intro)
+                if (!versionManager.IsAlive && s is Intro)
                     Add(versionManager);
             };
         }
@@ -43,6 +43,8 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
+                desktopWindow.CursorState = CursorState.Hidden;
+
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
                 desktopWindow.Title = Name;
 
@@ -67,7 +69,7 @@ namespace osu.Desktop
                 });
         }
 
-        static readonly string[] allowed_extensions = { @".osz", @".osr" };
+        private static readonly string[] allowed_extensions = { @".osz", @".osr" };
 
         private void dragEnter(DragEventArgs e)
         {
@@ -76,10 +78,7 @@ namespace osu.Desktop
             if (isFile)
             {
                 var paths = ((object[])e.Data.GetData(DataFormats.FileDrop)).Select(f => f.ToString()).ToArray();
-                if (allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))))
-                    e.Effect = DragDropEffects.Copy;
-                else
-                    e.Effect = DragDropEffects.None;
+                e.Effect = allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))) ? DragDropEffects.Copy : DragDropEffects.None;
             }
         }
     }

osu.Desktop/Overlays/VersionManager.cs

@@ -189,7 +189,7 @@ namespace osu.Desktop.Overlays
 
         private class UpdateProgressNotification : ProgressNotification
         {
-            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification()
             {
                 Text = @"Update ready to install. Click to restart!",
                 Activated = () =>
@@ -215,6 +215,7 @@ namespace osu.Desktop.Overlays
                         Origin = Anchor.Centre,
                         Icon = FontAwesome.fa_upload,
                         Colour = Color4.White,
+                        TextSize = 20
                     }
                 });
             }

osu.Desktop/app.config

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Desktop/osu.Desktop.csproj

@@ -23,6 +23,7 @@
     <SignAssembly>false</SignAssembly>
     <TargetZone>LocalIntranet</TargetZone>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -101,10 +102,6 @@
       <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
@@ -153,7 +150,6 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
     <None Include="osu!.res" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />

osu.Desktop/packages.config

@@ -7,7 +7,6 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="Splat" version="2.0.0" targetFramework="net45" />
   <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>

osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 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.Modes.Catch.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Catch.Beatmaps
+{
+    internal class CatchBeatmapConverter : IBeatmapConverter<CatchBaseHit>
+    {
+        public Beatmap<CatchBaseHit> Convert(Beatmap original)
+        {
+            return new Beatmap<CatchBaseHit>(original)
+            {
+                HitObjects = new List<CatchBaseHit>() // Todo: Convert HitObjects
+            };
+        }
+    }
+}

osu.Game.Modes.Catch/Beatmaps/CatchBeatmapProcessor.cs

@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2017 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.Modes.Catch.Objects;
+
+namespace osu.Game.Modes.Catch.Beatmaps
+{
+    internal class CatchBeatmapProcessor : IBeatmapProcessor<CatchBaseHit>
+    {
+        public void SetDefaults(CatchBaseHit hitObject, Beatmap<CatchBaseHit> beatmap)
+        {
+        }
+
+        public void PostProcess(Beatmap<CatchBaseHit> beatmap)
+        {
+        }
+    }
+}

osu.Game.Modes.Catch/CatchDifficultyCalculator.cs

@@ -2,26 +2,23 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
-using osu.Game.Modes.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Modes.Catch
 {
     public class CatchDifficultyCalculator : DifficultyCalculator<CatchBaseHit>
     {
-        protected override PlayMode PlayMode => PlayMode.Catch;
-
         public CatchDifficultyCalculator(Beatmap beatmap) : base(beatmap)
         {
         }
 
-        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             return 0;
         }
+
+        protected override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
     }
 }

osu.Game.Modes.Catch/CatchRuleset.cs

@@ -1,26 +1,21 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Graphics;
-using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.UI;
+using OpenTK.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Modes.Catch.Mods;
+using osu.Game.Modes.Catch.UI;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.Catch
 {
     public class CatchRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
-
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new CatchHitRenderer
-        {
-            Beatmap = beatmap,
-            InputManager = input,
-        };
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new CatchHitRenderer(beatmap);
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
@@ -62,6 +57,8 @@ namespace osu.Game.Modes.Catch
                     return new Mod[]
                     {
                         new CatchModRelax(),
+                        null,
+                        null,
                         new MultiMod
                         {
                             Mods = new Mod[]
@@ -79,12 +76,19 @@ namespace osu.Game.Modes.Catch
 
         protected override PlayMode PlayMode => PlayMode.Catch;
 
+        public override string Description => "osu!catch";
+
         public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
-
-        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[]
+        {
+            new KeyCounterKeyboard(Key.ShiftLeft),
+            new KeyCounterMouse(MouseButton.Left),
+            new KeyCounterMouse(MouseButton.Right)
+        };
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
+
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
     }
 }

osu.Game.Modes.Catch/CatchScoreProcessor.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Catch.Judgements;
+using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Catch
+{
+    internal class CatchScoreProcessor : ScoreProcessor<CatchBaseHit, CatchJudgement>
+    {
+        public CatchScoreProcessor()
+        {
+        }
+
+        public CatchScoreProcessor(HitRenderer<CatchBaseHit, CatchJudgement> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void UpdateCalculations(CatchJudgement newJudgement)
+        {
+        }
+    }
+}

osu.Game.Modes.Catch/Judgements/CatchJudgement.cs

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Judgements;
+
+namespace osu.Game.Modes.Catch.Judgements
+{
+    public class CatchJudgement : Judgement
+    {
+        public override string ScoreString => string.Empty;
+
+        public override string MaxScoreString => string.Empty;
+    }
+}

osu.Game.Modes.Catch/Mods/CatchMod.cs

@@ -1,7 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.Modes.Catch
+using osu.Game.Modes.Mods;
+
+namespace osu.Game.Modes.Catch.Mods
 {
     public class CatchModNoFail : ModNoFail
     {

osu.Game.Modes.Catch/Objects/CatchBaseHit.cs

@@ -7,6 +7,6 @@ namespace osu.Game.Modes.Catch.Objects
 {
     public abstract class CatchBaseHit : HitObject
     {
-        public float Position;
+        public float Position { get; set; }
     }
 }

osu.Game.Modes.Catch/Objects/CatchConverter.cs

@@ -1,40 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Modes.Catch.Objects
-{
-    internal class CatchConverter : HitObjectConverter<CatchBaseHit>
-    {
-        public override List<CatchBaseHit> Convert(Beatmap beatmap)
-        {
-            List<CatchBaseHit> output = new List<CatchBaseHit>();
-
-            foreach (HitObject i in beatmap.HitObjects)
-            {
-                CatchBaseHit h = i as CatchBaseHit;
-
-                if (h == null)
-                {
-                    OsuHitObject o = i as OsuHitObject;
-
-                    if (o == null) throw new HitObjectConvertException(@"Catch", i);
-
-                    h = new Fruit
-                    {
-                        StartTime = o.StartTime,
-                        Position = o.Position.X,
-                    };
-                }
-
-                output.Add(h);
-            }
-
-            return output;
-        }
-    }
-}

osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Catch.Objects.Drawable
 {
     internal class DrawableFruit : Sprite
     {
-        private CatchBaseHit h;
+        private readonly CatchBaseHit h;
 
         public DrawableFruit(CatchBaseHit h)
         {
@@ -29,8 +29,10 @@ namespace osu.Game.Modes.Catch.Objects.Drawable
         {
             Texture = textures.Get(@"Menu/logo");
 
+            const double duration = 0;
+
             Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) });
-            Transforms.Add(new TransformAlpha { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
+            Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });
             Expire(true);
         }
     }

osu.Game.Modes.Catch/UI/CatchComboCounter.cs

@@ -1,65 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Modes.Osu.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Catch.UI
-{
-    /// <summary>
-    /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch.
-    /// </summary>
-    public class CatchComboCounter : OsuComboCounter
-    {
-        protected override bool CanPopOutWhileRolling => true;
-
-        protected virtual double FadeOutDelay => 1000;
-        protected override double FadeOutDuration => 300;
-
-        protected override string FormatCount(ulong count)
-        {
-            return $@"{count:#,0}";
-        }
-
-        private void animateFade()
-        {
-            Show();
-            Delay(FadeOutDelay);
-            FadeOut(FadeOutDuration);
-            DelayReset();
-        }
-
-        protected override void OnCountChange(ulong currentValue, ulong newValue)
-        {
-            if (newValue != 0)
-                animateFade();
-            base.OnCountChange(currentValue, newValue);
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling)
-            {
-                PopOutCount.Colour = DisplayedCountSpriteText.Colour;
-                FadeOut(FadeOutDuration);
-            }
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        protected override void OnCountIncrement(ulong currentValue, ulong newValue)
-        {
-            animateFade();
-            base.OnCountIncrement(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Increaces counter and tints pop-out before animation.
-        /// </summary>
-        /// <param name="colour">Last grabbed fruit colour.</param>
-        public void CatchFruit(Color4 colour)
-        {
-            PopOutCount.Colour = colour;
-            Count++;
-        }
-    }
-}

osu.Game.Modes.Catch/UI/CatchHitRenderer.cs

@@ -1,19 +1,30 @@
 // Copyright (c) 2007-2017 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.Modes.Catch.Beatmaps;
+using osu.Game.Modes.Catch.Judgements;
 using osu.Game.Modes.Catch.Objects;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Catch.UI
 {
-    public class CatchHitRenderer : HitRenderer<CatchBaseHit>
+    public class CatchHitRenderer : HitRenderer<CatchBaseHit, CatchJudgement>
     {
-        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
+        public CatchHitRenderer(WorkingBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
 
-        protected override Playfield<CatchBaseHit> CreatePlayfield() => new CatchPlayfield();
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor(this);
 
-        protected override DrawableHitObject<CatchBaseHit> GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
+        protected override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
+
+        protected override IBeatmapProcessor<CatchBaseHit> CreateBeatmapProcessor() => new CatchBeatmapProcessor();
+
+        protected override Playfield<CatchBaseHit, CatchJudgement> CreatePlayfield() => new CatchPlayfield();
+
+        protected override DrawableHitObject<CatchBaseHit, CatchJudgement> GetVisualRepresentation(CatchBaseHit h) => null;
     }
 }

osu.Game.Modes.Catch/UI/CatchPlayfield.cs

@@ -6,10 +6,11 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Modes.Catch.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
+using osu.Game.Modes.Catch.Judgements;
 
 namespace osu.Game.Modes.Catch.UI
 {
-    public class CatchPlayfield : Playfield<CatchBaseHit>
+    public class CatchPlayfield : Playfield<CatchBaseHit, CatchJudgement>
     {
         public CatchPlayfield()
         {

osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj

@@ -47,18 +47,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\CatchBeatmapConverter.cs" />
+    <Compile Include="Beatmaps\CatchBeatmapProcessor.cs" />
     <Compile Include="CatchDifficultyCalculator.cs" />
+    <Compile Include="CatchScoreProcessor.cs" />
+    <Compile Include="Judgements\CatchJudgement.cs" />
     <Compile Include="Objects\CatchBaseHit.cs" />
-    <Compile Include="Objects\CatchConverter.cs" />
     <Compile Include="Objects\Drawable\DrawableFruit.cs" />
     <Compile Include="Objects\Droplet.cs" />
     <Compile Include="Objects\Fruit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\CatchComboCounter.cs" />
     <Compile Include="UI\CatchHitRenderer.cs" />
     <Compile Include="UI\CatchPlayfield.cs" />
     <Compile Include="CatchRuleset.cs" />
-    <Compile Include="CatchMod.cs" />
+    <Compile Include="Mods\CatchMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">

osu.Game.Modes.Catch/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 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.Modes.Mania.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Mania.Beatmaps
+{
+    internal class ManiaBeatmapConverter : IBeatmapConverter<ManiaBaseHit>
+    {
+        public Beatmap<ManiaBaseHit> Convert(Beatmap original)
+        {
+            return new Beatmap<ManiaBaseHit>(original)
+            {
+                HitObjects = new List<ManiaBaseHit>() // Todo: Implement
+            };
+        }
+    }
+}

osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapProcessor.cs

@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2017 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.Modes.Mania.Objects;
+
+namespace osu.Game.Modes.Mania.Beatmaps
+{
+    internal class ManiaBeatmapProcessor : IBeatmapProcessor<ManiaBaseHit>
+    {
+        public void SetDefaults(ManiaBaseHit hitObject, Beatmap<ManiaBaseHit> beatmap)
+        {
+        }
+
+        public void PostProcess(Beatmap<ManiaBaseHit> beatmap)
+        {
+        }
+    }
+}

osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Judgements;
+
+namespace osu.Game.Modes.Mania.Judgements
+{
+    public class ManiaJudgement : Judgement
+    {
+        public override string ScoreString => string.Empty;
+
+        public override string MaxScoreString => string.Empty;
+    }
+}

osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs

@@ -2,29 +2,24 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Modes.Mania
 {
     public class ManiaDifficultyCalculator : DifficultyCalculator<ManiaBaseHit>
     {
-        protected override PlayMode PlayMode => PlayMode.Mania;
-
-        private int columns;
-
-        public ManiaDifficultyCalculator(Beatmap beatmap, int columns = 5) : base(beatmap)
+        public ManiaDifficultyCalculator(Beatmap beatmap)
+            : base(beatmap)
         {
-            this.columns = columns;
         }
 
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             return 0;
         }
+
+        protected override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter() => new ManiaBeatmapConverter();
     }
 }

osu.Game.Modes.Mania/ManiaRuleset.cs

@@ -1,26 +1,20 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Graphics;
-using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Modes.Mania.Mods;
+using osu.Game.Modes.Mania.UI;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.Mania
 {
     public class ManiaRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
-
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new ManiaHitRenderer
-        {
-            Beatmap = beatmap,
-            InputManager = input,
-        };
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new ManiaHitRenderer(beatmap);
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
@@ -54,7 +48,14 @@ namespace osu.Game.Modes.Mania
                                 new ManiaModNightcore(),
                             },
                         },
-                        new ManiaModHidden(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModFadeIn(),
+                                new ManiaModHidden(),
+                            }
+                        },
                         new ManiaModFlashlight(),
                     };
 
@@ -76,8 +77,8 @@ namespace osu.Game.Modes.Mania
                                 new ManiaModKey3(),
                             },
                         },
-                        new ManiaModKeyCoop(),
                         new ManiaModRandom(),
+                        new ManiaModKeyCoop(),
                         new MultiMod
                         {
                             Mods = new Mod[]
@@ -95,12 +96,14 @@ namespace osu.Game.Modes.Mania
 
         protected override PlayMode PlayMode => PlayMode.Mania;
 
+        public override string Description => "osu!mania";
+
         public override FontAwesome Icon => FontAwesome.fa_osu_mania_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
-
-        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[] { /* Todo: Should be keymod specific */ };
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
+
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
     }
 }

osu.Game.Modes.Mania/ManiaScoreProcessor.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Mania.Judgements;
+using osu.Game.Modes.Mania.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Mania
+{
+    internal class ManiaScoreProcessor : ScoreProcessor<ManiaBaseHit, ManiaJudgement>
+    {
+        public ManiaScoreProcessor()
+        {
+        }
+
+        public ManiaScoreProcessor(HitRenderer<ManiaBaseHit, ManiaJudgement> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void UpdateCalculations(ManiaJudgement newJudgement)
+        {
+        }
+    }
+}

osu.Game.Modes.Mania/Mods/ManiaMod.cs

@@ -1,10 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Game.Graphics;
+using osu.Game.Modes.Mods;
+using System;
 
-namespace osu.Game.Modes.Mania
+namespace osu.Game.Modes.Mania.Mods
 {
     public class ManiaModNoFail : ModNoFail
     {

osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs

@@ -26,8 +26,10 @@ namespace osu.Game.Modes.Mania.Objects.Drawable
         {
             Texture = textures.Get(@"Menu/logo");
 
+            const double duration = 0;
+
             Transforms.Add(new TransformPositionY { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
-            Transforms.Add(new TransformAlpha { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
+            Transforms.Add(new TransformAlpha { StartTime = note.StartTime + duration + 200, EndTime = note.StartTime + duration + 400, StartValue = 1, EndValue = 0 });
             Expire(true);
         }
     }

osu.Game.Modes.Mania/Objects/ManiaConverter.cs

@@ -1,48 +0,0 @@
-// Copyright (c) 2007-2017 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 osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Modes.Mania.Objects
-{
-    internal class ManiaConverter : HitObjectConverter<ManiaBaseHit>
-    {
-        private readonly int columns;
-
-        public ManiaConverter(int columns)
-        {
-            this.columns = columns;
-        }
-
-        public override List<ManiaBaseHit> Convert(Beatmap beatmap)
-        {
-            List<ManiaBaseHit> output = new List<ManiaBaseHit>();
-
-            foreach (HitObject i in beatmap.HitObjects)
-            {
-                ManiaBaseHit h = i as ManiaBaseHit;
-
-                if (h == null)
-                {
-                    OsuHitObject o = i as OsuHitObject;
-
-                    if (o == null) throw new HitObjectConvertException(@"Mania", i);
-
-                    h = new Note
-                    {
-                        StartTime = o.StartTime,
-                        Column = (int)Math.Round(o.Position.X / 512 * columns)
-                    };
-                }
-
-                output.Add(h);
-            }
-
-            return output;
-        }
-    }
-}

osu.Game.Modes.Mania/UI/ManiaComboCounter.cs

@@ -1,78 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Modes.Taiko.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Mania.UI
-{
-    /// <summary>
-    /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.
-    /// </summary>
-    public class ManiaComboCounter : TaikoComboCounter
-    {
-        protected ushort KeysHeld;
-
-        protected Color4 OriginalColour;
-
-        protected Color4 TintColour => Color4.Orange;
-        protected EasingTypes TintEasing => EasingTypes.None;
-        protected int TintDuration => 500;
-
-        protected Color4 PopOutColor => Color4.Red;
-        protected override float PopOutInitialAlpha => 1.0f;
-        protected override double PopOutDuration => 300;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            PopOutCount.Anchor = Anchor.BottomCentre;
-            PopOutCount.Origin = Anchor.Centre;
-            PopOutCount.FadeColour(PopOutColor, 0);
-            OriginalColour = DisplayedCountSpriteText.Colour;
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling && newValue < currentValue)
-            {
-                PopOutCount.Text = FormatCount(currentValue);
-
-                PopOutCount.FadeTo(PopOutInitialAlpha);
-                PopOutCount.ScaleTo(1.0f);
-
-                PopOutCount.FadeOut(PopOutDuration, PopOutEasing);
-                PopOutCount.ScaleTo(PopOutScale, PopOutDuration, PopOutEasing);
-            }
-
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Tints text while holding a key.
-        /// </summary>
-        /// <remarks>
-        /// Does not alter combo. This has to be done depending of the scoring system.
-        /// (i.e. v1 = each period of time; v2 = when starting and ending a key hold)
-        /// </remarks>
-        public void HoldStart()
-        {
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(TintColour, TintDuration, TintEasing);
-            KeysHeld++;
-        }
-
-        /// <summary>
-        /// Ends tinting.
-        /// </summary>
-        public void HoldEnd()
-        {
-            KeysHeld--;
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(OriginalColour, TintDuration, TintEasing);
-        }
-    }
-}

osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs

@@ -1,34 +1,33 @@
 // Copyright (c) 2007-2017 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.Modes.Mania.Beatmaps;
+using osu.Game.Modes.Mania.Judgements;
 using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Mania.UI
 {
-    public class ManiaHitRenderer : HitRenderer<ManiaBaseHit>
+    public class ManiaHitRenderer : HitRenderer<ManiaBaseHit, ManiaJudgement>
     {
         private readonly int columns;
 
-        public ManiaHitRenderer(int columns = 5)
+        public ManiaHitRenderer(WorkingBeatmap beatmap, int columns = 5)
+            : base(beatmap)
         {
             this.columns = columns;
         }
 
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
 
-        protected override Playfield<ManiaBaseHit> CreatePlayfield() => new ManiaPlayfield(columns);
+        protected override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter() => new ManiaBeatmapConverter();
 
-        protected override DrawableHitObject<ManiaBaseHit> GetVisualRepresentation(ManiaBaseHit h)
-        {
-            return null;
-            //return new DrawableNote(h)
-            //{
-            //    Position = new Vector2((float)(h.Column + 0.5) / columns, -0.1f),
-            //    RelativePositionAxes = Axes.Both
-            //};
-        }
+        protected override IBeatmapProcessor<ManiaBaseHit> CreateBeatmapProcessor() => new ManiaBeatmapProcessor();
+
+        protected override Playfield<ManiaBaseHit, ManiaJudgement> CreatePlayfield() => new ManiaPlayfield(columns);
+
+        protected override DrawableHitObject<ManiaBaseHit, ManiaJudgement> GetVisualRepresentation(ManiaBaseHit h) => null;
     }
 }

osu.Game.Modes.Mania/UI/ManiaPlayfield.cs

@@ -7,10 +7,11 @@ using osu.Game.Modes.Mania.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Game.Modes.Mania.Judgements;
 
 namespace osu.Game.Modes.Mania.UI
 {
-    public class ManiaPlayfield : Playfield<ManiaBaseHit>
+    public class ManiaPlayfield : Playfield<ManiaBaseHit, ManiaJudgement>
     {
         public ManiaPlayfield(int columns)
         {

osu.Game.Modes.Mania/app.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj

@@ -47,18 +47,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\ManiaBeatmapConverter.cs" />
+    <Compile Include="Beatmaps\ManiaBeatmapProcessor.cs" />
+    <Compile Include="Judgements\ManiaJudgement.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
+    <Compile Include="ManiaScoreProcessor.cs" />
     <Compile Include="Objects\Drawable\DrawableNote.cs" />
     <Compile Include="Objects\HoldNote.cs" />
     <Compile Include="Objects\ManiaBaseHit.cs" />
-    <Compile Include="Objects\ManiaConverter.cs" />
     <Compile Include="Objects\Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\ManiaComboCounter.cs" />
     <Compile Include="UI\ManiaHitRenderer.cs" />
     <Compile Include="UI\ManiaPlayfield.cs" />
     <Compile Include="ManiaRuleset.cs" />
-    <Compile Include="ManiaMod.cs" />
+    <Compile Include="Mods\ManiaMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
@@ -82,10 +84,10 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
     <None Include="OpenTK.dll.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

osu.Game.Modes.Mania/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs

@@ -1,40 +1,81 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Beatmaps;
-using osu.Game.Modes.Osu.Objects.Drawables;
 using OpenTK;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.Osu.Objects.Drawables;
+using System.Collections.Generic;
+using osu.Game.Modes.Objects.Types;
+using System.Linq;
 
-namespace osu.Game.Modes.Osu.Objects
+namespace osu.Game.Modes.Osu.Beatmaps
 {
-    public class OsuHitObjectConverter : HitObjectConverter<OsuHitObject>
+    internal class OsuBeatmapConverter : IBeatmapConverter<OsuHitObject>
     {
-        public override List<OsuHitObject> Convert(Beatmap beatmap)
+        public Beatmap<OsuHitObject> Convert(Beatmap original)
         {
-            List<OsuHitObject> output = new List<OsuHitObject>();
-
-            int combo = 0;
-            foreach (HitObject h in beatmap.HitObjects)
+            return new Beatmap<OsuHitObject>(original)
             {
-                if (h.NewCombo) combo = 0;
-
-                h.ComboIndex = combo++;
-                output.Add(h as OsuHitObject);
-            }
-
-            UpdateStacking(output, beatmap.BeatmapInfo?.StackLeniency ?? 0.7f);
-
-            return output;
+                HitObjects = convertHitObjects(original.HitObjects, original.BeatmapInfo?.StackLeniency ?? 0.7f)
+            };
         }
 
-        public static void UpdateStacking(List<OsuHitObject> hitObjects, float stackLeniency, int startIndex = 0, int endIndex = -1)
+        private List<OsuHitObject> convertHitObjects(List<HitObject> hitObjects, float stackLeniency)
+        {
+            List<OsuHitObject> converted = hitObjects.Select(convertHitObject).ToList();
+
+            updateStacking(converted, stackLeniency);
+
+            return converted;
+        }
+
+        private OsuHitObject convertHitObject(HitObject original)
+        {
+            IHasCurve curveData = original as IHasCurve;
+            IHasEndTime endTimeData = original as IHasEndTime;
+            IHasPosition positionData = original as IHasPosition;
+            IHasCombo comboData = original as IHasCombo;
+
+            if (curveData != null)
+            {
+                return new Slider
+                {
+                    StartTime = original.StartTime,
+                    Sample = original.Sample,
+                    CurveObject = curveData,
+                    Position = positionData?.Position ?? Vector2.Zero,
+                    NewCombo = comboData?.NewCombo ?? false
+                };
+            }
+
+            if (endTimeData != null)
+            {
+                return new Spinner
+                {
+                    StartTime = original.StartTime,
+                    Sample = original.Sample,
+                    Position = new Vector2(512, 384) / 2,
+                    EndTime = endTimeData.EndTime
+                };
+            }
+
+            return new HitCircle
+            {
+                StartTime = original.StartTime,
+                Sample = original.Sample,
+                Position = positionData?.Position ?? Vector2.Zero,
+                NewCombo = comboData?.NewCombo ?? false
+            };
+        }
+
+        private void updateStacking(List<OsuHitObject> hitObjects, float stackLeniency, int startIndex = 0, int endIndex = -1)
         {
             if (endIndex == -1)
                 endIndex = hitObjects.Count - 1;
 
-            int stackDistance = 3;
+            const int stack_distance = 3;
             float stackThreshold = DrawableOsuHitObject.TIME_PREEMPT * stackLeniency;
 
             // Reset stacking inside the update range
@@ -52,14 +93,17 @@ namespace osu.Game.Modes.Osu.Objects
                     if (stackBaseObject is Spinner) break;
 
                     OsuHitObject objectN = hitObjects[n];
-                    if (objectN is Spinner) continue;
+                    if (objectN is Spinner)
+                        continue;
 
-                    if (objectN.StartTime - stackBaseObject.EndTime > stackThreshold)
+                    double endTime = (stackBaseObject as IHasEndTime)?.EndTime ?? stackBaseObject.StartTime;
+
+                    if (objectN.StartTime - endTime > stackThreshold)
                         //We are no longer within stacking range of the next object.
                         break;
 
-                    if (Vector2.Distance(stackBaseObject.Position, objectN.Position) < stackDistance ||
-                        (stackBaseObject is Slider && Vector2.Distance(stackBaseObject.EndPosition, objectN.Position) < stackDistance))
+                    if (Vector2.Distance(stackBaseObject.Position, objectN.Position) < stack_distance ||
+                        stackBaseObject is Slider && Vector2.Distance(stackBaseObject.EndPosition, objectN.Position) < stack_distance)
                     {
                         stackBaseIndex = n;
 
@@ -106,7 +150,9 @@ namespace osu.Game.Modes.Osu.Objects
                         OsuHitObject objectN = hitObjects[n];
                         if (objectN is Spinner) continue;
 
-                        if (objectI.StartTime - objectN.EndTime > stackThreshold)
+                        double endTime = (objectN as IHasEndTime)?.EndTime ?? objectN.StartTime;
+
+                        if (objectI.StartTime - endTime > stackThreshold)
                             //We are no longer within stacking range of the previous object.
                             break;
 
@@ -122,14 +168,14 @@ namespace osu.Game.Modes.Osu.Objects
                             *        o <- hitCircle has stack of -1
                             *         o <- hitCircle has stack of -2
                             */
-                        if (objectN is Slider && Vector2.Distance(objectN.EndPosition, objectI.Position) < stackDistance)
+                        if (objectN is Slider && Vector2.Distance(objectN.EndPosition, objectI.Position) < stack_distance)
                         {
                             int offset = objectI.StackHeight - objectN.StackHeight + 1;
                             for (int j = n + 1; j <= i; j++)
                             {
                                 //For each object which was declared under this slider, we will offset it to appear *below* the slider end (rather than above).
                                 OsuHitObject objectJ = hitObjects[j];
-                                if (Vector2.Distance(objectN.EndPosition, objectJ.Position) < stackDistance)
+                                if (Vector2.Distance(objectN.EndPosition, objectJ.Position) < stack_distance)
                                     objectJ.StackHeight -= offset;
                             }
 
@@ -138,7 +184,7 @@ namespace osu.Game.Modes.Osu.Objects
                             break;
                         }
 
-                        if (Vector2.Distance(objectN.Position, objectI.Position) < stackDistance)
+                        if (Vector2.Distance(objectN.Position, objectI.Position) < stack_distance)
                         {
                             //Keep processing as if there are no sliders.  If we come across a slider, this gets cancelled out.
                             //NOTE: Sliders with start positions stacking are a special case that is also handled here.
@@ -162,7 +208,7 @@ namespace osu.Game.Modes.Osu.Objects
                             //We are no longer within stacking range of the previous object.
                             break;
 
-                        if (Vector2.Distance(objectN.EndPosition, objectI.Position) < stackDistance)
+                        if (Vector2.Distance(objectN.EndPosition, objectI.Position) < stack_distance)
                         {
                             objectN.StackHeight = objectI.StackHeight + 1;
                             objectI = objectN;
@@ -171,6 +217,5 @@ namespace osu.Game.Modes.Osu.Objects
                 }
             }
         }
-
     }
 }

osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs

@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2017 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.Modes.Osu.Objects;
+
+namespace osu.Game.Modes.Osu.Beatmaps
+{
+    internal class OsuBeatmapProcessor : IBeatmapProcessor<OsuHitObject>
+    {
+        public void PostProcess(Beatmap<OsuHitObject> beatmap)
+        {
+            if (beatmap.ComboColors.Count == 0)
+                return;
+
+            int comboIndex = 0;
+            int colourIndex = 0;
+
+            foreach (var obj in beatmap.HitObjects)
+            {
+                if (obj.NewCombo)
+                {
+                    comboIndex = 0;
+                    colourIndex = (colourIndex + 1) % beatmap.ComboColors.Count;
+                }
+
+                obj.ComboIndex = comboIndex++;
+                obj.ComboColour = beatmap.ComboColors[colourIndex];
+            }
+        }
+    }
+}

osu.Game.Modes.Osu/Judgements/OsuJudgement.cs

@@ -0,0 +1,55 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Game.Modes.Judgements;
+using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Framework.Extensions;
+
+namespace osu.Game.Modes.Osu.Judgements
+{
+    public class OsuJudgement : Judgement
+    {
+        /// <summary>
+        /// The positional hit offset.
+        /// </summary>
+        public Vector2 PositionOffset;
+
+        /// <summary>
+        /// The score the user achieved.
+        /// </summary>
+        public OsuScoreResult Score;
+
+        /// <summary>
+        /// The score which would be achievable on a perfect hit.
+        /// </summary>
+        public OsuScoreResult MaxScore = OsuScoreResult.Hit300;
+
+        public override string ScoreString => Score.GetDescription();
+
+        public override string MaxScoreString => MaxScore.GetDescription();
+
+        public int ScoreValue => scoreToInt(Score);
+
+        public int MaxScoreValue => scoreToInt(MaxScore);
+
+        private int scoreToInt(OsuScoreResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+                case OsuScoreResult.Hit50:
+                    return 50;
+                case OsuScoreResult.Hit100:
+                    return 100;
+                case OsuScoreResult.Hit300:
+                    return 300;
+                case OsuScoreResult.SliderTick:
+                    return 10;
+            }
+        }
+
+        public ComboResult Combo;
+    }
+}

osu.Game.Modes.Osu/Mods/OsuMod.cs

@@ -1,11 +1,14 @@
 // Copyright (c) 2007-2017 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;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu.Objects;
 using System;
 using System.Linq;
-using osu.Game.Graphics;
 
-namespace osu.Game.Modes.Osu
+namespace osu.Game.Modes.Osu.Mods
 {
     public class OsuModNoFail : ModNoFail
     {
@@ -72,7 +75,7 @@ namespace osu.Game.Modes.Osu
         public override string Description => @"Spinners will be automatically completed";
         public override double ScoreMultiplier => 0.9;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModCinema), typeof(OsuModAutopilot) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
     }
 
     public class OsuModAutopilot : Mod
@@ -82,12 +85,17 @@ namespace osu.Game.Modes.Osu
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 0;
         public override bool Ranked => false;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModPerfect), typeof(ModNoFail), typeof(ModAutoplay), typeof(ModCinema) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
     }
 
-    public class OsuModAutoplay : ModAutoplay
+    public class OsuModAutoplay : ModAutoplay<OsuHitObject>
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+
+        protected override Score CreateReplayScore(Beatmap<OsuHitObject> beatmap) => new Score
+        {
+            Replay = new OsuAutoReplay(beatmap)
+        };
     }
 
     public class OsuModTarget : Mod

osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs

@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using System;
 using System.Collections.Generic;
+using OpenTK;
+using osu.Game.Modes.Objects.Types;
 
-namespace osu.Game.Modes.Osu.Objects.Drawables
+namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
 {
     public class FollowPointRenderer : ConnectionRenderer<OsuHitObject>
     {
@@ -64,7 +64,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 {
                     Vector2 startPosition = prevHitObject.EndPosition;
                     Vector2 endPosition = currHitObject.Position;
-                    double startTime = prevHitObject.EndTime;
+                    double startTime = (prevHitObject as IHasEndTime)?.EndTime ?? prevHitObject.StartTime;
                     double endTime = currHitObject.StartTime;
 
                     Vector2 distanceVector = endPosition - startPosition;

osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -7,44 +7,41 @@ using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
 using OpenTK;
+using osu.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
     public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
     {
-        private OsuHitObject osuObject;
-
         public ApproachCircle ApproachCircle;
-        private CirclePiece circle;
-        private RingPiece ring;
-        private FlashPiece flash;
-        private ExplodePiece explode;
-        private NumberPiece number;
-        private GlowPiece glow;
+        private readonly CirclePiece circle;
+        private readonly RingPiece ring;
+        private readonly FlashPiece flash;
+        private readonly ExplodePiece explode;
+        private readonly NumberPiece number;
+        private readonly GlowPiece glow;
 
         public DrawableHitCircle(OsuHitObject h) : base(h)
         {
             Origin = Anchor.Centre;
 
-            osuObject = h;
-
-            Position = osuObject.StackedPosition;
-            Scale = new Vector2(osuObject.Scale);
+            Position = HitObject.StackedPosition;
+            Scale = new Vector2(HitObject.Scale);
 
             Children = new Drawable[]
             {
                 glow = new GlowPiece
                 {
-                    Colour = osuObject.Colour
+                    Colour = AccentColour
                 },
                 circle = new CirclePiece
                 {
-                    Colour = osuObject.Colour,
+                    Colour = AccentColour,
                     Hit = () =>
                     {
                         if (Judgement.Result.HasValue) return false;
 
-                        ((PositionalJudgementInfo)Judgement).PositionOffset = Vector2.Zero; //todo: set to correct value
+                        Judgement.PositionOffset = Vector2.Zero; //todo: set to correct value
                         UpdateJudgement(true);
                         return true;
                     },
@@ -57,11 +54,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 flash = new FlashPiece(),
                 explode = new ExplodePiece
                 {
-                    Colour = osuObject.Colour,
+                    Colour = AccentColour,
                 },
                 ApproachCircle = new ApproachCircle
                 {
-                    Colour = osuObject.Colour,
+                    Colour = AccentColour,
                 }
             };
 
@@ -80,12 +77,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
             double hitOffset = Math.Abs(Judgement.TimeOffset);
 
-            OsuJudgementInfo osuJudgement = (OsuJudgementInfo)Judgement;
-
             if (hitOffset < HitObject.HitWindowFor(OsuScoreResult.Hit50))
             {
                 Judgement.Result = HitResult.Hit;
-                osuJudgement.Score = HitObject.ScoreResultForOffset(hitOffset);
+                Judgement.Score = HitObject.ScoreResultForOffset(hitOffset);
             }
             else
                 Judgement.Result = HitResult.Miss;
@@ -112,23 +107,26 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             ApproachCircle.FadeOut();
 
-            glow.Delay(osuObject.Duration);
+            double endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
+            double duration = endTime - HitObject.StartTime;
+
+            glow.Delay(duration);
             glow.FadeOut(400);
 
             switch (state)
             {
                 case ArmedState.Idle:
-                    Delay(osuObject.Duration + TIME_PREEMPT);
+                    Delay(duration + TIME_PREEMPT);
                     FadeOut(TIME_FADEOUT);
+                    Expire(true);
                     break;
                 case ArmedState.Miss:
                     FadeOut(TIME_FADEOUT / 5);
+                    Expire();
                     break;
                 case ArmedState.Hit:
                     const double flash_in = 40;
@@ -148,6 +146,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
                     FadeOut(800);
                     ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
+                    Expire();
                     break;
             }
         }

osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -3,26 +3,26 @@
 
 using System.ComponentModel;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Judgements;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
+    public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject, OsuJudgement>
     {
         public const float TIME_PREEMPT = 600;
         public const float TIME_FADEIN = 400;
         public const float TIME_FADEOUT = 500;
 
-        public DrawableOsuHitObject(OsuHitObject hitObject)
+        protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {
+            AccentColour = HitObject.ComboColour;
         }
 
-        protected override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.Hit300 };
+        protected override OsuJudgement CreateJudgement() => new OsuJudgement { MaxScore = OsuScoreResult.Hit300 };
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             Flush();
 
             UpdateInitialState();
@@ -45,42 +45,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         }
     }
 
-    public class OsuJudgementInfo : PositionalJudgementInfo
-    {
-        /// <summary>
-        /// The score the user achieved.
-        /// </summary>
-        public OsuScoreResult Score;
-
-        /// <summary>
-        /// The score which would be achievable on a perfect hit.
-        /// </summary>
-        public OsuScoreResult MaxScore = OsuScoreResult.Hit300;
-
-        public int ScoreValue => scoreToInt(Score);
-
-        public int MaxScoreValue => scoreToInt(MaxScore);
-
-        private int scoreToInt(OsuScoreResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-                case OsuScoreResult.Hit50:
-                    return 50;
-                case OsuScoreResult.Hit100:
-                    return 100;
-                case OsuScoreResult.Hit300:
-                    return 300;
-                case OsuScoreResult.SliderTick:
-                    return 10;
-            }
-        }
-
-        public ComboResult Combo;
-    }
-
     public enum ComboResult
     {
         [Description(@"")]

osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgement.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Transforms;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Judgements;
+using OpenTK;
+using osu.Game.Modes.Judgements;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables
+{
+    public class DrawableOsuJudgement : DrawableJudgement<OsuJudgement>
+    {
+        public DrawableOsuJudgement(OsuJudgement judgement) : base(judgement)
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            if (Judgement.Result != HitResult.Miss)
+                JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
+
+            base.LoadComplete();
+        }
+    }
+}

osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

@@ -13,27 +13,33 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 {
     public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
     {
-        private Slider slider;
+        private readonly Slider slider;
 
-        private DrawableHitCircle initialCircle;
+        private readonly DrawableHitCircle initialCircle;
 
-        private List<ISliderProgress> components = new List<ISliderProgress>();
+        private readonly List<ISliderProgress> components = new List<ISliderProgress>();
 
-        private Container<DrawableSliderTick> ticks;
+        private readonly Container<DrawableSliderTick> ticks;
 
-        private SliderBody body;
-        private SliderBall ball;
+        private readonly SliderBody body;
+        private readonly SliderBall ball;
 
-        private SliderBouncer bouncer1, bouncer2;
+        private readonly SliderBouncer bouncer2;
 
         public DrawableSlider(Slider s) : base(s)
         {
+            // Since the DrawableSlider itself is just a container without a size we need to
+            // pass all input through.
+            AlwaysReceiveInput = true;
+
+            SliderBouncer bouncer1;
             slider = s;
 
             Children = new Drawable[]
             {
                 body = new SliderBody(s)
                 {
+                    AccentColour = AccentColour,
                     Position = s.StackedPosition,
                     PathWidth = s.Scale * 64,
                 },
@@ -51,6 +57,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 ball = new SliderBall(s)
                 {
                     Scale = new Vector2(s.Scale),
+                    AccentColour = AccentColour
                 },
                 initialCircle = new DrawableHitCircle(new HitCircle
                 {
@@ -59,7 +66,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                     Position = s.StackedPosition,
                     ComboIndex = s.ComboIndex,
                     Scale = s.Scale,
-                    Colour = s.Colour,
+                    ComboColour = s.ComboColour,
                     Sample = s.Sample,
                 }),
             };
@@ -71,7 +78,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
             AddNested(initialCircle);
 
-            var repeatDuration = s.Curve.Length / s.Velocity;
+            var repeatDuration = s.Curve.Distance / s.Velocity;
             foreach (var tick in s.Ticks)
             {
                 var repeatStartTime = s.StartTime + tick.RepeatIndex * repeatDuration;
@@ -90,10 +97,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             }
         }
 
-        // Since the DrawableSlider itself is just a container without a size we need to
-        // pass all input through.
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         private int currentRepeat;
 
         protected override void Update()
@@ -103,7 +106,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             double progress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
             int repeat = slider.RepeatAt(progress);
-            progress = slider.CurveProgressAt(progress);
+            progress = slider.ProgressAt(progress);
 
             if (repeat > currentRepeat)
             {
@@ -124,27 +127,24 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void CheckJudgement(bool userTriggered)
         {
-            var j = Judgement as OsuJudgementInfo;
-            var sc = initialCircle.Judgement as OsuJudgementInfo;
-
-            if (!userTriggered && Time.Current >= HitObject.EndTime)
+            if (!userTriggered && Time.Current >= slider.EndTime)
             {
                 var ticksCount = ticks.Children.Count() + 1;
                 var ticksHit = ticks.Children.Count(t => t.Judgement.Result == HitResult.Hit);
-                if (sc.Result == HitResult.Hit)
+                if (initialCircle.Judgement.Result == HitResult.Hit)
                     ticksHit++;
 
                 var hitFraction = (double)ticksHit / ticksCount;
-                if (hitFraction == 1 && sc.Score == OsuScoreResult.Hit300)
-                    j.Score = OsuScoreResult.Hit300;
-                else if (hitFraction >= 0.5 && sc.Score >= OsuScoreResult.Hit100)
-                    j.Score = OsuScoreResult.Hit100;
+                if (hitFraction == 1 && initialCircle.Judgement.Score == OsuScoreResult.Hit300)
+                    Judgement.Score = OsuScoreResult.Hit300;
+                else if (hitFraction >= 0.5 && initialCircle.Judgement.Score >= OsuScoreResult.Hit100)
+                    Judgement.Score = OsuScoreResult.Hit100;
                 else if (hitFraction > 0)
-                    j.Score = OsuScoreResult.Hit50;
+                    Judgement.Score = OsuScoreResult.Hit50;
                 else
-                    j.Score = OsuScoreResult.Miss;
+                    Judgement.Score = OsuScoreResult.Miss;
 
-                j.Result = j.Score != OsuScoreResult.Miss ? HitResult.Hit : HitResult.Miss;
+                Judgement.Result = Judgement.Score != OsuScoreResult.Miss ? HitResult.Hit : HitResult.Miss;
             }
         }
 
@@ -164,12 +164,14 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
             ball.FadeIn();
 
-            Delay(HitObject.Duration, true);
+            Delay(slider.Duration, true);
 
             body.FadeOut(160);
             ball.FadeOut(160);
 
             FadeOut(800);
+
+            Expire();
         }
 
         public Drawable ProxiedLayer => initialCircle.ApproachCircle;

osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Judgements;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 {
     public class DrawableSliderTick : DrawableOsuHitObject
     {
-        private SliderTick sliderTick;
+        private readonly SliderTick sliderTick;
 
         public double FadeInTime;
         public double FadeOutTime;
@@ -26,7 +27,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        protected override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.SliderTick };
+        protected override OsuJudgement CreateJudgement() => new OsuJudgement { MaxScore = OsuScoreResult.SliderTick };
 
         public DrawableSliderTick(SliderTick sliderTick) : base(sliderTick)
         {
@@ -47,7 +48,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = sliderTick.Colour,
+                    Colour = AccentColour,
                     Alpha = 0.3f,
                 }
             };
@@ -71,12 +72,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void CheckJudgement(bool userTriggered)
         {
-            var j = (OsuJudgementInfo)Judgement;
-
             if (Judgement.TimeOffset >= 0)
             {
-                j.Result = Tracking ? HitResult.Hit : HitResult.Miss;
-                j.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
+                Judgement.Result = Tracking ? HitResult.Hit : HitResult.Miss;
+                Judgement.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
             }
         }
         
@@ -96,8 +95,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             switch (state)

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -15,15 +15,17 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 {
     public class DrawableSpinner : DrawableOsuHitObject
     {
-        private Spinner spinner;
+        private readonly Spinner spinner;
 
-        private SpinnerDisc disc;
-        private SpinnerBackground background;
-        private Container circleContainer;
-        private DrawableHitCircle circle;
+        private readonly SpinnerDisc disc;
+        private readonly SpinnerBackground background;
+        private readonly Container circleContainer;
+        private readonly DrawableHitCircle circle;
 
         public DrawableSpinner(Spinner s) : base(s)
         {
+            AlwaysReceiveInput = true;
+
             Origin = Anchor.Centre;
             Position = s.Position;
 
@@ -46,7 +48,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                     Alpha = 0,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    DiscColour = s.Colour
+                    DiscColour = AccentColour
                 },
                 circleContainer = new Container
                 {
@@ -69,50 +71,46 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             disc.Scale = scaleToCircle;
         }
 
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         protected override void CheckJudgement(bool userTriggered)
         {
             if (Time.Current < HitObject.StartTime) return;
 
-            var j = (OsuJudgementInfo)Judgement;
-
             disc.ScaleTo(Interpolation.ValueAt(Math.Sqrt(Progress), scaleToCircle, Vector2.One, 0, 1), 100);
 
             if (Progress >= 1)
                 disc.Complete = true;
 
-            if (!userTriggered && Time.Current >= HitObject.EndTime)
+            if (!userTriggered && Time.Current >= spinner.EndTime)
             {
                 if (Progress >= 1)
                 {
-                    j.Score = OsuScoreResult.Hit300;
-                    j.Result = HitResult.Hit;
+                    Judgement.Score = OsuScoreResult.Hit300;
+                    Judgement.Result = HitResult.Hit;
                 }
                 else if (Progress > .9)
                 {
-                    j.Score = OsuScoreResult.Hit100;
-                    j.Result = HitResult.Hit;
+                    Judgement.Score = OsuScoreResult.Hit100;
+                    Judgement.Result = HitResult.Hit;
                 }
                 else if (Progress > .75)
                 {
-                    j.Score = OsuScoreResult.Hit50;
-                    j.Result = HitResult.Hit;
+                    Judgement.Score = OsuScoreResult.Hit50;
+                    Judgement.Result = HitResult.Hit;
                 }
                 else
                 {
-                    j.Score = OsuScoreResult.Miss;
-                    if (Time.Current >= HitObject.EndTime)
-                        j.Result = HitResult.Miss;
+                    Judgement.Score = OsuScoreResult.Miss;
+                    if (Time.Current >= spinner.EndTime)
+                        Judgement.Result = HitResult.Miss;
                 }
             }
         }
 
         private Vector2 scaleToCircle => circle.Scale * circle.DrawWidth / DrawWidth * 0.95f;
 
-        private float spinsPerMinuteNeeded = 100 + 5 * 15; //TODO: read per-map OD and place it on the 5
+        private const float spins_per_minute_needed = 100 + 5 * 15; //TODO: read per-map OD and place it on the 5
 
-        private float rotationsNeeded => (float)(spinsPerMinuteNeeded * (spinner.EndTime - spinner.StartTime) / 60000f);
+        private float rotationsNeeded => (float)(spins_per_minute_needed * (spinner.EndTime - spinner.StartTime) / 60000f);
 
         public float Progress => MathHelper.Clamp(disc.RotationAbsolute / 360 / rotationsNeeded, 0, 1);
 
@@ -136,11 +134,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
-            Delay(HitObject.Duration, true);
+            Delay(spinner.Duration, true);
 
             FadeOut(160);
 
@@ -148,9 +144,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             {
                 case ArmedState.Hit:
                     ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
+                    Expire();
                     break;
                 case ArmedState.Miss:
                     ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
+                    Expire();
                     break;
             }
         }

osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs

@@ -1,85 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Modes.Objects.Drawables;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class HitExplosion : FillFlowContainer
-    {
-        private readonly OsuJudgementInfo judgement;
-        private SpriteText line1;
-        private SpriteText line2;
-
-        public HitExplosion(OsuJudgementInfo judgement, OsuHitObject h = null)
-        {
-            this.judgement = judgement;
-            AutoSizeAxes = Axes.Both;
-            Origin = Anchor.Centre;
-
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(0, 2);
-            Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
-
-            Children = new Drawable[]
-            {
-                line1 = new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = judgement.Score.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 16,
-                },
-                line2 = new OsuSpriteText
-                {
-                    Text = judgement.Combo.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 11,
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (judgement.Result == HitResult.Miss)
-            {
-                FadeInFromZero(60);
-
-                ScaleTo(1.6f);
-                ScaleTo(1, 100, EasingTypes.In);
-
-                MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
-                RotateTo(40, 800, EasingTypes.InQuint);
-
-                Delay(600);
-                FadeOut(200);
-            }
-            else
-            {
-                line1.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
-                line2.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
-                FadeOut(500);
-            }
-
-            switch (judgement.Result)
-            {
-                case HitResult.Miss:
-                    Colour = Color4.Red;
-                    break;
-            }
-
-            Expire();
-        }
-    }
-}

osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class ApproachCircle : Container
     {
-        private Sprite approachCircle;
+        private readonly Sprite approachCircle;
 
         public ApproachCircle()
         {

osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class CirclePiece : Container
     {
-        private Sprite disc;
+        private readonly Sprite disc;
 
 
         public Func<bool> Hit;

osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class GlowPiece : Container
     {
-        private Sprite layer;
+        private readonly Sprite layer;
 
         public GlowPiece()
         {

osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class NumberPiece : Container
     {
-        private SpriteText number;
+        private readonly SpriteText number;
 
         public string Text
         {
@@ -29,6 +29,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             {
                 new CircularContainer
                 {
+                    Masking = true,
+                    Origin = Anchor.Centre,
                     EdgeEffect = new EdgeEffect
                     {
                         Type = EdgeEffectType.Glow,

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs

@@ -12,11 +12,27 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class SliderBall : CircularContainer, ISliderProgress
     {
-        private readonly Slider slider;
-        private Box follow;
-
         private const float width = 128;
 
+        private Color4 accentColour = Color4.Black;
+        /// <summary>
+        /// The colour that is used for the slider ball.
+        /// </summary>
+        public Color4 AccentColour
+        {
+            get { return accentColour; }
+            set
+            {
+                accentColour = value;
+                if (ball != null)
+                    ball.Colour = value;
+            }
+        }
+
+        private readonly Slider slider;
+        private readonly Box follow;
+        private readonly Box ball;
+
         public SliderBall(Slider slider)
         {
             this.slider = slider;
@@ -49,9 +65,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     Alpha = 1,
                     Children = new[]
                     {
-                        new Box
+                        ball = new Box
                         {
-                            Colour = slider.Colour,
+                            Colour = AccentColour,
                             Alpha = 0.4f,
                             Width = width,
                             Height = width,

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs

@@ -13,27 +13,45 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Configuration;
 using OpenTK;
 using OpenTK.Graphics.ES30;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class SliderBody : Container, ISliderProgress
     {
-        private Path path;
-        private BufferedContainer container;
+        private readonly Path path;
+        private readonly BufferedContainer container;
 
         public float PathWidth
         {
             get { return path.PathWidth; }
-            set
-            {
-                path.PathWidth = value;
-            }
+            set { path.PathWidth = value; }
         }
 
         public double? SnakedStart { get; private set; }
         public double? SnakedEnd { get; private set; }
 
-        private Slider slider;
+        private Color4 accentColour;
+        /// <summary>
+        /// Used to colour the path.
+        /// </summary>
+        public Color4 AccentColour
+        {
+            get { return accentColour; }
+            set
+            {
+                if (accentColour == value)
+                    return;
+                accentColour = value;
+
+                if (LoadState == LoadState.Loaded)
+                    Schedule(reloadTexture);
+            }
+        }
+
+        private int textureWidth => (int)PathWidth * 2;
+
+        private readonly Slider slider;
         public SliderBody(Slider s)
         {
             slider = s;
@@ -82,7 +100,12 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             snakingIn = config.GetBindable<bool>(OsuConfig.SnakingInSliders);
             snakingOut = config.GetBindable<bool>(OsuConfig.SnakingOutSliders);
 
-            int textureWidth = (int)PathWidth * 2;
+            reloadTexture();
+        }
+
+        private void reloadTexture()
+        {
+            var texture = new Texture(textureWidth, 1);
 
             //initialise background
             var upload = new TextureUpload(textureWidth * 4);
@@ -110,19 +133,18 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                 {
                     progress -= border_portion;
 
-                    bytes[i * 4] = (byte)(slider.Colour.R * 255);
-                    bytes[i * 4 + 1] = (byte)(slider.Colour.G * 255);
-                    bytes[i * 4 + 2] = (byte)(slider.Colour.B * 255);
-                    bytes[i * 4 + 3] = (byte)((opacity_at_edge - (opacity_at_edge - opacity_at_centre) * progress / gradient_portion) * (slider.Colour.A * 255));
+                    bytes[i * 4] = (byte)(AccentColour.R * 255);
+                    bytes[i * 4 + 1] = (byte)(AccentColour.G * 255);
+                    bytes[i * 4 + 2] = (byte)(AccentColour.B * 255);
+                    bytes[i * 4 + 3] = (byte)((opacity_at_edge - (opacity_at_edge - opacity_at_centre) * progress / gradient_portion) * (AccentColour.A * 255));
                 }
             }
 
-            var texture = new Texture(textureWidth, 1);
             texture.SetData(upload);
             path.Texture = texture;
         }
 
-        private List<Vector2> currentCurve = new List<Vector2>();
+        private readonly List<Vector2> currentCurve = new List<Vector2>();
         private bool updateSnaking(double p0, double p1)
         {
             if (SnakedStart == p0 && SnakedEnd == p1) return false;

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
     {
         private readonly Slider slider;
         private readonly bool isEnd;
-        private TextAwesome icon;
+        private readonly TextAwesome icon;
 
         public SliderBouncer(Slider slider, bool isEnd)
         {

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -19,8 +19,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class SpinnerDisc : CircularContainer
     {
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
         protected Sprite Disc;
 
         public SRGBColour DiscColour
@@ -35,6 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private void load(OsuColour colours)
         {
             completeColour = colours.YellowLight.Opacity(0.8f);
+            Masking = true;
         }
 
         private class SpinnerBorder : Container
@@ -63,6 +62,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     {
                         Colour = Color4.White,
                         RelativePositionAxes = Axes.Both,
+                        Masking = true,
                         Origin = Anchor.Centre,
                         Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000),
                         Children = new[]
@@ -101,6 +101,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         public SpinnerDisc()
         {
+            AlwaysReceiveInput = true;
+
             RelativeSizeAxes = Axes.Both;
 
             Children = new Drawable[]

osu.Game.Modes.Osu/Objects/HitCircle.cs

@@ -5,6 +5,5 @@ namespace osu.Game.Modes.Osu.Objects
 {
     public class HitCircle : OsuHitObject
     {
-        public override HitObjectType Type => HitObjectType.Circle;
     }
 }

osu.Game.Modes.Osu/Objects/OsuHitObject.cs

@@ -1,15 +1,17 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Game.Modes.Objects;
 using OpenTK;
-using osu.Game.Beatmaps;
 using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Game.Modes.Objects.Types;
+using OpenTK.Graphics;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;
 
 namespace osu.Game.Modes.Osu.Objects
 {
-    public abstract class OsuHitObject : HitObject
+    public abstract class OsuHitObject : HitObject, IHasCombo, IHasPosition
     {
         public const double OBJECT_RADIUS = 64;
 
@@ -34,7 +36,9 @@ namespace osu.Game.Modes.Osu.Objects
 
         public float Scale { get; set; } = 1;
 
-        public abstract HitObjectType Type { get; }
+        public Color4 ComboColour { get; set; } = Color4.Gray;
+        public virtual bool NewCombo { get; set; }
+        public int ComboIndex { get; set; }
 
         public double HitWindowFor(OsuScoreResult result)
         {
@@ -62,23 +66,11 @@ namespace osu.Game.Modes.Osu.Objects
             return OsuScoreResult.Miss;
         }
 
-        public override void SetDefaultsFromBeatmap(Beatmap beatmap)
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
         {
-            base.SetDefaultsFromBeatmap(beatmap);
+            base.ApplyDefaults(timing, difficulty);
 
-            Scale = (1.0f - 0.7f * (beatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2;
+            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }
     }
-
-    [Flags]
-    public enum HitObjectType
-    {
-        Circle = 1 << 0,
-        Slider = 1 << 1,
-        NewCombo = 1 << 2,
-        Spinner = 1 << 3,
-        ColourHax = 122,
-        Hold = 1 << 7,
-        SliderTick = 1 << 8,
-    }
 }

osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs

@@ -47,11 +47,11 @@ namespace osu.Game.Modes.Osu.Objects
 
         internal int MaxCombo = 1;
 
-        private float scalingFactor;
+        private readonly float scalingFactor;
         private float lazySliderLength;
 
-        private Vector2 startPosition;
-        private Vector2 endPosition;
+        private readonly Vector2 startPosition;
+        private readonly Vector2 endPosition;
 
         internal OsuHitObjectDifficulty(OsuHitObject baseHitObject)
         {
@@ -148,11 +148,11 @@ namespace osu.Game.Modes.Osu.Objects
             double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
             double decay = Math.Pow(DECAY_BASE[(int)type], timeElapsed / 1000);
 
-            if (BaseHitObject.Type == HitObjectType.Spinner)
+            if (BaseHitObject is Spinner)
             {
                 // Do nothing for spinners
             }
-            else if (BaseHitObject.Type == HitObjectType.Slider)
+            else if (BaseHitObject is Slider)
             {
                 switch (type)
                 {
@@ -180,7 +180,7 @@ namespace osu.Game.Modes.Osu.Objects
                         break;
                 }
             }
-            else if (BaseHitObject.Type == HitObjectType.Circle)
+            else if (BaseHitObject is HitCircle)
             {
                 addition = spacingWeight(DistanceTo(previousHitObject), type) * spacing_weight_scaling[(int)type];
             }

osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs

@@ -1,105 +0,0 @@
-// Copyright (c) 2007-2017 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.Globalization;
-using osu.Game.Beatmaps.Samples;
-using osu.Game.Modes.Objects;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class OsuHitObjectParser : HitObjectParser
-    {
-        public override HitObject Parse(string text)
-        {
-            string[] split = text.Split(',');
-            var type = (HitObjectType)int.Parse(split[3]);
-            bool combo = type.HasFlag(HitObjectType.NewCombo);
-            type &= (HitObjectType)0xF;
-            type &= ~HitObjectType.NewCombo;
-            OsuHitObject result;
-            switch (type)
-            {
-                case HitObjectType.Circle:
-                    result = new HitCircle
-                    {
-                        Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]))
-                    };
-                    break;
-                case HitObjectType.Slider:
-                    CurveTypes curveType = CurveTypes.Catmull;
-                    double length = 0;
-                    List<Vector2> points = new List<Vector2> { new Vector2(int.Parse(split[0]), int.Parse(split[1])) };
-
-                    string[] pointsplit = split[5].Split('|');
-                    for (int i = 0; i < pointsplit.Length; i++)
-                    {
-                        if (pointsplit[i].Length == 1)
-                        {
-                            switch (pointsplit[i])
-                            {
-                                case @"C":
-                                    curveType = CurveTypes.Catmull;
-                                    break;
-                                case @"B":
-                                    curveType = CurveTypes.Bezier;
-                                    break;
-                                case @"L":
-                                    curveType = CurveTypes.Linear;
-                                    break;
-                                case @"P":
-                                    curveType = CurveTypes.PerfectCurve;
-                                    break;
-                            }
-                            continue;
-                        }
-
-                        string[] temp = pointsplit[i].Split(':');
-                        Vector2 v = new Vector2(
-                            (int)Convert.ToDouble(temp[0], CultureInfo.InvariantCulture),
-                            (int)Convert.ToDouble(temp[1], CultureInfo.InvariantCulture)
-                        );
-                        points.Add(v);
-                    }
-
-                    int repeatCount = Convert.ToInt32(split[6], CultureInfo.InvariantCulture);
-
-                    if (repeatCount > 9000)
-                        throw new ArgumentOutOfRangeException(nameof(repeatCount), @"Repeat count is way too high");
-
-                    if (split.Length > 7)
-                        length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
-
-                    result = new Slider
-                    {
-                        ControlPoints = points,
-                        Length = length,
-                        CurveType = curveType,
-                        RepeatCount = repeatCount,
-                        Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]))
-                    };
-                    break;
-                case HitObjectType.Spinner:
-                    result = new Spinner
-                    {
-                        Length = Convert.ToDouble(split[5], CultureInfo.InvariantCulture) - Convert.ToDouble(split[2], CultureInfo.InvariantCulture),
-                        Position = new Vector2(512, 384) / 2,
-                    };
-                    break;
-                default:
-                    throw new InvalidOperationException($@"Unknown hit object type {type}");
-            }
-            result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);
-            result.Sample = new HitSampleInfo
-            {
-                Type = (SampleType)int.Parse(split[4]),
-                Set = SampleSet.Soft,
-            };
-            result.NewCombo = combo;
-            // TODO: "addition" field
-            return result;
-        }
-    }
-}

osu.Game.Modes.Osu/Objects/Slider.cs

@@ -2,44 +2,36 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Modes.Objects.Types;
 using System;
 using System.Collections.Generic;
+using osu.Game.Modes.Objects;
+using osu.Game.Database;
 
 namespace osu.Game.Modes.Osu.Objects
 {
-    public class Slider : OsuHitObject
+    public class Slider : OsuHitObject, IHasCurve
     {
-        public override double EndTime => StartTime + RepeatCount * Curve.Length / Velocity;
+        public IHasCurve CurveObject { get; set; }
+
+        public SliderCurve Curve => CurveObject.Curve;
+
+        public double EndTime => StartTime + RepeatCount * Curve.Distance / Velocity;
+        public double Duration => EndTime - StartTime;
 
         public override Vector2 EndPosition => PositionAt(1);
 
-        /// <summary>
-        /// Computes the position on the slider at a given progress that ranges from 0 (beginning of the slider)
-        /// to 1 (end of the slider). This includes repeat logic.
-        /// </summary>
-        /// <param name="progress">Ranges from 0 (beginning of the slider) to 1 (end of the slider).</param>
-        /// <returns></returns>
-        public Vector2 PositionAt(double progress) => Curve.PositionAt(CurveProgressAt(progress));
+        public Vector2 PositionAt(double progress) => CurveObject.PositionAt(progress);
+        public double ProgressAt(double progress) => CurveObject.ProgressAt(progress);
+        public int RepeatAt(double progress) => CurveObject.RepeatAt(progress);
 
-        /// <summary>
-        /// Find the current progress along the curve, accounting for repeat logic.
-        /// </summary>
-        public double CurveProgressAt(double progress)
-        {
-            var p = progress * RepeatCount % 1;
-            if (RepeatAt(progress) % 2 == 1)
-                p = 1 - p;
-            return p;
-        }
+        public List<Vector2> ControlPoints => CurveObject.ControlPoints;
+        public CurveType CurveType => CurveObject.CurveType;
+        public double Distance => CurveObject.Distance;
 
-        /// <summary>
-        /// Determine which repeat of the slider we are on at a given progress.
-        /// Range is 0..RepeatCount where 0 is the first run.
-        /// </summary>
-        public int RepeatAt(double progress) => (int)(progress * RepeatCount);
+        public int RepeatCount => CurveObject.RepeatCount;
 
         private int stackHeight;
         public override int StackHeight
@@ -52,53 +44,29 @@ namespace osu.Game.Modes.Osu.Objects
             }
         }
 
-        public List<Vector2> ControlPoints
-        {
-            get { return Curve.ControlPoints; }
-            set { Curve.ControlPoints = value; }
-        }
-
-        public double Length
-        {
-            get { return Curve.Length; }
-            set { Curve.Length = value; }
-        }
-
-        public CurveTypes CurveType
-        {
-            get { return Curve.CurveType; }
-            set { Curve.CurveType = value; }
-        }
-
         public double Velocity;
         public double TickDistance;
 
-        public override void SetDefaultsFromBeatmap(Beatmap beatmap)
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
         {
-            base.SetDefaultsFromBeatmap(beatmap);
-
-            var baseDifficulty = beatmap.BeatmapInfo.BaseDifficulty;
+            base.ApplyDefaults(timing, difficulty);
 
             ControlPoint overridePoint;
-            ControlPoint timingPoint = beatmap.TimingPointAt(StartTime, out overridePoint);
+            ControlPoint timingPoint = timing.TimingPointAt(StartTime, out overridePoint);
             var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
-            var baseVelocity = 100 * baseDifficulty.SliderMultiplier / velocityAdjustment;
+            var baseVelocity = 100 * difficulty.SliderMultiplier / velocityAdjustment;
 
             Velocity = baseVelocity / timingPoint.BeatLength;
-            TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
+            TickDistance = baseVelocity / difficulty.SliderTickRate;
         }
 
-        public int RepeatCount = 1;
-
-        internal readonly SliderCurve Curve = new SliderCurve();
-
         public IEnumerable<SliderTick> Ticks
         {
             get
             {
                 if (TickDistance == 0) yield break;
 
-                var length = Curve.Length;
+                var length = Curve.Distance;
                 var tickDistance = Math.Min(TickDistance, length);
                 var repeatDuration = length / Velocity;
 
@@ -124,7 +92,7 @@ namespace osu.Game.Modes.Osu.Objects
                             Position = Curve.PositionAt(distanceProgress),
                             StackHeight = StackHeight,
                             Scale = Scale,
-                            Colour = Colour,
+                            ComboColour = ComboColour,
                             Sample = new HitSampleInfo
                             {
                                 Type = SampleType.None,
@@ -135,15 +103,5 @@ namespace osu.Game.Modes.Osu.Objects
                 }
             }
         }
-
-        public override HitObjectType Type => HitObjectType.Slider;
-    }
-
-    public enum CurveTypes
-    {
-        Catmull,
-        Bezier,
-        Linear,
-        PerfectCurve
     }
 }

osu.Game.Modes.Osu/Objects/SliderTick.cs

@@ -6,7 +6,5 @@ namespace osu.Game.Modes.Osu.Objects
     public class SliderTick : OsuHitObject
     {
         public int RepeatIndex { get; set; }
-
-        public override HitObjectType Type => HitObjectType.SliderTick;
     }
 }

osu.Game.Modes.Osu/Objects/Spinner.cs

@@ -1,14 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Modes.Objects.Types;
+
 namespace osu.Game.Modes.Osu.Objects
 {
-    public class Spinner : OsuHitObject
+    public class Spinner : OsuHitObject, IHasEndTime
     {
-        public double Length;
+        public double EndTime { get; set; }
+        public double Duration => EndTime - StartTime;
 
-        public override double EndTime => StartTime + Length;
-
-        public override HitObjectType Type => HitObjectType.Spinner;
+        public override bool NewCombo => true;
     }
 }

osu.Game.Modes.Osu/OsuAutoReplay.cs

@@ -1,27 +1,28 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
+using OpenTK;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
-using OpenTK;
-using System;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Osu.Objects.Drawables;
-using osu.Framework.MathUtils;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using osu.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Osu
 {
     public class OsuAutoReplay : LegacyReplay
     {
-        static readonly Vector2 spinner_centre = new Vector2(256, 192);
+        private static readonly Vector2 spinner_centre = new Vector2(256, 192);
 
-        const float spin_radius = 50;
+        private const float spin_radius = 50;
 
-        private Beatmap beatmap;
+        private readonly Beatmap<OsuHitObject> beatmap;
 
-        public OsuAutoReplay(Beatmap beatmap)
+        public OsuAutoReplay(Beatmap<OsuHitObject> beatmap)
         {
             this.beatmap = beatmap;
 
@@ -36,11 +37,11 @@ namespace osu.Game.Modes.Osu
             }
         }
 
-        private static IComparer<LegacyReplayFrame> replayFrameComparer = new LegacyReplayFrameComparer();
+        private static readonly IComparer<LegacyReplayFrame> replay_frame_comparer = new LegacyReplayFrameComparer();
 
         private int findInsertionIndex(LegacyReplayFrame frame)
         {
-            int index = Frames.BinarySearch(frame, replayFrameComparer);
+            int index = Frames.BinarySearch(frame, replay_frame_comparer);
 
             if (index < 0)
             {
@@ -65,12 +66,13 @@ namespace osu.Game.Modes.Osu
         private double applyModsToTime(double v) => v;
         private double applyModsToRate(double v) => v;
 
+        public bool DelayedMovements; // ModManager.CheckActive(Mods.Relax2);
+
         private void createAutoReplay()
         {
             int buttonIndex = 0;
 
-            bool delayedMovements = false;// ModManager.CheckActive(Mods.Relax2);
-            EasingTypes preferredEasing = delayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out;
+            EasingTypes preferredEasing = DelayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out;
 
             addFrameToReplay(new LegacyReplayFrame(-100000, 256, 500, LegacyButtonState.None));
             addFrameToReplay(new LegacyReplayFrame(beatmap.HitObjects[0].StartTime - 1500, 256, 500, LegacyButtonState.None));
@@ -85,7 +87,7 @@ namespace osu.Game.Modes.Osu
 
             for (int i = 0; i < beatmap.HitObjects.Count; i++)
             {
-                OsuHitObject h = beatmap.HitObjects[i] as OsuHitObject;
+                OsuHitObject h = beatmap.HitObjects[i];
 
                 //if (h.EndTime < InputManager.ReplayStartTime)
                 //{
@@ -95,24 +97,26 @@ namespace osu.Game.Modes.Osu
 
                 int endDelay = h is Spinner ? 1 : 0;
 
-                if (delayedMovements && i > 0)
+                if (DelayedMovements && i > 0)
                 {
-                    OsuHitObject last = beatmap.HitObjects[i - 1] as OsuHitObject;
+                    OsuHitObject last = beatmap.HitObjects[i - 1];
+
+                    double endTime = (last as IHasEndTime)?.EndTime ?? last.StartTime;
 
                     //Make the cursor stay at a hitObject as long as possible (mainly for autopilot).
-                    if (h.StartTime - h.HitWindowFor(OsuScoreResult.Miss) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
+                    if (h.StartTime - h.HitWindowFor(OsuScoreResult.Miss) > endTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
                         if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Miss), h.Position.X, h.Position.Y, LegacyButtonState.None));
                     }
-                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
+                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50) > endTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
                         if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50), h.Position.X, h.Position.Y, LegacyButtonState.None));
                     }
-                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit100) + 50)
+                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100) > endTime + h.HitWindowFor(OsuScoreResult.Hit100) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit100), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit100), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
                         if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100), h.Position.X, h.Position.Y, LegacyButtonState.None));
                     }
                 }
@@ -205,8 +209,10 @@ namespace osu.Game.Modes.Osu
 
                 LegacyButtonState button = buttonIndex % 2 == 0 ? LegacyButtonState.Left1 : LegacyButtonState.Right1;
 
+                double hEndTime = (h as IHasEndTime)?.EndTime ?? h.StartTime;
+
                 LegacyReplayFrame newFrame = new LegacyReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
-                LegacyReplayFrame endFrame = new LegacyReplayFrame(h.EndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, LegacyButtonState.None);
+                LegacyReplayFrame endFrame = new LegacyReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, LegacyButtonState.None);
 
                 // Decrement because we want the previous frame, not the next one
                 int index = findInsertionIndex(newFrame) - 1;
@@ -250,6 +256,8 @@ namespace osu.Game.Modes.Osu
                 // We add intermediate frames for spinning / following a slider here.
                 if (h is Spinner)
                 {
+                    Spinner s = h as Spinner;
+
                     Vector2 difference = targetPosition - spinner_centre;
 
                     float radius = difference.Length;
@@ -257,7 +265,7 @@ namespace osu.Game.Modes.Osu
 
                     double t;
 
-                    for (double j = h.StartTime + frameDelay; j < h.EndTime; j += frameDelay)
+                    for (double j = h.StartTime + frameDelay; j < s.EndTime; j += frameDelay)
                     {
                         t = applyModsToTime(j - h.StartTime) * spinnerDirection;
 
@@ -265,10 +273,10 @@ namespace osu.Game.Modes.Osu
                         addFrameToReplay(new LegacyReplayFrame((int)j, pos.X, pos.Y, button));
                     }
 
-                    t = applyModsToTime(h.EndTime - h.StartTime) * spinnerDirection;
+                    t = applyModsToTime(s.EndTime - h.StartTime) * spinnerDirection;
                     Vector2 endPosition = spinner_centre + circlePosition(t / 20 + angle, spin_radius);
 
-                    addFrameToReplay(new LegacyReplayFrame(h.EndTime, endPosition.X, endPosition.Y, button));
+                    addFrameToReplay(new LegacyReplayFrame(s.EndTime, endPosition.X, endPosition.Y, button));
 
                     endFrame.MouseX = endPosition.X;
                     endFrame.MouseY = endPosition.Y;
@@ -283,7 +291,7 @@ namespace osu.Game.Modes.Osu
                         addFrameToReplay(new LegacyReplayFrame(h.StartTime + j, pos.X, pos.Y, button));
                     }
 
-                    addFrameToReplay(new LegacyReplayFrame(h.EndTime, s.EndPosition.X, s.EndPosition.Y, button));
+                    addFrameToReplay(new LegacyReplayFrame(s.EndTime, s.EndPosition.X, s.EndPosition.Y, button));
                 }
 
                 // We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed!

osu.Game.Modes.Osu/OsuDifficultyCalculator.cs

@@ -2,10 +2,11 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects.Types;
+using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
 using System;
 using System.Collections.Generic;
-using osu.Game.Modes.Objects;
 
 namespace osu.Game.Modes.Osu
 {
@@ -14,8 +15,6 @@ namespace osu.Game.Modes.Osu
         private const double star_scaling_factor = 0.0675;
         private const double extreme_scaling_factor = 0.5;
 
-        protected override PlayMode PlayMode => PlayMode.Osu;
-
         /// <summary>
         /// HitObjects are stored as a member variable.
         /// </summary>
@@ -25,16 +24,13 @@ namespace osu.Game.Modes.Osu
         {
         }
 
-        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
-
         protected override void PreprocessHitObjects()
         {
             foreach (var h in Objects)
-                if (h.Type == HitObjectType.Slider)
-                    ((Slider)h).Curve.Calculate();
+                (h as IHasCurve)?.Curve?.Calculate();
         }
 
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             // Fill our custom DifficultyHitObject class, that carries additional information
             DifficultyHitObjects.Clear();
@@ -184,6 +180,8 @@ namespace osu.Game.Modes.Osu
             return difficulty;
         }
 
+        protected override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter() => new OsuBeatmapConverter();
+
         // Those values are used as array indices. Be careful when changing them!
         public enum DifficultyType
         {

osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs

@@ -0,0 +1,56 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Input;
+using osu.Game.Configuration;
+using osu.Game.Screens.Play;
+using OpenTK.Input;
+using KeyboardState = osu.Framework.Input.KeyboardState;
+using MouseState = osu.Framework.Input.MouseState;
+
+namespace osu.Game.Modes.Osu
+{
+    public class OsuKeyConversionInputManager : KeyConversionInputManager
+    {
+        private bool leftViaKeyboard;
+        private bool rightViaKeyboard;
+        private Bindable<bool> mouseDisabled;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            mouseDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableButtons);
+        }
+
+        protected override void TransformState(InputState state)
+        {
+            base.TransformState(state);
+
+            var mouse = state.Mouse as MouseState;
+            var keyboard = state.Keyboard as KeyboardState;
+
+            if (keyboard != null)
+            {
+                leftViaKeyboard = keyboard.Keys.Contains(Key.Z);
+                rightViaKeyboard = keyboard.Keys.Contains(Key.X);
+            }
+
+            if (mouse != null)
+            {
+                if (mouseDisabled.Value)
+                {
+                    mouse.PressedButtons.Remove(MouseButton.Left);
+                    mouse.PressedButtons.Remove(MouseButton.Right);
+                }
+
+                if (leftViaKeyboard)
+                    mouse.PressedButtons.Add(MouseButton.Left);
+                if (rightViaKeyboard)
+                    mouse.PressedButtons.Add(MouseButton.Right);
+            }
+        }
+    }
+}

osu.Game.Modes.Osu/OsuRuleset.cs

@@ -1,27 +1,23 @@
 // Copyright (c) 2007-2017 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 OpenTK.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Modes.Objects;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu.Mods;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Modes.Osu
 {
     public class OsuRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
-
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new OsuHitRenderer
-        {
-            Beatmap = beatmap,
-            InputManager = input
-        };
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new OsuHitRenderer(beatmap);
 
         public override IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new[]
         {
@@ -80,7 +76,6 @@ namespace osu.Game.Modes.Osu
                     {
                         new OsuModRelax(),
                         new OsuModAutopilot(),
-                        new OsuModTarget(),
                         new OsuModSpunOut(),
                         new MultiMod
                         {
@@ -90,6 +85,7 @@ namespace osu.Game.Modes.Osu
                                 new ModCinema(),
                             },
                         },
+                        new OsuModTarget(),
                     };
 
                 default:
@@ -99,19 +95,20 @@ namespace osu.Game.Modes.Osu
 
         public override FontAwesome Icon => FontAwesome.fa_osu_osu_o;
 
-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
-
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => new OsuScoreProcessor(hitObjectCount);
-
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);
 
-        public override Score CreateAutoplayScore(Beatmap beatmap)
-        {
-            var score = CreateScoreProcessor().GetScore();
-            score.Replay = new OsuAutoReplay(beatmap);
-            return score;
-        }
-
         protected override PlayMode PlayMode => PlayMode.Osu;
+
+        public override string Description => "osu!";
+
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[]
+        {
+            new KeyCounterKeyboard(Key.Z),
+            new KeyCounterKeyboard(Key.X),
+            new KeyCounterMouse(MouseButton.Left),
+            new KeyCounterMouse(MouseButton.Right)
+        };
+
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
     }
 }

osu.Game.Modes.Osu/OsuScoreProcessor.cs

@@ -2,20 +2,32 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Game.Modes.Osu.Judgements;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Osu
 {
-    internal class OsuScoreProcessor : ScoreProcessor
+    internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject, OsuJudgement>
     {
-        public OsuScoreProcessor(int hitObjectCount = 0)
-            : base(hitObjectCount)
+        public OsuScoreProcessor()
         {
+        }
+
+        public OsuScoreProcessor(HitRenderer<OsuHitObject, OsuJudgement> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void Reset()
+        {
+            base.Reset();
+
             Health.Value = 1;
             Accuracy.Value = 1;
         }
 
-        protected override void UpdateCalculations(JudgementInfo judgement)
+        protected override void UpdateCalculations(OsuJudgement judgement)
         {
             if (judgement != null)
             {
@@ -35,9 +47,8 @@ namespace osu.Game.Modes.Osu
             int score = 0;
             int maxScore = 0;
 
-            foreach (var judgementInfo in Judgements)
+            foreach (var j in Judgements)
             {
-                var j = (OsuJudgementInfo)judgementInfo;
                 score += j.ScoreValue;
                 maxScore += j.MaxScoreValue;
             }

osu.Game.Modes.Osu/UI/OsuHitRenderer.cs

@@ -1,21 +1,35 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes.Objects;
+using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Beatmaps;
+using osu.Game.Modes.Osu.Judgements;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.Objects.Drawables;
 using osu.Game.Modes.UI;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Osu.UI
 {
-    public class OsuHitRenderer : HitRenderer<OsuHitObject>
+    public class OsuHitRenderer : HitRenderer<OsuHitObject, OsuJudgement>
     {
-        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
+        public OsuHitRenderer(WorkingBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
 
-        protected override Playfield<OsuHitObject> CreatePlayfield() => new OsuPlayfield();
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor(this);
 
-        protected override DrawableHitObject<OsuHitObject> GetVisualRepresentation(OsuHitObject h)
+        protected override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter() => new OsuBeatmapConverter();
+
+        protected override IBeatmapProcessor<OsuHitObject> CreateBeatmapProcessor() => new OsuBeatmapProcessor();
+
+        protected override Playfield<OsuHitObject, OsuJudgement> CreatePlayfield() => new OsuPlayfield();
+
+        protected override KeyConversionInputManager CreateKeyConversionInputManager() => new OsuKeyConversionInputManager();
+
+        protected override DrawableHitObject<OsuHitObject, OsuJudgement> GetVisualRepresentation(OsuHitObject h)
         {
             var circle = h as HitCircle;
             if (circle != null)

osu.Game.Modes.Osu/UI/OsuPlayfield.cs

@@ -11,15 +11,15 @@ using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using osu.Game.Modes.UI;
 using System.Linq;
 using osu.Game.Graphics.Cursor;
-using OpenTK.Graphics;
+using osu.Game.Modes.Osu.Judgements;
 
 namespace osu.Game.Modes.Osu.UI
 {
-    public class OsuPlayfield : Playfield<OsuHitObject>
+    public class OsuPlayfield : Playfield<OsuHitObject, OsuJudgement>
     {
-        private Container approachCircles;
-        private Container judgementLayer;
-        private ConnectionRenderer<OsuHitObject> connectionLayer;
+        private readonly Container approachCircles;
+        private readonly Container judgementLayer;
+        private readonly ConnectionRenderer<OsuHitObject> connectionLayer;
 
         public override Vector2 Size
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.UI
             }
         }
 
-        public OsuPlayfield()
+        public OsuPlayfield() : base(512)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -62,20 +62,16 @@ namespace osu.Game.Modes.Osu.UI
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (InputManager.ReplayInputHandler != null)
-                Add(new OsuCursorContainer { Colour = Color4.LightYellow });
+            AddInternal(new GameplayCursor());
         }
 
-        public override void Add(DrawableHitObject<OsuHitObject> h)
+        public override void Add(DrawableHitObject<OsuHitObject, OsuJudgement> h)
         {
             h.Depth = (float)h.HitObject.StartTime;
+
             IDrawableHitObjectWithProxiedApproach c = h as IDrawableHitObjectWithProxiedApproach;
             if (c != null)
-            {
                 approachCircles.Add(c.ProxiedLayer.CreateProxy());
-            }
-
-            h.OnJudgement += judgement;
 
             base.Add(h);
         }
@@ -83,13 +79,17 @@ namespace osu.Game.Modes.Osu.UI
         public override void PostProcess()
         {
             connectionLayer.HitObjects = HitObjects.Children
-                .Select(d => (OsuHitObject)d.HitObject)
+                .Select(d => d.HitObject)
                 .OrderBy(h => h.StartTime);
         }
 
-        private void judgement(DrawableHitObject<OsuHitObject> h, JudgementInfo j)
+        public override void OnJudgement(DrawableHitObject<OsuHitObject, OsuJudgement> judgedObject)
         {
-            HitExplosion explosion = new HitExplosion((OsuJudgementInfo)j, h.HitObject);
+            DrawableOsuJudgement explosion = new DrawableOsuJudgement(judgedObject.Judgement)
+            {
+                Origin = Anchor.Centre,
+                Position = judgedObject.HitObject.StackedEndPosition + judgedObject.Judgement.PositionOffset
+            };
 
             judgementLayer.Add(explosion);
         }