Merge remote-tracking branch 'upstream/master' into general-fixes

# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs

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;
+        }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

@@ -1,12 +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 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.Mods;
 using osu.Game.Screens.Play;
+using System;
+using System.IO;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -22,9 +23,9 @@ namespace osu.Desktop.VisualTests.Tests
 
         protected override Player CreatePlayer(WorkingBeatmap beatmap)
         {
-            var player = base.CreatePlayer(beatmap);
+            beatmap.Mods.Value = new Mod[] { new OsuModAutoplay() };
-            player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler();
+
-            return player;
+            return base.CreatePlayer(beatmap);
         }
     }
 }

osu.Game.Modes.Catch/CatchRuleset.cs

@@ -4,7 +4,9 @@
 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.Objects;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
@@ -14,7 +16,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)
         {

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/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)
         {
         }

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

@@ -57,7 +57,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">

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;

osu.Game.Modes.Mania/ManiaRuleset.cs

@@ -3,7 +3,9 @@
 
 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.Objects;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
@@ -13,7 +15,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)
         {

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

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

@@ -57,7 +57,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">

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
     {
@@ -85,9 +88,14 @@ 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<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/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)

osu.Game.Modes.Osu/OsuRuleset.cs

@@ -4,7 +4,9 @@
 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.Mods;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
@@ -16,7 +18,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[]
         {
@@ -100,13 +102,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!";

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

@@ -13,7 +13,7 @@ namespace osu.Game.Modes.Osu.UI
 {
     public class OsuHitRenderer : HitRenderer<OsuHitObject>
     {
-        public OsuHitRenderer(Beatmap beatmap)
+        public OsuHitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
         {
         }

osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj

@@ -85,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">

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
     {

osu.Game.Modes.Taiko/TaikoRuleset.cs

@@ -4,7 +4,9 @@
 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.Mods;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
@@ -14,7 +16,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)
         {

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)
         {
         }

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -55,7 +55,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">

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
 {

osu.Game/Modes/Mods/IApplicableMod.cs

@@ -0,0 +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 osu.Game.Modes.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Mods
+{
+    /// <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 IApplicableMod<TObject>
+        where TObject : HitObject
+    {
+        /// <summary>
+        /// Applies the mod to a HitRenderer.
+        /// </summary>
+        /// <param name="hitRenderer">The HitRenderer to apply the mod to.</param>
+        void Apply(HitRenderer<TObject> hitRenderer);
+    }
+}

osu.Game/Modes/Mods/Mod.cs

@@ -1,11 +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 System;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Screens.Play;
+using osu.Game.Modes.Objects;
+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 +43,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
@@ -151,11 +147,16 @@ namespace osu.Game.Modes
         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) };
+    }
 
-        public override void PlayerLoading(Player player)
+    public abstract class ModAutoplay<T> : ModAutoplay, IApplicableMod<T>
+        where T : HitObject
     {
-            base.PlayerLoading(player);
+        protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
-            player.ReplayInputHandler = Ruleset.GetRuleset(player.Beatmap.PlayMode).CreateAutoplayScore(player.Beatmap.Beatmap)?.Replay?.GetInputHandler();
+
+        public void Apply(HitRenderer<T> hitRenderer)
+        {
+            hitRenderer.InputManager.ReplayInputHandler = CreateReplayScore(hitRenderer.Beatmap)?.Replay?.GetInputHandler();
         }
     }
 
@@ -170,11 +171,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,
-    }
 }

osu.Game/Modes/Mods/ModType.cs

@@ -0,0 +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
+
+namespace osu.Game.Modes.Mods
+{
+    public enum ModType
+    {
+        DifficultyReduction,
+        DifficultyIncrease,
+        Special,
+    }
+}

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;
@@ -31,7 +32,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();
 
@@ -47,8 +48,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;

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,10 +22,13 @@ namespace osu.Game.Modes.UI
 
         internal readonly PlayerInputManager InputManager = new PlayerInputManager();
 
-        /// <summary>
+        protected readonly KeyConversionInputManager KeyConversionInputManager;
-        /// A function to convert coordinates from gamefield to screen space.
+
-        /// </summary>
+        protected HitRenderer()
-        public abstract Func<Vector2, Vector2> MapPlayfieldToScreenSpace { get; }
+        {
+            KeyConversionInputManager = CreateKeyConversionInputManager();
+            KeyConversionInputManager.RelativeSizeAxes = Axes.Both;
+        }
 
         /// <summary>
         /// Whether all the HitObjects have been judged.
@@ -39,51 +42,48 @@ namespace osu.Game.Modes.UI
             if (AllObjectsJudged)
                 OnAllJudged?.Invoke();
         }
+
+        protected virtual KeyConversionInputManager CreateKeyConversionInputManager() => new KeyConversionInputManager();
     }
 
     public abstract class HitRenderer<TObject> : HitRenderer
         where TObject : HitObject
     {
-        internal readonly KeyConversionInputManager KeyConversionInputManager;
+        public Beatmap<TObject> Beatmap;
-
-        public override Func<Vector2, Vector2> MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace;
-        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;
 
-        protected HitRenderer(Beatmap beatmap)
+        protected HitRenderer(WorkingBeatmap beatmap)
         {
-            Beatmap = CreateBeatmapConverter().Convert(beatmap);
+            Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap);
+
+            applyMods(beatmap.Mods.Value);
 
             RelativeSizeAxes = Axes.Both;
 
-            KeyConversionInputManager = CreateKeyConversionInputManager();
-            KeyConversionInputManager.RelativeSizeAxes = Axes.Both;
             KeyConversionInputManager.Add(Playfield = CreatePlayfield());
 
             InputManager.Add(content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new[] { KeyConversionInputManager }
-                {
-                    KeyConversionInputManager
-                }
             });
 
             AddInternal(InputManager);
         }
 
-
         [BackgroundDependencyLoader]
         private void load()
         {
             loadObjects();
+
+            if (InputManager?.ReplayInputHandler != null)
+                InputManager.ReplayInputHandler.ToScreenSpace = Playfield.ScaledContent.ToScreenSpace;
         }
 
         private void loadObjects()
@@ -103,11 +103,19 @@ namespace osu.Game.Modes.UI
             Playfield.PostProcess();
         }
 
+        private void applyMods(IEnumerable<Mod> mods)
+        {
+            if (mods == null)
+                return;
+
+            foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
+                mod.Apply(this);
+        }
+
         private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);
 
         protected abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
         protected abstract Playfield<TObject> CreatePlayfield();
         protected abstract IBeatmapConverter<TObject> CreateBeatmapConverter();
-        protected virtual KeyConversionInputManager CreateKeyConversionInputManager() => new KeyConversionInputManager();
     }
 }

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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);
 
@@ -128,13 +125,10 @@ namespace osu.Game.Screens.Play
                 OnQuit = Exit
             };
 
-            hitRenderer = ruleset.CreateHitRendererWith(beatmap);
+            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;
 

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\IApplicableMod.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" />