From 64aab090d52227a820711db9a76b68995b6ed6cc Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sun, 12 Mar 2017 18:03:13 +0900
Subject: [PATCH 1/9] Instantiate HitRenderer with WorkingBeatmap.

---
 .../Tests/TestCaseGamefield.cs                | 28 +++++++++++++++++--
 osu.Game.Modes.Catch/CatchRuleset.cs          |  2 +-
 osu.Game.Modes.Catch/UI/CatchHitRenderer.cs   |  2 +-
 osu.Game.Modes.Mania/ManiaRuleset.cs          |  2 +-
 osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs   |  2 +-
 osu.Game.Modes.Osu/OsuRuleset.cs              |  2 +-
 osu.Game.Modes.Osu/UI/OsuHitRenderer.cs       |  2 +-
 osu.Game.Modes.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs   |  2 +-
 osu.Game/Modes/Ruleset.cs                     |  2 +-
 osu.Game/Modes/UI/HitRenderer.cs              |  4 +--
 osu.Game/Screens/Play/Player.cs               |  2 +-
 12 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index ede430478e..767fb0dffb 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -8,6 +8,8 @@ using osu.Framework.MathUtils;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.IO;
+using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
@@ -41,10 +43,19 @@ 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
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        Author = @"peppy",
+                    }
+                }
+            });
 
             Add(new Drawable[]
             {
@@ -83,5 +94,16 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
         }
+
+        private class TestWorkingBeatmap : WorkingBeatmap
+        {
+            public TestWorkingBeatmap(Beatmap beatmap)
+                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+            {
+                Beatmap = beatmap;
+            }
+
+            protected override ArchiveReader GetReader() => null;
+        }
     }
 }
diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 2cdd35cf3a..31599bbc44 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Modes.Catch
 {
     public class CatchRuleset : Ruleset
     {
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer(beatmap);
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new CatchHitRenderer(beatmap);
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
index 1537227d8f..a8b2d48760 100644
--- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
+++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Catch.UI
 {
     public class CatchHitRenderer : HitRenderer<CatchBaseHit>
     {
-        public CatchHitRenderer(Beatmap beatmap)
+        public CatchHitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
         {
         }
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 0aef44cd7b..015df0c961 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Modes.Mania
 {
     public class ManiaRuleset : Ruleset
     {
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer(beatmap);
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new ManiaHitRenderer(beatmap);
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
index 911742b222..d29a088225 100644
--- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Modes.Mania.UI
     {
         private readonly int columns;
 
-        public ManiaHitRenderer(Beatmap beatmap, int columns = 5)
+        public ManiaHitRenderer(WorkingBeatmap beatmap, int columns = 5)
             : base(beatmap)
         {
             this.columns = columns;
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index a61bda5bb3..1b06d704f1 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu
 {
     public class OsuRuleset : Ruleset
     {
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer(beatmap);
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new OsuHitRenderer(beatmap);
 
         public override IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new[]
         {
diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index 8b7606e61e..414bfd2afa 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.UI
 {
     public class OsuHitRenderer : HitRenderer<OsuHitObject>
     {
-        public OsuHitRenderer(Beatmap beatmap)
+        public OsuHitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
         {
         }
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index 3765862229..e8a8dcdd64 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Modes.Taiko
 {
     public class TaikoRuleset : Ruleset
     {
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap);
+        public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new TaikoHitRenderer(beatmap);
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index dc0276aacc..fb5e38d4dc 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Taiko.UI
 {
     public class TaikoHitRenderer : HitRenderer<TaikoBaseHit>
     {
-        public TaikoHitRenderer(Beatmap beatmap)
+        public TaikoHitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
         {
         }
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index 54137b2402..1dcd452541 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Modes
 
         public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0);
 
-        public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap);
+        public abstract HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap);
 
         public abstract HitObjectParser CreateHitObjectParser();
 
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index e08570522f..27d2cf693f 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -55,9 +55,9 @@ namespace osu.Game.Modes.UI
 
         private Container content;
 
-        protected HitRenderer(Beatmap beatmap)
+        protected HitRenderer(WorkingBeatmap beatmap)
         {
-            Beatmap = CreateBeatmapConverter().Convert(beatmap);
+            Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap);
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1a71543786..71ac67601a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.Play
                 OnQuit = Exit
             };
 
-            hitRenderer = ruleset.CreateHitRendererWith(beatmap);
+            hitRenderer = ruleset.CreateHitRendererWith(Beatmap);
 
             if (ReplayInputHandler != null)
             {

From c0e29652a6d8e5f5d40c0b6cb3ddae905ddbd64d Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sun, 12 Mar 2017 22:13:43 +0900
Subject: [PATCH 2/9] Initial attempt at making mods apply better.

---
 .../Tests/TestCaseReplay.cs                   | 13 ++++---
 osu.Game.Modes.Catch/CatchRuleset.cs          |  2 +
 osu.Game.Modes.Catch/{ => Mods}/CatchMod.cs   |  4 +-
 .../osu.Game.Modes.Catch.csproj               |  6 ++-
 osu.Game.Modes.Mania/ManiaRuleset.cs          |  2 +
 osu.Game.Modes.Mania/{ => Mods}/ManiaMod.cs   |  5 ++-
 .../osu.Game.Modes.Mania.csproj               |  2 +-
 osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs   | 13 +++++++
 osu.Game.Modes.Osu/{ => Mods}/OsuMod.cs       | 22 +++++++++--
 osu.Game.Modes.Osu/OsuAutoReplay.cs           | 18 ++++-----
 osu.Game.Modes.Osu/OsuRuleset.cs              |  9 +----
 osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj  |  3 +-
 osu.Game.Modes.Taiko/{ => Mods}/TaikoMod.cs   |  4 +-
 osu.Game.Modes.Taiko/TaikoRuleset.cs          |  2 +
 .../osu.Game.Modes.Taiko.csproj               |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  7 ++--
 osu.Game/Modes/Mods/IApplyableMod.cs          | 15 ++++++++
 osu.Game/Modes/{ => Mods}/Mod.cs              | 38 +++++++++----------
 osu.Game/Modes/Mods/ModType.cs                | 13 +++++++
 osu.Game/Modes/Ruleset.cs                     |  3 +-
 osu.Game/Modes/UI/HitRenderer.cs              | 30 +++++++++++----
 osu.Game/Overlays/Mods/AssistedSection.cs     |  2 +-
 .../Mods/DifficultyIncreaseSection.cs         |  2 +-
 .../Mods/DifficultyReductionSection.cs        |  2 +-
 osu.Game/Overlays/Mods/ModButton.cs           |  6 +--
 osu.Game/Overlays/Mods/ModSection.cs          |  4 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  9 +++--
 osu.Game/Screens/Play/Player.cs               |  9 +----
 osu.Game/osu.Game.csproj                      |  4 +-
 29 files changed, 167 insertions(+), 84 deletions(-)
 rename osu.Game.Modes.Catch/{ => Mods}/CatchMod.cs (91%)
 rename osu.Game.Modes.Mania/{ => Mods}/ManiaMod.cs (94%)
 create mode 100644 osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs
 rename osu.Game.Modes.Osu/{ => Mods}/OsuMod.cs (83%)
 rename osu.Game.Modes.Taiko/{ => Mods}/TaikoMod.cs (91%)
 create mode 100644 osu.Game/Modes/Mods/IApplyableMod.cs
 rename osu.Game/Modes/{ => Mods}/Mod.cs (87%)
 create mode 100644 osu.Game/Modes/Mods/ModType.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
index f39da70a16..b5a45f237a 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
@@ -1,12 +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 System;
-using System.IO;
 using osu.Framework.Input.Handlers;
 using osu.Game.Beatmaps;
 using osu.Game.Modes;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu;
+using osu.Game.Modes.Osu.Mods;
 using osu.Game.Screens.Play;
+using System;
+using System.IO;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -22,9 +25,9 @@ namespace osu.Desktop.VisualTests.Tests
 
         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);
         }
     }
 }
diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 31599bbc44..d989db8ddf 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -5,7 +5,9 @@ using OpenTK.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Catch.Beatmaps;
+using osu.Game.Modes.Catch.Mods;
 using osu.Game.Modes.Catch.UI;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
diff --git a/osu.Game.Modes.Catch/CatchMod.cs b/osu.Game.Modes.Catch/Mods/CatchMod.cs
similarity index 91%
rename from osu.Game.Modes.Catch/CatchMod.cs
rename to osu.Game.Modes.Catch/Mods/CatchMod.cs
index 07d6d3469e..97e4e58a5d 100644
--- a/osu.Game.Modes.Catch/CatchMod.cs
+++ b/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
     {
diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
index 10abb312fc..5b815d667c 100644
--- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
+++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
@@ -58,7 +58,7 @@
     <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">
@@ -76,6 +76,10 @@
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
+      <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
+      <Name>osu.Game.Modes.Taiko</Name>
+    </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
       <Name>osu.Game</Name>
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 015df0c961..0d548eacff 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -4,7 +4,9 @@
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Mania.Beatmaps;
+using osu.Game.Modes.Mania.Mods;
 using osu.Game.Modes.Mania.UI;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
diff --git a/osu.Game.Modes.Mania/ManiaMod.cs b/osu.Game.Modes.Mania/Mods/ManiaMod.cs
similarity index 94%
rename from osu.Game.Modes.Mania/ManiaMod.cs
rename to osu.Game.Modes.Mania/Mods/ManiaMod.cs
index d52db2977c..b330680550 100644
--- a/osu.Game.Modes.Mania/ManiaMod.cs
+++ b/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
     {
diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
index 66e46f9e48..c6db2d257f 100644
--- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
+++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
@@ -58,7 +58,7 @@
     <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">
diff --git a/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs b/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs
new file mode 100644
index 0000000000..e30c2eb0a5
--- /dev/null
+++ b/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs
@@ -0,0 +1,13 @@
+// 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.Mods;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Osu.Mods
+{
+    internal interface IApplyableOsuMod : IApplyableMod<HitRenderer<OsuHitObject>>
+    {
+    }
+}
diff --git a/osu.Game.Modes.Osu/OsuMod.cs b/osu.Game.Modes.Osu/Mods/OsuMod.cs
similarity index 83%
rename from osu.Game.Modes.Osu/OsuMod.cs
rename to osu.Game.Modes.Osu/Mods/OsuMod.cs
index 3290eed61a..f7d318a9d4 100644
--- a/osu.Game.Modes.Osu/OsuMod.cs
+++ b/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.Graphics;
+using osu.Game.Modes.Mods;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.UI;
 using System;
 using System.Linq;
-using osu.Game.Graphics;
 
-namespace osu.Game.Modes.Osu
+namespace osu.Game.Modes.Osu.Mods
 {
     public class OsuModNoFail : ModNoFail
     {
@@ -85,9 +88,22 @@ namespace osu.Game.Modes.Osu
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
     }
 
-    public class OsuModAutoplay : ModAutoplay
+    public class OsuModAutoplay : ModAutoplay, IApplyableOsuMod
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+
+        public void Apply(HitRenderer<OsuHitObject> hitRenderer)
+        {
+            Attach(hitRenderer, new Score
+            {
+                Replay = new OsuAutoReplay(hitRenderer.Beatmap)
+            });
+        }
+
+        public void Revert(HitRenderer<OsuHitObject> hitRenderer)
+        {
+            Detach(hitRenderer);
+        }
     }
 
     public class OsuModTarget : Mod
diff --git a/osu.Game.Modes.Osu/OsuAutoReplay.cs b/osu.Game.Modes.Osu/OsuAutoReplay.cs
index 953f131797..3de6106030 100644
--- a/osu.Game.Modes.Osu/OsuAutoReplay.cs
+++ b/osu.Game.Modes.Osu/OsuAutoReplay.cs
@@ -1,14 +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.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;
 
 namespace osu.Game.Modes.Osu
@@ -19,9 +19,9 @@ namespace osu.Game.Modes.Osu
 
         private const float spin_radius = 50;
 
-        private Beatmap beatmap;
+        private Beatmap<OsuHitObject> beatmap;
 
-        public OsuAutoReplay(Beatmap beatmap)
+        public OsuAutoReplay(Beatmap<OsuHitObject> beatmap)
         {
             this.beatmap = beatmap;
 
@@ -86,7 +86,7 @@ namespace osu.Game.Modes.Osu
 
             for (int i = 0; i < beatmap.HitObjects.Count; i++)
             {
-                OsuHitObject h = (OsuHitObject)beatmap.HitObjects[i];
+                OsuHitObject h = beatmap.HitObjects[i];
 
                 //if (h.EndTime < InputManager.ReplayStartTime)
                 //{
@@ -98,7 +98,7 @@ namespace osu.Game.Modes.Osu
 
                 if (DelayedMovements && i > 0)
                 {
-                    OsuHitObject last = (OsuHitObject)beatmap.HitObjects[i - 1];
+                    OsuHitObject last = beatmap.HitObjects[i - 1];
 
                     //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)
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index 1b06d704f1..c9d1fa136c 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -4,8 +4,10 @@
 using OpenTK.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Beatmaps;
+using osu.Game.Modes.Osu.Mods;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
@@ -101,13 +103,6 @@ namespace osu.Game.Modes.Osu
 
         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!";
diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
index c214c881d8..341accbdff 100644
--- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
+++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
@@ -44,6 +44,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Beatmaps\OsuBeatmapConverter.cs" />
+    <Compile Include="Mods\IApplyableOsuMod.cs" />
     <Compile Include="Objects\BezierApproximator.cs" />
     <Compile Include="Objects\CircularArcApproximator.cs" />
     <Compile Include="Objects\Drawables\DrawableOsuHitObject.cs" />
@@ -84,7 +85,7 @@
     <Compile Include="Objects\Slider.cs" />
     <Compile Include="Objects\Spinner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="OsuMod.cs" />
+    <Compile Include="Mods\OsuMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
diff --git a/osu.Game.Modes.Taiko/TaikoMod.cs b/osu.Game.Modes.Taiko/Mods/TaikoMod.cs
similarity index 91%
rename from osu.Game.Modes.Taiko/TaikoMod.cs
rename to osu.Game.Modes.Taiko/Mods/TaikoMod.cs
index 62db875991..c929ebffdd 100644
--- a/osu.Game.Modes.Taiko/TaikoMod.cs
+++ b/osu.Game.Modes.Taiko/Mods/TaikoMod.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.Taiko
+using osu.Game.Modes.Mods;
+
+namespace osu.Game.Modes.Taiko.Mods
 {
     public class TaikoModNoFail : ModNoFail
     {
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index e8a8dcdd64..8f67ce9e9e 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -4,8 +4,10 @@
 using OpenTK.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Taiko.Beatmaps;
+using osu.Game.Modes.Taiko.Mods;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index 0089e84532..5e99d2ba65 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -56,7 +56,7 @@
     <Compile Include="UI\TaikoHitRenderer.cs" />
     <Compile Include="UI\TaikoPlayfield.cs" />
     <Compile Include="TaikoRuleset.cs" />
-    <Compile Include="TaikoMod.cs" />
+    <Compile Include="Mods\TaikoMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 1d4047ea45..16db4fc2a6 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -1,9 +1,6 @@
 // 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.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
@@ -11,6 +8,10 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
+using osu.Game.Modes.Mods;
+using System;
+using System.Collections.Generic;
+using System.IO;
 
 namespace osu.Game.Beatmaps
 {
diff --git a/osu.Game/Modes/Mods/IApplyableMod.cs b/osu.Game/Modes/Mods/IApplyableMod.cs
new file mode 100644
index 0000000000..6e21aa1095
--- /dev/null
+++ b/osu.Game/Modes/Mods/IApplyableMod.cs
@@ -0,0 +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.UI;
+
+namespace osu.Game.Modes.Mods
+{
+    public interface IApplyableMod<TRenderer>
+        where TRenderer : HitRenderer
+    {
+        void Apply(TRenderer hitRenderer);
+        void Revert(TRenderer hitRenderer);
+    }
+}
diff --git a/osu.Game/Modes/Mod.cs b/osu.Game/Modes/Mods/Mod.cs
similarity index 87%
rename from osu.Game/Modes/Mod.cs
rename to osu.Game/Modes/Mods/Mod.cs
index 167421c23d..870b9d3fc1 100644
--- a/osu.Game/Modes/Mod.cs
+++ b/osu.Game/Modes/Mods/Mod.cs
@@ -1,11 +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.Screens.Play;
+using osu.Game.Modes.UI;
+using System;
 
-namespace osu.Game.Modes
+namespace osu.Game.Modes.Mods
 {
     /// <summary>
     /// The base class for gameplay modifiers.
@@ -41,12 +41,6 @@ namespace osu.Game.Modes
         /// The mods this mod cannot be enabled with.
         /// </summary>
         public virtual Type[] IncompatibleMods => new Type[] { };
-
-        /// <summary>
-        /// Direct access to the Player before load has run.
-        /// </summary>
-        /// <param name="player"></param>
-        public virtual void PlayerLoading(Player player) { }
     }
 
     public class MultiMod : Mod
@@ -152,10 +146,23 @@ namespace osu.Game.Modes
         public override double ScoreMultiplier => 0;
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
 
-        public override void PlayerLoading(Player player)
+        /// <summary>
+        /// Attaches a replay score to a HitRenderer.
+        /// </summary>
+        /// <param name="hitRenderer">The HitRenderer to attach the score to.</param>
+        /// <param name="score">The score to attach.</param>
+        protected void Attach(HitRenderer hitRenderer, Score score)
         {
-            base.PlayerLoading(player);
-            player.ReplayInputHandler = Ruleset.GetRuleset(player.Beatmap.PlayMode).CreateAutoplayScore(player.Beatmap.Beatmap)?.Replay?.GetInputHandler();
+            hitRenderer.InputManager.ReplayInputHandler = score?.Replay?.GetInputHandler();
+        }
+
+        /// <summary>
+        /// Detaches the active replay score from a HitRenderer.
+        /// </summary>
+        /// <param name="hitRenderer">The HitRenderer to detach the score from.</param>
+        protected void Detach(HitRenderer hitRenderer)
+        {
+            hitRenderer.InputManager.ReplayInputHandler = null;
         }
     }
 
@@ -170,11 +177,4 @@ namespace osu.Game.Modes
         public override string Name => "Cinema";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema;
     }
-
-    public enum ModType
-    {
-        DifficultyReduction,
-        DifficultyIncrease,
-        Special,
-    }
 }
diff --git a/osu.Game/Modes/Mods/ModType.cs b/osu.Game/Modes/Mods/ModType.cs
new file mode 100644
index 0000000000..f7d3aea5e2
--- /dev/null
+++ b/osu.Game/Modes/Mods/ModType.cs
@@ -0,0 +1,13 @@
+// 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.Mods
+{
+    public enum ModType
+    {
+        DifficultyReduction,
+        DifficultyIncrease,
+        Special,
+    }
+}
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index 1dcd452541..ab8dda8a2a 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
@@ -49,8 +50,6 @@ namespace osu.Game.Modes
 
         public abstract IEnumerable<KeyCounter> CreateGameplayKeys();
 
-        public virtual Score CreateAutoplayScore(Beatmap beatmap) => null;
-
         public static Ruleset GetRuleset(PlayMode mode)
         {
             Type type;
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 27d2cf693f..6bdcd15872 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -1,11 +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 OpenTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Screens.Play;
@@ -22,11 +22,6 @@ namespace osu.Game.Modes.UI
 
         internal readonly PlayerInputManager InputManager = new PlayerInputManager();
 
-        /// <summary>
-        /// A function to convert coordinates from gamefield to screen space.
-        /// </summary>
-        public abstract Func<Vector2, Vector2> MapPlayfieldToScreenSpace { get; }
-
         /// <summary>
         /// Whether all the HitObjects have been judged.
         /// </summary>
@@ -44,14 +39,14 @@ namespace osu.Game.Modes.UI
     public abstract class HitRenderer<TObject> : HitRenderer
         where TObject : HitObject
     {
-        public override Func<Vector2, Vector2> MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace;
+        public Beatmap<TObject> Beatmap;
+
         public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.HitObjects.Children;
 
         protected override Container<Drawable> Content => content;
         protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue);
 
         protected Playfield<TObject> Playfield;
-        protected Beatmap<TObject> Beatmap;
 
         private Container content;
 
@@ -59,6 +54,8 @@ namespace osu.Game.Modes.UI
         {
             Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap);
 
+            applyMods(beatmap.Mods.Value);
+
             RelativeSizeAxes = Axes.Both;
 
             InputManager.Add(content = new Container
@@ -78,6 +75,9 @@ namespace osu.Game.Modes.UI
         private void load()
         {
             loadObjects();
+
+            if (InputManager?.ReplayInputHandler != null)
+                InputManager.ReplayInputHandler.ToScreenSpace = Playfield.ScaledContent.ToScreenSpace;
         }
 
         private void loadObjects()
@@ -97,6 +97,20 @@ namespace osu.Game.Modes.UI
             Playfield.PostProcess();
         }
 
+        private void applyMods(IEnumerable<Mod> mods)
+        {
+            if (mods == null)
+                return;
+
+            foreach (var mod in mods)
+            {
+                var applyable = mod as IApplyableMod<HitRenderer<TObject>>;
+
+                if (applyable != null)
+                    applyable.Apply(this);
+            }
+        }
+
         private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);
 
         protected abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs
index 0bb1bc9dff..a1ec7a3fdc 100644
--- a/osu.Game/Overlays/Mods/AssistedSection.cs
+++ b/osu.Game/Overlays/Mods/AssistedSection.cs
@@ -4,7 +4,7 @@
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
-using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
index 4dfb0ba6c2..13df5aabfb 100644
--- a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
+++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
@@ -4,7 +4,7 @@
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
-using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
index d92fb541c3..f8ac4551ef 100644
--- a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
+++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
@@ -4,7 +4,7 @@
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
-using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 6e3bafbada..acd5f37092 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -1,8 +1,6 @@
 // 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.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
@@ -15,8 +13,10 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 using osu.Game.Modes.UI;
+using System;
+using System.Linq;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index c07114919e..489af21ef4 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -1,7 +1,6 @@
 // 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 OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
@@ -10,7 +9,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Modes;
+using osu.Game.Modes.Mods;
+using System;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1be1b9a351..3a685be7fa 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -1,11 +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
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -13,11 +11,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
+using osu.Game.Modes.Mods;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Overlays.Mods
 {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 71ac67601a..1a3a5b7036 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
@@ -69,8 +68,6 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            Beatmap.Mods.Value.ForEach(m => m.PlayerLoading(this));
-
             dimLevel = config.GetBindable<int>(OsuConfig.DimLevel);
             mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
 
@@ -131,10 +128,7 @@ namespace osu.Game.Screens.Play
             hitRenderer = ruleset.CreateHitRendererWith(Beatmap);
 
             if (ReplayInputHandler != null)
-            {
-                ReplayInputHandler.ToScreenSpace = hitRenderer.MapPlayfieldToScreenSpace;
                 hitRenderer.InputManager.ReplayInputHandler = ReplayInputHandler;
-            }
 
             hudOverlay.BindHitRenderer(hitRenderer);
 
@@ -305,7 +299,8 @@ namespace osu.Game.Screens.Play
         {
             if (pauseOverlay == null) return false;
 
-            if (ReplayInputHandler != null) return false;
+            if (hitRenderer.InputManager.ReplayInputHandler != null)
+                return false;
 
             if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3d4a763cb8..46cb593d20 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -91,6 +91,8 @@
     <Compile Include="IO\Legacy\SerializationWriter.cs" />
     <Compile Include="IPC\ScoreIPCChannel.cs" />
     <Compile Include="Modes\LegacyReplay.cs" />
+    <Compile Include="Modes\Mods\IApplyableMod.cs" />
+    <Compile Include="Modes\Mods\ModType.cs" />
     <Compile Include="Modes\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
     <Compile Include="Modes\Objects\HitObjectParser.cs" />
     <Compile Include="Modes\Objects\NullHitObjectParser.cs" />
@@ -306,7 +308,7 @@
     <Compile Include="Screens\Play\Pause\RetryButton.cs" />
     <Compile Include="Screens\Play\Pause\QuitButton.cs" />
     <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
-    <Compile Include="Modes\Mod.cs" />
+    <Compile Include="Modes\Mods\Mod.cs" />
     <Compile Include="Overlays\Mods\ModButton.cs" />
     <Compile Include="Modes\UI\ModIcon.cs" />
     <Compile Include="Overlays\Mods\ModSection.cs" />

From 7d129ebd6dd969d415b600b05e817f8f75b1696c Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sun, 12 Mar 2017 22:38:50 +0900
Subject: [PATCH 3/9] Attempt to fix things.

---
 .../Tests/TestCaseReplay.cs                   |  2 --
 osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs   | 13 -----------
 osu.Game.Modes.Osu/Mods/OsuMod.cs             |  2 +-
 osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj  |  1 -
 osu.Game/Modes/Mods/IApplyableMod.cs          | 22 +++++++++++++++----
 osu.Game/Modes/UI/HitRenderer.cs              |  5 ++---
 6 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
index b5a45f237a..c36fc0a47d 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
@@ -3,9 +3,7 @@
 
 using osu.Framework.Input.Handlers;
 using osu.Game.Beatmaps;
-using osu.Game.Modes;
 using osu.Game.Modes.Mods;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.Mods;
 using osu.Game.Screens.Play;
 using System;
diff --git a/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs b/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs
deleted file mode 100644
index e30c2eb0a5..0000000000
--- a/osu.Game.Modes.Osu/Mods/IApplyableOsuMod.cs
+++ /dev/null
@@ -1,13 +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.Mods;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.UI;
-
-namespace osu.Game.Modes.Osu.Mods
-{
-    internal interface IApplyableOsuMod : IApplyableMod<HitRenderer<OsuHitObject>>
-    {
-    }
-}
diff --git a/osu.Game.Modes.Osu/Mods/OsuMod.cs b/osu.Game.Modes.Osu/Mods/OsuMod.cs
index f7d318a9d4..98b87a9bb5 100644
--- a/osu.Game.Modes.Osu/Mods/OsuMod.cs
+++ b/osu.Game.Modes.Osu/Mods/OsuMod.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Modes.Osu.Mods
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
     }
 
-    public class OsuModAutoplay : ModAutoplay, IApplyableOsuMod
+    public class OsuModAutoplay : ModAutoplay, IApplyableMod<OsuHitObject>
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
 
diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
index 341accbdff..017d435983 100644
--- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
+++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
@@ -44,7 +44,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Beatmaps\OsuBeatmapConverter.cs" />
-    <Compile Include="Mods\IApplyableOsuMod.cs" />
     <Compile Include="Objects\BezierApproximator.cs" />
     <Compile Include="Objects\CircularArcApproximator.cs" />
     <Compile Include="Objects\Drawables\DrawableOsuHitObject.cs" />
diff --git a/osu.Game/Modes/Mods/IApplyableMod.cs b/osu.Game/Modes/Mods/IApplyableMod.cs
index 6e21aa1095..abbc3ea893 100644
--- a/osu.Game/Modes/Mods/IApplyableMod.cs
+++ b/osu.Game/Modes/Mods/IApplyableMod.cs
@@ -2,14 +2,28 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 
+using osu.Game.Modes.Objects;
 using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Mods
 {
-    public interface IApplyableMod<TRenderer>
-        where TRenderer : HitRenderer
+    /// <summary>
+    /// An interface for mods that are applied to a HitRenderer.
+    /// </summary>
+    /// <typeparam name="TObject">The type of HitObject the HitRenderer contains.</typeparam>
+    public interface IApplyableMod<TObject>
+        where TObject : HitObject
     {
-        void Apply(TRenderer hitRenderer);
-        void Revert(TRenderer hitRenderer);
+        /// <summary>
+        /// Applies the mod to a HitRenderer.
+        /// </summary>
+        /// <param name="hitRenderer">The HitRenderer to apply the mod to.</param>
+        void Apply(HitRenderer<TObject> hitRenderer);
+
+        /// <summary>
+        /// Reverts any changes applied to a HitRenderer through <see cref="Apply(HitRenderer{TObject})"/>.
+        /// </summary>
+        /// <param name="hitRenderer">The HitRenderer to revert from.</param>
+        void Revert(HitRenderer<TObject> hitRenderer);
     }
 }
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 6bdcd15872..f124dd24ed 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -104,10 +104,9 @@ namespace osu.Game.Modes.UI
 
             foreach (var mod in mods)
             {
-                var applyable = mod as IApplyableMod<HitRenderer<TObject>>;
+                var applyable = mod as IApplyableMod<TObject>;
 
-                if (applyable != null)
-                    applyable.Apply(this);
+                applyable?.Apply(this);
             }
         }
 

From 842f9384390ebdb47dbae95d748348bfb7fec1ac Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 13 Mar 2017 21:05:09 +0900
Subject: [PATCH 4/9] General fixes.

---
 .../osu.Game.Modes.Catch.csproj               |  4 ----
 .../Beatmaps/ManiaBeatmapConverter.cs         |  1 -
 osu.Game.Modes.Osu/Mods/OsuMod.cs             | 18 ++++----------
 osu.Game/Modes/Mods/IApplyableMod.cs          |  6 -----
 osu.Game/Modes/Mods/Mod.cs                    | 24 +++++++------------
 osu.Game/Modes/Mods/ModType.cs                |  1 -
 6 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
index 5b815d667c..a8595babe8 100644
--- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
+++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
@@ -76,10 +76,6 @@
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
-      <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
-      <Name>osu.Game.Modes.Taiko</Name>
-    </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
       <Name>osu.Game</Name>
diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 0f42da4ac8..3ff210c1cc 100644
--- a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -1,7 +1,6 @@
 // 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;
diff --git a/osu.Game.Modes.Osu/Mods/OsuMod.cs b/osu.Game.Modes.Osu/Mods/OsuMod.cs
index 98b87a9bb5..e80975aed1 100644
--- a/osu.Game.Modes.Osu/Mods/OsuMod.cs
+++ b/osu.Game.Modes.Osu/Mods/OsuMod.cs
@@ -1,10 +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 osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Mods;
 using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.UI;
 using System;
 using System.Linq;
 
@@ -88,22 +88,14 @@ namespace osu.Game.Modes.Osu.Mods
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
     }
 
-    public class OsuModAutoplay : ModAutoplay, IApplyableMod<OsuHitObject>
+    public class OsuModAutoplay : ModAutoplay<OsuHitObject>
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
 
-        public void Apply(HitRenderer<OsuHitObject> hitRenderer)
+        protected override Score CreateReplayScore(Beatmap<OsuHitObject> beatmap) => new Score
         {
-            Attach(hitRenderer, new Score
-            {
-                Replay = new OsuAutoReplay(hitRenderer.Beatmap)
-            });
-        }
-
-        public void Revert(HitRenderer<OsuHitObject> hitRenderer)
-        {
-            Detach(hitRenderer);
-        }
+            Replay = new OsuAutoReplay(beatmap)
+        };
     }
 
     public class OsuModTarget : Mod
diff --git a/osu.Game/Modes/Mods/IApplyableMod.cs b/osu.Game/Modes/Mods/IApplyableMod.cs
index abbc3ea893..5db952a4db 100644
--- a/osu.Game/Modes/Mods/IApplyableMod.cs
+++ b/osu.Game/Modes/Mods/IApplyableMod.cs
@@ -19,11 +19,5 @@ namespace osu.Game.Modes.Mods
         /// </summary>
         /// <param name="hitRenderer">The HitRenderer to apply the mod to.</param>
         void Apply(HitRenderer<TObject> hitRenderer);
-
-        /// <summary>
-        /// Reverts any changes applied to a HitRenderer through <see cref="Apply(HitRenderer{TObject})"/>.
-        /// </summary>
-        /// <param name="hitRenderer">The HitRenderer to revert from.</param>
-        void Revert(HitRenderer<TObject> hitRenderer);
     }
 }
diff --git a/osu.Game/Modes/Mods/Mod.cs b/osu.Game/Modes/Mods/Mod.cs
index 870b9d3fc1..40940e9690 100644
--- a/osu.Game/Modes/Mods/Mod.cs
+++ b/osu.Game/Modes/Mods/Mod.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
 
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Modes.Objects;
 using osu.Game.Modes.UI;
 using System;
 
@@ -145,24 +147,16 @@ namespace osu.Game.Modes.Mods
         public override string Description => "Watch a perfect automated play through the song";
         public override double ScoreMultiplier => 0;
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
+    }
 
-        /// <summary>
-        /// Attaches a replay score to a HitRenderer.
-        /// </summary>
-        /// <param name="hitRenderer">The HitRenderer to attach the score to.</param>
-        /// <param name="score">The score to attach.</param>
-        protected void Attach(HitRenderer hitRenderer, Score score)
-        {
-            hitRenderer.InputManager.ReplayInputHandler = score?.Replay?.GetInputHandler();
-        }
+    public abstract class ModAutoplay<T> : ModAutoplay, IApplyableMod<T>
+        where T : HitObject
+    {
+        protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
 
-        /// <summary>
-        /// Detaches the active replay score from a HitRenderer.
-        /// </summary>
-        /// <param name="hitRenderer">The HitRenderer to detach the score from.</param>
-        protected void Detach(HitRenderer hitRenderer)
+        public void Apply(HitRenderer<T> hitRenderer)
         {
-            hitRenderer.InputManager.ReplayInputHandler = null;
+            hitRenderer.InputManager.ReplayInputHandler = CreateReplayScore(hitRenderer.Beatmap)?.Replay?.GetInputHandler();
         }
     }
 
diff --git a/osu.Game/Modes/Mods/ModType.cs b/osu.Game/Modes/Mods/ModType.cs
index f7d3aea5e2..b1d0e781e1 100644
--- a/osu.Game/Modes/Mods/ModType.cs
+++ b/osu.Game/Modes/Mods/ModType.cs
@@ -1,7 +1,6 @@
 // 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.Mods
 {
     public enum ModType

From 980807d91e3f6843d254ad2860cdec43cfb595ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Mar 2017 22:33:31 +0900
Subject: [PATCH 5/9] Fix post-merge issues.

---
 osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 767fb0dffb..83dbe6898f 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -103,7 +103,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap;
             }
 
-            protected override ArchiveReader GetReader() => null;
+            protected override BeatmapArchiveReader GetReader() => null;
         }
     }
 }

From bc5912eab5374f37f28fcda45a93c4acb8933207 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Tue, 14 Mar 2017 12:32:31 +0900
Subject: [PATCH 6/9] Applyable -> Applicable.

---
 osu.Game/Modes/Mods/{IApplyableMod.cs => IApplicableMod.cs} | 2 +-
 osu.Game/Modes/Mods/Mod.cs                                  | 2 +-
 osu.Game/Modes/UI/HitRenderer.cs                            | 2 +-
 osu.Game/osu.Game.csproj                                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Modes/Mods/{IApplyableMod.cs => IApplicableMod.cs} (91%)

diff --git a/osu.Game/Modes/Mods/IApplyableMod.cs b/osu.Game/Modes/Mods/IApplicableMod.cs
similarity index 91%
rename from osu.Game/Modes/Mods/IApplyableMod.cs
rename to osu.Game/Modes/Mods/IApplicableMod.cs
index 5db952a4db..25d0f8d701 100644
--- a/osu.Game/Modes/Mods/IApplyableMod.cs
+++ b/osu.Game/Modes/Mods/IApplicableMod.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Mods
     /// An interface for mods that are applied to a HitRenderer.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject the HitRenderer contains.</typeparam>
-    public interface IApplyableMod<TObject>
+    public interface IApplicableMod<TObject>
         where TObject : HitObject
     {
         /// <summary>
diff --git a/osu.Game/Modes/Mods/Mod.cs b/osu.Game/Modes/Mods/Mod.cs
index 40940e9690..6a720a3574 100644
--- a/osu.Game/Modes/Mods/Mod.cs
+++ b/osu.Game/Modes/Mods/Mod.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Modes.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
     }
 
-    public abstract class ModAutoplay<T> : ModAutoplay, IApplyableMod<T>
+    public abstract class ModAutoplay<T> : ModAutoplay, IApplicableMod<T>
         where T : HitObject
     {
         protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index f124dd24ed..b7775a8f96 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Modes.UI
 
             foreach (var mod in mods)
             {
-                var applyable = mod as IApplyableMod<TObject>;
+                var applyable = mod as IApplicableMod<TObject>;
 
                 applyable?.Apply(this);
             }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0ae1e049c8..df74ca6b5e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -91,7 +91,7 @@
     <Compile Include="IO\Legacy\SerializationWriter.cs" />
     <Compile Include="IPC\ScoreIPCChannel.cs" />
     <Compile Include="Modes\LegacyReplay.cs" />
-    <Compile Include="Modes\Mods\IApplyableMod.cs" />
+    <Compile Include="Modes\Mods\IApplicableMod.cs" />
     <Compile Include="Modes\Mods\ModType.cs" />
     <Compile Include="Modes\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
     <Compile Include="Modes\Objects\HitObjectParser.cs" />

From 6ebd88060adaea9dd4fa1dc864be91d642de5bdb Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Tue, 14 Mar 2017 12:38:30 +0900
Subject: [PATCH 7/9] Simplify foreach.

---
 osu.Game/Modes/UI/HitRenderer.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index b7775a8f96..5b007e5ad3 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -102,12 +102,8 @@ namespace osu.Game.Modes.UI
             if (mods == null)
                 return;
 
-            foreach (var mod in mods)
-            {
-                var applyable = mod as IApplicableMod<TObject>;
-
-                applyable?.Apply(this);
-            }
+            foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
+                mod?.Apply(this);
         }
 
         private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);

From a502ff2c87660f0f4047983f1b863459f7bb5e97 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Tue, 14 Mar 2017 12:47:29 +0900
Subject: [PATCH 8/9] Fix post-merge issues.

---
 osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 83dbe6898f..767fb0dffb 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -103,7 +103,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap;
             }
 
-            protected override BeatmapArchiveReader GetReader() => null;
+            protected override ArchiveReader GetReader() => null;
         }
     }
 }

From db8cbba8d5e1d1d9d5cd5d1f1d52eb6c85b7b7a9 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Tue, 14 Mar 2017 12:52:12 +0900
Subject: [PATCH 9/9] Okay resharper u da boss.

---
 osu.Game/Modes/UI/HitRenderer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 5b007e5ad3..e466dd2b8c 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Modes.UI
                 return;
 
             foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
-                mod?.Apply(this);
+                mod.Apply(this);
         }
 
         private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);