From 7b1ff38df7652b3eee6c159f50125f7809cefb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 9 Sep 2019 23:41:51 +0200
Subject: [PATCH 001/116] Implement line-buffered reader

Add a line-buffered reader decorator operating on StreamReader
instances. The decorator has two main operations - PeekLine(), which
allows to see the next line in the stream without consuming it,
ReadLine(), which consumes and returns the next line in the stream, and
ReadToEnd() which reads all the remaining text in the stream (including
the unconsumed peeked line). Peeking line-per-line uses an internal
queue of lines that have been read ahead from the underlying stream.

The addition of the line-buffered reader is a workaround solution to
a problem with decoding. At current selecting a decoder works by
irreversibly reading the first line from the stream and looking for
a magic string that indicates the type of decoder to use.

It might however be possible for a file to be valid in format, just
missing a header. In such a case a lack of a line-buffered reader makes
it impossible to reparse the content of that first line. Introducing it
will however allow to peek the first line for magic first.

 - If magic is found in the first line, GetDecoder() will peek it and
   use it to return the correct Decoder instance. Note that in the case
   of JsonBeatmapDecoder the magic is the opening JSON object brace,
   and therefore must not be consumed.

 - If magic is not found, the fallback decoder will be able to consume
   it using ReadLine() in Decode().

This commit additionally contains basic unit tests for the reader.

Suggested-by: Aergwyn <aergwyn@t-online.de>
---
 .../Beatmaps/IO/LineBufferedReaderTest.cs     | 133 ++++++++++++++++++
 osu.Game/IO/LineBufferedReader.cs             |  70 +++++++++
 2 files changed, 203 insertions(+)
 create mode 100644 osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
 create mode 100644 osu.Game/IO/LineBufferedReader.cs

diff --git a/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
new file mode 100644
index 0000000000..b582ca0a6f
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
@@ -0,0 +1,133 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using osu.Game.IO;
+
+namespace osu.Game.Tests.Beatmaps.IO
+{
+    [TestFixture]
+    public class LineBufferedReaderTest
+    {
+        [Test]
+        public void TestReadLineByLine()
+        {
+            const string contents = @"line 1
+line 2
+line 3";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual("line 1", bufferedReader.ReadLine());
+                Assert.AreEqual("line 2", bufferedReader.ReadLine());
+                Assert.AreEqual("line 3", bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+            }
+        }
+
+        [Test]
+        public void TestPeekLineOnce()
+        {
+            const string contents = @"line 1
+peek this
+line 3";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual("line 1", bufferedReader.ReadLine());
+                Assert.AreEqual("peek this", bufferedReader.PeekLine());
+                Assert.AreEqual("peek this", bufferedReader.ReadLine());
+                Assert.AreEqual("line 3", bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+            }
+        }
+
+        [Test]
+        public void TestPeekLineMultipleTimes()
+        {
+            const string contents = @"peek this once
+line 2
+peek this a lot";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual("peek this once", bufferedReader.PeekLine());
+                Assert.AreEqual("peek this once", bufferedReader.ReadLine());
+                Assert.AreEqual("line 2", bufferedReader.ReadLine());
+                Assert.AreEqual("peek this a lot", bufferedReader.PeekLine());
+                Assert.AreEqual("peek this a lot", bufferedReader.PeekLine());
+                Assert.AreEqual("peek this a lot", bufferedReader.PeekLine());
+                Assert.AreEqual("peek this a lot", bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+            }
+        }
+
+        [Test]
+        public void TestPeekLineAtEndOfStream()
+        {
+            const string contents = @"first line
+second line";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual("first line", bufferedReader.ReadLine());
+                Assert.AreEqual("second line", bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.PeekLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.PeekLine());
+            }
+        }
+
+        [Test]
+        public void TestPeekReadLineOnEmptyStream()
+        {
+            using (var stream = new MemoryStream())
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.IsNull(bufferedReader.PeekLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.ReadLine());
+                Assert.IsNull(bufferedReader.PeekLine());
+            }
+        }
+
+        [Test]
+        public void TestReadToEndNoPeeks()
+        {
+            const string contents = @"first line
+second line";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual(contents, bufferedReader.ReadToEnd());
+            }
+        }
+
+        [Test]
+        public void TestReadToEndAfterReadsAndPeeks()
+        {
+            const string contents = @"this line is gone
+this one shouldn't be
+these ones
+definitely not";
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            using (var bufferedReader = new LineBufferedReader(stream))
+            {
+                Assert.AreEqual("this line is gone", bufferedReader.ReadLine());
+                Assert.AreEqual("this one shouldn't be", bufferedReader.PeekLine());
+                const string ending = @"this one shouldn't be
+these ones
+definitely not";
+                Assert.AreEqual(ending, bufferedReader.ReadToEnd());
+            }
+        }
+    }
+}
diff --git a/osu.Game/IO/LineBufferedReader.cs b/osu.Game/IO/LineBufferedReader.cs
new file mode 100644
index 0000000000..66dee1181f
--- /dev/null
+++ b/osu.Game/IO/LineBufferedReader.cs
@@ -0,0 +1,70 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace osu.Game.IO
+{
+    /// <summary>
+    /// A <see cref="StreamReader"/>-like decorator (with more limited API) for <see cref="Stream"/>s
+    /// that allows lines to be peeked without consuming.
+    /// </summary>
+    public class LineBufferedReader : IDisposable
+    {
+        private readonly StreamReader streamReader;
+        private readonly Queue<string> lineBuffer;
+
+        public LineBufferedReader(Stream stream)
+        {
+            streamReader = new StreamReader(stream);
+            lineBuffer = new Queue<string>();
+        }
+
+        /// <summary>
+        /// Reads the next line from the stream without consuming it.
+        /// </summary>
+        public string PeekLine()
+        {
+            if (lineBuffer.Count > 0)
+                return lineBuffer.Peek();
+
+            var line = streamReader.ReadLine();
+            if (line != null)
+                lineBuffer.Enqueue(line);
+            return line;
+        }
+
+        /// <summary>
+        /// Reads the next line from the stream and consumes it.
+        /// </summary>
+        public string ReadLine() => lineBuffer.Count > 0 ? lineBuffer.Dequeue() : streamReader.ReadLine();
+
+        /// <summary>
+        /// Reads the stream to its end and returns the text read.
+        /// This includes any peeked but unconsumed lines.
+        /// </summary>
+        public string ReadToEnd()
+        {
+            var remainingText = streamReader.ReadToEnd();
+            if (lineBuffer.Count == 0)
+                return remainingText;
+
+            var builder = new StringBuilder();
+
+            // this might not be completely correct due to varying platform line endings
+            while (lineBuffer.Count > 0)
+                builder.AppendLine(lineBuffer.Dequeue());
+            builder.Append(remainingText);
+
+            return builder.ToString();
+        }
+
+        public void Dispose()
+        {
+            streamReader?.Dispose();
+        }
+    }
+}

From 11eda44d3451c889469af4e8e30d522b04d2dd15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Sep 2019 00:43:30 +0200
Subject: [PATCH 002/116] Migrate decoding to line-buffered reader

Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
---
 osu.Game.Rulesets.Osu.Tests/StackingTest.cs   |  3 +-
 .../Formats/LegacyBeatmapDecoderTest.cs       | 42 +++++++++----------
 .../Beatmaps/Formats/LegacyDecoderTest.cs     |  4 +-
 .../Formats/LegacyStoryboardDecoderTest.cs    |  6 +--
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs    |  5 ++-
 .../Beatmaps/IO/OszArchiveReaderTest.cs       |  3 +-
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs |  6 +--
 osu.Game.Tests/WaveformTestBeatmap.cs         |  3 +-
 osu.Game/Beatmaps/BeatmapManager.cs           |  5 ++-
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  8 ++--
 osu.Game/Beatmaps/Formats/Decoder.cs          |  9 ++--
 .../Beatmaps/Formats/JsonBeatmapDecoder.cs    |  7 +---
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  3 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |  4 +-
 .../Formats/LegacyStoryboardDecoder.cs        |  3 +-
 osu.Game/Skinning/LegacySkin.cs               |  3 +-
 .../Tests/Beatmaps/BeatmapConversionTest.cs   |  3 +-
 .../Beatmaps/DifficultyCalculatorTest.cs      |  3 +-
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        |  3 +-
 19 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/StackingTest.cs b/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
index e8b99e86f9..871afdb09d 100644
--- a/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Beatmaps;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestStacking()
         {
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(beatmap_data)))
-            using (var reader = new StreamReader(stream))
+            using (var reader = new LineBufferedReader(stream))
             {
                 var beatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
                 var converted = new TestWorkingBeatmap(beatmap).GetPlayableBeatmap(new OsuRuleset().RulesetInfo, Array.Empty<Mod>());
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 535320530d..6a77c6ca96 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using NUnit.Framework;
 using osuTK;
 using osuTK.Graphics;
@@ -13,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.IO;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -30,13 +30,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapVersion()
         {
             using (var resStream = TestResources.OpenResource("beatmap-version.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
-
-                stream.BaseStream.Position = 0;
-                stream.DiscardBufferedData();
-
                 var working = new TestWorkingBeatmap(decoder.Decode(stream));
 
                 Assert.AreEqual(6, working.BeatmapInfo.BeatmapVersion);
@@ -51,7 +47,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
                 var beatmapInfo = beatmap.BeatmapInfo;
@@ -75,7 +71,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder();
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmapInfo = decoder.Decode(stream).BeatmapInfo;
 
@@ -101,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder();
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
                 var beatmapInfo = beatmap.BeatmapInfo;
@@ -126,7 +122,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder();
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var difficulty = decoder.Decode(stream).BeatmapInfo.BaseDifficulty;
 
@@ -145,7 +141,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
                 var metadata = beatmap.Metadata;
@@ -164,7 +160,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
                 var controlPoints = beatmap.ControlPointInfo;
@@ -239,7 +235,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("overlapping-control-points.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var controlPoints = decoder.Decode(stream).ControlPointInfo;
 
@@ -271,7 +267,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacySkinDecoder();
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var comboColors = decoder.Decode(stream).ComboColours;
 
@@ -297,7 +293,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder();
 
             using (var resStream = TestResources.OpenResource("hitobject-combo-offset.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
 
@@ -320,7 +316,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder();
 
             using (var resStream = TestResources.OpenResource("hitobject-combo-offset.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
 
@@ -343,7 +339,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -371,7 +367,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("controlpoint-custom-samplebank.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -393,7 +389,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("hitobject-custom-samplebank.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -411,7 +407,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("hitobject-file-samples.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -431,7 +427,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("slider-samples.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -475,7 +471,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var resStream = TestResources.OpenResource("hitobject-no-addition-bank.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
@@ -489,7 +485,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
             using (var badResStream = TestResources.OpenResource("invalid-events.osu"))
-            using (var badStream = new StreamReader(badResStream))
+            using (var badStream = new LineBufferedReader(badResStream))
             {
                 Assert.DoesNotThrow(() => decoder.Decode(badStream));
             }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
index b4d219456c..335a6aeeb0 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Beatmaps.Formats
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LineLoggingDecoder(14);
 
             using (var resStream = TestResources.OpenResource("comments.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 decoder.Decode(stream);
 
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 953763c95d..66d53d7e7b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyStoryboardDecoder();
 
             using (var resStream = TestResources.OpenResource("Himeringo - Yotsuya-san ni Yoroshiku (RLC) [Winber1's Extreme].osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var storyboard = decoder.Decode(stream);
 
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             var decoder = new LegacyStoryboardDecoder();
 
             using (var resStream = TestResources.OpenResource("variable-with-suffix.osb"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var storyboard = decoder.Decode(stream);
 
diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index 4859abbb8e..63346b8c9d 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -148,13 +149,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
         private Beatmap decode(string filename, out Beatmap jsonDecoded)
         {
             using (var stream = TestResources.OpenResource(filename))
-            using (var sr = new StreamReader(stream))
+            using (var sr = new LineBufferedReader(stream))
             {
                 var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);
 
                 using (var ms = new MemoryStream())
                 using (var sw = new StreamWriter(ms))
-                using (var sr2 = new StreamReader(ms))
+                using (var sr2 = new LineBufferedReader(ms))
                 {
                     sw.Write(legacyDecoded.Serialize());
                     sw.Flush();
diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
index 37e0565df0..022b2c1a59 100644
--- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 
 namespace osu.Game.Tests.Beatmaps.IO
@@ -50,7 +51,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                 Beatmap beatmap;
 
-                using (var stream = new StreamReader(reader.GetStream("Soleily - Renatus (Deif) [Platter].osu")))
+                using (var stream = new LineBufferedReader(reader.GetStream("Soleily - Renatus (Deif) [Platter].osu")))
                     beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
 
                 var meta = beatmap.Metadata;
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index 8bd846518b..0d96dd08da 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
 using NUnit.Framework;
+using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osuTK.Graphics;
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Skins
             var decoder = new LegacySkinDecoder();
 
             using (var resStream = TestResources.OpenResource(hasColours ? "skin.ini" : "skin-empty.ini"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var comboColors = decoder.Decode(stream).ComboColours;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Skins
             var decoder = new LegacySkinDecoder();
 
             using (var resStream = TestResources.OpenResource("skin.ini"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var config = decoder.Decode(stream);
 
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index db9576b5fa..0d16a78f75 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Tests.Resources;
 
@@ -56,7 +57,7 @@ namespace osu.Game.Tests
         private Beatmap createTestBeatmap()
         {
             using (var beatmapStream = getBeatmapStream())
-            using (var beatmapReader = new StreamReader(beatmapStream))
+            using (var beatmapReader = new LineBufferedReader(beatmapStream))
                 return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
         }
     }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b9ed3664ef..372eec50fd 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -20,6 +20,7 @@ using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -264,7 +265,7 @@ namespace osu.Game.Beatmaps
             }
 
             Beatmap beatmap;
-            using (var stream = new StreamReader(reader.GetStream(mapName)))
+            using (var stream = new LineBufferedReader(reader.GetStream(mapName)))
                 beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
 
             return new BeatmapSetInfo
@@ -287,7 +288,7 @@ namespace osu.Game.Beatmaps
             {
                 using (var raw = reader.GetStream(name))
                 using (var ms = new MemoryStream()) //we need a memory stream so we can seek
-                using (var sr = new StreamReader(ms))
+                using (var sr = new LineBufferedReader(ms))
                 {
                     raw.CopyTo(ms);
                     ms.Position = 0;
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 1d00c94ef2..b879b92f01 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -11,6 +10,7 @@ using osu.Framework.Graphics.Video;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    using (var stream = new StreamReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch
@@ -127,7 +127,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new StreamReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -136,7 +136,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new StreamReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 953e50eadc..0f1b617809 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using osu.Game.IO;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -13,15 +14,15 @@ namespace osu.Game.Beatmaps.Formats
     {
         protected virtual TOutput CreateTemplateObject() => new TOutput();
 
-        public TOutput Decode(StreamReader primaryStream, params StreamReader[] otherStreams)
+        public TOutput Decode(LineBufferedReader primaryStream, params LineBufferedReader[] otherStreams)
         {
             var output = CreateTemplateObject();
-            foreach (StreamReader stream in otherStreams.Prepend(primaryStream))
+            foreach (LineBufferedReader stream in otherStreams.Prepend(primaryStream))
                 ParseStreamInto(stream, output);
             return output;
         }
 
-        protected abstract void ParseStreamInto(StreamReader stream, TOutput output);
+        protected abstract void ParseStreamInto(LineBufferedReader stream, TOutput output);
     }
 
     public abstract class Decoder
@@ -39,7 +40,7 @@ namespace osu.Game.Beatmaps.Formats
         /// Retrieves a <see cref="Decoder"/> to parse a <see cref="Beatmap"/>.
         /// </summary>
         /// <param name="stream">A stream pointing to the <see cref="Beatmap"/>.</param>
-        public static Decoder<T> GetDecoder<T>(StreamReader stream)
+        public static Decoder<T> GetDecoder<T>(LineBufferedReader stream)
             where T : new()
         {
             if (stream == null)
diff --git a/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
index d8482b200f..988968fa42 100644
--- a/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
+using osu.Game.IO;
 using osu.Game.IO.Serialization;
 
 namespace osu.Game.Beatmaps.Formats
@@ -13,11 +13,8 @@ namespace osu.Game.Beatmaps.Formats
             AddDecoder<Beatmap>("{", m => new JsonBeatmapDecoder());
         }
 
-        protected override void ParseStreamInto(StreamReader stream, Beatmap output)
+        protected override void ParseStreamInto(LineBufferedReader stream, Beatmap output)
         {
-            stream.BaseStream.Position = 0;
-            stream.DiscardBufferedData();
-
             stream.ReadToEnd().DeserializeInto(output);
 
             foreach (var hitObject in output.HitObjects)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 0532790f0a..6e34fd8e90 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -8,6 +8,7 @@ using osu.Framework.IO.File;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.IO;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -41,7 +42,7 @@ namespace osu.Game.Beatmaps.Formats
             offset = FormatVersion < 5 ? 24 : 0;
         }
 
-        protected override void ParseStreamInto(StreamReader stream, Beatmap beatmap)
+        protected override void ParseStreamInto(LineBufferedReader stream, Beatmap beatmap)
         {
             this.beatmap = beatmap;
             this.beatmap.BeatmapInfo.BeatmapVersion = FormatVersion;
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 9a8197ad82..83d20da458 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
@@ -21,7 +21,7 @@ namespace osu.Game.Beatmaps.Formats
             FormatVersion = version;
         }
 
-        protected override void ParseStreamInto(StreamReader stream, T output)
+        protected override void ParseStreamInto(LineBufferedReader stream, T output)
         {
             Section section = Section.None;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 14c6ea5c8e..a8f8dbf69d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -10,6 +10,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.IO.File;
+using osu.Game.IO;
 using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps.Formats
@@ -35,7 +36,7 @@ namespace osu.Game.Beatmaps.Formats
             AddDecoder<Storyboard>(@"[Events]", m => new LegacyStoryboardDecoder());
         }
 
-        protected override void ParseStreamInto(StreamReader stream, Storyboard storyboard)
+        protected override void ParseStreamInto(LineBufferedReader stream, Storyboard storyboard)
         {
             this.storyboard = storyboard;
             base.ParseStreamInto(stream, storyboard);
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 0b1076be01..fea15458e4 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Skinning
         {
             Stream stream = storage?.GetStream(filename);
             if (stream != null)
-                using (StreamReader reader = new StreamReader(stream))
+                using (LineBufferedReader reader = new LineBufferedReader(stream))
                     Configuration = new LegacySkinDecoder().Decode(reader);
             else
                 Configuration = new DefaultSkinConfiguration();
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 3fc9662b17..e99b5fc5fb 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -142,7 +143,7 @@ namespace osu.Game.Tests.Beatmaps
         private IBeatmap getBeatmap(string name)
         {
             using (var resStream = openResource($"{resource_namespace}.{name}.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
diff --git a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
index 108fa8ff71..748a52d1c5 100644
--- a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
+++ b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
@@ -7,6 +7,7 @@ using System.Reflection;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -26,7 +27,7 @@ namespace osu.Game.Tests.Beatmaps
         private WorkingBeatmap getBeatmap(string name)
         {
             using (var resStream = openResource($"{resource_namespace}.{name}.osu"))
-            using (var stream = new StreamReader(resStream))
+            using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index b77a8508ad..d6f92ba086 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
@@ -39,7 +40,7 @@ namespace osu.Game.Tests.Beatmaps
         private static Beatmap createTestBeatmap()
         {
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(test_beatmap_data)))
-            using (var reader = new StreamReader(stream))
+            using (var reader = new LineBufferedReader(stream))
                 return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
         }
 

From 86588778b170b363b2e7156a9ffa08ba32e15f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Sep 2019 22:06:10 +0200
Subject: [PATCH 003/116] Implement fallback decoder registration

After the preparatory introduction of LineBufferedReader, it is now
possible to introduce registration of fallback decoders that won't drop
input supplied in the first line of the file.

A fallback decoder is used when the magic in the first line of the file
does not match any of the other known decoders. In such a case,
the fallback decoder is constructed and provided a LineBufferedReader
instance. The process of matching magic only peeks the first non-empty
line, so it is available for re-reading in Decode() using ReadLine().

There can be only one fallback decoder per type; a second attempt of
registering a fallback will result in an exception to avoid bugs.

To address the issue of parsing failing on badly or non-headered files,
set the legacy decoders for Beatmaps and Storyboards as the fallbacks.

Due to non-trivial logic, several new, passing unit tests with possible
edge cases also included.
---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 101 ++++++++++++++++++
 .../Beatmaps/IO/ImportBeatmapTest.cs          |   2 +-
 osu.Game.Tests/Resources/corrupted-header.osu |   5 +
 .../empty-line-instead-of-header.osu          |   5 +
 .../Resources/empty-lines-at-start.osu        |   8 ++
 osu.Game.Tests/Resources/missing-header.osu   |   4 +
 .../Resources/no-empty-line-after-header.osu  |   4 +
 osu.Game.Tests/osu.Game.Tests.csproj          |   7 ++
 osu.Game/Beatmaps/Formats/Decoder.cs          |  41 +++++--
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |   1 +
 .../Formats/LegacyStoryboardDecoder.cs        |   1 +
 osu.Game/IO/LineBufferedReader.cs             |   2 +
 12 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/corrupted-header.osu
 create mode 100644 osu.Game.Tests/Resources/empty-line-instead-of-header.osu
 create mode 100644 osu.Game.Tests/Resources/empty-lines-at-start.osu
 create mode 100644 osu.Game.Tests/Resources/missing-header.osu
 create mode 100644 osu.Game.Tests/Resources/no-empty-line-after-header.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 6a77c6ca96..f6c0dbbecf 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using NUnit.Framework;
 using osuTK;
 using osuTK.Graphics;
@@ -490,5 +491,105 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.DoesNotThrow(() => decoder.Decode(badStream));
             }
         }
+
+        [Test]
+        public void TestFallbackDecoderForCorruptedHeader()
+        {
+            Decoder<Beatmap> decoder = null;
+            Beatmap beatmap = null;
+
+            using (var resStream = TestResources.OpenResource("corrupted-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+                Assert.DoesNotThrow(() => beatmap = decoder.Decode(stream));
+                Assert.IsNotNull(beatmap);
+                Assert.AreEqual("Beatmap with corrupted header", beatmap.Metadata.Title);
+                Assert.AreEqual("Evil Hacker", beatmap.Metadata.AuthorString);
+            }
+        }
+
+        [Test]
+        public void TestFallbackDecoderForMissingHeader()
+        {
+            Decoder<Beatmap> decoder = null;
+            Beatmap beatmap = null;
+
+            using (var resStream = TestResources.OpenResource("missing-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+                Assert.DoesNotThrow(() => beatmap = decoder.Decode(stream));
+                Assert.IsNotNull(beatmap);
+                Assert.AreEqual("Beatmap with no header", beatmap.Metadata.Title);
+                Assert.AreEqual("Incredibly Evil Hacker", beatmap.Metadata.AuthorString);
+            }
+        }
+
+        [Test]
+        public void TestDecodeFileWithEmptyLinesAtStart()
+        {
+            Decoder<Beatmap> decoder = null;
+            Beatmap beatmap = null;
+
+            using (var resStream = TestResources.OpenResource("empty-lines-at-start.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+                Assert.DoesNotThrow(() => beatmap = decoder.Decode(stream));
+                Assert.IsNotNull(beatmap);
+                Assert.AreEqual("Empty lines at start", beatmap.Metadata.Title);
+                Assert.AreEqual("Edge Case Hunter", beatmap.Metadata.AuthorString);
+            }
+        }
+
+        [Test]
+        public void TestDecodeFileWithEmptyLinesAndNoHeader()
+        {
+            Decoder<Beatmap> decoder = null;
+            Beatmap beatmap = null;
+
+            using (var resStream = TestResources.OpenResource("empty-line-instead-of-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+                Assert.DoesNotThrow(() => beatmap = decoder.Decode(stream));
+                Assert.IsNotNull(beatmap);
+                Assert.AreEqual("The dog ate the file header", beatmap.Metadata.Title);
+                Assert.AreEqual("Why does this keep happening", beatmap.Metadata.AuthorString);
+            }
+        }
+
+        [Test]
+        public void TestDecodeFileWithContentImmediatelyAfterHeader()
+        {
+            Decoder<Beatmap> decoder = null;
+            Beatmap beatmap = null;
+
+            using (var resStream = TestResources.OpenResource("no-empty-line-after-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+                Assert.DoesNotThrow(() => beatmap = decoder.Decode(stream));
+                Assert.IsNotNull(beatmap);
+                Assert.AreEqual("No empty line delimiting header from contents", beatmap.Metadata.Title);
+                Assert.AreEqual("Edge Case Hunter", beatmap.Metadata.AuthorString);
+            }
+        }
+
+        [Test]
+        public void TestDecodeEmptyFile()
+        {
+            using (var resStream = new MemoryStream())
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.Throws<IOException>(() => Decoder.GetDecoder<Beatmap>(stream));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index ad0ed00989..0686073292 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                     var breakTemp = TestResources.GetTestBeatmapForImport();
 
-                    MemoryStream brokenOsu = new MemoryStream(new byte[] { 1, 3, 3, 7 });
+                    MemoryStream brokenOsu = new MemoryStream();
                     MemoryStream brokenOsz = new MemoryStream(File.ReadAllBytes(breakTemp));
 
                     File.Delete(breakTemp);
diff --git a/osu.Game.Tests/Resources/corrupted-header.osu b/osu.Game.Tests/Resources/corrupted-header.osu
new file mode 100644
index 0000000000..92701a4a7d
--- /dev/null
+++ b/osu.Game.Tests/Resources/corrupted-header.osu
@@ -0,0 +1,5 @@
+ow computerosu file format v14
+
+[Metadata]
+Title: Beatmap with corrupted header
+Creator: Evil Hacker
diff --git a/osu.Game.Tests/Resources/empty-line-instead-of-header.osu b/osu.Game.Tests/Resources/empty-line-instead-of-header.osu
new file mode 100644
index 0000000000..91ecf8d84a
--- /dev/null
+++ b/osu.Game.Tests/Resources/empty-line-instead-of-header.osu
@@ -0,0 +1,5 @@
+
+
+[Metadata]
+Title: The dog ate the file header
+Creator: Why does this keep happening
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/empty-lines-at-start.osu b/osu.Game.Tests/Resources/empty-lines-at-start.osu
new file mode 100644
index 0000000000..cb3b1761a2
--- /dev/null
+++ b/osu.Game.Tests/Resources/empty-lines-at-start.osu
@@ -0,0 +1,8 @@
+
+
+
+osu file format v14
+
+[Metadata]
+Title: Empty lines at start
+Creator: Edge Case Hunter
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/missing-header.osu b/osu.Game.Tests/Resources/missing-header.osu
new file mode 100644
index 0000000000..95fac0d79b
--- /dev/null
+++ b/osu.Game.Tests/Resources/missing-header.osu
@@ -0,0 +1,4 @@
+[Metadata]
+
+Title: Beatmap with no header
+Creator: Incredibly Evil Hacker
diff --git a/osu.Game.Tests/Resources/no-empty-line-after-header.osu b/osu.Game.Tests/Resources/no-empty-line-after-header.osu
new file mode 100644
index 0000000000..9db2b7c01c
--- /dev/null
+++ b/osu.Game.Tests/Resources/no-empty-line-after-header.osu
@@ -0,0 +1,4 @@
+osu file format v14
+[Metadata]
+Title: No empty line delimiting header from contents
+Creator: Edge Case Hunter
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 84f67c9319..9dc3e85e1b 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -1,5 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
+  <ItemGroup>
+    <None Remove="Resources\corrupted-header.osu" />
+    <None Remove="Resources\empty-line-instead-of-header.osu" />
+    <None Remove="Resources\empty-lines-at-start.osu" />
+    <None Remove="Resources\missing-header.osu" />
+    <None Remove="Resources\no-empty-line-after-header.osu" />
+  </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 0f1b617809..4a539cc33f 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Beatmaps.Formats
     public abstract class Decoder
     {
         private static readonly Dictionary<Type, Dictionary<string, Func<string, Decoder>>> decoders = new Dictionary<Type, Dictionary<string, Func<string, Decoder>>>();
+        private static readonly Dictionary<Type, Func<Decoder>> fallback_decoders = new Dictionary<Type, Func<Decoder>>();
 
         static Decoder()
         {
@@ -49,21 +50,31 @@ namespace osu.Game.Beatmaps.Formats
             if (!decoders.TryGetValue(typeof(T), out var typedDecoders))
                 throw new IOException(@"Unknown decoder type");
 
-            string line;
+            // start off with the first line of the file
+            string line = stream.PeekLine()?.Trim();
 
-            do
+            while (line != null && line.Length == 0)
             {
-                line = stream.ReadLine()?.Trim();
-            } while (line != null && line.Length == 0);
+                // consume the previously peeked empty line and advance to the next one
+                stream.ReadLine();
+                line = stream.PeekLine()?.Trim();
+            }
 
             if (line == null)
-                throw new IOException(@"Unknown file format (null)");
+                throw new IOException("Unknown file format (null)");
 
             var decoder = typedDecoders.Select(d => line.StartsWith(d.Key, StringComparison.InvariantCulture) ? d.Value : null).FirstOrDefault();
-            if (decoder == null)
-                throw new IOException($@"Unknown file format ({line})");
 
-            return (Decoder<T>)decoder.Invoke(line);
+            // it's important the magic does NOT get consumed here, since sometimes it's part of the structure
+            // (see JsonBeatmapDecoder - the magic string is the opening brace)
+            // decoder implementations should therefore not die on receiving their own magic
+            if (decoder != null)
+                return (Decoder<T>)decoder.Invoke(line);
+
+            if (!fallback_decoders.TryGetValue(typeof(T), out var fallbackDecoder))
+                throw new IOException($"Unknown file format ({line})");
+
+            return (Decoder<T>)fallbackDecoder.Invoke();
         }
 
         /// <summary>
@@ -78,5 +89,19 @@ namespace osu.Game.Beatmaps.Formats
 
             typedDecoders[magic] = constructor;
         }
+
+        /// <summary>
+        /// Registers a fallback decoder instantiation function.
+        /// The fallback will be returned if the first line of the decoded stream does not match any known magic.
+        /// </summary>
+        /// <typeparam name="T">Type of object being decoded.</typeparam>
+        /// <param name="constructor">A function that constructs the fallback<see cref="Decoder"/>.</param>
+        protected static void SetFallbackDecoder<T>(Func<Decoder> constructor)
+        {
+            if (fallback_decoders.ContainsKey(typeof(T)))
+                throw new InvalidOperationException($"A fallback decoder was already added for type {typeof(T)}.");
+
+            fallback_decoders[typeof(T)] = constructor;
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 6e34fd8e90..786b7611b5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Beatmaps.Formats
         public static void Register()
         {
             AddDecoder<Beatmap>(@"osu file format v", m => new LegacyBeatmapDecoder(Parsing.ParseInt(m.Split('v').Last())));
+            SetFallbackDecoder<Beatmap>(() => new LegacyBeatmapDecoder());
         }
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index a8f8dbf69d..5dbd67d304 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Beatmaps.Formats
             // note that this isn't completely correct
             AddDecoder<Storyboard>(@"osu file format v", m => new LegacyStoryboardDecoder());
             AddDecoder<Storyboard>(@"[Events]", m => new LegacyStoryboardDecoder());
+            SetFallbackDecoder<Storyboard>(() => new LegacyStoryboardDecoder());
         }
 
         protected override void ParseStreamInto(LineBufferedReader stream, Storyboard storyboard)
diff --git a/osu.Game/IO/LineBufferedReader.cs b/osu.Game/IO/LineBufferedReader.cs
index 66dee1181f..aab761afd8 100644
--- a/osu.Game/IO/LineBufferedReader.cs
+++ b/osu.Game/IO/LineBufferedReader.cs
@@ -25,6 +25,7 @@ namespace osu.Game.IO
 
         /// <summary>
         /// Reads the next line from the stream without consuming it.
+        /// Subsequent calls to <see cref="PeekLine"/> without a <see cref="ReadLine"/> will return the same string.
         /// </summary>
         public string PeekLine()
         {
@@ -39,6 +40,7 @@ namespace osu.Game.IO
 
         /// <summary>
         /// Reads the next line from the stream and consumes it.
+        /// If a line was peeked, that same line will then be consumed and returned.
         /// </summary>
         public string ReadLine() => lineBuffer.Count > 0 ? lineBuffer.Dequeue() : streamReader.ReadLine();
 

From 29fcab65f9a2e553dd9c9cd550173612f1b74303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Sep 2019 22:40:52 +0200
Subject: [PATCH 004/116] Remove superfluous csproj entries

---
 osu.Game.Tests/osu.Game.Tests.csproj | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 9dc3e85e1b..84f67c9319 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -1,12 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup>
-    <None Remove="Resources\corrupted-header.osu" />
-    <None Remove="Resources\empty-line-instead-of-header.osu" />
-    <None Remove="Resources\empty-lines-at-start.osu" />
-    <None Remove="Resources\missing-header.osu" />
-    <None Remove="Resources\no-empty-line-after-header.osu" />
-  </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />

From dd9f620c2364e35c1f1185f2f4b5a43893b5874f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Sep 2019 22:45:34 +0200
Subject: [PATCH 005/116] Fix misleading xmldoc

---
 osu.Game/Beatmaps/Formats/Decoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 4a539cc33f..045eb2d14d 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps.Formats
 
         /// <summary>
         /// Registers a fallback decoder instantiation function.
-        /// The fallback will be returned if the first line of the decoded stream does not match any known magic.
+        /// The fallback will be returned if the first non-empty line of the decoded stream does not match any known magic.
         /// </summary>
         /// <typeparam name="T">Type of object being decoded.</typeparam>
         /// <param name="constructor">A function that constructs the fallback<see cref="Decoder"/>.</param>

From 5024770544999feda8849f7463102b1db5fe2283 Mon Sep 17 00:00:00 2001
From: LeNitrous <n20gaming2000@gmail.com>
Date: Mon, 23 Sep 2019 20:52:44 +0800
Subject: [PATCH 006/116] move common logic to IntroScreen

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 74 ++++++-----------------
 osu.Game/Screens/Menu/IntroScreen.cs    | 80 +++++++++++++++++++++++--
 osu.Game/Screens/Menu/IntroTriangles.cs | 65 ++++----------------
 3 files changed, 104 insertions(+), 115 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index c069f82134..d5d7f5cb7a 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -2,86 +2,46 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
+using osu.Framework.Audio;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.IO.Archives;
 
 namespace osu.Game.Screens.Menu
 {
     public class IntroCircles : IntroScreen
     {
-        private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
+        protected override string BeatmapHash => "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
 
-        private SampleChannel welcome;
-
-        private Bindable<bool> menuMusic;
-
-        private Track track;
-
-        private WorkingBeatmap introBeatmap;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, ISampleStore samples)
-        {
-            menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
-
-            BeatmapSetInfo setInfo = null;
-
-            if (!menuMusic.Value)
-            {
-                var sets = beatmaps.GetAllUsableBeatmapSets();
-                if (sets.Count > 0)
-                    setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
-            }
-
-            if (setInfo == null)
-            {
-                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == menu_music_beatmap_hash);
-
-                if (setInfo == null)
-                {
-                    // we need to import the default menu background beatmap
-                    setInfo = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream(@"Tracks/circles.osz"), "circles.osz")).Result;
-
-                    setInfo.Protected = true;
-                    beatmaps.Update(setInfo);
-                }
-            }
-
-            introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-            track = introBeatmap.Track;
-
-            if (config.Get<bool>(OsuSetting.MenuVoice))
-                welcome = samples.Get(@"welcome");
-        }
+        protected override string BeatmapFile => "circles.osz";
 
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            if (MenuVoice.Value)
+                SetWelcome();
+        }
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);
 
             if (!resuming)
             {
-                Beatmap.Value = introBeatmap;
-                introBeatmap = null;
+                Beatmap.Value = IntroBeatmap;
+                IntroBeatmap = null;
 
-                welcome?.Play();
+                Welcome?.Play();
 
                 Scheduler.AddDelayed(delegate
                 {
                     // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-                    if (menuMusic.Value)
+                    if (MenuMusic.Value)
                     {
-                        track.Restart();
-                        track = null;
+                        Track.Restart();
+                        Track = null;
                     }
 
                     PrepareMenuLoad();
@@ -97,7 +57,7 @@ namespace osu.Game.Screens.Menu
 
         public override void OnSuspending(IScreen next)
         {
-            track = null;
+            Track = null;
 
             this.FadeOut(300);
             base.OnSuspending(next);
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 4d0f7ff87a..651fa7583d 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -4,12 +4,19 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.MathUtils;
 using osu.Framework.Screens;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.IO.Archives;
 using osu.Game.Screens.Backgrounds;
+using osu.Game.Skinning;
+using osu.Game.Online.API;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
@@ -17,6 +24,10 @@ namespace osu.Game.Screens.Menu
 {
     public abstract class IntroScreen : StartupScreen
     {
+        protected abstract string BeatmapHash { get; }
+
+        protected abstract string BeatmapFile { get; }
+
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
 
         public const int EXIT_DELAY = 3000;
@@ -24,24 +35,83 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
+        protected SampleChannel Welcome;
+
         private SampleChannel seeya;
 
-        private Bindable<bool> menuVoice;
+        protected Bindable<bool> MenuVoice;
+
+        protected Bindable<bool> MenuMusic;
+
+        protected Track Track;
+
+        protected WorkingBeatmap IntroBeatmap;
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
         public new Bindable<WorkingBeatmap> Beatmap => beatmap;
 
+        protected Bindable<User> User;
+
+        protected Bindable<Skin> Skin;
+
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
+        private void load(OsuConfigManager config, IAPIProvider api, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
             // prevent user from changing beatmap while the intro is still runnning.
             beatmap = base.Beatmap.BeginLease(false);
 
-            menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
-            seeya = audio.Samples.Get(@"seeya");
+            MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
+            MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
+
+            User = api.LocalUser.GetBoundCopy();
+            Skin = skinManager.CurrentSkin.GetBoundCopy();
+
+            Skin.BindValueChanged(_ => updateSeeya(), true);
+
+            BeatmapSetInfo setInfo = null;
+
+            if (!MenuMusic.Value)
+            {
+                var sets = beatmaps.GetAllUsableBeatmapSets();
+                if (sets.Count > 0)
+                    setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
+            }
+
+            if (setInfo == null)
+            {
+                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
+
+                if (setInfo == null)
+                {
+                    // we need to import the default menu background beatmap
+                    setInfo = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).Result;
+
+                    setInfo.Protected = true;
+                    beatmaps.Update(setInfo);
+                }
+            }
+
+            IntroBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
+            Track = IntroBeatmap.Track;
+        }
+
+        private void updateSeeya()
+        {
+            if (User.Value?.IsSupporter ?? false)
+                seeya = Skin.Value.GetSample(new SampleInfo("seeya")) ?? audio.Samples.Get(@"seeya");
+            else
+                seeya = audio.Samples.Get(@"seeya");
+        }
+
+        protected void SetWelcome()
+        {
+            if (User.Value?.IsSupporter ?? false)
+                Welcome = Skin.Value.GetSample(new SampleInfo("welcome")) ?? audio.Samples.Get(@"welcome");
+            else
+                Welcome = audio.Samples.Get(@"welcome");
         }
 
         /// <summary>
@@ -61,7 +131,7 @@ namespace osu.Game.Screens.Menu
 
             double fadeOutTime = EXIT_DELAY;
             //we also handle the exit transition.
-            if (menuVoice.Value)
+            if (MenuVoice.Value)
                 seeya.Play();
             else
                 fadeOutTime = 500;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index db970dd76e..77700900a8 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -6,9 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -17,12 +14,9 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.IO.Archives;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osuTK;
@@ -32,9 +26,9 @@ namespace osu.Game.Screens.Menu
 {
     public class IntroTriangles : IntroScreen
     {
-        private const string menu_music_beatmap_hash = "a1556d0801b3a6b175dda32ef546f0ec812b400499f575c44fccbe9c67f9b1e5";
+        protected override string BeatmapHash => "a1556d0801b3a6b175dda32ef546f0ec812b400499f575c44fccbe9c67f9b1e5";
 
-        private SampleChannel welcome;
+        protected override string BeatmapFile => "triangles.osz";
 
         protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
         {
@@ -44,48 +38,13 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private AudioManager audio { get; set; }
 
-        private Bindable<bool> menuMusic;
-        private Track track;
-        private WorkingBeatmap introBeatmap;
-
         private BackgroundScreenDefault background;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
+        private void load(AudioManager audio)
         {
-            menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
-
-            BeatmapSetInfo setInfo = null;
-
-            if (!menuMusic.Value)
-            {
-                var sets = beatmaps.GetAllUsableBeatmapSets();
-                if (sets.Count > 0)
-                    setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
-            }
-
-            if (setInfo == null)
-            {
-                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == menu_music_beatmap_hash);
-
-                if (setInfo == null)
-                {
-                    // we need to import the default menu background beatmap
-                    setInfo = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream(@"Tracks/triangles.osz"), "triangles.osz")).Result;
-
-                    setInfo.Protected = true;
-                    beatmaps.Update(setInfo);
-                }
-            }
-
-            introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-
-            track = introBeatmap.Track;
-            track.Reset();
-
-            if (config.Get<bool>(OsuSetting.MenuVoice) && !menuMusic.Value)
-                // triangles has welcome sound included in the track. only play this if the user doesn't want menu music.
-                welcome = audio.Samples.Get(@"welcome");
+            if (MenuVoice.Value && !MenuMusic.Value)
+                SetWelcome();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -96,24 +55,24 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = introBeatmap;
-                introBeatmap = null;
+                Beatmap.Value = IntroBeatmap;
+                IntroBeatmap = null;
 
                 PrepareMenuLoad();
 
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = new FramedClock(menuMusic.Value ? track : null),
+                    Clock = new FramedClock(MenuMusic.Value ? Track : null),
                     LoadMenu = LoadMenu
                 }, t =>
                 {
                     AddInternal(t);
-                    welcome?.Play();
+                    Welcome?.Play();
 
                     // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-                    if (menuMusic.Value)
-                        track.Start();
+                    if (MenuMusic.Value)
+                        Track.Start();
                 });
             }
         }
@@ -126,7 +85,7 @@ namespace osu.Game.Screens.Menu
 
         public override void OnSuspending(IScreen next)
         {
-            track = null;
+            Track = null;
             base.OnSuspending(next);
         }
 

From ec78889e94178357e1d18303ca0f7164f5e31955 Mon Sep 17 00:00:00 2001
From: LeNitrous <n20gaming2000@gmail.com>
Date: Tue, 24 Sep 2019 08:14:20 +0800
Subject: [PATCH 007/116] remove unused dependencies

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 3 +--
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index d5d7f5cb7a..a861d54663 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 
@@ -18,7 +17,7 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_two = 600;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             if (MenuVoice.Value)
                 SetWelcome();
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 77700900a8..5b49a81a5a 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Menu
         private BackgroundScreenDefault background;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             if (MenuVoice.Value && !MenuMusic.Value)
                 SetWelcome();

From 028c958431728deb42811a92a3993f2382ee49a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Sep 2019 19:19:43 +0900
Subject: [PATCH 008/116] Initial implementation of a switch button

---
 .../UserInterface/TestSceneSwitchButton.cs    |  20 +++
 .../Graphics/UserInterface/SwitchButton.cs    | 117 ++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
 create mode 100644 osu.Game/Graphics/UserInterface/SwitchButton.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
new file mode 100644
index 0000000000..8fe381f141
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneSwitchButton : OsuTestScene
+    {
+        public TestSceneSwitchButton()
+        {
+            Child = new SwitchButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/SwitchButton.cs b/osu.Game/Graphics/UserInterface/SwitchButton.cs
new file mode 100644
index 0000000000..21712051ef
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/SwitchButton.cs
@@ -0,0 +1,117 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class SwitchButton : Checkbox
+    {
+        private const float border_thickness = 4.5f;
+        private const float padding = 1.25f;
+
+        private readonly Box fill;
+        private readonly Container switchContainer;
+        private readonly Drawable switchCircle;
+        private readonly CircularBorderContainer circularContainer;
+
+        private Color4 enabledColour;
+        private Color4 disabledColour;
+
+        public SwitchButton()
+        {
+            Size = new Vector2(45, 20);
+
+            InternalChild = circularContainer = new CircularBorderContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                BorderColour = Color4.White,
+                BorderThickness = border_thickness,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    fill = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        AlwaysPresent = true,
+                        Alpha = 0
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding(border_thickness + padding),
+                        Child = switchContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = switchCircle = new CircularContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                FillMode = FillMode.Fit,
+                                Masking = true,
+                                Child = new Box { RelativeSizeAxes = Axes.Both }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            enabledColour = colours.BlueDark;
+            disabledColour = colours.Gray3;
+
+            switchContainer.Colour = enabledColour;
+            fill.Colour = disabledColour;
+
+            updateBorder();
+        }
+
+        protected override void OnUserChange(bool value)
+        {
+            base.OnUserChange(value);
+
+            if (value)
+                switchCircle.MoveToX(switchContainer.DrawWidth - switchCircle.DrawWidth, 200, Easing.OutQuint);
+            else
+                switchCircle.MoveToX(0, 200, Easing.OutQuint);
+
+            fill.FadeTo(value ? 1 : 0, 250, Easing.OutQuint);
+
+            updateBorder();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateBorder();
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateBorder();
+            base.OnHoverLost(e);
+        }
+
+        private void updateBorder()
+        {
+            circularContainer.TransformBorderTo((Current.Value ? enabledColour : disabledColour).Lighten(IsHovered ? 0.3f : 0));
+        }
+
+        private class CircularBorderContainer : CircularContainer
+        {
+            public void TransformBorderTo(SRGBColour colour)
+                => this.TransformTo(nameof(BorderColour), colour, 250, Easing.OutQuint);
+        }
+    }
+}

From afa043aa7de522e6436276d2c000f9820800b970 Mon Sep 17 00:00:00 2001
From: LeNitrous <n20gaming2000@gmail.com>
Date: Tue, 24 Sep 2019 18:17:27 +0800
Subject: [PATCH 009/116] always use default samples

---
 osu.Game/Screens/Menu/IntroCircles.cs   |  5 +++--
 osu.Game/Screens/Menu/IntroScreen.cs    | 30 ++-----------------------
 osu.Game/Screens/Menu/IntroTriangles.cs |  4 ++--
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index a861d54663..6c643860a0 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 
@@ -17,10 +18,10 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_two = 600;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                SetWelcome();
+                Welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 651fa7583d..c81fef6436 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -9,14 +9,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Framework.Screens;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.IO.Archives;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Skinning;
-using osu.Game.Online.API;
-using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
@@ -51,14 +48,10 @@ namespace osu.Game.Screens.Menu
 
         public new Bindable<WorkingBeatmap> Beatmap => beatmap;
 
-        protected Bindable<User> User;
-
-        protected Bindable<Skin> Skin;
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, IAPIProvider api, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
+        private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
             // prevent user from changing beatmap while the intro is still runnning.
             beatmap = base.Beatmap.BeginLease(false);
@@ -66,10 +59,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            User = api.LocalUser.GetBoundCopy();
-            Skin = skinManager.CurrentSkin.GetBoundCopy();
-
-            Skin.BindValueChanged(_ => updateSeeya(), true);
+            seeya = audio.Samples.Get(@"seeya");
 
             BeatmapSetInfo setInfo = null;
 
@@ -98,22 +88,6 @@ namespace osu.Game.Screens.Menu
             Track = IntroBeatmap.Track;
         }
 
-        private void updateSeeya()
-        {
-            if (User.Value?.IsSupporter ?? false)
-                seeya = Skin.Value.GetSample(new SampleInfo("seeya")) ?? audio.Samples.Get(@"seeya");
-            else
-                seeya = audio.Samples.Get(@"seeya");
-        }
-
-        protected void SetWelcome()
-        {
-            if (User.Value?.IsSupporter ?? false)
-                Welcome = Skin.Value.GetSample(new SampleInfo("welcome")) ?? audio.Samples.Get(@"welcome");
-            else
-                Welcome = audio.Samples.Get(@"welcome");
-        }
-
         /// <summary>
         /// Whether we have loaded the menu previously.
         /// </summary>
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 5b49a81a5a..590069ab43 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -41,10 +41,10 @@ namespace osu.Game.Screens.Menu
         private BackgroundScreenDefault background;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                SetWelcome();
+                Welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From 7fab1a4337c4db0094e4179fb34037984f1d322b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 24 Sep 2019 16:06:33 -0700
Subject: [PATCH 010/116] Truncate long metadata on beatmap info wedge

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 22 +++++++++++++++------
 osu.Game/Screens/Select/SongSelect.cs       |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 65ecd7b812..6c3eed8610 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -31,7 +31,9 @@ namespace osu.Game.Screens.Select
 {
     public class BeatmapInfoWedge : OverlayContainer
     {
-        private static readonly Vector2 wedged_container_shear = new Vector2(0.15f, 0);
+        private const float shear_width = 36.75f;
+
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.wedged_container_size.Y, 0);
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
@@ -200,14 +202,17 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
                         Direction = FillDirection.Vertical,
-                        Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
-                        AutoSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f, Bottom = 20 },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
                             VersionLabel = new OsuSpriteText
                             {
                                 Text = beatmapInfo.Version,
                                 Font = OsuFont.GetFont(size: 24, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
                             },
                         }
                     },
@@ -217,7 +222,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                         Direction = FillDirection.Vertical,
-                        Margin = new MarginPadding { Top = 14, Left = 10, Right = 18, Bottom = 20 },
+                        Padding = new MarginPadding { Top = 14, Left = 10, Right = shear_width / 2, Bottom = 20 },
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
@@ -236,17 +241,22 @@ namespace osu.Game.Screens.Select
                         Origin = Anchor.TopLeft,
                         Y = -22,
                         Direction = FillDirection.Vertical,
-                        Margin = new MarginPadding { Top = 15, Left = 25, Right = 10, Bottom = 20 },
-                        AutoSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Top = 15, Left = 25, Right = shear_width, Bottom = 20 },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
                             TitleLabel = new OsuSpriteText
                             {
                                 Font = OsuFont.GetFont(size: 28, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
                             },
                             ArtistLabel = new OsuSpriteText
                             {
                                 Font = OsuFont.GetFont(size: 17, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
                             },
                             MapperContainer = new FillFlowContainer
                             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index fca801ce78..6c0d8a0f36 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Select
 {
     public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
-        private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
+        public static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
 
         protected const float BACKGROUND_BLUR = 20;
         private const float left_area_padding = 20;

From 8efba255c383acd4114b1625939eaf745bb59cbd Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 24 Sep 2019 16:21:08 -0700
Subject: [PATCH 011/116] Add truncation test

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 932e114580..cda6bedf5d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -127,6 +127,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check no info labels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
         }
 
+        [Test]
+        public void testTruncation()
+        {
+            selectBeatmap(createLongMetadata());
+        }
+
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
             BeatmapInfoWedge.BufferedWedgeInfo infoBefore = null;
@@ -166,6 +172,25 @@ namespace osu.Game.Tests.Visual.SongSelect
             };
         }
 
+        private IBeatmap createLongMetadata()
+        {
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        AuthorString = $"WWWWWWWWWWWWWWW",
+                        Artist = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
+                        Source = $"Verrrrry long Source",
+                        Title = $"Verrrrry long Title"
+                    },
+                    Version = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
+                    Status = BeatmapSetOnlineStatus.Graveyard,
+                },
+            };
+        }
+
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
             public new BufferedWedgeInfo Info => base.Info;

From cc6030ca14d3f6377c657afeb44faa96bca3bbd2 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 24 Sep 2019 16:23:36 -0700
Subject: [PATCH 012/116] Update beatmap info wedge tests

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index cda6bedf5d..017e9c527b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -75,7 +75,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 testBeatmapLabels(instance);
 
-                // TODO: adjust cases once more info is shown for other gamemodes
                 switch (instance)
                 {
                     case OsuRuleset _:
@@ -99,8 +98,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                         break;
                 }
             }
-
-            testNullBeatmap();
         }
 
         private void testBeatmapLabels(Ruleset ruleset)
@@ -117,7 +114,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check info labels count", () => infoWedge.Info.InfoLabelContainer.Children.Count == expectedCount);
         }
 
-        private void testNullBeatmap()
+        [Test]
+        public void testNullBeatmap()
         {
             selectBeatmap(null);
             AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));

From 9861b214407a5e4861722b2cfb876bd524db76de Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 24 Sep 2019 16:28:40 -0700
Subject: [PATCH 013/116] Remove unnecessary padding/margin

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 6c3eed8610..33060e0735 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f, Bottom = 20 },
+                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f },
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
@@ -222,7 +222,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 14, Left = 10, Right = shear_width / 2, Bottom = 20 },
+                        Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
@@ -239,9 +239,9 @@ namespace osu.Game.Screens.Select
                         Name = "Centre-aligned metadata",
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.TopLeft,
-                        Y = -22,
+                        Y = -7,
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 15, Left = 25, Right = shear_width, Bottom = 20 },
+                        Padding = new MarginPadding { Left = 25, Right = shear_width },
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]

From 102dbd85bdd4fd4f4589314e3164512502860b51 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 24 Sep 2019 16:48:22 -0700
Subject: [PATCH 014/116] Fix CI errors

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 14 +++++++-------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs        |  2 +-
 osu.Game/Screens/Select/SongSelect.cs              | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 017e9c527b..f49d7a14a6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void testNullBeatmap()
+        public void TestNullBeatmap()
         {
             selectBeatmap(null);
             AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void testTruncation()
+        public void TestTruncation()
         {
             selectBeatmap(createLongMetadata());
         }
@@ -178,12 +178,12 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     Metadata = new BeatmapMetadata
                     {
-                        AuthorString = $"WWWWWWWWWWWWWWW",
-                        Artist = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
-                        Source = $"Verrrrry long Source",
-                        Title = $"Verrrrry long Title"
+                        AuthorString = "WWWWWWWWWWWWWWW",
+                        Artist = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
+                        Source = "Verrrrry long Source",
+                        Title = "Verrrrry long Title"
                     },
-                    Version = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
+                    Version = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
                     Status = BeatmapSetOnlineStatus.Graveyard,
                 },
             };
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 33060e0735..8b360d4a86 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select
     {
         private const float shear_width = 36.75f;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.wedged_container_size.Y, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGED_CONTAINER_SIZE.Y, 0);
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6c0d8a0f36..653f62dd15 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Select
 {
     public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
-        public static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
+        public static readonly Vector2 WEDGED_CONTAINER_SIZE = new Vector2(0.5f, 245);
 
         protected const float BACKGROUND_BLUR = 20;
         private const float left_area_padding = 20;
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Select
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Right = -150 },
-                            Size = new Vector2(wedged_container_size.X, 1),
+                            Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
                         }
                     }
                 },
@@ -118,11 +118,11 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(wedged_container_size.X, 1),
+                    Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
                     Padding = new MarginPadding
                     {
                         Bottom = Footer.HEIGHT,
-                        Top = wedged_container_size.Y + left_area_padding,
+                        Top = WEDGED_CONTAINER_SIZE.Y + left_area_padding,
                         Left = left_area_padding,
                         Right = left_area_padding * 2,
                     },
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.Select
                                 Child = Carousel = new BeatmapCarousel
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Size = new Vector2(1 - wedged_container_size.X, 1),
+                                    Size = new Vector2(1 - WEDGED_CONTAINER_SIZE.X, 1),
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
                                     SelectionChanged = updateSelectedBeatmap,
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.Select
                 },
                 beatmapInfoWedge = new BeatmapInfoWedge
                 {
-                    Size = wedged_container_size,
+                    Size = WEDGED_CONTAINER_SIZE,
                     RelativeSizeAxes = Axes.X,
                     Margin = new MarginPadding
                     {

From 261ba5c80ac4b82d5d73ce02c9609fe8bc829783 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 25 Sep 2019 17:42:27 +0900
Subject: [PATCH 015/116] Fix button not transforming correctly in some cases

---
 .../UserInterface/TestSceneSwitchButton.cs    | 30 +++++++++++++++++--
 .../Graphics/UserInterface/SwitchButton.cs    | 19 ++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
index 8fe381f141..bf9071b812 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
@@ -1,20 +1,44 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneSwitchButton : OsuTestScene
+    public class TestSceneSwitchButton : ManualInputManagerTestScene
     {
-        public TestSceneSwitchButton()
+        private SwitchButton switchButton;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Child = new SwitchButton
+            Child = switchButton = new SwitchButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
+        });
+
+        [Test]
+        public void TestChangeThroughInput()
+        {
+            AddStep("move to switch button", () => InputManager.MoveMouseTo(switchButton));
+            AddStep("click on", () => InputManager.Click(MouseButton.Left));
+            AddStep("click off", () => InputManager.Click(MouseButton.Left));
+        }
+
+        [Test]
+        public void TestChangeThroughBindable()
+        {
+            BindableBool bindable = null;
+
+            AddStep("bind bindable", () => switchButton.Current.BindTo(bindable = new BindableBool()));
+            AddStep("toggle bindable", () => bindable.Toggle());
+            AddStep("toggle bindable", () => bindable.Toggle());
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/SwitchButton.cs b/osu.Game/Graphics/UserInterface/SwitchButton.cs
index 21712051ef..9964af91d5 100644
--- a/osu.Game/Graphics/UserInterface/SwitchButton.cs
+++ b/osu.Game/Graphics/UserInterface/SwitchButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -73,20 +74,20 @@ namespace osu.Game.Graphics.UserInterface
 
             switchContainer.Colour = enabledColour;
             fill.Colour = disabledColour;
-
-            updateBorder();
         }
 
-        protected override void OnUserChange(bool value)
+        protected override void LoadComplete()
         {
-            base.OnUserChange(value);
+            base.LoadComplete();
 
-            if (value)
-                switchCircle.MoveToX(switchContainer.DrawWidth - switchCircle.DrawWidth, 200, Easing.OutQuint);
-            else
-                switchCircle.MoveToX(0, 200, Easing.OutQuint);
+            Current.BindValueChanged(updateState, true);
+            FinishTransforms(true);
+        }
 
-            fill.FadeTo(value ? 1 : 0, 250, Easing.OutQuint);
+        private void updateState(ValueChangedEvent<bool> state)
+        {
+            switchCircle.MoveToX(state.NewValue ? switchContainer.DrawWidth - switchCircle.DrawWidth : 0, 200, Easing.OutQuint);
+            fill.FadeTo(state.NewValue ? 1 : 0, 250, Easing.OutQuint);
 
             updateBorder();
         }

From c9e39c124e5817bce9909acc8e057606701ea0ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 25 Sep 2019 17:42:35 +0900
Subject: [PATCH 016/116] Add a labelled switch button

---
 .../TestSceneLabelledSwitchButton.cs          | 50 +++++++++++++++++++
 .../LabelledSwitchButton.cs                   | 17 +++++++
 2 files changed, 67 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledSwitchButton.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
new file mode 100644
index 0000000000..dbce08c898
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Edit.Setup.Components.LabelledComponents;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneLabelledSwitchButton : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(LabelledSwitchButton),
+            typeof(SwitchButton)
+        };
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSwitchButton(bool hasDescription) => createSwitchButton(hasDescription);
+
+        private void createSwitchButton(bool hasDescription = false)
+        {
+            AddStep("create component", () =>
+            {
+                LabelledSwitchButton component;
+
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                    Child = component = new LabelledSwitchButton
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+
+                component.Label = "a sample component";
+                component.Description = hasDescription ? "this text describes the component" : string.Empty;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledSwitchButton.cs b/osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledSwitchButton.cs
new file mode 100644
index 0000000000..54f6184578
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledSwitchButton.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Setup.Components.LabelledComponents
+{
+    public class LabelledSwitchButton : LabelledComponent<SwitchButton>
+    {
+        public LabelledSwitchButton()
+            : base(true)
+        {
+        }
+
+        protected override SwitchButton CreateComponent() => new SwitchButton();
+    }
+}

From 9f77a1ef35c081db6812bbd40e38185101ae4fcc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 25 Sep 2019 17:53:08 +0900
Subject: [PATCH 017/116] Adjust namespaces

---
 .../Visual/UserInterface/TestSceneLabelledSwitchButton.cs     | 3 +--
 osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs  | 2 +-
 osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs     | 4 +---
 .../{UserInterface => UserInterfaceV2}/SwitchButton.cs        | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename osu.Game/Graphics/{UserInterface => UserInterfaceV2}/SwitchButton.cs (98%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
index dbce08c898..6ca4d9fa4c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
@@ -6,8 +6,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Setup.Components.LabelledComponents;
+using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
index bf9071b812..4a104b4a41 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
index 54f6184578..c973f1d13e 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Screens.Edit.Setup.Components.LabelledComponents
+namespace osu.Game.Graphics.UserInterfaceV2
 {
     public class LabelledSwitchButton : LabelledComponent<SwitchButton>
     {
diff --git a/osu.Game/Graphics/UserInterface/SwitchButton.cs b/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
similarity index 98%
rename from osu.Game/Graphics/UserInterface/SwitchButton.cs
rename to osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
index 9964af91d5..a7fd25b554 100644
--- a/osu.Game/Graphics/UserInterface/SwitchButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
@@ -13,7 +13,7 @@ using osu.Framework.Input.Events;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Graphics.UserInterface
+namespace osu.Game.Graphics.UserInterfaceV2
 {
     public class SwitchButton : Checkbox
     {

From 67bed57cbdf3f0921a6a721c74cc28317afc74c7 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Fri, 27 Sep 2019 08:46:49 +0300
Subject: [PATCH 018/116] Bind value changed event of cursor trail appearence
 outside BDL

https://github.com/ppy/osu/pull/6270#discussion_r328899728
---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index a944ff88c6..6dbdf0114d 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -40,6 +40,11 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private void load(OsuRulesetConfigManager config)
         {
             config?.BindWith(OsuRulesetSetting.ShowCursorTrail, showTrail);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
         }

From f64fe22f3669cd2117a295d490ecd6a9f14b8f0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 27 Sep 2019 18:00:24 +0900
Subject: [PATCH 019/116] Remove bindables from osu! selection blueprints

---
 .../HitCircles/Components/HitCirclePiece.cs   | 10 +++++++---
 .../Edit/Blueprints/HitObjectPiece.cs         | 19 ++-----------------
 .../Edit/Blueprints/SliderPiece.cs            | 17 +++--------------
 .../Components/PathControlPointVisualiser.cs  |  9 ++-------
 .../Sliders/Components/SliderBodyPiece.cs     |  6 +++---
 .../Sliders/Components/SliderCirclePiece.cs   | 12 ------------
 .../Spinners/Components/SpinnerPiece.cs       | 12 +++++++-----
 7 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index fe11ead94d..99928cdad9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -31,10 +31,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
         private void load(OsuColour colours)
         {
             Colour = colours.Yellow;
+        }
 
-            PositionBindable.BindValueChanged(_ => UpdatePosition(), true);
-            StackHeightBindable.BindValueChanged(_ => UpdatePosition());
-            ScaleBindable.BindValueChanged(scale => Scale = new Vector2(scale.NewValue), true);
+        protected override void Update()
+        {
+            base.Update();
+
+            UpdatePosition();
+            Scale = new Vector2(hitCircle.Scale);
         }
 
         protected virtual void UpdatePosition() => Position = hitCircle.StackedPosition;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
index 315a5a2b9d..3d7d609c6b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
@@ -1,11 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
@@ -14,23 +11,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
     /// </summary>
     public abstract class HitObjectPiece : CompositeDrawable
     {
-        protected readonly IBindable<Vector2> PositionBindable = new Bindable<Vector2>();
-        protected readonly IBindable<int> StackHeightBindable = new Bindable<int>();
-        protected readonly IBindable<float> ScaleBindable = new Bindable<float>();
-
-        private readonly OsuHitObject hitObject;
+        protected readonly OsuHitObject HitObject;
 
         protected HitObjectPiece(OsuHitObject hitObject)
         {
-            this.hitObject = hitObject;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            PositionBindable.BindTo(hitObject.PositionBindable);
-            StackHeightBindable.BindTo(hitObject.StackHeightBindable);
-            ScaleBindable.BindTo(hitObject.ScaleBindable);
+            HitObject = hitObject;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs
index 8fd1d6d6f9..e0fcf8a000 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs
@@ -1,32 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
     /// <summary>
-    /// A piece of a blueprint which responds to changes in the state of a <see cref="Slider"/>.
+    /// A piece of a blueprint which responds to changes in the state of a <see cref="Objects.Slider"/>.
     /// </summary>
     public abstract class SliderPiece : HitObjectPiece
     {
-        protected readonly IBindable<SliderPath> PathBindable = new Bindable<SliderPath>();
-
-        private readonly Slider slider;
+        protected readonly Slider Slider;
 
         protected SliderPiece(Slider slider)
             : base(slider)
         {
-            this.slider = slider;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            PathBindable.BindTo(slider.PathBindable);
+            Slider = slider;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index df846b5d5b..3d8e014551 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Objects;
@@ -22,14 +21,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             InternalChild = pieces = new Container<PathControlPointPiece> { RelativeSizeAxes = Axes.Both };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void Update()
         {
-            PathBindable.BindValueChanged(_ => updatePathControlPoints(), true);
-        }
+            base.Update();
 
-        private void updatePathControlPoints()
-        {
             while (slider.Path.ControlPoints.Length > pieces.Count)
                 pieces.Add(new PathControlPointPiece(slider, pieces.Count));
             while (slider.Path.ControlPoints.Length < pieces.Count)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index f1f55731b6..aea17a4b8f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -31,9 +31,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private void load(OsuColour colours)
         {
             body.BorderColour = colours.Yellow;
-
-            PositionBindable.BindValueChanged(_ => updatePosition(), true);
-            ScaleBindable.BindValueChanged(scale => body.PathRadius = scale.NewValue * OsuHitObject.OBJECT_RADIUS, true);
         }
 
         private void updatePosition() => Position = slider.StackedPosition;
@@ -42,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.Update();
 
+            Position = slider.StackedPosition;
+            body.PathRadius = HitObject.Scale * OsuHitObject.OBJECT_RADIUS;
+
             var vertices = new List<Vector2>();
             slider.Path.GetPathToProgress(vertices, 0, 1);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
index 2ecfea2e3e..ec3a1d0034 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
@@ -1,9 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -11,8 +8,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
     public class SliderCirclePiece : HitCirclePiece
     {
-        private readonly IBindable<SliderPath> pathBindable = new Bindable<SliderPath>();
-
         private readonly Slider slider;
         private readonly SliderPosition position;
 
@@ -23,13 +18,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             this.position = position;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            pathBindable.BindTo(slider.PathBindable);
-            pathBindable.BindValueChanged(_ => UpdatePosition(), true);
-        }
-
         protected override void UpdatePosition()
         {
             switch (position)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index ae94848c81..e2084bbb7c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -52,13 +52,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
         private void load(OsuColour colours)
         {
             Colour = colours.Yellow;
-
-            PositionBindable.BindValueChanged(_ => updatePosition(), true);
-            StackHeightBindable.BindValueChanged(_ => updatePosition());
-            ScaleBindable.BindValueChanged(scale => ring.Scale = new Vector2(scale.NewValue), true);
         }
 
-        private void updatePosition() => Position = spinner.Position;
+        protected override void Update()
+        {
+            base.Update();
+
+            Position = spinner.Position;
+            ring.Scale = new Vector2(spinner.Scale);
+        }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.ReceivePositionalInputAt(screenSpacePos);
     }

From 4fc37d11376980b2fc34c616b247e8fbaca8b640 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 27 Sep 2019 18:01:55 +0900
Subject: [PATCH 020/116] Remove SliderPiece + HitObjectPiece

---
 .../HitCircles/Components/HitCirclePiece.cs   |  4 ++--
 .../Edit/Blueprints/HitObjectPiece.cs         | 21 -------------------
 .../Edit/Blueprints/SliderPiece.cs            | 21 -------------------
 .../Components/PathControlPointVisualiser.cs  |  3 +--
 .../Sliders/Components/SliderBodyPiece.cs     |  6 +++---
 .../Spinners/Components/SpinnerPiece.cs       |  3 +--
 6 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index 99928cdad9..5e46b3ace4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
@@ -10,12 +11,11 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
 {
-    public class HitCirclePiece : HitObjectPiece
+    public class HitCirclePiece : CompositeDrawable
     {
         private readonly HitCircle hitCircle;
 
         public HitCirclePiece(HitCircle hitCircle)
-            : base(hitCircle)
         {
             this.hitCircle = hitCircle;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
deleted file mode 100644
index 3d7d609c6b..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitObjectPiece.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Osu.Objects;
-
-namespace osu.Game.Rulesets.Osu.Edit.Blueprints
-{
-    /// <summary>
-    /// A piece of a blueprint which responds to changes in the state of a <see cref="OsuHitObject"/>.
-    /// </summary>
-    public abstract class HitObjectPiece : CompositeDrawable
-    {
-        protected readonly OsuHitObject HitObject;
-
-        protected HitObjectPiece(OsuHitObject hitObject)
-        {
-            HitObject = hitObject;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs
deleted file mode 100644
index e0fcf8a000..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/SliderPiece.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Osu.Objects;
-
-namespace osu.Game.Rulesets.Osu.Edit.Blueprints
-{
-    /// <summary>
-    /// A piece of a blueprint which responds to changes in the state of a <see cref="Objects.Slider"/>.
-    /// </summary>
-    public abstract class SliderPiece : HitObjectPiece
-    {
-        protected readonly Slider Slider;
-
-        protected SliderPiece(Slider slider)
-            : base(slider)
-        {
-            Slider = slider;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 3d8e014551..24fcc460d1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -7,14 +7,13 @@ using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
-    public class PathControlPointVisualiser : SliderPiece
+    public class PathControlPointVisualiser : CompositeDrawable
     {
         private readonly Slider slider;
 
         private readonly Container<PathControlPointPiece> pieces;
 
         public PathControlPointVisualiser(Slider slider)
-            : base(slider)
         {
             this.slider = slider;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index aea17a4b8f..239feee431 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
@@ -11,13 +12,12 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
-    public class SliderBodyPiece : SliderPiece
+    public class SliderBodyPiece : CompositeDrawable
     {
         private readonly Slider slider;
         private readonly ManualSliderBody body;
 
         public SliderBodyPiece(Slider slider)
-            : base(slider)
         {
             this.slider = slider;
 
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             base.Update();
 
             Position = slider.StackedPosition;
-            body.PathRadius = HitObject.Scale * OsuHitObject.OBJECT_RADIUS;
+            body.PathRadius = slider.Scale * OsuHitObject.OBJECT_RADIUS;
 
             var vertices = new List<Vector2>();
             slider.Path.GetPathToProgress(vertices, 0, 1);
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index e2084bbb7c..5dab501a24 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -12,14 +12,13 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
 {
-    public class SpinnerPiece : HitObjectPiece
+    public class SpinnerPiece : CompositeDrawable
     {
         private readonly Spinner spinner;
         private readonly CircularContainer circle;
         private readonly RingPiece ring;
 
         public SpinnerPiece(Spinner spinner)
-            : base(spinner)
         {
             this.spinner = spinner;
 

From bddaead72e5b650b4e2e0205572b3ac232c865bf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 27 Sep 2019 18:45:22 +0900
Subject: [PATCH 021/116] Make hitobject pieces able to update dynamically

---
 .../Edit/Blueprints/BlueprintPiece.cs         | 25 +++++++++++++
 .../HitCircles/Components/HitCirclePiece.cs   | 18 +++-------
 .../HitCircles/HitCirclePlacementBlueprint.cs | 11 +++++-
 .../HitCircles/HitCircleSelectionBlueprint.cs | 13 +++++--
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  |  7 ++--
 .../Components/PathControlPointPiece.cs       |  2 +-
 .../Sliders/Components/SliderBodyPiece.cs     | 21 ++++-------
 .../Sliders/Components/SliderCirclePiece.cs   | 35 -------------------
 .../Sliders/SliderCircleSelectionBlueprint.cs | 21 ++++++++---
 .../Sliders/SliderPlacementBlueprint.cs       | 15 ++++++--
 .../Sliders/SliderSelectionBlueprint.cs       | 16 ++++++---
 .../Spinners/Components/SpinnerPiece.cs       | 16 +++------
 .../Spinners/SpinnerPlacementBlueprint.cs     |  9 ++++-
 .../Spinners/SpinnerSelectionBlueprint.cs     | 11 ++++--
 14 files changed, 125 insertions(+), 95 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
new file mode 100644
index 0000000000..95e926fdfa
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Edit.Blueprints
+{
+    /// <summary>
+    /// A piece of a selection or placement blueprint which visualises an <see cref="OsuHitObject"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="OsuHitObject"/> which this <see cref="BlueprintPiece{T}"/> visualises.</typeparam>
+    public abstract class BlueprintPiece<T> : CompositeDrawable
+        where T : OsuHitObject
+    {
+        /// <summary>
+        /// Updates this <see cref="BlueprintPiece{T}"/> using the properties of a <see cref="OsuHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="OsuHitObject"/> to reference properties from.</param>
+        public virtual void UpdateFrom(T hitObject)
+        {
+            Position = hitObject.Position;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index 5e46b3ace4..2b6b93a590 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
@@ -11,17 +10,13 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
 {
-    public class HitCirclePiece : CompositeDrawable
+    public class HitCirclePiece : BlueprintPiece<HitCircle>
     {
-        private readonly HitCircle hitCircle;
-
-        public HitCirclePiece(HitCircle hitCircle)
+        public HitCirclePiece()
         {
-            this.hitCircle = hitCircle;
             Origin = Anchor.Centre;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
-            Scale = new Vector2(hitCircle.Scale);
             CornerRadius = Size.X / 2;
 
             InternalChild = new RingPiece();
@@ -33,14 +28,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
             Colour = colours.Yellow;
         }
 
-        protected override void Update()
+        public override void UpdateFrom(HitCircle hitObject)
         {
-            base.Update();
+            base.UpdateFrom(hitObject);
 
-            UpdatePosition();
-            Scale = new Vector2(hitCircle.Scale);
+            Scale = new Vector2(hitObject.Scale);
         }
-
-        protected virtual void UpdatePosition() => Position = hitCircle.StackedPosition;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index a4050f0c31..cccef52737 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -13,10 +13,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
     {
         public new HitCircle HitObject => (HitCircle)base.HitObject;
 
+        private readonly HitCirclePiece circlePiece;
+
         public HitCirclePlacementBlueprint()
             : base(new HitCircle())
         {
-            InternalChild = new HitCirclePiece(HitObject);
+            InternalChild = circlePiece = new HitCirclePiece();
         }
 
         protected override void LoadComplete()
@@ -27,6 +29,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero;
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            circlePiece.UpdateFrom(HitObject);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             HitObject.StartTime = EditorClock.CurrentTime;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index 83787e2219..430d4a0222 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -7,12 +7,21 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 {
-    public class HitCircleSelectionBlueprint : OsuSelectionBlueprint
+    public class HitCircleSelectionBlueprint : OsuSelectionBlueprint<HitCircle>
     {
+        private readonly HitCirclePiece circlePiece;
+
         public HitCircleSelectionBlueprint(DrawableHitCircle hitCircle)
             : base(hitCircle)
         {
-            InternalChild = new HitCirclePiece((HitCircle)hitCircle.HitObject);
+            InternalChild = circlePiece = new HitCirclePiece();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            circlePiece.UpdateFrom(HitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index dd524252f3..2e4b990db8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -7,11 +7,12 @@ using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
-    public class OsuSelectionBlueprint : SelectionBlueprint
+    public abstract class OsuSelectionBlueprint<T> : SelectionBlueprint
+        where T : OsuHitObject
     {
-        protected OsuHitObject OsuObject => (OsuHitObject)HitObject.HitObject;
+        protected new T HitObject => (T)base.HitObject.HitObject;
 
-        public OsuSelectionBlueprint(DrawableHitObject hitObject)
+        protected OsuSelectionBlueprint(DrawableHitObject hitObject)
             : base(hitObject)
         {
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index e257369ad9..3aec7c2872 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
-    public class PathControlPointPiece : CompositeDrawable
+    public class PathControlPointPiece : BlueprintPiece<Slider>
     {
         private readonly Slider slider;
         private readonly int index;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 239feee431..d28cf7b492 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
@@ -12,18 +11,15 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
-    public class SliderBodyPiece : CompositeDrawable
+    public class SliderBodyPiece : BlueprintPiece<Slider>
     {
-        private readonly Slider slider;
         private readonly ManualSliderBody body;
 
-        public SliderBodyPiece(Slider slider)
+        public SliderBodyPiece()
         {
-            this.slider = slider;
-
             InternalChild = body = new ManualSliderBody
             {
-                AccentColour = Color4.Transparent,
+                AccentColour = Color4.Transparent
             };
         }
 
@@ -33,17 +29,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             body.BorderColour = colours.Yellow;
         }
 
-        private void updatePosition() => Position = slider.StackedPosition;
-
-        protected override void Update()
+        public override void UpdateFrom(Slider hitObject)
         {
-            base.Update();
+            base.UpdateFrom(hitObject);
 
-            Position = slider.StackedPosition;
-            body.PathRadius = slider.Scale * OsuHitObject.OBJECT_RADIUS;
+            body.PathRadius = hitObject.Scale * OsuHitObject.OBJECT_RADIUS;
 
             var vertices = new List<Vector2>();
-            slider.Path.GetPathToProgress(vertices, 0, 1);
+            hitObject.Path.GetPathToProgress(vertices, 0, 1);
 
             body.SetVertices(vertices);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
deleted file mode 100644
index ec3a1d0034..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
-using osu.Game.Rulesets.Osu.Objects;
-
-namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
-{
-    public class SliderCirclePiece : HitCirclePiece
-    {
-        private readonly Slider slider;
-        private readonly SliderPosition position;
-
-        public SliderCirclePiece(Slider slider, SliderPosition position)
-            : base(slider.HeadCircle)
-        {
-            this.slider = slider;
-            this.position = position;
-        }
-
-        protected override void UpdatePosition()
-        {
-            switch (position)
-            {
-                case SliderPosition.Start:
-                    Position = slider.StackedPosition + slider.Path.PositionAt(0);
-                    break;
-
-                case SliderPosition.End:
-                    Position = slider.StackedPosition + slider.Path.PositionAt(1);
-                    break;
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index c9f005495c..8f9a9c3a64 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -1,22 +1,33 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
-    public class SliderCircleSelectionBlueprint : OsuSelectionBlueprint
+    public class SliderCircleSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
-        public SliderCircleSelectionBlueprint(DrawableOsuHitObject hitObject, Slider slider, SliderPosition position)
-            : base(hitObject)
+        private readonly SliderPosition position;
+        private readonly HitCirclePiece circlePiece;
+
+        public SliderCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position)
+            : base(slider)
         {
-            InternalChild = new SliderCirclePiece(slider, position);
+            this.position = position;
+            InternalChild = circlePiece = new HitCirclePiece();
 
             Select();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            circlePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle);
+        }
+
         // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
         public override bool HandlePositionalInput => false;
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 55de626d7d..4c281a0e7d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osuTK;
 using osuTK.Input;
@@ -21,6 +22,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
     {
         public new Objects.Slider HitObject => (Objects.Slider)base.HitObject;
 
+        private SliderBodyPiece bodyPiece;
+        private HitCirclePiece headCirclePiece;
+        private HitCirclePiece tailCirclePiece;
+
         private readonly List<Segment> segments = new List<Segment>();
         private Vector2 cursor;
 
@@ -38,9 +43,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             InternalChildren = new Drawable[]
             {
-                new SliderBodyPiece(HitObject),
-                new SliderCirclePiece(HitObject, SliderPosition.Start),
-                new SliderCirclePiece(HitObject, SliderPosition.End),
+                bodyPiece = new SliderBodyPiece(),
+                headCirclePiece = new HitCirclePiece(),
+                tailCirclePiece = new HitCirclePiece(),
                 new PathControlPointVisualiser(HitObject),
             };
 
@@ -130,6 +135,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             var newControlPoints = segments.SelectMany(s => s.ControlPoints).Concat(cursor.Yield()).ToArray();
             HitObject.Path = new SliderPath(newControlPoints.Length > 2 ? PathType.Bezier : PathType.Linear, newControlPoints);
+
+            bodyPiece.UpdateFrom(HitObject);
+            headCirclePiece.UpdateFrom(HitObject.HeadCircle);
+            tailCirclePiece.UpdateFrom(HitObject.TailCircle);
         }
 
         private void setState(PlacementState newState)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index fb8c081ff7..bc760c9456 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -9,8 +9,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
-    public class SliderSelectionBlueprint : OsuSelectionBlueprint
+    public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
+        private readonly SliderBodyPiece bodyPiece;
         private readonly SliderCircleSelectionBlueprint headBlueprint;
 
         public SliderSelectionBlueprint(DrawableSlider slider)
@@ -20,13 +21,20 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             InternalChildren = new Drawable[]
             {
-                new SliderBodyPiece(sliderObject),
-                headBlueprint = new SliderCircleSelectionBlueprint(slider.HeadCircle, sliderObject, SliderPosition.Start),
-                new SliderCircleSelectionBlueprint(slider.TailCircle, sliderObject, SliderPosition.End),
+                bodyPiece = new SliderBodyPiece(),
+                headBlueprint = new SliderCircleSelectionBlueprint(slider, SliderPosition.Start),
+                new SliderCircleSelectionBlueprint(slider, SliderPosition.End),
                 new PathControlPointVisualiser(sliderObject),
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            bodyPiece.UpdateFrom(HitObject);
+        }
+
         public override Vector2 SelectionPoint => headBlueprint.SelectionPoint;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index 5dab501a24..65c8720031 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -12,16 +12,13 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
 {
-    public class SpinnerPiece : CompositeDrawable
+    public class SpinnerPiece : BlueprintPiece<Spinner>
     {
-        private readonly Spinner spinner;
         private readonly CircularContainer circle;
         private readonly RingPiece ring;
 
-        public SpinnerPiece(Spinner spinner)
+        public SpinnerPiece()
         {
-            this.spinner = spinner;
-
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.Both;
@@ -43,8 +40,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
                     Origin = Anchor.Centre
                 }
             };
-
-            ring.Scale = new Vector2(spinner.Scale);
         }
 
         [BackgroundDependencyLoader]
@@ -53,12 +48,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components
             Colour = colours.Yellow;
         }
 
-        protected override void Update()
+        public override void UpdateFrom(Spinner hitObject)
         {
-            base.Update();
+            base.UpdateFrom(hitObject);
 
-            Position = spinner.Position;
-            ring.Scale = new Vector2(spinner.Scale);
+            ring.Scale = new Vector2(hitObject.Scale);
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.ReceivePositionalInputAt(screenSpacePos);
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 03d761c67f..8d9dea736b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -21,7 +21,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
         public SpinnerPlacementBlueprint()
             : base(new Spinner { Position = OsuPlayfield.BASE_SIZE / 2 })
         {
-            InternalChild = piece = new SpinnerPiece(HitObject) { Alpha = 0.5f };
+            InternalChild = piece = new SpinnerPiece { Alpha = 0.5f };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            piece.UpdateFrom(HitObject);
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
index 25cef3b251..f05d4f8435 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
@@ -8,14 +8,21 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 {
-    public class SpinnerSelectionBlueprint : OsuSelectionBlueprint
+    public class SpinnerSelectionBlueprint : OsuSelectionBlueprint<Spinner>
     {
         private readonly SpinnerPiece piece;
 
         public SpinnerSelectionBlueprint(DrawableSpinner spinner)
             : base(spinner)
         {
-            InternalChild = piece = new SpinnerPiece((Spinner)spinner.HitObject);
+            InternalChild = piece = new SpinnerPiece();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            piece.UpdateFrom(HitObject);
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => piece.ReceivePositionalInputAt(screenSpacePos);

From a310c4b65f220afef633a4dc6ff9d8c58c89f0d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Oct 2019 19:32:47 +0900
Subject: [PATCH 022/116] Make selection blueprints a bit more testable

---
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  4 ++-
 .../TestSceneNoteSelectionBlueprint.cs        |  8 +++---
 .../TestSceneSpinnerSelectionBlueprint.cs     |  9 ++++---
 .../Visual/SelectionBlueprintTestScene.cs     | 26 +++++--------------
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
index 622d840a0c..5507ca2ba0 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Rulesets.Mania.Tests
                     AccentColour = { Value = OsuColour.Gray(0.3f) }
                 }
             };
+
+            AddBlueprint(new HoldNoteSelectionBlueprint(drawableObject));
         }
 
         protected override void Update()
@@ -52,6 +54,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             }
         }
 
-        protected override SelectionBlueprint CreateBlueprint() => new HoldNoteSelectionBlueprint(drawableObject);
+        protected override SelectionBlueprint CreateBlueprint() => new HoldNoteSelectionBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
index 6bb344f977..c0482e2150 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 {
     public class TestSceneNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
-        private readonly DrawableNote drawableObject;
-
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
@@ -27,6 +25,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             var note = new Note { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
+            DrawableNote drawableObject;
+
             base.Content.Child = content = new ScrollingTestContainer(ScrollingDirection.Down)
             {
                 Anchor = Anchor.Centre,
@@ -34,8 +34,10 @@ namespace osu.Game.Rulesets.Mania.Tests
                 Size = new Vector2(50, 20),
                 Child = drawableObject = new DrawableNote(note)
             };
+
+            AddBlueprint(new NoteSelectionBlueprint(drawableObject));
         }
 
-        protected override SelectionBlueprint CreateBlueprint() => new NoteSelectionBlueprint(drawableObject);
+        protected override SelectionBlueprint CreateBlueprint() => new NoteSelectionBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
index c5cea76b14..1c195311a4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(SpinnerPiece)
         };
 
-        private readonly DrawableSpinner drawableSpinner;
-
         public TestSceneSpinnerSelectionBlueprint()
         {
             var spinner = new Spinner
@@ -35,16 +33,21 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StartTime = -1000,
                 EndTime = 2000
             };
+
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
+            DrawableSpinner drawableSpinner;
+
             Add(new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.5f),
                 Child = drawableSpinner = new DrawableSpinner(spinner)
             });
+
+            AddBlueprint(new SpinnerSelectionBlueprint(drawableSpinner) { Size = new Vector2(0.5f) });
         }
 
-        protected override SelectionBlueprint CreateBlueprint() => new SpinnerSelectionBlueprint(drawableSpinner) { Size = new Vector2(0.5f) };
+        protected override SelectionBlueprint CreateBlueprint() => new SpinnerSelectionBlueprint(null) { Size = new Vector2(0.5f) };
     }
 }
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index df3af2cc43..55dda03b16 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -1,10 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 
@@ -12,8 +10,6 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class SelectionBlueprintTestScene : OsuTestScene
     {
-        private SelectionBlueprint blueprint;
-
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
@@ -26,23 +22,13 @@ namespace osu.Game.Tests.Visual
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected void AddBlueprint(SelectionBlueprint blueprint)
         {
-            blueprint = CreateBlueprint();
-            blueprint.Depth = float.MinValue;
-            blueprint.SelectionRequested += (_, __) => blueprint.Select();
-
-            Add(blueprint);
-
-            AddStep("Select", () => blueprint.Select());
-            AddStep("Deselect", () => blueprint.Deselect());
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            blueprint.Deselect();
-            return true;
+            Add(blueprint.With(d =>
+            {
+                d.Depth = float.MinValue;
+                d.Select();
+            }));
         }
 
         protected abstract SelectionBlueprint CreateBlueprint();

From ba5c9547e14a74af6cee3cbfd61a9066bb944734 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Oct 2019 19:33:08 +0900
Subject: [PATCH 023/116] Add more tests for hitcircle selection blueprint

---
 .../TestSceneHitCircleSelectionBlueprint.cs   | 45 +++++++++++++++++--
 .../HitCircles/HitCircleSelectionBlueprint.cs |  6 +--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
index 32043bf5d7..7278d923c1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
@@ -1,10 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
@@ -14,16 +16,53 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneHitCircleSelectionBlueprint : SelectionBlueprintTestScene
     {
-        private readonly DrawableHitCircle drawableObject;
+        private HitCircle hitCircle;
+        private DrawableHitCircle drawableObject;
+        private TestBlueprint blueprint;
 
-        public TestSceneHitCircleSelectionBlueprint()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            var hitCircle = new HitCircle { Position = new Vector2(256, 192) };
+            Clear();
+
+            hitCircle = new HitCircle { Position = new Vector2(256, 192) };
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableHitCircle(hitCircle));
+            AddBlueprint(blueprint = new TestBlueprint(drawableObject));
+        });
+
+        [Test]
+        public void TestInitialState()
+        {
+            AddAssert("blueprint positioned over hitobject", () => blueprint.CirclePiece.Position == hitCircle.Position);
+        }
+
+        [Test]
+        public void TestMoveHitObject()
+        {
+            AddStep("move hitobject", () => hitCircle.Position = new Vector2(300, 225));
+            AddAssert("blueprint positioned over hitobject", () => blueprint.CirclePiece.Position == hitCircle.Position);
+        }
+
+        [Test]
+        public void TestMoveAfterApplyingDefaults()
+        {
+            AddStep("apply defaults", () => hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 }));
+            AddStep("move hitobject", () => hitCircle.Position = new Vector2(300, 225));
+            AddAssert("blueprint positioned over hitobject", () => blueprint.CirclePiece.Position == hitCircle.Position);
         }
 
         protected override SelectionBlueprint CreateBlueprint() => new HitCircleSelectionBlueprint(drawableObject);
+
+        private class TestBlueprint : HitCircleSelectionBlueprint
+        {
+            public new HitCirclePiece CirclePiece => base.CirclePiece;
+
+            public TestBlueprint(DrawableHitCircle hitCircle)
+                : base(hitCircle)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index 430d4a0222..a191dba8ff 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -9,19 +9,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 {
     public class HitCircleSelectionBlueprint : OsuSelectionBlueprint<HitCircle>
     {
-        private readonly HitCirclePiece circlePiece;
+        protected readonly HitCirclePiece CirclePiece;
 
         public HitCircleSelectionBlueprint(DrawableHitCircle hitCircle)
             : base(hitCircle)
         {
-            InternalChild = circlePiece = new HitCirclePiece();
+            InternalChild = CirclePiece = new HitCirclePiece();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            circlePiece.UpdateFrom(HitObject);
+            CirclePiece.UpdateFrom(HitObject);
         }
     }
 }

From 90ad1c5166fdc4dd116ff89554a585c28853774b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Oct 2019 19:33:24 +0900
Subject: [PATCH 024/116] Add more tests for slider selection blueprint

---
 .../TestSceneSliderSelectionBlueprint.cs      | 79 ++++++++++++++++++-
 .../Sliders/SliderCircleSelectionBlueprint.cs |  7 +-
 .../Sliders/SliderSelectionBlueprint.cs       | 17 ++--
 3 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
index 8cf5a2f33e..61c8316ed9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
@@ -3,11 +3,14 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
@@ -29,11 +32,16 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(PathControlPointPiece)
         };
 
-        private readonly DrawableSlider drawableObject;
+        private Slider slider;
+        private DrawableSlider drawableObject;
+        private TestSliderBlueprint blueprint;
 
-        public TestSceneSliderSelectionBlueprint()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            var slider = new Slider
+            Clear();
+
+            slider = new Slider
             {
                 Position = new Vector2(256, 192),
                 Path = new SliderPath(PathType.Bezier, new[]
@@ -47,8 +55,73 @@ namespace osu.Game.Rulesets.Osu.Tests
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
+            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+        });
+
+        [Test]
+        public void TestInitialState()
+        {
+            checkPositions();
+        }
+
+        [Test]
+        public void TestMoveHitObject()
+        {
+            moveHitObject();
+            checkPositions();
+        }
+
+        [Test]
+        public void TestMoveAfterApplyingDefaults()
+        {
+            AddStep("apply defaults", () => slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 }));
+            moveHitObject();
+            checkPositions();
+        }
+
+        private void moveHitObject()
+        {
+            AddStep("move hitobject", () =>
+            {
+                slider.Position = new Vector2(300, 225);
+            });
+        }
+
+        private void checkPositions()
+        {
+            AddAssert("body positioned correctly", () => blueprint.BodyPiece.Position == slider.Position);
+
+            AddAssert("head positioned correctly",
+                () => Precision.AlmostEquals(blueprint.HeadBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
+
+            AddAssert("tail positioned correctly",
+                () => Precision.AlmostEquals(blueprint.TailBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
         }
 
         protected override SelectionBlueprint CreateBlueprint() => new SliderSelectionBlueprint(drawableObject);
+
+        private class TestSliderBlueprint : SliderSelectionBlueprint
+        {
+            public new SliderBodyPiece BodyPiece => base.BodyPiece;
+            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
+            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+
+            public TestSliderBlueprint(DrawableSlider slider)
+                : base(slider)
+            {
+            }
+
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+        }
+
+        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        {
+            public new HitCirclePiece CirclePiece => base.CirclePiece;
+
+            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+                : base(slider, position)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index 8f9a9c3a64..f09279ed73 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -9,14 +9,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderCircleSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
+        protected readonly HitCirclePiece CirclePiece;
+
         private readonly SliderPosition position;
-        private readonly HitCirclePiece circlePiece;
 
         public SliderCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position)
             : base(slider)
         {
             this.position = position;
-            InternalChild = circlePiece = new HitCirclePiece();
+            InternalChild = CirclePiece = new HitCirclePiece();
 
             Select();
         }
@@ -25,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
 
-            circlePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle);
+            CirclePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle);
         }
 
         // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index bc760c9456..fdeffc6f8a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -11,8 +11,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
-        private readonly SliderBodyPiece bodyPiece;
-        private readonly SliderCircleSelectionBlueprint headBlueprint;
+        protected readonly SliderBodyPiece BodyPiece;
+        protected readonly SliderCircleSelectionBlueprint HeadBlueprint;
+        protected readonly SliderCircleSelectionBlueprint TailBlueprint;
 
         public SliderSelectionBlueprint(DrawableSlider slider)
             : base(slider)
@@ -21,9 +22,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             InternalChildren = new Drawable[]
             {
-                bodyPiece = new SliderBodyPiece(),
-                headBlueprint = new SliderCircleSelectionBlueprint(slider, SliderPosition.Start),
-                new SliderCircleSelectionBlueprint(slider, SliderPosition.End),
+                BodyPiece = new SliderBodyPiece(),
+                HeadBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.Start),
+                TailBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.End),
                 new PathControlPointVisualiser(sliderObject),
             };
         }
@@ -32,9 +33,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
 
-            bodyPiece.UpdateFrom(HitObject);
+            BodyPiece.UpdateFrom(HitObject);
         }
 
-        public override Vector2 SelectionPoint => headBlueprint.SelectionPoint;
+        public override Vector2 SelectionPoint => HeadBlueprint.SelectionPoint;
+
+        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }
 }

From c5540048ab1608873b6377f2fa15bbd4b5b7ab01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 1 Oct 2019 19:39:06 +0900
Subject: [PATCH 025/116] Fix tail circle not moving with slider position
 changes

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index d8514092bc..3ed1f2cdde 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -54,13 +54,13 @@ namespace osu.Game.Rulesets.Osu.Objects
             {
                 base.Position = value;
 
+                endPositionCache.Invalidate();
+
                 if (HeadCircle != null)
                     HeadCircle.Position = value;
 
                 if (TailCircle != null)
                     TailCircle.Position = EndPosition;
-
-                endPositionCache.Invalidate();
             }
         }
 

From a69b9f1148bbee373e6243452291cbab0bab0e16 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 11:16:31 -0700
Subject: [PATCH 026/116] Fix alt-f4 being blocked during gameplay

---
 osu.Game/Screens/Play/Player.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 44be73b089..91d34c8056 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -299,7 +299,10 @@ namespace osu.Game.Screens.Play
         {
             if (!this.IsCurrentScreen()) return;
 
-            this.Exit();
+            if (canPause)
+                Pause();
+            else
+                this.Exit();
         }
 
         public void Restart()
@@ -508,12 +511,6 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
-            if (canPause)
-            {
-                Pause();
-                return true;
-            }
-
             // ValidForResume is false when restarting
             if (ValidForResume)
             {

From 752dd26a4f5a73823a9acbcbc5b518f9a9b6f4bf Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 11:17:43 -0700
Subject: [PATCH 027/116] Fix alt-f4 being blocked in interface

---
 osu.Game/Screens/Menu/MainMenu.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c195ed6cb6..df4803b2b6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -81,8 +81,8 @@ namespace osu.Game.Screens.Menu
                     {
                         if (holdDelay.Value > 0)
                             confirmAndExit();
-                        else
-                            this.Exit();
+                        else if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
+                            dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
                     }
                 });
             }
@@ -253,12 +253,6 @@ namespace osu.Game.Screens.Menu
 
         public override bool OnExiting(IScreen next)
         {
-            if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
-            {
-                dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
-                return true;
-            }
-
             buttons.State = ButtonSystemState.Exit;
             this.FadeOut(3000);
             return base.OnExiting(next);

From ff56453f1a259ed80d8ab6338ba4d8c9b93a27d3 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 12:07:07 -0700
Subject: [PATCH 028/116] Fix test regressions

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 50583e43c4..c67001c3d8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -132,9 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("exit", () => Player.Exit());
 
-            confirmPaused();
-
-            exitAndConfirm();
+            confirmExited();
         }
 
         [Test]

From 38fe519c91f9836f46b6a9347e4ceb97a96f0d67 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 12:28:48 -0700
Subject: [PATCH 029/116] Remove unnecessary exitConfirmed condition check

---
 osu.Game/Screens/Menu/MainMenu.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index df4803b2b6..6deb29c2f2 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -80,9 +80,9 @@ namespace osu.Game.Screens.Menu
                     Action = () =>
                     {
                         if (holdDelay.Value > 0)
-                            confirmAndExit();
-                        else if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
-                            dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
+                            this.Exit();
+                        else if (dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
+                            dialogOverlay.Push(new ConfirmExitDialog(this.Exit, () => exitConfirmOverlay.Abort()));
                     }
                 });
             }
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
                             OnEdit = delegate { this.Push(new Editor()); },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
-                            OnExit = confirmAndExit,
+                            OnExit = this.Exit,
                         }
                     }
                 },
@@ -129,12 +129,6 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
-        private void confirmAndExit()
-        {
-            exitConfirmed = true;
-            this.Exit();
-        }
-
         private void preloadSongSelect()
         {
             if (songSelect == null)
@@ -172,8 +166,6 @@ namespace osu.Game.Screens.Menu
             Beatmap.ValueChanged += beatmap_ValueChanged;
         }
 
-        private bool exitConfirmed;
-
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);

From 148089f160240fc408f5a68b72caa2b84dc8731e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 16:08:19 -0700
Subject: [PATCH 030/116] Revert "Remove unnecessary exitConfirmed condition
 check"

This reverts commit 38fe519c91f9836f46b6a9347e4ceb97a96f0d67.
---
 osu.Game/Screens/Menu/MainMenu.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 6deb29c2f2..df4803b2b6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -80,9 +80,9 @@ namespace osu.Game.Screens.Menu
                     Action = () =>
                     {
                         if (holdDelay.Value > 0)
-                            this.Exit();
-                        else if (dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
-                            dialogOverlay.Push(new ConfirmExitDialog(this.Exit, () => exitConfirmOverlay.Abort()));
+                            confirmAndExit();
+                        else if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
+                            dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
                     }
                 });
             }
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
                             OnEdit = delegate { this.Push(new Editor()); },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
-                            OnExit = this.Exit,
+                            OnExit = confirmAndExit,
                         }
                     }
                 },
@@ -129,6 +129,12 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
+        private void confirmAndExit()
+        {
+            exitConfirmed = true;
+            this.Exit();
+        }
+
         private void preloadSongSelect()
         {
             if (songSelect == null)
@@ -166,6 +172,8 @@ namespace osu.Game.Screens.Menu
             Beatmap.ValueChanged += beatmap_ValueChanged;
         }
 
+        private bool exitConfirmed;
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);

From 80177885213d56d52f2386dc885784c0549a0db6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 16:08:24 -0700
Subject: [PATCH 031/116] Revert "Fix alt-f4 being blocked in interface"

This reverts commit 752dd26a4f5a73823a9acbcbc5b518f9a9b6f4bf.
---
 osu.Game/Screens/Menu/MainMenu.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index df4803b2b6..c195ed6cb6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -81,8 +81,8 @@ namespace osu.Game.Screens.Menu
                     {
                         if (holdDelay.Value > 0)
                             confirmAndExit();
-                        else if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
-                            dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
+                        else
+                            this.Exit();
                     }
                 });
             }
@@ -253,6 +253,12 @@ namespace osu.Game.Screens.Menu
 
         public override bool OnExiting(IScreen next)
         {
+            if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
+            {
+                dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
+                return true;
+            }
+
             buttons.State = ButtonSystemState.Exit;
             this.FadeOut(3000);
             return base.OnExiting(next);

From 897b3233afdd196157db7891bc7ad05b8a173e0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 14:23:48 +0900
Subject: [PATCH 032/116] Add start time tracking to EditorBeatmap

---
 osu.Game/Rulesets/Objects/HitObject.cs | 20 ++++++++++++++++-
 osu.Game/Screens/Edit/EditorBeatmap.cs | 31 +++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 6c5627c5d2..a99fac09cc 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -27,10 +28,16 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         private const double control_point_leniency = 1;
 
+        public readonly Bindable<double> StartTimeBindable = new Bindable<double>();
+
         /// <summary>
         /// The time at which the HitObject starts.
         /// </summary>
-        public virtual double StartTime { get; set; }
+        public virtual double StartTime
+        {
+            get => StartTimeBindable.Value;
+            set => StartTimeBindable.Value = value;
+        }
 
         private List<HitSampleInfo> samples;
 
@@ -67,6 +74,17 @@ namespace osu.Game.Rulesets.Objects
         [JsonIgnore]
         public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects;
 
+        public HitObject()
+        {
+            StartTimeBindable.ValueChanged += time =>
+            {
+                double offset = time.NewValue - time.OldValue;
+
+                foreach (var nested in NestedHitObjects)
+                    nested.StartTime += offset;
+            };
+        }
+
         /// <summary>
         /// Applies default values to this HitObject.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index f0b6c62154..22aa133de7 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
@@ -15,12 +16,17 @@ namespace osu.Game.Screens.Edit
     {
         public event Action<HitObject> HitObjectAdded;
         public event Action<HitObject> HitObjectRemoved;
+        public event Action<HitObject> HitObjectChanged;
 
+        private readonly Dictionary<T, Bindable<double>> startTimeBindables = new Dictionary<T, Bindable<double>>();
         private readonly Beatmap<T> beatmap;
 
         public EditorBeatmap(Beatmap<T> beatmap)
         {
             this.beatmap = beatmap;
+
+            foreach (var obj in HitObjects)
+                trackStartTime(obj);
         }
 
         public BeatmapInfo BeatmapInfo
@@ -37,7 +43,7 @@ namespace osu.Game.Screens.Edit
 
         public double TotalBreakTime => beatmap.TotalBreakTime;
 
-        IReadOnlyList<T> IBeatmap<T>.HitObjects => beatmap.HitObjects;
+        public IReadOnlyList<T> HitObjects => beatmap.HitObjects;
 
         IReadOnlyList<HitObject> IBeatmap.HitObjects => beatmap.HitObjects;
 
@@ -51,6 +57,8 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
         public void Add(T hitObject)
         {
+            trackStartTime(hitObject);
+
             // Preserve existing sorting order in the beatmap
             var insertionIndex = beatmap.HitObjects.FindLastIndex(h => h.StartTime <= hitObject.StartTime);
             beatmap.HitObjects.Insert(insertionIndex + 1, hitObject);
@@ -65,7 +73,28 @@ namespace osu.Game.Screens.Edit
         public void Remove(T hitObject)
         {
             if (beatmap.HitObjects.Remove(hitObject))
+            {
+                var bindable = startTimeBindables[hitObject];
+                bindable.UnbindAll();
+
+                startTimeBindables.Remove(hitObject);
                 HitObjectRemoved?.Invoke(hitObject);
+            }
+        }
+
+        private void trackStartTime(T hitObject)
+        {
+            startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();
+            startTimeBindables[hitObject].ValueChanged += _ =>
+            {
+                // For now we'll remove and re-add the hitobject. This is not optimal and can be improved if required.
+                beatmap.HitObjects.Remove(hitObject);
+
+                var insertionIndex = beatmap.HitObjects.FindLastIndex(h => h.StartTime <= hitObject.StartTime);
+                beatmap.HitObjects.Insert(insertionIndex + 1, hitObject);
+
+                HitObjectChanged?.Invoke(hitObject);
+            };
         }
 
         /// <summary>

From f2719afd0e7f7e445659e413e03edd32125db3f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 14:27:40 +0900
Subject: [PATCH 033/116] Add tests for Editorbeatmap

---
 osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs | 154 +++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs

diff --git a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
new file mode 100644
index 0000000000..88c9f9cb6c
--- /dev/null
+++ b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
@@ -0,0 +1,154 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using Microsoft.EntityFrameworkCore.Internal;
+using NUnit.Framework;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    [TestFixture]
+    public class EditorBeatmapTest
+    {
+        /// <summary>
+        /// Tests that the addition event is correctly invoked after a hitobject is added.
+        /// </summary>
+        [Test]
+        public void TestHitObjectAddEvent()
+        {
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap());
+
+            HitObject addedObject = null;
+            editorBeatmap.HitObjectAdded += h => addedObject = h;
+
+            var hitCircle = new HitCircle();
+
+            editorBeatmap.Add(hitCircle);
+            Assert.That(addedObject, Is.EqualTo(hitCircle));
+        }
+
+        /// <summary>
+        /// Tests that the removal event is correctly invoked after a hitobject is removed.
+        /// </summary>
+        [Test]
+        public void HitObjectRemoveEvent()
+        {
+            var hitCircle = new HitCircle();
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap { HitObjects = { hitCircle } });
+
+            HitObject removedObject = null;
+            editorBeatmap.HitObjectRemoved += h => removedObject = h;
+
+            editorBeatmap.Remove(hitCircle);
+            Assert.That(removedObject, Is.EqualTo(hitCircle));
+        }
+
+        /// <summary>
+        /// Tests that the changed event is correctly invoked after the start time of a hitobject is changed.
+        /// This tests for hitobjects which were already present before the editor beatmap was constructed.
+        /// </summary>
+        [Test]
+        public void TestInitialHitObjectStartTimeChangeEvent()
+        {
+            var hitCircle = new HitCircle();
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap { HitObjects = { hitCircle } });
+
+            HitObject changedObject = null;
+            editorBeatmap.HitObjectChanged += h => changedObject = h;
+
+            hitCircle.StartTime = 1000;
+            Assert.That(changedObject, Is.EqualTo(hitCircle));
+        }
+
+        /// <summary>
+        /// Tests that the changed event is correctly invoked after the start time of a hitobject is changed.
+        /// This tests for hitobjects which were added to an existing editor beatmap.
+        /// </summary>
+        [Test]
+        public void TestAddedHitObjectStartTimeChangeEvent()
+        {
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap());
+
+            HitObject changedObject = null;
+            editorBeatmap.HitObjectChanged += h => changedObject = h;
+
+            var hitCircle = new HitCircle();
+
+            editorBeatmap.Add(hitCircle);
+            Assert.That(changedObject, Is.Null);
+
+            hitCircle.StartTime = 1000;
+            Assert.That(changedObject, Is.EqualTo(hitCircle));
+        }
+
+        /// <summary>
+        /// Tests that the channged event is not invoked after a hitobject is removed from the beatmap/
+        /// </summary>
+        [Test]
+        public void TestRemovedHitObjectStartTimeChangeEvent()
+        {
+            var hitCircle = new HitCircle();
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap { HitObjects = { hitCircle } });
+
+            HitObject changedObject = null;
+            editorBeatmap.HitObjectChanged += h => changedObject = h;
+
+            editorBeatmap.Remove(hitCircle);
+            Assert.That(changedObject, Is.Null);
+
+            hitCircle.StartTime = 1000;
+            Assert.That(changedObject, Is.Null);
+        }
+
+        /// <summary>
+        /// Tests that an added hitobject is correctly inserted to preserve the sorting order of the beatmap.
+        /// </summary>
+        [Test]
+        public void TestAddHitObjectInMiddle()
+        {
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle(),
+                    new HitCircle { StartTime = 1000 },
+                    new HitCircle { StartTime = 1000 },
+                    new HitCircle { StartTime = 2000 },
+                }
+            });
+
+            var hitCircle = new HitCircle { StartTime = 1000 };
+            editorBeatmap.Add(hitCircle);
+            Assert.That(editorBeatmap.HitObjects.Count(h => h == hitCircle), Is.EqualTo(1));
+            Assert.That(editorBeatmap.HitObjects.IndexOf(hitCircle), Is.EqualTo(3));
+        }
+
+        /// <summary>
+        /// Tests that the beatmap remains correctly sorted after the start time of a hitobject is changed.
+        /// </summary>
+        [Test]
+        public void TestResortWhenStartTimeChanged()
+        {
+            var hitCircle = new HitCircle { StartTime = 1000 };
+            var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle(),
+                    new HitCircle { StartTime = 1000 },
+                    new HitCircle { StartTime = 1000 },
+                    hitCircle,
+                    new HitCircle { StartTime = 2000 },
+                }
+            });
+
+            hitCircle.StartTime = 0;
+            Assert.That(editorBeatmap.HitObjects.Count(h => h == hitCircle), Is.EqualTo(1));
+            Assert.That(editorBeatmap.HitObjects.IndexOf(hitCircle), Is.EqualTo(1));
+        }
+    }
+}

From 3fb0b0b66833d107ef2e5e17f9930959deefeff2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 14:37:16 +0900
Subject: [PATCH 034/116] Rename to StartTimeChanged and add xmldocs

---
 osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs |  6 +++---
 osu.Game/Screens/Edit/EditorBeatmap.cs       | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
index 88c9f9cb6c..98e630abd2 100644
--- a/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/EditorBeatmapTest.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap { HitObjects = { hitCircle } });
 
             HitObject changedObject = null;
-            editorBeatmap.HitObjectChanged += h => changedObject = h;
+            editorBeatmap.StartTimeChanged += h => changedObject = h;
 
             hitCircle.StartTime = 1000;
             Assert.That(changedObject, Is.EqualTo(hitCircle));
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap());
 
             HitObject changedObject = null;
-            editorBeatmap.HitObjectChanged += h => changedObject = h;
+            editorBeatmap.StartTimeChanged += h => changedObject = h;
 
             var hitCircle = new HitCircle();
 
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Beatmaps
             var editorBeatmap = new EditorBeatmap<OsuHitObject>(new OsuBeatmap { HitObjects = { hitCircle } });
 
             HitObject changedObject = null;
-            editorBeatmap.HitObjectChanged += h => changedObject = h;
+            editorBeatmap.StartTimeChanged += h => changedObject = h;
 
             editorBeatmap.Remove(hitCircle);
             Assert.That(changedObject, Is.Null);
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 22aa133de7..c3a322ea36 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -14,9 +14,20 @@ namespace osu.Game.Screens.Edit
     public class EditorBeatmap<T> : IEditorBeatmap<T>
         where T : HitObject
     {
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is added to this <see cref="EditorBeatmap{T}"/>.
+        /// </summary>
         public event Action<HitObject> HitObjectAdded;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is removed from this <see cref="EditorBeatmap{T}"/>.
+        /// </summary>
         public event Action<HitObject> HitObjectRemoved;
-        public event Action<HitObject> HitObjectChanged;
+
+        /// <summary>
+        /// Invoked when the start time of a <see cref="HitObject"/> in this <see cref="EditorBeatmap{T}"/> was changed.
+        /// </summary>
+        public event Action<HitObject> StartTimeChanged;
 
         private readonly Dictionary<T, Bindable<double>> startTimeBindables = new Dictionary<T, Bindable<double>>();
         private readonly Beatmap<T> beatmap;
@@ -93,7 +104,7 @@ namespace osu.Game.Screens.Edit
                 var insertionIndex = beatmap.HitObjects.FindLastIndex(h => h.StartTime <= hitObject.StartTime);
                 beatmap.HitObjects.Insert(insertionIndex + 1, hitObject);
 
-                HitObjectChanged?.Invoke(hitObject);
+                StartTimeChanged?.Invoke(hitObject);
             };
         }
 

From 2c13043c42b79fb166483862284fce652f3fb17f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 14:40:00 +0900
Subject: [PATCH 035/116] Hook up the event to HitObjectComposer

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index fc324d7021..a267d7c44d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -132,6 +132,7 @@ namespace osu.Game.Rulesets.Edit
             editorBeatmap = new EditorBeatmap<TObject>(playableBeatmap);
             editorBeatmap.HitObjectAdded += addHitObject;
             editorBeatmap.HitObjectRemoved += removeHitObject;
+            editorBeatmap.StartTimeChanged += updateHitObject;
 
             var dependencies = new DependencyContainer(parent);
             dependencies.CacheAs<IEditorBeatmap>(editorBeatmap);
@@ -162,12 +163,7 @@ namespace osu.Game.Rulesets.Edit
             });
         }
 
-        private void addHitObject(HitObject hitObject)
-        {
-            beatmapProcessor?.PreProcess();
-            hitObject.ApplyDefaults(playableBeatmap.ControlPointInfo, playableBeatmap.BeatmapInfo.BaseDifficulty);
-            beatmapProcessor?.PostProcess();
-        }
+        private void addHitObject(HitObject hitObject) => updateHitObject(hitObject);
 
         private void removeHitObject(HitObject hitObject)
         {
@@ -175,6 +171,13 @@ namespace osu.Game.Rulesets.Edit
             beatmapProcessor?.PostProcess();
         }
 
+        private void updateHitObject(HitObject hitObject)
+        {
+            beatmapProcessor?.PreProcess();
+            hitObject.ApplyDefaults(playableBeatmap.ControlPointInfo, playableBeatmap.BeatmapInfo.BaseDifficulty);
+            beatmapProcessor?.PostProcess();
+        }
+
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
         public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
 

From b28689c774c8a0e4bc029eda00cb5a4083ad040e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Oct 2019 15:00:47 +0800
Subject: [PATCH 036/116] Fix key counters appearing negative on intense
 beatmaps

When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.

I have changed this to use `Rate` as exposed by the frame stable clock.

- Closes #6198.
---
 .../Rulesets/UI/FrameStabilityContainer.cs    | 28 ++++++++++---------
 osu.Game/Rulesets/UI/RulesetInputManager.cs   |  4 +--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 05d3c02381..74d3439c59 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -47,6 +47,11 @@ namespace osu.Game.Rulesets.UI
 
         private IFrameBasedClock parentGameplayClock;
 
+        /// <summary>
+        /// The current direction of playback to be exposed to frame stable children.
+        /// </summary>
+        private int direction;
+
         [BackgroundDependencyLoader(true)]
         private void load(GameplayClock clock)
         {
@@ -111,16 +116,12 @@ namespace osu.Game.Rulesets.UI
 
             validState = true;
 
-            manualClock.Rate = parentGameplayClock.Rate;
-            manualClock.IsRunning = parentGameplayClock.IsRunning;
-
             var newProposedTime = parentGameplayClock.CurrentTime;
 
             try
             {
                 if (!FrameStablePlayback)
                 {
-                    manualClock.CurrentTime = newProposedTime;
                     requireMoreUpdateLoops = false;
                     return;
                 }
@@ -128,9 +129,9 @@ namespace osu.Game.Rulesets.UI
                 {
                     // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
                     // Instead we perform an initial seek to the proposed time.
-                    manualClock.CurrentTime = newProposedTime;
 
-                    // do a second process to clear out ElapsedTime
+                    // process frame (in addition to finally clause) to clear out ElapsedTime
+                    manualClock.CurrentTime = newProposedTime;
                     framedClock.ProcessFrame();
 
                     firstConsumption = false;
@@ -144,11 +145,7 @@ namespace osu.Game.Rulesets.UI
                         : Math.Max(newProposedTime, manualClock.CurrentTime - sixty_frame_time);
                 }
 
-                if (!isAttached)
-                {
-                    manualClock.CurrentTime = newProposedTime;
-                }
-                else
+                if (isAttached)
                 {
                     double? newTime = ReplayInputHandler.SetFrameFromTime(newProposedTime);
 
@@ -156,9 +153,7 @@ namespace osu.Game.Rulesets.UI
                     {
                         // we shouldn't execute for this time value. probably waiting on more replay data.
                         validState = false;
-
                         requireMoreUpdateLoops = true;
-                        manualClock.CurrentTime = newProposedTime;
                         return;
                     }
 
@@ -169,6 +164,13 @@ namespace osu.Game.Rulesets.UI
             }
             finally
             {
+                if (newProposedTime != manualClock.CurrentTime)
+                    direction = newProposedTime > manualClock.CurrentTime ? 1 : -1;
+
+                manualClock.CurrentTime = newProposedTime;
+                manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
+                manualClock.IsRunning = parentGameplayClock.IsRunning;
+
                 // The manual clock time has changed in the above code. The framed clock now needs to be updated
                 // to ensure that the its time is valid for our children before input is processed
                 framedClock.ProcessFrame();
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 98e27240d3..5cc213be41 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -137,9 +137,9 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            public bool OnPressed(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnPressed(action, Clock.ElapsedFrameTime > 0));
+            public bool OnPressed(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnPressed(action, Clock.Rate >= 0));
 
-            public bool OnReleased(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnReleased(action, Clock.ElapsedFrameTime > 0));
+            public bool OnReleased(T action) => Target.Children.OfType<KeyCounterAction<T>>().Any(c => c.OnReleased(action, Clock.Rate >= 0));
         }
 
         #endregion

From 652acac87fa69d2debfd9ee18872e08379c4ad0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 16:14:42 +0900
Subject: [PATCH 037/116] Move placement movement event to BlueprintContainer

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  | 11 ++++------
 .../Blueprints/ManiaPlacementBlueprint.cs     |  9 ++++----
 .../HitCircles/HitCirclePlacementBlueprint.cs | 13 ++---------
 .../Sliders/SliderPlacementBlueprint.cs       | 20 +++++------------
 .../Spinners/SpinnerPlacementBlueprint.cs     |  5 +++++
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  |  8 ++++++-
 .../Compose/Components/BlueprintContainer.cs  | 22 ++++++++++++++++++-
 7 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 26115311f7..bcbc1ee527 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK;
@@ -49,13 +48,13 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private double originalStartTime;
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        public override void UpdatePosition(Vector2 screenSpacePosition)
         {
-            base.OnMouseMove(e);
+            base.UpdatePosition(screenSpacePosition);
 
             if (PlacementBegun)
             {
-                var endTime = TimeAt(e.ScreenSpaceMousePosition);
+                var endTime = TimeAt(screenSpacePosition);
 
                 HitObject.StartTime = endTime < originalStartTime ? endTime : originalStartTime;
                 HitObject.Duration = Math.Abs(endTime - originalStartTime);
@@ -65,10 +64,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 headPiece.Width = tailPiece.Width = SnappedWidth;
                 headPiece.X = tailPiece.X = SnappedMousePosition.X;
 
-                originalStartTime = HitObject.StartTime = TimeAt(e.ScreenSpaceMousePosition);
+                originalStartTime = HitObject.StartTime = TimeAt(screenSpacePosition);
             }
-
-            return true;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index d3779e2e18..7ad38860dd 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -62,19 +62,18 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return base.OnMouseUp(e);
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        public override void UpdatePosition(Vector2 screenSpacePosition)
         {
             if (!PlacementBegun)
-                Column = ColumnAt(e.ScreenSpaceMousePosition);
+                Column = ColumnAt(screenSpacePosition);
 
-            if (Column == null) return false;
+            if (Column == null) return;
 
             SnappedWidth = Column.DrawWidth;
 
             // Snap to the column
             var parentPos = Parent.ToLocalSpace(Column.ToScreenSpace(new Vector2(Column.DrawWidth / 2, 0)));
-            SnappedMousePosition = new Vector2(parentPos.X, e.MousePosition.Y);
-            return true;
+            SnappedMousePosition = new Vector2(parentPos.X, Parent.ToLocalSpace(screenSpacePosition).Y);
         }
 
         protected double TimeAt(Vector2 screenSpacePosition)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index a4050f0c31..0f6bee19bb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -19,14 +19,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             InternalChild = new HitCirclePiece(HitObject);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
-            HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero;
-        }
-
         protected override bool OnClick(ClickEvent e)
         {
             HitObject.StartTime = EditorClock.CurrentTime;
@@ -34,10 +26,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             return true;
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        public override void UpdatePosition(Vector2 screenSpacePosition)
         {
-            HitObject.Position = e.MousePosition;
-            return true;
+            HitObject.Position = ToLocalSpace(screenSpacePosition);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 55de626d7d..62c879b05e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -47,28 +47,18 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             setState(PlacementState.Initial);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
-            HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero;
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
+        public override void UpdatePosition(Vector2 screenSpacePosition)
         {
             switch (state)
             {
                 case PlacementState.Initial:
-                    HitObject.Position = e.MousePosition;
-                    return true;
+                    HitObject.Position = ToLocalSpace(screenSpacePosition);
+                    break;
 
                 case PlacementState.Body:
-                    cursor = e.MousePosition - HitObject.Position;
-                    return true;
+                    cursor = ToLocalSpace(screenSpacePosition) - HitObject.Position;
+                    break;
             }
-
-            return false;
         }
 
         protected override bool OnClick(ClickEvent e)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 03d761c67f..730b8448de 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -7,6 +7,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 {
@@ -43,5 +44,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 
             return true;
         }
+
+        public override void UpdatePosition(Vector2 screenSpacePosition)
+        {
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 757c269358..290fd8d27d 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -108,6 +108,12 @@ namespace osu.Game.Rulesets.Edit
             placementHandler.EndPlacement(HitObject);
         }
 
+        /// <summary>
+        /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
+        /// </summary>
+        /// <param name="screenSpacePosition">The screen-space position.</param>
+        public abstract void UpdatePosition(Vector2 screenSpacePosition);
+
         /// <summary>
         /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>,
         /// refreshing <see cref="Objects.HitObject.NestedHitObjects"/> and parameters for the <see cref="HitObject"/>.
@@ -125,7 +131,7 @@ namespace osu.Game.Rulesets.Edit
                 case ScrollEvent _:
                     return false;
 
-                case MouseEvent _:
+                case MouseButtonEvent _:
                     return true;
 
                 default:
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7d25fd5283..d96d88c2b9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Rulesets.Edit;
@@ -22,8 +23,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private Container<PlacementBlueprint> placementBlueprintContainer;
         private PlacementBlueprint currentPlacement;
-
         private SelectionHandler selectionHandler;
+        private InputManager inputManager;
 
         private IEnumerable<SelectionBlueprint> selections => selectionBlueprints.Children.Where(c => c.IsAlive);
 
@@ -66,6 +67,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             beatmap.HitObjectAdded += addBlueprintFor;
             beatmap.HitObjectRemoved += removeBlueprintFor;
+
+            inputManager = GetContainingInputManager();
         }
 
         private HitObjectCompositionTool currentTool;
@@ -136,6 +139,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            if (currentPlacement != null)
+            {
+                currentPlacement.UpdatePosition(e.ScreenSpaceMousePosition);
+                return true;
+            }
+
+            return base.OnMouseMove(e);
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -158,8 +172,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             currentPlacement = null;
 
             var blueprint = CurrentTool?.CreatePlacementBlueprint();
+
             if (blueprint != null)
+            {
                 placementBlueprintContainer.Child = currentPlacement = blueprint;
+
+                // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
+                blueprint.UpdatePosition(inputManager.CurrentState.Mouse.Position);
+            }
         }
 
         /// <summary>

From f2ba87a1d2a2f66fa423a682a0eb2ef0f7edef9c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 16:28:56 +0900
Subject: [PATCH 038/116] Fix placement blueprint test scenes not working

---
 .../Visual/PlacementBlueprintTestScene.cs     | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index 2b177e264f..0688620b8e 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -4,6 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -18,16 +20,17 @@ namespace osu.Game.Tests.Visual
         protected Container HitObjectContainer;
         private PlacementBlueprint currentBlueprint;
 
+        private InputManager inputManager;
+
         protected PlacementBlueprintTestScene()
         {
-            Add(HitObjectContainer = CreateHitObjectContainer());
+            Add(HitObjectContainer = CreateHitObjectContainer().With(c => c.Clock = new FramedClock(new StopwatchClock())));
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize = 2;
-            Add(currentBlueprint = CreateBlueprint());
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -38,6 +41,14 @@ namespace osu.Game.Tests.Visual
             return dependencies;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+            Add(currentBlueprint = CreateBlueprint());
+        }
+
         public void BeginPlacement(HitObject hitObject)
         {
         }
@@ -54,10 +65,27 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        protected virtual Container CreateHitObjectContainer() => new Container { RelativeSizeAxes = Axes.Both };
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            currentBlueprint.UpdatePosition(e.ScreenSpaceMousePosition);
+            return true;
+        }
+
+        public override void Add(Drawable drawable)
+        {
+            base.Add(drawable);
+
+            if (drawable is PlacementBlueprint blueprint)
+            {
+                blueprint.Show();
+                blueprint.UpdatePosition(inputManager.CurrentState.Mouse.Position);
+            }
+        }
 
         protected virtual void AddHitObject(DrawableHitObject hitObject) => HitObjectContainer.Add(hitObject);
 
+        protected virtual Container CreateHitObjectContainer() => new Container { RelativeSizeAxes = Axes.Both };
+
         protected abstract DrawableHitObject CreateHitObject(HitObject hitObject);
         protected abstract PlacementBlueprint CreateBlueprint();
     }

From ee34c5ccb457e582868ced659a6d0f952cb98665 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:21:00 +0900
Subject: [PATCH 039/116] Add a flip step to mania placement test scenes

---
 .../ManiaPlacementBlueprintTestScene.cs            | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index 4b3786c30a..afde1c9521 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -27,8 +27,13 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
+        [Cached(typeof(IScrollingInfo))]
+        private IScrollingInfo scrollingInfo;
+
         protected ManiaPlacementBlueprintTestScene()
         {
+            scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
+
             Add(column = new Column(0)
             {
                 Anchor = Anchor.Centre,
@@ -36,15 +41,8 @@ namespace osu.Game.Rulesets.Mania.Tests
                 AccentColour = Color4.OrangeRed,
                 Clock = new FramedClock(new StopwatchClock()), // No scroll
             });
-        }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
-            dependencies.CacheAs(((ScrollingTestContainer)HitObjectContainer).ScrollingInfo);
-
-            return dependencies;
+            AddStep("change direction", () => ((ScrollingTestContainer)HitObjectContainer).Flip());
         }
 
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };

From 754fbc59e1a96f2dc7da030dce850a0cb5231e78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:21:36 +0900
Subject: [PATCH 040/116] Fix note placement being offset

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index d3779e2e18..f7d21ddf55 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             // If we're scrolling downwards, a position of 0 is actually further away from the hit target
             // so we need to flip the vertical coordinate in the hitobject container's space
-            var hitObjectPos = Column.HitObjectContainer.ToLocalSpace(applyPositionOffset(screenSpacePosition, false)).Y;
+            var hitObjectPos = applyPositionOffset(Column.HitObjectContainer.ToLocalSpace(screenSpacePosition), false).Y;
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
                 hitObjectPos = hitObjectContainer.DrawHeight - hitObjectPos;
 

From 0a409075be251fbc1acbebfdfa80f81204d8f0a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:21:50 +0900
Subject: [PATCH 041/116] Fix note placement offset not working for down-scroll

---
 .../Blueprints/ManiaPlacementBlueprint.cs     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index f7d21ddf55..83282f9990 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -111,8 +111,23 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private Vector2 applyPositionOffset(Vector2 position, bool reverse)
         {
-            position.Y += (scrollingInfo.Direction.Value == ScrollingDirection.Up && !reverse ? -1 : 1) * NotePiece.NOTE_HEIGHT / 2;
-            return position;
+            float offset = 0;
+
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                    offset = -NotePiece.NOTE_HEIGHT / 2;
+                    break;
+
+                case ScrollingDirection.Down:
+                    offset = NotePiece.NOTE_HEIGHT / 2;
+                    break;
+            }
+
+            if (reverse)
+                offset = -offset;
+
+            return new Vector2(position.X, position.Y + offset);
         }
     }
 }

From 39369620fa530000cf22dc6b1643b932b738dda1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:22:06 +0900
Subject: [PATCH 042/116] Remove position offset from ColumnAt

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 83282f9990..a0feecee3b 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         }
 
         protected Column ColumnAt(Vector2 screenSpacePosition)
-            => composer.ColumnAt(applyPositionOffset(screenSpacePosition, false));
+            => composer.ColumnAt(screenSpacePosition);
 
         private Vector2 applyPositionOffset(Vector2 position, bool reverse)
         {

From f1ff22cf8bc1612aef947df2bdafd4e0e0d2cafd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:23:13 +0900
Subject: [PATCH 043/116] Fix hold note blueprint placing in the wrong
 direction

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index a0feecee3b..4a187b1942 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -103,6 +103,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 scrollingInfo.TimeRange.Value,
                 Column.HitObjectContainer.DrawHeight);
 
+            if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
+                pos = Column.HitObjectContainer.DrawHeight - pos;
+
             return applyPositionOffset(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent), true).Y;
         }
 

From 80585d446c108268e3261933caf9ef2f3d56f1c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:27:39 +0900
Subject: [PATCH 044/116] Split applyPositionOffset into two methods and add
 xmldocs

---
 .../Blueprints/ManiaPlacementBlueprint.cs     | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 4a187b1942..e83c85b40e 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             // If we're scrolling downwards, a position of 0 is actually further away from the hit target
             // so we need to flip the vertical coordinate in the hitobject container's space
-            var hitObjectPos = applyPositionOffset(Column.HitObjectContainer.ToLocalSpace(screenSpacePosition), false).Y;
+            var hitObjectPos = mouseToHitObjectPosition(Column.HitObjectContainer.ToLocalSpace(screenSpacePosition)).Y;
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
                 hitObjectPos = hitObjectContainer.DrawHeight - hitObjectPos;
 
@@ -106,31 +106,55 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
                 pos = Column.HitObjectContainer.DrawHeight - pos;
 
-            return applyPositionOffset(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent), true).Y;
+            return hitObjectToMousePosition(Column.HitObjectContainer.ToSpaceOfOtherDrawable(new Vector2(0, pos), Parent)).Y;
         }
 
         protected Column ColumnAt(Vector2 screenSpacePosition)
             => composer.ColumnAt(screenSpacePosition);
 
-        private Vector2 applyPositionOffset(Vector2 position, bool reverse)
+        /// <summary>
+        /// Converts a mouse position to a hitobject position.
+        /// </summary>
+        /// <remarks>
+        /// Blueprints are centred on the mouse position, such that the hitobject position is anchored at the top or bottom of the blueprint depending on the scroll direction.
+        /// </remarks>
+        /// <param name="mousePosition">The mouse position.</param>
+        /// <returns>The resulting hitobject position, acnhored at the top or bottom of the blueprint depending on the scroll direction.</returns>
+        private Vector2 mouseToHitObjectPosition(Vector2 mousePosition)
         {
-            float offset = 0;
-
             switch (scrollingInfo.Direction.Value)
             {
                 case ScrollingDirection.Up:
-                    offset = -NotePiece.NOTE_HEIGHT / 2;
+                    mousePosition.Y -= NotePiece.NOTE_HEIGHT / 2;
                     break;
 
                 case ScrollingDirection.Down:
-                    offset = NotePiece.NOTE_HEIGHT / 2;
+                    mousePosition.Y += NotePiece.NOTE_HEIGHT / 2;
                     break;
             }
 
-            if (reverse)
-                offset = -offset;
+            return mousePosition;
+        }
 
-            return new Vector2(position.X, position.Y + offset);
+        /// <summary>
+        /// Converts a hitobject position to a mouse position.
+        /// </summary>
+        /// <param name="hitObjectPosition">The hitobject position.</param>
+        /// <returns>The resulting mouse position, anchored at the centre of the hitobject.</returns>
+        private Vector2 hitObjectToMousePosition(Vector2 hitObjectPosition)
+        {
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                    hitObjectPosition.Y += NotePiece.NOTE_HEIGHT / 2;
+                    break;
+
+                case ScrollingDirection.Down:
+                    hitObjectPosition.Y -= NotePiece.NOTE_HEIGHT / 2;
+                    break;
+            }
+
+            return hitObjectPosition;
         }
     }
 }

From 2d0c52239893526a28be0e01eacf74b18bab0ee3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 18:43:46 +0900
Subject: [PATCH 045/116] Remove unused method

---
 .../TestSceneHoldNoteSelectionBlueprint.cs                     | 3 ---
 .../TestSceneNoteSelectionBlueprint.cs                         | 3 ---
 .../TestSceneHitCircleSelectionBlueprint.cs                    | 3 ---
 .../TestSceneSliderSelectionBlueprint.cs                       | 3 ---
 .../TestSceneSpinnerSelectionBlueprint.cs                      | 3 ---
 osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs           | 2 --
 6 files changed, 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
index 5507ca2ba0..90394f3d1b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteSelectionBlueprint.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -53,7 +52,5 @@ namespace osu.Game.Rulesets.Mania.Tests
                 nested.Y = (float)(-finalPosition * content.DrawHeight);
             }
         }
-
-        protected override SelectionBlueprint CreateBlueprint() => new HoldNoteSelectionBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
index c0482e2150..1514bdf0bd 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNoteSelectionBlueprint.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -37,7 +36,5 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddBlueprint(new NoteSelectionBlueprint(drawableObject));
         }
-
-        protected override SelectionBlueprint CreateBlueprint() => new NoteSelectionBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
index 7278d923c1..d4cdabdb07 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleSelectionBlueprint.cs
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
@@ -53,8 +52,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("blueprint positioned over hitobject", () => blueprint.CirclePiece.Position == hitCircle.Position);
         }
 
-        protected override SelectionBlueprint CreateBlueprint() => new HitCircleSelectionBlueprint(drawableObject);
-
         private class TestBlueprint : HitCircleSelectionBlueprint
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
index 61c8316ed9..ec23ec31b2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
@@ -98,8 +97,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(blueprint.TailBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
         }
 
-        protected override SelectionBlueprint CreateBlueprint() => new SliderSelectionBlueprint(drawableObject);
-
         private class TestSliderBlueprint : SliderSelectionBlueprint
         {
             public new SliderBodyPiece BodyPiece => base.BodyPiece;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
index 1c195311a4..d777ca3610 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerSelectionBlueprint.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
@@ -47,7 +46,5 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddBlueprint(new SpinnerSelectionBlueprint(drawableSpinner) { Size = new Vector2(0.5f) });
         }
-
-        protected override SelectionBlueprint CreateBlueprint() => new SpinnerSelectionBlueprint(null) { Size = new Vector2(0.5f) };
     }
 }
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index 55dda03b16..f53c12b047 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -30,7 +30,5 @@ namespace osu.Game.Tests.Visual
                 d.Select();
             }));
         }
-
-        protected abstract SelectionBlueprint CreateBlueprint();
     }
 }

From 925615320e4d8ae455738b5dc3fa1de8a170f71f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 10:46:48 +0800
Subject: [PATCH 046/116] Update lazer default combo colours to match stable

---
 osu.Game/Skinning/DefaultSkinConfiguration.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/DefaultSkinConfiguration.cs b/osu.Game/Skinning/DefaultSkinConfiguration.cs
index f52fac6077..cd5975edac 100644
--- a/osu.Game/Skinning/DefaultSkinConfiguration.cs
+++ b/osu.Game/Skinning/DefaultSkinConfiguration.cs
@@ -14,10 +14,10 @@ namespace osu.Game.Skinning
         {
             ComboColours.AddRange(new[]
             {
-                new Color4(17, 136, 170, 255),
-                new Color4(102, 136, 0, 255),
-                new Color4(204, 102, 0, 255),
-                new Color4(121, 9, 13, 255)
+                new Color4(255, 192, 0, 255),
+                new Color4(0, 202, 0, 255),
+                new Color4(18, 124, 255, 255),
+                new Color4(242, 24, 57, 255),
             });
         }
     }

From 71985c7ef13913af2d3c6acf07c17ac4d11986c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 11:23:42 +0800
Subject: [PATCH 047/116] Update fail logic to match

---
 osu.Game/Screens/Play/Player.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 91d34c8056..5560baa7d1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -299,6 +299,12 @@ namespace osu.Game.Screens.Play
         {
             if (!this.IsCurrentScreen()) return;
 
+            if (HasFailed && !FailOverlay.IsPresent)
+            {
+                failAnimation.FinishTransforms(true);
+                return;
+            }
+
             if (canPause)
                 Pause();
             else
@@ -517,12 +523,6 @@ namespace osu.Game.Screens.Play
                 if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
                     // still want to block if we are within the cooldown period and not already paused.
                     return true;
-
-                if (HasFailed && !FailOverlay.IsPresent)
-                {
-                    failAnimation.FinishTransforms(true);
-                    return true;
-                }
             }
 
             GameplayClockContainer.ResetLocalAdjustments();

From e646b2677ca0b07267690783cf8894676e437dc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 11:25:23 +0800
Subject: [PATCH 048/116] Add test coverage

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index c67001c3d8..48159aa5e0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -127,6 +127,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             exitAndConfirm();
         }
 
+        [Test]
+        public void TestExitFromFailedGameplay()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+            AddStep("exit", () => Player.Exit());
+
+            confirmExited();
+        }
+
         [Test]
         public void TestExitFromGameplay()
         {

From 47c1f36f9d91f54eb68b824badad248b69c169be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 11:41:53 +0800
Subject: [PATCH 049/116] Add ValidForResume check

---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5560baa7d1..0b363eac4d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -299,7 +299,7 @@ namespace osu.Game.Screens.Play
         {
             if (!this.IsCurrentScreen()) return;
 
-            if (HasFailed && !FailOverlay.IsPresent)
+            if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
             {
                 failAnimation.FinishTransforms(true);
                 return;

From 626f7388c8fdc8dd34935d2a8cf86cfaf702ac4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 12:23:01 +0800
Subject: [PATCH 050/116] Add tests for quick retry and quick exit scenarios

---
 .../Visual/Gameplay/TestScenePause.cs         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 48159aa5e0..2df22df659 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -136,6 +136,24 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmExited();
         }
 
+        [Test]
+        public void TestQuickRetryFromFailedGameplay()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+            AddStep("quick retry", () => Player.GameplayClockContainer.OfType<HotkeyRetryOverlay>().First().Action?.Invoke());
+
+            confirmExited();
+        }
+
+        [Test]
+        public void TestQuickExitFromFailedGameplay()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+            AddStep("quick exit", () => Player.GameplayClockContainer.OfType<HotkeyExitOverlay>().First().Action?.Invoke());
+
+            confirmExited();
+        }
+
         [Test]
         public void TestExitFromGameplay()
         {
@@ -144,6 +162,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmExited();
         }
 
+        [Test]
+        public void TestQuickExitFromGameplay()
+        {
+            AddStep("quick exit", () => Player.GameplayClockContainer.OfType<HotkeyExitOverlay>().First().Action?.Invoke());
+
+            confirmExited();
+        }
+
         [Test]
         public void TestExitViaHoldToExit()
         {

From ffde389641a15f0b0faceb8e1e900fa186509bda Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 4 Oct 2019 13:28:32 +0900
Subject: [PATCH 051/116] Add difficulty calculator beatmap decoder fallback

---
 .../Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
index 2c493254e0..238187bf8f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Beatmaps.Formats
         public new static void Register()
         {
             AddDecoder<Beatmap>(@"osu file format v", m => new LegacyDifficultyCalculatorBeatmapDecoder(int.Parse(m.Split('v').Last())));
+            SetFallbackDecoder<Beatmap>(() => new LegacyDifficultyCalculatorBeatmapDecoder());
         }
 
         protected override TimingControlPoint CreateTimingControlPoint()

From ddef7fa3ba67d47ff90d62446d7ed5bbf294c46d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 13:32:47 +0800
Subject: [PATCH 052/116] Repair behavioural change

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

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 74d3439c59..c6d812aee3 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.UI
                         return;
                     }
 
-                    manualClock.CurrentTime = newTime.Value;
+                    newProposedTime = newTime.Value;
                 }
 
                 requireMoreUpdateLoops = manualClock.CurrentTime != parentGameplayClock.CurrentTime;

From aeb62825cdb0c0727fca76b6ae21541133aeb1e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Oct 2019 13:42:06 +0800
Subject: [PATCH 053/116] Move out requireMoreUpdateLoops for better
 consistency

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index c6d812aee3..e569bb8459 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -115,17 +115,16 @@ namespace osu.Game.Rulesets.UI
                 setClock(); // LoadComplete may not be run yet, but we still want the clock.
 
             validState = true;
+            requireMoreUpdateLoops = false;
 
             var newProposedTime = parentGameplayClock.CurrentTime;
 
             try
             {
                 if (!FrameStablePlayback)
-                {
-                    requireMoreUpdateLoops = false;
                     return;
-                }
-                else if (firstConsumption)
+
+                if (firstConsumption)
                 {
                     // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
                     // Instead we perform an initial seek to the proposed time.
@@ -159,8 +158,6 @@ namespace osu.Game.Rulesets.UI
 
                     newProposedTime = newTime.Value;
                 }
-
-                requireMoreUpdateLoops = manualClock.CurrentTime != parentGameplayClock.CurrentTime;
             }
             finally
             {
@@ -171,6 +168,8 @@ namespace osu.Game.Rulesets.UI
                 manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
                 manualClock.IsRunning = parentGameplayClock.IsRunning;
 
+                requireMoreUpdateLoops |= manualClock.CurrentTime != parentGameplayClock.CurrentTime;
+
                 // The manual clock time has changed in the above code. The framed clock now needs to be updated
                 // to ensure that the its time is valid for our children before input is processed
                 framedClock.ProcessFrame();

From 76c74719a44f2aa461cebf93cd2b71e476663632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 4 Oct 2019 17:00:51 +0200
Subject: [PATCH 054/116] Add test for fallback decoder overwrite

LegacyDifficultyCalculatorBeatmapDecoder was registered as a fallback
decoder in commit ffde389 for future use in the server-side difficulty
calculation components. Due to the pre-existing fallback registrations
this causes a runtime crash when the diffcalc components are started.
Add a test reproducing this scenario to prevent the issue from
resurfacing in the future.
---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index f6c0dbbecf..de516d3142 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -591,5 +591,27 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.Throws<IOException>(() => Decoder.GetDecoder<Beatmap>(stream));
             }
         }
+
+        [Test]
+        public void TestAllowFallbackDecoderOverwrite()
+        {
+            Decoder<Beatmap> decoder = null;
+
+            using (var resStream = TestResources.OpenResource("corrupted-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
+            }
+
+            Assert.DoesNotThrow(LegacyDifficultyCalculatorBeatmapDecoder.Register);
+
+            using (var resStream = TestResources.OpenResource("corrupted-header.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Assert.DoesNotThrow(() => decoder = Decoder.GetDecoder<Beatmap>(stream));
+                Assert.IsInstanceOf<LegacyDifficultyCalculatorBeatmapDecoder>(decoder);
+            }
+        }
     }
 }

From 7c2c537bc9cca82740ea9df51f65c3f8047de372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 4 Oct 2019 17:23:33 +0200
Subject: [PATCH 055/116] Allow fallback decoder overwrite

To fix the runtime crashes in difficulty calculation components, remove
the check for pre-existing fallback registration along with
the exception. The xmldoc for the registration function has been
extended to make users aware of possible consequences of calling it.
---
 osu.Game/Beatmaps/Formats/Decoder.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 045eb2d14d..40c329eb7e 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -93,14 +93,12 @@ namespace osu.Game.Beatmaps.Formats
         /// <summary>
         /// Registers a fallback decoder instantiation function.
         /// The fallback will be returned if the first non-empty line of the decoded stream does not match any known magic.
+        /// Calling this method will overwrite any existing global fallback registration for type <see cref="T"/> - use with caution.
         /// </summary>
         /// <typeparam name="T">Type of object being decoded.</typeparam>
         /// <param name="constructor">A function that constructs the fallback<see cref="Decoder"/>.</param>
         protected static void SetFallbackDecoder<T>(Func<Decoder> constructor)
         {
-            if (fallback_decoders.ContainsKey(typeof(T)))
-                throw new InvalidOperationException($"A fallback decoder was already added for type {typeof(T)}.");
-
             fallback_decoders[typeof(T)] = constructor;
         }
     }

From e7ba6ef5c43fcf1c55d93a86cb0773ea4d8070f2 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 4 Oct 2019 14:32:43 -0700
Subject: [PATCH 056/116] Fix keybinding order of beatmap options

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 2 +-
 osu.Game/Screens/Select/SongSelect.cs     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 4df6e6a3f3..9368bac69f 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select
             {
                 ValidForResume = false;
                 Edit();
-            }, Key.Number3);
+            }, Key.Number4);
         }
 
         public override void OnResuming(IScreen last)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 452c63a18c..ee2e40dcd9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -230,9 +230,9 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number4, float.MaxValue);
-                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo), Key.Number2);
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number1, float.MaxValue);
+                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number2);
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo), Key.Number3);
             }
 
             if (this.beatmaps == null)

From 5d460eaf6b8a9c05d54c61f2cd01cfddb2636386 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 4 Oct 2019 17:14:19 -0700
Subject: [PATCH 057/116] Remove depth specification and button order
 regression

---
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs | 5 ++---
 osu.Game/Screens/Select/SongSelect.cs                    | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index ede526f9da..b831ae274c 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Select.Options
         /// <para>Lower depth to be put on the left, and higher to be put on the right.</para>
         /// <para>Notice this is different to <see cref="Footer"/>!</para>
         /// </param>
-        public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action, Key? hotkey = null, float depth = 0)
+        public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action, Key? hotkey = null)
         {
             var button = new BeatmapOptionsButton
             {
@@ -101,7 +101,6 @@ namespace osu.Game.Screens.Select.Options
                 SecondLineText = secondLine,
                 Icon = icon,
                 ButtonColour = colour,
-                Depth = depth,
                 Action = () =>
                 {
                     Hide();
@@ -110,7 +109,7 @@ namespace osu.Game.Screens.Select.Options
                 HotKey = hotkey
             };
 
-            buttonsContainer.Insert((int)depth, button);
+            buttonsContainer.Add(button);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ee2e40dcd9..59a143728c 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -230,9 +230,9 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number1, float.MaxValue);
-                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number2);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo), Key.Number3);
+                BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo), Key.Number2);
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number3);
             }
 
             if (this.beatmaps == null)

From de658c932e6ef23ce6511d15cabf28b836f94416 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 4 Oct 2019 17:22:42 -0700
Subject: [PATCH 058/116] Fix test regression

---
 .../Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index ecdc484887..f55c099d83 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, Color4.Purple, null, Key.Number1);
             overlay.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, Color4.Purple, null, Key.Number2);
-            overlay.AddButton(@"Edit", @"Beatmap", FontAwesome.Solid.PencilAlt, Color4.Yellow, null, Key.Number3);
-            overlay.AddButton(@"Delete", @"Beatmap", FontAwesome.Solid.Trash, Color4.Pink, null, Key.Number4, float.MaxValue);
+            overlay.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, Color4.Pink, null, Key.Number3);
+            overlay.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, Color4.Yellow, null, Key.Number4);
 
             Add(overlay);
 

From a71db11ea544cacf62fdd22da93a9f89a6523f5c Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 4 Oct 2019 18:38:44 -0700
Subject: [PATCH 059/116] Remove depth parameter description

---
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index b831ae274c..c01970f536 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -89,10 +89,6 @@ namespace osu.Game.Screens.Select.Options
         /// <param name="icon">Icon of the button.</param>
         /// <param name="hotkey">Hotkey of the button.</param>
         /// <param name="action">Binding the button does.</param>
-        /// <param name="depth">
-        /// <para>Lower depth to be put on the left, and higher to be put on the right.</para>
-        /// <para>Notice this is different to <see cref="Footer"/>!</para>
-        /// </param>
         public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action, Key? hotkey = null)
         {
             var button = new BeatmapOptionsButton

From e257f4ca04481e6b43ef8ec52337c7c364218b56 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 5 Oct 2019 10:31:44 -0700
Subject: [PATCH 060/116] Resume music to same position when exiting gameplay

---
 osu.Game/Screens/Select/SongSelect.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 59a143728c..d9ddfa2a94 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -413,7 +413,7 @@ namespace osu.Game.Screens.Select
                     Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, previous);
 
                     if (this.IsCurrentScreen() && Beatmap.Value?.Track != previous?.Track)
-                        ensurePlayingSelected();
+                        ensurePlayingSelected(true);
 
                     if (beatmap != null)
                     {
@@ -585,18 +585,14 @@ namespace osu.Game.Screens.Select
         {
             Track track = Beatmap.Value.Track;
 
-            if (!track.IsRunning || restart)
+            if (!track.IsRunning)
             {
                 track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-                if (music != null)
-                {
-                    // use the global music controller (when available) to cancel a potential local user paused state.
-                    music.SeekTo(track.RestartPoint);
-                    music.Play();
-                }
-                else
+                if (restart)
                     track.Restart();
+                else
+                    track.Start();
             }
         }
 

From bdea75b99584c2624cfc9acff6fc811f332ebc07 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sat, 5 Oct 2019 23:53:05 +0300
Subject: [PATCH 061/116] Autoscroll playlist on song change

---
 osu.Game/Configuration/OsuConfigManager.cs    |  5 +++-
 osu.Game/Overlays/Music/PlaylistList.cs       | 11 +++++++-
 .../Sections/Audio/PlaylistSettings.cs        | 27 +++++++++++++++++++
 .../Settings/Sections/AudioSection.cs         |  1 +
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c0ce08ba08..75cc961a9e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
+
+            Set(OsuSetting.FollowPlayback, true);
         }
 
         public OsuConfigManager(Storage storage)
@@ -186,6 +188,7 @@ namespace osu.Game.Configuration
         UIScale,
         IntroSequence,
         UIHoldActivationDelay,
-        HitLighting
+        HitLighting,
+        FollowPlayback
     }
 }
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 5b528c5ab2..95b4a28125 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
@@ -52,6 +53,8 @@ namespace osu.Game.Overlays.Music
 
             private IBindableList<BeatmapSetInfo> beatmaps;
 
+            private IBindable<bool> followPlayback;
+
             [Resolved]
             private MusicController musicController { get; set; }
 
@@ -76,8 +79,10 @@ namespace osu.Game.Overlays.Music
             }
 
             [BackgroundDependencyLoader]
-            private void load(IBindable<WorkingBeatmap> beatmap)
+            private void load(IBindable<WorkingBeatmap> beatmap, OsuConfigManager configManager)
             {
+                followPlayback = configManager.GetBindable<bool>(OsuSetting.FollowPlayback);
+
                 beatmaps = musicController.BeatmapSets.GetBoundCopy();
                 beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet);
                 beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet);
@@ -109,7 +114,11 @@ namespace osu.Game.Overlays.Music
             private void updateSelectedSet()
             {
                 foreach (PlaylistItem s in items.Children)
+                {
                     s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID;
+                    if (s.Selected && followPlayback.Value)
+                        ScrollIntoView(s);
+                }
             }
 
             public string SearchTerm
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
new file mode 100644
index 0000000000..5de99e24af
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class PlaylistSettings : SettingsSubsection
+    {
+        protected override string Header => "Playlist";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Follow playback",
+                    Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index 772f5c2039..dd67493a75 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 new VolumeSettings(),
                 new OffsetSettings(),
                 new MainMenuSettings(),
+                new PlaylistSettings()
             };
         }
     }

From eda4a27b45e66c8231c7aeea7c9c2915bbfca74b Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 6 Oct 2019 15:06:25 +0300
Subject: [PATCH 062/116] Move FollowPlayback setting to User Interface
 subsection

---
 .../Sections/Audio/PlaylistSettings.cs        | 27 -------------------
 .../Settings/Sections/AudioSection.cs         |  3 +--
 .../Graphics/UserInterfaceSettings.cs         |  5 ++++
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
deleted file mode 100644
index 5de99e24af..0000000000
--- a/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-
-namespace osu.Game.Overlays.Settings.Sections.Audio
-{
-    public class PlaylistSettings : SettingsSubsection
-    {
-        protected override string Header => "Playlist";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new SettingsCheckbox
-                {
-                    LabelText = "Follow playback",
-                    Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index dd67493a75..7ca313a751 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -19,8 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 new AudioDevicesSettings(),
                 new VolumeSettings(),
                 new OffsetSettings(),
-                new MainMenuSettings(),
-                new PlaylistSettings()
+                new MainMenuSettings()
             };
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
index a8953ac3a2..2678d4c11a 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
@@ -17,6 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         {
             Children = new Drawable[]
             {
+                new SettingsCheckbox
+                {
+                    LabelText = "Scroll playlist on song change",
+                    Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Rotate cursor when dragging",

From 38c1cee5fdbb913c771ddbf373ca3fea3d062235 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 6 Oct 2019 10:22:55 -0700
Subject: [PATCH 063/116] Fix tab controls overflowing

---
 .../Overlays/Chat/Tabs/ChannelTabControl.cs    | 13 ++-----------
 osu.Game/Overlays/ChatOverlay.cs               |  9 +++++++++
 .../SearchableListFilterControl.cs             | 10 +++++++++-
 .../Select/BeatmapDetailAreaTabControl.cs      | 18 +++++++++++++++---
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index 612379d339..8b88d81b88 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -9,7 +9,6 @@ using osuTK;
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Chat.Tabs
 {
@@ -25,19 +24,11 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         public ChannelTabControl()
         {
-            TabContainer.Margin = new MarginPadding { Left = 50 };
+            Padding = new MarginPadding { Left = 50 };
+
             TabContainer.Spacing = new Vector2(-SHEAR_WIDTH, 0);
             TabContainer.Masking = false;
 
-            AddInternal(new SpriteIcon
-            {
-                Icon = FontAwesome.Solid.Comments,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Size = new Vector2(20),
-                Margin = new MarginPadding(10),
-            });
-
             AddTabItem(selectorTab = new ChannelSelectorTabItem());
 
             ChannelSelectorActive.BindTo(selectorTab.Active);
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 0cadbdfd31..33bcc4c139 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -21,6 +21,7 @@ using osu.Game.Overlays.Chat;
 using osu.Game.Overlays.Chat.Selection;
 using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays
 {
@@ -156,6 +157,14 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4.Black,
                                 },
+                                new SpriteIcon
+                                {
+                                    Icon = FontAwesome.Solid.Comments,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Size = new Vector2(20),
+                                    Margin = new MarginPadding(10),
+                                },
                                 ChannelTabControl = CreateChannelTabControl().With(d =>
                                 {
                                     d.Anchor = Anchor.BottomLeft;
diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index a0c4e9a080..d72e99289e 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Overlays.SearchableList
         private const float padding = 10;
 
         private readonly Container filterContainer;
+        private readonly Container tabsContainer;
         private readonly Box tabStrip;
 
         public readonly SearchTextBox Search;
@@ -85,9 +86,14 @@ namespace osu.Game.Overlays.SearchableList
                                     AutoSizeAxes = Axes.Y,
                                     Margin = new MarginPadding { Top = controls != null ? padding : 0 },
                                 },
-                                Tabs = new PageTabControl<T>
+                                tabsContainer = new Container
                                 {
                                     RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Child = Tabs = new PageTabControl<T>
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                    },
                                 },
                                 new Box //keep the tab strip part of autosize, but don't put it in the flow container
                                 {
@@ -127,6 +133,8 @@ namespace osu.Game.Overlays.SearchableList
 
             Height = filterContainer.Height;
             DisplayStyleControl.Margin = new MarginPadding { Top = filterContainer.Height - 35, Right = SearchableListOverlay.WIDTH_PADDING };
+
+            tabsContainer.Padding = new MarginPadding { Right = DisplayStyleControl.Width };
         }
 
         private class FilterSearchTextBox : SearchTextBox
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 6caef8e2aa..4ca629fee9 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Select
         public static readonly float HEIGHT = 24;
         private readonly OsuTabControlCheckbox modsCheckbox;
         private readonly OsuTabControl<BeatmapDetailTab> tabs;
+        private readonly Container tabsContainer;
 
         public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
 
@@ -39,11 +40,15 @@ namespace osu.Game.Screens.Select
                     Height = 1,
                     Colour = Color4.White.Opacity(0.2f),
                 },
-                tabs = new OsuTabControl<BeatmapDetailTab>
+                tabsContainer = new Container
                 {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
+                    Child = tabs = new OsuTabControl<BeatmapDetailTab>
+                    {
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        RelativeSizeAxes = Axes.Both,
+                    },
                 },
                 modsCheckbox = new OsuTabControlCheckbox
                 {
@@ -69,6 +74,13 @@ namespace osu.Game.Screens.Select
             tabs.Current.TriggerChange();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            tabsContainer.Padding = new MarginPadding { Right = modsCheckbox.Width };
+        }
+
         private void invokeOnFilter()
         {
             OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);

From 11d937beab1708fb1354994b017e08e98cb5cc78 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 6 Oct 2019 10:24:33 -0700
Subject: [PATCH 064/116] Fix beatmap detail area tab dropdown being blocked by
 content

---
 osu.Game/Screens/Select/BeatmapDetailArea.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 5348de68d6..71733c9f06 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -36,6 +36,11 @@ namespace osu.Game.Screens.Select
         {
             AddRangeInternal(new Drawable[]
             {
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Top = BeatmapDetailAreaTabControl.HEIGHT },
+                },
                 new BeatmapDetailAreaTabControl
                 {
                     RelativeSizeAxes = Axes.X,
@@ -58,11 +63,6 @@ namespace osu.Game.Screens.Select
                         }
                     },
                 },
-                content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = BeatmapDetailAreaTabControl.HEIGHT },
-                },
             });
 
             AddRange(new Drawable[]

From 62c4c1266ef8c1dc71324021bd4808abbb7b6205 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Oct 2019 14:45:26 +0900
Subject: [PATCH 065/116] Move private functions to bottom

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 202 +++++++++---------
 1 file changed, 101 insertions(+), 101 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 6bdd94db21..527367fdb8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -58,107 +58,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null)
-        {
-            if (beatmapSets == null)
-            {
-                beatmapSets = new List<BeatmapSetInfo>();
-
-                for (int i = 1; i <= set_count; i++)
-                    beatmapSets.Add(createTestBeatmapSet(i));
-            }
-
-            bool changed = false;
-            AddStep($"Load {beatmapSets.Count} Beatmaps", () =>
-            {
-                carousel.Filter(new FilterCriteria());
-                carousel.BeatmapSetsChanged = () => changed = true;
-                carousel.BeatmapSets = beatmapSets;
-            });
-
-            AddUntilStep("Wait for load", () => changed);
-        }
-
-        private void ensureRandomFetchSuccess() =>
-            AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
-
-        private void waitForSelection(int set, int? diff = null) =>
-            AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
-            {
-                if (diff != null)
-                    return carousel.SelectedBeatmap == carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff.Value - 1).First();
-
-                return carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Contains(carousel.SelectedBeatmap);
-            });
-
-        private void setSelected(int set, int diff) =>
-            AddStep($"select set{set} diff{diff}", () =>
-                carousel.SelectBeatmap(carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff - 1).First()));
-
-        private void advanceSelection(bool diff, int direction = 1, int count = 1)
-        {
-            if (count == 1)
-                AddStep($"select {(direction > 0 ? "next" : "prev")} {(diff ? "diff" : "set")}", () =>
-                    carousel.SelectNext(direction, !diff));
-            else
-            {
-                AddRepeatStep($"select {(direction > 0 ? "next" : "prev")} {(diff ? "diff" : "set")}", () =>
-                    carousel.SelectNext(direction, !diff), count);
-            }
-        }
-
-        private void checkVisibleItemCount(bool diff, int count) =>
-            AddAssert($"{count} {(diff ? "diffs" : "sets")} visible", () =>
-                carousel.Items.Count(s => (diff ? s.Item is CarouselBeatmap : s.Item is CarouselBeatmapSet) && s.Item.Visible) == count);
-
-        private void checkNoSelection() => AddAssert("Selection is null", () => currentSelection == null);
-
-        private void nextRandom() =>
-            AddStep("select random next", () =>
-            {
-                carousel.RandomAlgorithm.Value = RandomSelectAlgorithm.RandomPermutation;
-
-                if (!selectedSets.Any() && carousel.SelectedBeatmap != null)
-                    selectedSets.Push(carousel.SelectedBeatmapSet);
-
-                carousel.SelectNextRandom();
-                selectedSets.Push(carousel.SelectedBeatmapSet);
-            });
-
-        private void ensureRandomDidntRepeat() =>
-            AddAssert("ensure no repeats", () => selectedSets.Distinct().Count() == selectedSets.Count);
-
-        private void prevRandom() => AddStep("select random last", () =>
-        {
-            carousel.SelectPreviousRandom();
-            selectedSets.Pop();
-        });
-
-        private bool selectedBeatmapVisible()
-        {
-            var currentlySelected = carousel.Items.Find(s => s.Item is CarouselBeatmap && s.Item.State.Value == CarouselItemState.Selected);
-            if (currentlySelected == null)
-                return true;
-
-            return currentlySelected.Item.Visible;
-        }
-
-        private void checkInvisibleDifficultiesUnselectable()
-        {
-            nextRandom();
-            AddAssert("Selection is visible", selectedBeatmapVisible);
-        }
-
-        private void checkNonmatchingFilter()
-        {
-            AddStep("Toggle non-matching filter", () =>
-            {
-                carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false);
-                carousel.Filter(new FilterCriteria(), false);
-                eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
-            });
-        }
-
         /// <summary>
         /// Test keyboard traversal
         /// </summary>
@@ -482,6 +381,107 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection was random", () => eagerSelectedIDs.Count > 1);
         }
 
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null)
+        {
+            if (beatmapSets == null)
+            {
+                beatmapSets = new List<BeatmapSetInfo>();
+
+                for (int i = 1; i <= set_count; i++)
+                    beatmapSets.Add(createTestBeatmapSet(i));
+            }
+
+            bool changed = false;
+            AddStep($"Load {beatmapSets.Count} Beatmaps", () =>
+            {
+                carousel.Filter(new FilterCriteria());
+                carousel.BeatmapSetsChanged = () => changed = true;
+                carousel.BeatmapSets = beatmapSets;
+            });
+
+            AddUntilStep("Wait for load", () => changed);
+        }
+
+        private void ensureRandomFetchSuccess() =>
+            AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
+
+        private void waitForSelection(int set, int? diff = null) =>
+            AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
+            {
+                if (diff != null)
+                    return carousel.SelectedBeatmap == carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff.Value - 1).First();
+
+                return carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Contains(carousel.SelectedBeatmap);
+            });
+
+        private void setSelected(int set, int diff) =>
+            AddStep($"select set{set} diff{diff}", () =>
+                carousel.SelectBeatmap(carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff - 1).First()));
+
+        private void advanceSelection(bool diff, int direction = 1, int count = 1)
+        {
+            if (count == 1)
+                AddStep($"select {(direction > 0 ? "next" : "prev")} {(diff ? "diff" : "set")}", () =>
+                    carousel.SelectNext(direction, !diff));
+            else
+            {
+                AddRepeatStep($"select {(direction > 0 ? "next" : "prev")} {(diff ? "diff" : "set")}", () =>
+                    carousel.SelectNext(direction, !diff), count);
+            }
+        }
+
+        private void checkVisibleItemCount(bool diff, int count) =>
+            AddAssert($"{count} {(diff ? "diffs" : "sets")} visible", () =>
+                carousel.Items.Count(s => (diff ? s.Item is CarouselBeatmap : s.Item is CarouselBeatmapSet) && s.Item.Visible) == count);
+
+        private void checkNoSelection() => AddAssert("Selection is null", () => currentSelection == null);
+
+        private void nextRandom() =>
+            AddStep("select random next", () =>
+            {
+                carousel.RandomAlgorithm.Value = RandomSelectAlgorithm.RandomPermutation;
+
+                if (!selectedSets.Any() && carousel.SelectedBeatmap != null)
+                    selectedSets.Push(carousel.SelectedBeatmapSet);
+
+                carousel.SelectNextRandom();
+                selectedSets.Push(carousel.SelectedBeatmapSet);
+            });
+
+        private void ensureRandomDidntRepeat() =>
+            AddAssert("ensure no repeats", () => selectedSets.Distinct().Count() == selectedSets.Count);
+
+        private void prevRandom() => AddStep("select random last", () =>
+        {
+            carousel.SelectPreviousRandom();
+            selectedSets.Pop();
+        });
+
+        private bool selectedBeatmapVisible()
+        {
+            var currentlySelected = carousel.Items.Find(s => s.Item is CarouselBeatmap && s.Item.State.Value == CarouselItemState.Selected);
+            if (currentlySelected == null)
+                return true;
+
+            return currentlySelected.Item.Visible;
+        }
+
+        private void checkInvisibleDifficultiesUnselectable()
+        {
+            nextRandom();
+            AddAssert("Selection is visible", selectedBeatmapVisible);
+        }
+
+        private void checkNonmatchingFilter()
+        {
+            AddStep("Toggle non-matching filter", () =>
+            {
+                carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false);
+                carousel.Filter(new FilterCriteria(), false);
+                eagerSelectedIDs.Add(carousel.SelectedBeatmapSet.ID);
+            });
+        }
+
         private BeatmapSetInfo createTestBeatmapSet(int id)
         {
             return new BeatmapSetInfo

From 46d6c5ec3b6832d353f033d9284d761f423943db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Oct 2019 15:13:58 +0900
Subject: [PATCH 066/116] Add failing test

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 527367fdb8..f87d6ebebb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -245,6 +245,30 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert($"Check #{set_count} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Title.EndsWith($"#{set_count}!"));
         }
 
+        [Test]
+        public void TestSortingWithFiltered()
+        {
+            List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
+
+            for (int i = 0; i < 3; i++)
+            {
+                var set = createTestBeatmapSet(i);
+                set.Beatmaps[0].StarDifficulty = 3 - i;
+                set.Beatmaps[2].StarDifficulty = 6 + i;
+                sets.Add(set);
+            }
+
+            loadBeatmaps(sets);
+
+            AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
+            AddAssert("Check first set at end", () => carousel.BeatmapSets.First() == sets.Last());
+            AddAssert("Check last set at start", () => carousel.BeatmapSets.Last() == sets.First());
+
+            AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
+            AddAssert("Check first set at start", () => carousel.BeatmapSets.First() == sets.First());
+            AddAssert("Check last set at end", () => carousel.BeatmapSets.Last() == sets.Last());
+        }
+
         [Test]
         public void TestRemoveAll()
         {

From f15953d65ce00c38a2544234c426c33f55429cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Oct 2019 15:16:26 +0900
Subject: [PATCH 067/116] Fix carousel including filtered difficulties in sort
 comparisons

---
 .../Select/Carousel/CarouselBeatmapSet.cs     | 23 ++++++++++++++++---
 .../Screens/Select/Carousel/CarouselGroup.cs  |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 5a3996bb49..35816fe620 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -49,16 +49,33 @@ namespace osu.Game.Screens.Select.Carousel
                     return otherSet.BeatmapSet.DateAdded.CompareTo(BeatmapSet.DateAdded);
 
                 case SortMode.BPM:
-                    return BeatmapSet.MaxBPM.CompareTo(otherSet.BeatmapSet.MaxBPM);
+                    return compareUsingAggregateMax(otherSet, b => b.BPM);
 
                 case SortMode.Length:
-                    return BeatmapSet.MaxLength.CompareTo(otherSet.BeatmapSet.MaxLength);
+                    return compareUsingAggregateMax(otherSet, b => b.Length);
 
                 case SortMode.Difficulty:
-                    return BeatmapSet.MaxStarDifficulty.CompareTo(otherSet.BeatmapSet.MaxStarDifficulty);
+                    return compareUsingAggregateMax(otherSet, b => b.StarDifficulty);
             }
         }
 
+        /// <summary>
+        /// All beatmaps which are not filtered and valid for display.
+        /// </summary>
+        protected IEnumerable<BeatmapInfo> ValidBeatmaps => Beatmaps.Where(b => !b.Filtered.Value).Select(b => b.Beatmap);
+
+        private int compareUsingAggregateMax(CarouselBeatmapSet other, Func<BeatmapInfo, double> func)
+        {
+            var ourBeatmaps = ValidBeatmaps.Any();
+            var otherBeatmaps = other.ValidBeatmaps.Any();
+
+            if (!ourBeatmaps && !otherBeatmaps) return 0;
+            if (!ourBeatmaps) return -1;
+            if (!otherBeatmaps) return 1;
+
+            return ValidBeatmaps.Max(func).CompareTo(other.ValidBeatmaps.Max(func));
+        }
+
         public override void Filter(FilterCriteria criteria)
         {
             base.Filter(criteria);
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index 6ebd2d41cc..09b728abeb 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Screens.Select.Carousel
 
             var children = new List<CarouselItem>(InternalChildren);
 
-            children.Sort((x, y) => x.CompareTo(criteria, y));
             children.ForEach(c => c.Filter(criteria));
+            children.Sort((x, y) => x.CompareTo(criteria, y));
 
             InternalChildren = children;
         }

From e265beb289a3d1df5c5d0645526884e85c410ac9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 7 Oct 2019 18:49:59 +0900
Subject: [PATCH 068/116] Fix merge error

---
 .../Blueprints/HitCircles/HitCirclePlacementBlueprint.cs   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 38584ce898..6c08990ad6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -21,6 +21,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             InternalChild = circlePiece = new HitCirclePiece();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            circlePiece.UpdateFrom(HitObject);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             HitObject.StartTime = EditorClock.CurrentTime;

From e00992dfd8f18cc9e99724099e75eae42d0a1424 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Mon, 7 Oct 2019 19:44:22 +0300
Subject: [PATCH 069/116] Remove FollowPlayback setting

---
 osu.Game/Configuration/OsuConfigManager.cs               | 5 +----
 osu.Game/Overlays/Music/PlaylistList.cs                  | 9 ++-------
 .../Settings/Sections/Graphics/UserInterfaceSettings.cs  | 5 -----
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 75cc961a9e..c0ce08ba08 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -117,8 +117,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
-
-            Set(OsuSetting.FollowPlayback, true);
         }
 
         public OsuConfigManager(Storage storage)
@@ -188,7 +186,6 @@ namespace osu.Game.Configuration
         UIScale,
         IntroSequence,
         UIHoldActivationDelay,
-        HitLighting,
-        FollowPlayback
+        HitLighting
     }
 }
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 95b4a28125..f497bd5b8d 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
@@ -53,8 +52,6 @@ namespace osu.Game.Overlays.Music
 
             private IBindableList<BeatmapSetInfo> beatmaps;
 
-            private IBindable<bool> followPlayback;
-
             [Resolved]
             private MusicController musicController { get; set; }
 
@@ -79,10 +76,8 @@ namespace osu.Game.Overlays.Music
             }
 
             [BackgroundDependencyLoader]
-            private void load(IBindable<WorkingBeatmap> beatmap, OsuConfigManager configManager)
+            private void load(IBindable<WorkingBeatmap> beatmap)
             {
-                followPlayback = configManager.GetBindable<bool>(OsuSetting.FollowPlayback);
-
                 beatmaps = musicController.BeatmapSets.GetBoundCopy();
                 beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet);
                 beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet);
@@ -116,7 +111,7 @@ namespace osu.Game.Overlays.Music
                 foreach (PlaylistItem s in items.Children)
                 {
                     s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID;
-                    if (s.Selected && followPlayback.Value)
+                    if (s.Selected)
                         ScrollIntoView(s);
                 }
             }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
index 2678d4c11a..a8953ac3a2 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
@@ -17,11 +17,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         {
             Children = new Drawable[]
             {
-                new SettingsCheckbox
-                {
-                    LabelText = "Scroll playlist on song change",
-                    Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
-                },
                 new SettingsCheckbox
                 {
                     LabelText = "Rotate cursor when dragging",

From 8e6e90eaecf467b2764f3b2497acac12d4977c30 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 7 Oct 2019 16:11:40 -0700
Subject: [PATCH 070/116] Use fixed numbers for padding instead

---
 .../SearchableList/SearchableListFilterControl.cs     |  6 ++----
 .../Screens/Select/BeatmapDetailAreaTabControl.cs     | 11 ++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
index d72e99289e..372da94b37 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Overlays.SearchableList
         private const float padding = 10;
 
         private readonly Container filterContainer;
-        private readonly Container tabsContainer;
         private readonly Box tabStrip;
 
         public readonly SearchTextBox Search;
@@ -86,10 +85,11 @@ namespace osu.Game.Overlays.SearchableList
                                     AutoSizeAxes = Axes.Y,
                                     Margin = new MarginPadding { Top = controls != null ? padding : 0 },
                                 },
-                                tabsContainer = new Container
+                                new Container
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Right = 225 },
                                     Child = Tabs = new PageTabControl<T>
                                     {
                                         RelativeSizeAxes = Axes.X,
@@ -133,8 +133,6 @@ namespace osu.Game.Overlays.SearchableList
 
             Height = filterContainer.Height;
             DisplayStyleControl.Margin = new MarginPadding { Top = filterContainer.Height - 35, Right = SearchableListOverlay.WIDTH_PADDING };
-
-            tabsContainer.Padding = new MarginPadding { Right = DisplayStyleControl.Width };
         }
 
         private class FilterSearchTextBox : SearchTextBox
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 4ca629fee9..38b1c6411b 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Screens.Select
         public static readonly float HEIGHT = 24;
         private readonly OsuTabControlCheckbox modsCheckbox;
         private readonly OsuTabControl<BeatmapDetailTab> tabs;
-        private readonly Container tabsContainer;
 
         public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
 
@@ -40,9 +39,10 @@ namespace osu.Game.Screens.Select
                     Height = 1,
                     Colour = Color4.White.Opacity(0.2f),
                 },
-                tabsContainer = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Right = 100 },
                     Child = tabs = new OsuTabControl<BeatmapDetailTab>
                     {
                         Anchor = Anchor.BottomLeft,
@@ -74,13 +74,6 @@ namespace osu.Game.Screens.Select
             tabs.Current.TriggerChange();
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            tabsContainer.Padding = new MarginPadding { Right = modsCheckbox.Width };
-        }
-
         private void invokeOnFilter()
         {
             OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);

From 9fdbe583262411aa5f863aec924459420e373c26 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 7 Oct 2019 16:17:58 -0700
Subject: [PATCH 071/116] Fix dropdown header padding when selected mod filter
 is hidden

---
 osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 38b1c6411b..bba72c7ee1 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Select
         public static readonly float HEIGHT = 24;
         private readonly OsuTabControlCheckbox modsCheckbox;
         private readonly OsuTabControl<BeatmapDetailTab> tabs;
+        private readonly Container tabsContainer;
 
         public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
 
@@ -39,10 +40,9 @@ namespace osu.Game.Screens.Select
                     Height = 1,
                     Colour = Color4.White.Opacity(0.2f),
                 },
-                new Container
+                tabsContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Right = 100 },
                     Child = tabs = new OsuTabControl<BeatmapDetailTab>
                     {
                         Anchor = Anchor.BottomLeft,
@@ -79,6 +79,8 @@ namespace osu.Game.Screens.Select
             OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
 
             modsCheckbox.FadeTo(tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 1, 200, Easing.OutQuint);
+
+            tabsContainer.Padding = new MarginPadding { Right = tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 100 };
         }
     }
 

From 3ec78388e896e6b5bf1fe1f2fa3869545c6759c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 11:02:54 +0900
Subject: [PATCH 072/116] Avoid excess background updates in playlist overlay

---
 osu.Game/Overlays/Music/PlaylistList.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 5b528c5ab2..e8c2537c43 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Music
                 beatmaps.ForEach(addBeatmapSet);
 
                 beatmapBacking.BindTo(beatmap);
-                beatmapBacking.ValueChanged += _ => updateSelectedSet();
+                beatmapBacking.ValueChanged += _ => Scheduler.AddOnce(updateSelectedSet);
             }
 
             private void addBeatmapSet(BeatmapSetInfo obj)

From e7fc5e556c79f154b334545b2d367e712c0154e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 10:40:52 +0900
Subject: [PATCH 073/116] Fix song select not correctly playing tracks in some
 cases

---
 osu.Game/Screens/Select/SongSelect.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d9ddfa2a94..04a686f481 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -412,9 +412,6 @@ namespace osu.Game.Screens.Select
                     WorkingBeatmap previous = Beatmap.Value;
                     Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, previous);
 
-                    if (this.IsCurrentScreen() && Beatmap.Value?.Track != previous?.Track)
-                        ensurePlayingSelected(true);
-
                     if (beatmap != null)
                     {
                         if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID)
@@ -424,6 +421,9 @@ namespace osu.Game.Screens.Select
                     }
                 }
 
+                if (this.IsCurrentScreen())
+                    ensurePlayingSelected();
+
                 UpdateBeatmap(Beatmap.Value);
             }
         }
@@ -581,19 +581,14 @@ namespace osu.Game.Screens.Select
                 beatmap.Track.Looping = true;
         }
 
-        private void ensurePlayingSelected(bool restart = false)
+        private void ensurePlayingSelected()
         {
             Track track = Beatmap.Value.Track;
 
-            if (!track.IsRunning)
-            {
-                track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+            track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-                if (restart)
-                    track.Restart();
-                else
-                    track.Start();
-            }
+            if (!track.IsRunning)
+                track.Restart();
         }
 
         private void onBeatmapSetAdded(BeatmapSetInfo s) => Carousel.UpdateBeatmapSet(s);

From 3c0b1be7f48c32db7714b04ce6fda76ffeefdcb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 11:52:16 +0900
Subject: [PATCH 074/116] Add xmldoc where applicable

---
 osu.Game/Screens/Menu/IntroScreen.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index c81fef6436..1052ebdd5b 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -21,8 +21,15 @@ namespace osu.Game.Screens.Menu
 {
     public abstract class IntroScreen : StartupScreen
     {
+        /// <summary>
+        /// A hash used to find the associated beatmap if already imported.
+        /// </summary>
         protected abstract string BeatmapHash { get; }
 
+        /// <summary>
+        /// A source file to use as an import source if the intro beatmap is not yet present.
+        /// Should be within the "Tracks" namespace of game resources.
+        /// </summary>
         protected abstract string BeatmapFile { get; }
 
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);

From c3d56088d87d8f12fe7abbe2912b8a6f89e73bc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 11:54:39 +0900
Subject: [PATCH 075/116] Make constant private

---
 osu.Game/Screens/Menu/IntroScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 1052ebdd5b..5d560c0c2a 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Menu
 
         private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
 
-        public const int EXIT_DELAY = 3000;
+        private const int exit_delay = 3000;
 
         [Resolved]
         private AudioManager audio { get; set; }
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Menu
         {
             this.FadeIn(300);
 
-            double fadeOutTime = EXIT_DELAY;
+            double fadeOutTime = exit_delay;
             //we also handle the exit transition.
             if (MenuVoice.Value)
                 seeya.Play();
@@ -151,8 +151,8 @@ namespace osu.Game.Screens.Menu
                     .ScaleTo(1, initialMovementTime, Easing.OutQuint)
                     .FadeIn(quick_appear, Easing.OutQuint)
                     .Then()
-                    .RotateTo(20, EXIT_DELAY * 1.5f)
-                    .FadeOut(EXIT_DELAY);
+                    .RotateTo(20, exit_delay * 1.5f)
+                    .FadeOut(exit_delay);
             }
         }
 

From 449e53ee6d5c57db401884b9924eb4d5158dda20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:03:42 +0900
Subject: [PATCH 076/116] Centralise track handling

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 12 +-----------
 osu.Game/Screens/Menu/IntroScreen.cs    | 18 +++++++++++++++++-
 osu.Game/Screens/Menu/IntroTriangles.cs | 13 +------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 6c643860a0..8f3b4f43c5 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -30,19 +30,11 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = IntroBeatmap;
-                IntroBeatmap = null;
-
                 Welcome?.Play();
 
                 Scheduler.AddDelayed(delegate
                 {
-                    // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-                    if (MenuMusic.Value)
-                    {
-                        Track.Restart();
-                        Track = null;
-                    }
+                    StartTrack();
 
                     PrepareMenuLoad();
 
@@ -57,8 +49,6 @@ namespace osu.Game.Screens.Menu
 
         public override void OnSuspending(IScreen next)
         {
-            Track = null;
-
             this.FadeOut(300);
             base.OnSuspending(next);
         }
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 5d560c0c2a..c00d105e12 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
 
         protected Bindable<bool> MenuMusic;
 
-        protected Track Track;
+        protected Track Track { get; private set; }
 
         protected WorkingBeatmap IntroBeatmap;
 
@@ -57,6 +57,13 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
+        protected void StartTrack()
+        {
+            // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
+            if (MenuMusic.Value)
+                Track.Restart();
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
@@ -136,6 +143,9 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
+                Beatmap.Value = IntroBeatmap;
+                IntroBeatmap = null;
+
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
                 logo.Hide();
@@ -156,6 +166,12 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+            Track = null;
+        }
+
         private MainMenu mainMenu;
 
         protected void PrepareMenuLoad()
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 590069ab43..08941eca37 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -55,9 +55,6 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = IntroBeatmap;
-                IntroBeatmap = null;
-
                 PrepareMenuLoad();
 
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
@@ -70,9 +67,7 @@ namespace osu.Game.Screens.Menu
                     AddInternal(t);
                     Welcome?.Play();
 
-                    // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-                    if (MenuMusic.Value)
-                        Track.Start();
+                    StartTrack();
                 });
             }
         }
@@ -83,12 +78,6 @@ namespace osu.Game.Screens.Menu
             background.FadeOut(100);
         }
 
-        public override void OnSuspending(IScreen next)
-        {
-            Track = null;
-            base.OnSuspending(next);
-        }
-
         private class TrianglesIntroSequence : CompositeDrawable
         {
             private readonly OsuLogo logo;

From a0bb19334219edf1f37282a95aa11893cb2fd954 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:04:13 +0900
Subject: [PATCH 077/116] Remove unnecessary beatmap storage

---
 osu.Game/Screens/Menu/IntroScreen.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index c00d105e12..ccb7b8ef3d 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -53,8 +53,6 @@ namespace osu.Game.Screens.Menu
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
-        public new Bindable<WorkingBeatmap> Beatmap => beatmap;
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
         protected void StartTrack()
@@ -68,7 +66,7 @@ namespace osu.Game.Screens.Menu
         private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
             // prevent user from changing beatmap while the intro is still runnning.
-            beatmap = base.Beatmap.BeginLease(false);
+            beatmap = Beatmap.BeginLease(false);
 
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);

From 4ba2dccde30caac207687d4bff7bbb62a2d770cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:05:52 +0900
Subject: [PATCH 078/116] Reorder file contents

---
 osu.Game/Screens/Menu/IntroScreen.cs | 73 +++++++++++++---------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index ccb7b8ef3d..c638d4f3c9 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Screens.Menu
 {
     public abstract class IntroScreen : StartupScreen
     {
+        /// <summary>
+        /// Whether we have loaded the menu previously.
+        /// </summary>
+        public bool DidLoadMenu { get; private set; }
+
         /// <summary>
         /// A hash used to find the associated beatmap if already imported.
         /// </summary>
@@ -32,35 +37,28 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         protected abstract string BeatmapFile { get; }
 
-        private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
-
-        private const int exit_delay = 3000;
-
-        [Resolved]
-        private AudioManager audio { get; set; }
-
         protected SampleChannel Welcome;
 
-        private SampleChannel seeya;
-
         protected Bindable<bool> MenuVoice;
 
         protected Bindable<bool> MenuMusic;
 
+        protected WorkingBeatmap IntroBeatmap;
+
         protected Track Track { get; private set; }
 
-        protected WorkingBeatmap IntroBeatmap;
+        private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
+
+        private const int exit_delay = 3000;
+
+        private SampleChannel seeya;
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
+        private MainMenu mainMenu;
 
-        protected void StartTrack()
-        {
-            // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-            if (MenuMusic.Value)
-                Track.Restart();
-        }
+        [Resolved]
+        private AudioManager audio { get; set; }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
@@ -100,16 +98,7 @@ namespace osu.Game.Screens.Menu
             Track = IntroBeatmap.Track;
         }
 
-        /// <summary>
-        /// Whether we have loaded the menu previously.
-        /// </summary>
-        public bool DidLoadMenu { get; private set; }
-
-        public override bool OnExiting(IScreen next)
-        {
-            //cancel exiting if we haven't loaded the menu yet.
-            return !DidLoadMenu;
-        }
+        public override bool OnExiting(IScreen next) => !DidLoadMenu;
 
         public override void OnResuming(IScreen last)
         {
@@ -131,6 +120,21 @@ namespace osu.Game.Screens.Menu
             base.OnResuming(last);
         }
 
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+            Track = null;
+        }
+
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
+
+        protected void StartTrack()
+        {
+            // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
+            if (MenuMusic.Value)
+                Track.Restart();
+        }
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);
@@ -151,7 +155,7 @@ namespace osu.Game.Screens.Menu
             else
             {
                 const int quick_appear = 350;
-                int initialMovementTime = logo.Alpha > 0.2f ? quick_appear : 0;
+                var initialMovementTime = logo.Alpha > 0.2f ? quick_appear : 0;
 
                 logo.MoveTo(new Vector2(0.5f), initialMovementTime, Easing.OutQuint);
 
@@ -164,18 +168,7 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        public override void OnSuspending(IScreen next)
-        {
-            base.OnSuspending(next);
-            Track = null;
-        }
-
-        private MainMenu mainMenu;
-
-        protected void PrepareMenuLoad()
-        {
-            LoadComponentAsync(mainMenu = new MainMenu());
-        }
+        protected void PrepareMenuLoad() => LoadComponentAsync(mainMenu = new MainMenu());
 
         protected void LoadMenu()
         {

From b8b2ff2674001e9bc3334a7799a8931b5004e7d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:07:59 +0900
Subject: [PATCH 079/116] Move welcome to local usages

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 7 +++++--
 osu.Game/Screens/Menu/IntroScreen.cs    | 2 --
 osu.Game/Screens/Menu/IntroTriangles.cs | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 8f3b4f43c5..aa9cee969c 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 
@@ -17,11 +18,13 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
+        private SampleChannel welcome;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                Welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -30,7 +33,7 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Welcome?.Play();
+                welcome?.Play();
 
                 Scheduler.AddDelayed(delegate
                 {
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index c638d4f3c9..0c192552eb 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         protected abstract string BeatmapFile { get; }
 
-        protected SampleChannel Welcome;
-
         protected Bindable<bool> MenuVoice;
 
         protected Bindable<bool> MenuMusic;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 08941eca37..c86f1393a4 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -40,11 +41,13 @@ namespace osu.Game.Screens.Menu
 
         private BackgroundScreenDefault background;
 
+        private SampleChannel welcome;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                Welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"welcome");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -65,7 +68,7 @@ namespace osu.Game.Screens.Menu
                 }, t =>
                 {
                     AddInternal(t);
-                    Welcome?.Play();
+                    welcome?.Play();
 
                     StartTrack();
                 });

From c280bee894df7e9c01c88332df579d2964f401e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:08:47 +0900
Subject: [PATCH 080/116] Protect configuration bindables

---
 osu.Game/Screens/Menu/IntroScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 0c192552eb..feb472ba88 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -37,9 +37,9 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         protected abstract string BeatmapFile { get; }
 
-        protected Bindable<bool> MenuVoice;
+        protected IBindable<bool> MenuVoice { get; private set; }
 
-        protected Bindable<bool> MenuMusic;
+        protected IBindable<bool> MenuMusic { get; private set; }
 
         protected WorkingBeatmap IntroBeatmap;
 

From cbb120cd3874044673e3197a9fc78942433a3edd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:09:42 +0900
Subject: [PATCH 081/116] Switch beatmap to private

---
 osu.Game/Screens/Menu/IntroScreen.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index feb472ba88..f5ef839b06 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Menu
 
         protected IBindable<bool> MenuMusic { get; private set; }
 
-        protected WorkingBeatmap IntroBeatmap;
+        private WorkingBeatmap introBeatmap;
 
         protected Track Track { get; private set; }
 
@@ -92,8 +92,8 @@ namespace osu.Game.Screens.Menu
                 }
             }
 
-            IntroBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-            Track = IntroBeatmap.Track;
+            introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
+            Track = introBeatmap.Track;
         }
 
         public override bool OnExiting(IScreen next) => !DidLoadMenu;
@@ -143,8 +143,8 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = IntroBeatmap;
-                IntroBeatmap = null;
+                Beatmap.Value = introBeatmap;
+                introBeatmap = null;
 
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);

From 52770f803d8844c135c3cfb05a4abb1d119e087c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:14:53 +0900
Subject: [PATCH 082/116] Fix incorrect beatmap usage

---
 osu.Game/Screens/Menu/IntroScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index f5ef839b06..df83e98494 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = introBeatmap;
+                beatmap.Value = introBeatmap;
                 introBeatmap = null;
 
                 logo.MoveTo(new Vector2(0.5f));

From 5472029ffed6681a327eeacad42577da0306e0e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:27:51 +0900
Subject: [PATCH 083/116] Fix editor defaulting to 0.5x playback speed

---
 osu.Game/Screens/Edit/Components/PlaybackControl.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 8d4ad0efa9..62d6c4648b 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
@@ -105,6 +106,8 @@ namespace osu.Game.Screens.Edit.Components
                 TabContainer.Spacing = Vector2.Zero;
 
                 tempo_values.ForEach(AddItem);
+
+                Current.Value = tempo_values.Last();
             }
 
             public class PlaybackTabItem : TabItem<double>

From 24269c0384f6ebaa5c09ce52c6a4d404bf23fb7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:52:34 +0900
Subject: [PATCH 084/116] Fix skins not being displayed correctly in the editor

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 13 ++++++++++++-
 osu.Game/Skinning/SkinProvidingContainer.cs    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index ec4dda5c23..bd7e8e44e5 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Logging;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose
@@ -115,7 +116,17 @@ namespace osu.Game.Screens.Edit.Compose
                 return;
             }
 
-            composerContainer.Child = composer;
+            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
+
+            // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
+            // full access to all skin sources.
+            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider));
+
+            // load the skinning hierarchy first.
+            // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
+            composerContainer.Add(
+                beatmapSkinProvider.WithChild(
+                    rulesetSkinProvider.WithChild(composer)));
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index ef7f5f381b..1c01bbf1ab 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Skinning
             if (AllowTextureLookup(componentName) && (sourceTexture = skin?.GetTexture(componentName)) != null)
                 return sourceTexture;
 
-            return fallbackSource.GetTexture(componentName);
+            return fallbackSource?.GetTexture(componentName);
         }
 
         public SampleChannel GetSample(ISampleInfo sampleInfo)

From 63bf8ff832ba04886bb2b60f83247f4b30e3073d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 14:23:13 +0900
Subject: [PATCH 085/116] Better signify under construction screens in editor

---
 .../Screens/Edit/Compose/ComposeScreen.cs     |  41 ++--
 osu.Game/Screens/Edit/Design/DesignScreen.cs  |  41 +---
 osu.Game/Screens/Edit/Editor.cs               |  10 +
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  13 ++
 osu.Game/Screens/Edit/Timing/SetupScreen.cs   |  13 ++
 osu.Game/Screens/ScreenWhiteBox.cs            | 200 ++++++++++--------
 6 files changed, 169 insertions(+), 149 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupScreen.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/SetupScreen.cs

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index bd7e8e44e5..2a99d81516 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Skinning;
@@ -23,8 +22,6 @@ namespace osu.Game.Screens.Edit.Compose
 
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
-        private HitObjectComposer composer;
-
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] BindableBeatDivisor beatDivisor)
         {
@@ -107,26 +104,32 @@ namespace osu.Game.Screens.Edit.Compose
                 return;
             }
 
-            composer = ruleset.CreateHitObjectComposer();
+            var composer = ruleset.CreateHitObjectComposer();
 
-            if (composer == null)
+            Drawable content;
+
+            if (composer != null)
             {
-                Logger.Log($"Ruleset {ruleset.Description} doesn't support hitobject composition.");
-                // ExitRequested?.Invoke();
-                return;
+                var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
+
+                // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
+                // full access to all skin sources.
+                var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider));
+
+                // load the skinning hierarchy first.
+                // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
+                content = beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
+            }
+            else
+            {
+                content = new ScreenWhiteBox.UnderConstructionMessage($"{ruleset.Description}'s composer");
             }
 
-            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
-
-            // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
-            // full access to all skin sources.
-            var rulesetSkinProvider = new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(beatmapSkinProvider));
-
-            // load the skinning hierarchy first.
-            // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
-            composerContainer.Add(
-                beatmapSkinProvider.WithChild(
-                    rulesetSkinProvider.WithChild(composer)));
+            LoadComponentAsync(content, _ =>
+            {
+                composerContainer.Add(content);
+                content.FadeInFromZero(300, Easing.OutQuint);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Design/DesignScreen.cs b/osu.Game/Screens/Edit/Design/DesignScreen.cs
index 2a334e1b30..9f1fcf55b2 100644
--- a/osu.Game/Screens/Edit/Design/DesignScreen.cs
+++ b/osu.Game/Screens/Edit/Design/DesignScreen.cs
@@ -1,52 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
 namespace osu.Game.Screens.Edit.Design
 {
     public class DesignScreen : EditorScreen
     {
         public DesignScreen()
         {
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                        Alpha = 0.35f
-                    },
-                    new Container
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Black,
-                                Alpha = 0.5f
-                            },
-                            new Container
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Padding = new MarginPadding(20),
-                                Child = new OsuSpriteText { Text = "Design screen" }
-                            }
-                        }
-                    }
-                }
-            });
+            Child = new ScreenWhiteBox.UnderConstructionMessage("Design mode");
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8cc227d9be..9ebe3bc26a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -26,6 +26,8 @@ using System.Collections.Generic;
 using osu.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
+using osu.Game.Screens.Edit.Setup;
+using osu.Game.Screens.Edit.Timing;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
@@ -258,6 +260,10 @@ namespace osu.Game.Screens.Edit
 
             switch (e.NewValue)
             {
+                case EditorScreenMode.SongSetup:
+                    currentScreen = new SetupScreen();
+                    break;
+
                 case EditorScreenMode.Compose:
                     currentScreen = new ComposeScreen();
                     break;
@@ -266,6 +272,10 @@ namespace osu.Game.Screens.Edit
                     currentScreen = new DesignScreen();
                     break;
 
+                case EditorScreenMode.Timing:
+                    currentScreen = new TimingScreen();
+                    break;
+
                 default:
                     currentScreen = new EditorScreen();
                     break;
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
new file mode 100644
index 0000000000..758dbc6e16
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -0,0 +1,13 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    public class SetupScreen : EditorScreen
+    {
+        public SetupScreen()
+        {
+            Child = new ScreenWhiteBox.UnderConstructionMessage("Setup mode");
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/SetupScreen.cs b/osu.Game/Screens/Edit/Timing/SetupScreen.cs
new file mode 100644
index 0000000000..9ded4207e5
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/SetupScreen.cs
@@ -0,0 +1,13 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Edit.Timing
+{
+    public class TimingScreen : EditorScreen
+    {
+        public TimingScreen()
+        {
+            Child = new ScreenWhiteBox.UnderConstructionMessage("Timing mode");
+        }
+    }
+}
diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs
index 6c5854d17e..e4971221c4 100644
--- a/osu.Game/Screens/ScreenWhiteBox.cs
+++ b/osu.Game/Screens/ScreenWhiteBox.cs
@@ -20,38 +20,17 @@ namespace osu.Game.Screens
 {
     public class ScreenWhiteBox : OsuScreen
     {
+        private readonly UnderConstructionMessage message;
+
         private const double transition_time = 1000;
 
         protected virtual IEnumerable<Type> PossibleChildren => null;
 
-        private readonly FillFlowContainer textContainer;
-        private readonly Container boxContainer;
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg2");
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            Alpha = 0;
-            textContainer.Position = new Vector2(DrawSize.X / 16, 0);
-
-            boxContainer.ScaleTo(0.2f);
-            boxContainer.RotateTo(-20);
-
-            using (BeginDelayedSequence(300, true))
-            {
-                boxContainer.ScaleTo(1, transition_time, Easing.OutElastic);
-                boxContainer.RotateTo(0, transition_time / 2, Easing.OutQuint);
-
-                textContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo);
-                this.FadeIn(transition_time, Easing.OutExpo);
-            }
-        }
-
         public override bool OnExiting(IScreen next)
         {
-            textContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, Easing.OutExpo);
+            message.TextContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, Easing.OutExpo);
             this.FadeOut(transition_time, Easing.OutExpo);
 
             return base.OnExiting(next);
@@ -61,7 +40,7 @@ namespace osu.Game.Screens
         {
             base.OnSuspending(next);
 
-            textContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, Easing.OutExpo);
+            message.TextContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, Easing.OutExpo);
             this.FadeOut(transition_time, Easing.OutExpo);
         }
 
@@ -69,7 +48,7 @@ namespace osu.Game.Screens
         {
             base.OnResuming(last);
 
-            textContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo);
+            message.TextContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo);
             this.FadeIn(transition_time, Easing.OutExpo);
         }
 
@@ -79,65 +58,7 @@ namespace osu.Game.Screens
 
             InternalChildren = new Drawable[]
             {
-                boxContainer = new Container
-                {
-                    Size = new Vector2(0.3f),
-                    RelativeSizeAxes = Axes.Both,
-                    CornerRadius = 20,
-                    Masking = true,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-
-                            Colour = getColourFor(GetType()),
-                            Alpha = 0.2f,
-                            Blending = BlendingParameters.Additive,
-                        },
-                        textContainer = new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Direction = FillDirection.Vertical,
-                            Children = new Drawable[]
-                            {
-                                new SpriteIcon
-                                {
-                                    Icon = FontAwesome.Solid.UniversalAccess,
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    Size = new Vector2(50),
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    Text = GetType().Name,
-                                    Colour = getColourFor(GetType()).Lighten(0.8f),
-                                    Font = OsuFont.GetFont(size: 50),
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    Text = "is not yet ready for use!",
-                                    Font = OsuFont.GetFont(size: 20),
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    Text = "please check back a bit later.",
-                                    Font = OsuFont.GetFont(size: 14),
-                                },
-                            }
-                        },
-                    }
-                },
+                message = new UnderConstructionMessage(GetType().Name),
                 childModeButtons = new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,
@@ -155,24 +76,24 @@ namespace osu.Game.Screens
                     childModeButtons.Add(new ChildModeButton
                     {
                         Text = $@"{t.Name}",
-                        BackgroundColour = getColourFor(t),
-                        HoverColour = getColourFor(t).Lighten(0.2f),
+                        BackgroundColour = getColourFor(t.Name),
+                        HoverColour = getColourFor(t.Name).Lighten(0.2f),
                         Action = delegate { this.Push(Activator.CreateInstance(t) as Screen); }
                     });
                 }
             }
         }
 
-        private Color4 getColourFor(Type type)
+        private static Color4 getColourFor(object type)
         {
-            int hash = type.Name.GetHashCode();
+            int hash = type.GetHashCode();
             byte r = (byte)MathHelper.Clamp(((hash & 0xFF0000) >> 16) * 0.8f, 20, 255);
             byte g = (byte)MathHelper.Clamp(((hash & 0x00FF00) >> 8) * 0.8f, 20, 255);
             byte b = (byte)MathHelper.Clamp((hash & 0x0000FF) * 0.8f, 20, 255);
             return new Color4(r, g, b, 255);
         }
 
-        public class ChildModeButton : TwoLayerButton
+        private class ChildModeButton : TwoLayerButton
         {
             public ChildModeButton()
             {
@@ -181,5 +102,104 @@ namespace osu.Game.Screens
                 Origin = Anchor.BottomRight;
             }
         }
+
+        public class UnderConstructionMessage : CompositeDrawable
+        {
+            public FillFlowContainer TextContainer { get; }
+
+            private readonly Container boxContainer;
+
+            public UnderConstructionMessage(string name)
+            {
+                RelativeSizeAxes = Axes.Both;
+                Size = new Vector2(0.3f);
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                var colour = getColourFor(name);
+
+                InternalChildren = new Drawable[]
+                {
+                    boxContainer = new Container
+                    {
+                        CornerRadius = 20,
+                        Masking = true,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+
+                                Colour = colour,
+                                Alpha = 0.2f,
+                                Blending = BlendingParameters.Additive,
+                            },
+                            TextContainer = new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    new SpriteIcon
+                                    {
+                                        Icon = FontAwesome.Solid.UniversalAccess,
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Size = new Vector2(50),
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Text = name,
+                                        Colour = colour.Lighten(0.8f),
+                                        Font = OsuFont.GetFont(size: 36),
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Text = "is not yet ready for use!",
+                                        Font = OsuFont.GetFont(size: 20),
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Text = "please check back a bit later.",
+                                        Font = OsuFont.GetFont(size: 14),
+                                    },
+                                }
+                            },
+                        }
+                    },
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                TextContainer.Position = new Vector2(DrawSize.X / 16, 0);
+
+                boxContainer.Hide();
+                boxContainer.ScaleTo(0.2f);
+                boxContainer.RotateTo(-20);
+
+                using (BeginDelayedSequence(300, true))
+                {
+                    boxContainer.ScaleTo(1, transition_time, Easing.OutElastic);
+                    boxContainer.RotateTo(0, transition_time / 2, Easing.OutQuint);
+
+                    TextContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo);
+                    boxContainer.FadeIn(transition_time, Easing.OutExpo);
+                }
+            }
+        }
     }
 }

From 3e904b4838b9169b80b0f6fc2381f0de6a47a6cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 14:37:56 +0900
Subject: [PATCH 086/116] Fix naming of file

---
 osu.Game/Screens/Edit/Timing/{SetupScreen.cs => TimingScreen.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Screens/Edit/Timing/{SetupScreen.cs => TimingScreen.cs} (100%)

diff --git a/osu.Game/Screens/Edit/Timing/SetupScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
similarity index 100%
rename from osu.Game/Screens/Edit/Timing/SetupScreen.cs
rename to osu.Game/Screens/Edit/Timing/TimingScreen.cs

From 4e026b163ccd15556945a8d769cad3b5c0a8ac34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 15:03:48 +0900
Subject: [PATCH 087/116] Don't resume playback when user has paused and track
 hasn't changed

---
 osu.Game/Screens/Select/SongSelect.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 04a686f481..6c5f64ed6c 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -581,14 +581,24 @@ namespace osu.Game.Screens.Select
                 beatmap.Track.Looping = true;
         }
 
+        private readonly WeakReference<Track> lastTrack = new WeakReference<Track>(null);
+
+        /// <summary>
+        /// Ensures some music is playing for the current track.
+        /// Will resume playback from a manual user pause if the track has changed.
+        /// </summary>
         private void ensurePlayingSelected()
         {
             Track track = Beatmap.Value.Track;
 
+            bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
+
             track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-            if (!track.IsRunning)
+            if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
                 track.Restart();
+
+            lastTrack.SetTarget(track);
         }
 
         private void onBeatmapSetAdded(BeatmapSetInfo s) => Carousel.UpdateBeatmapSet(s);

From f284d096b75fc63349f08fa0385ce8709e79f214 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 16:37:47 +0900
Subject: [PATCH 088/116] Fix ignored song select test

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 263eada07c..be054495cc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -128,12 +128,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        [Ignore("needs fixing")]
         public void TestImportUnderDifferentRuleset()
         {
             createSongSelect();
-            changeRuleset(2);
-            addRulesetImportStep(0);
+            addRulesetImportStep(2);
             AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmap == null);
         }
 

From 8ebccfe31fe098807ed355bf171c990557d6642f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 16:37:34 +0900
Subject: [PATCH 089/116] Add comprehensive audio state tests

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 263eada07c..5584de5484 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -16,6 +16,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -34,6 +35,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private RulesetStore rulesets;
 
+        private MusicController music;
+
         private WorkingBeatmap defaultBeatmap;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
@@ -79,6 +82,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, defaultBeatmap = Beatmap.Default));
 
+            Dependencies.Cache(music = new MusicController());
+
+            // required to get bindables attached
+            Add(music);
+
             Beatmap.SetDefault();
 
             Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
@@ -93,6 +101,57 @@ namespace osu.Game.Tests.Visual.SongSelect
             manager?.Delete(manager.GetAllUsableBeatmapSets());
         });
 
+        [Test]
+        public void TestAudioResuming()
+        {
+            createSongSelect();
+
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+
+            checkMusicPlaying(true);
+            AddStep("select first", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.First()));
+            checkMusicPlaying(true);
+
+            AddStep("manual pause", () => music.TogglePause());
+            checkMusicPlaying(false);
+            AddStep("select next difficulty", () => songSelect.Carousel.SelectNext(skipDifficulties: false));
+            checkMusicPlaying(false);
+
+            AddStep("select next set", () => songSelect.Carousel.SelectNext());
+            checkMusicPlaying(true);
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestAudioRemainsCorrectOnRulesetChange(bool rulesetsInSameBeatmap)
+        {
+            createSongSelect();
+
+            // start with non-osu! to avoid convert confusion
+            changeRuleset(1);
+
+            if (rulesetsInSameBeatmap)
+                AddStep("import multi-ruleset map", () =>
+                {
+                    var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
+                    manager.Import(createTestBeatmapSet(0, usableRulesets)).Wait();
+                });
+            else
+            {
+                addRulesetImportStep(1);
+                addRulesetImportStep(0);
+            }
+
+            checkMusicPlaying(true);
+
+            AddStep("manual pause", () => music.TogglePause());
+            checkMusicPlaying(false);
+
+            changeRuleset(0);
+            checkMusicPlaying(!rulesetsInSameBeatmap);
+        }
+
         [Test]
         public void TestDummy()
         {
@@ -224,6 +283,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         private static int importId;
         private int getImportId() => ++importId;
 
+        private void checkMusicPlaying(bool playing) =>
+            AddUntilStep($"music {(playing ? "" : "not ")}playing", () => music.IsPlaying == playing);
+
         private void changeMods(params Mod[] mods) => AddStep($"change mods to {string.Join(", ", mods.Select(m => m.Acronym))}", () => Mods.Value = mods);
 
         private void changeRuleset(int id) => AddStep($"change ruleset to {id}", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == id));

From b09d9b7e1f761e9070c0f3aa3629928729c1c7a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 17:56:56 +0900
Subject: [PATCH 090/116] Add todo in slider tail to avoid confusion

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 23c5494cf5..42bf5e4d21 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             positionBindable.BindValueChanged(_ => updatePosition());
             pathBindable.BindValueChanged(_ => updatePosition(), true);
+
+            // TODO: This has no drawable content. Support for skins should be added.
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)

From 4446a2972c7c36e48099b99fc597587156cf50c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 18:08:05 +0900
Subject: [PATCH 091/116] Move WaveContainer test out of editor namespace

---
 .../Visual/{Editor => UserInterface}/TestSceneWaveContainer.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/{Editor => UserInterface}/TestSceneWaveContainer.cs (97%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
index de19727251..5b130b9224 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
@@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
     public class TestSceneWaveContainer : OsuTestScene

From 3dd2b18ff0d32cb717bddd6c982e42ca3a7a723f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 16:04:58 +0900
Subject: [PATCH 092/116] Make EditorScreen abstract

---
 osu.Game/Screens/Edit/Editor.cs       |  6 +-----
 osu.Game/Screens/Edit/EditorScreen.cs | 15 +++++----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9ebe3bc26a..7f08c2f8b9 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -19,13 +19,13 @@ using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
-using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
 using System.Collections.Generic;
 using osu.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
+using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Users;
@@ -275,10 +275,6 @@ namespace osu.Game.Screens.Edit
                 case EditorScreenMode.Timing:
                     currentScreen = new TimingScreen();
                     break;
-
-                default:
-                    currentScreen = new EditorScreen();
-                    break;
             }
 
             LoadComponentAsync(currentScreen, screenContainer.Add);
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 045e5a1226..1b57c703ae 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -10,16 +10,17 @@ using osu.Game.Beatmaps;
 namespace osu.Game.Screens.Edit
 {
     /// <summary>
-    /// TODO: eventually make this inherit Screen and add a local scren stack inside the Editor.
+    /// TODO: eventually make this inherit Screen and add a local screen stack inside the Editor.
     /// </summary>
-    public class EditorScreen : Container
+    public abstract class EditorScreen : Container
     {
-        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        [Resolved]
+        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
 
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public EditorScreen()
+        protected EditorScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -28,12 +29,6 @@ namespace osu.Game.Screens.Edit
             InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
-        {
-            Beatmap.BindTo(beatmap);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From f2adae8fd167195b667989d30d7bc99b09e12ba3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 16:05:38 +0900
Subject: [PATCH 093/116] Rename test case to better match underlying class

---
 ...{TestSceneEditorCompose.cs => TestSceneComposeScreen.cs} | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
 rename osu.Game.Tests/Visual/Editor/{TestSceneEditorCompose.cs => TestSceneComposeScreen.cs} (72%)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorCompose.cs b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
similarity index 72%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorCompose.cs
rename to osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
index 608df1965e..9f16e1d781 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorCompose.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Osu;
@@ -11,10 +9,8 @@ using osu.Game.Screens.Edit.Compose;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestSceneEditorCompose : EditorClockTestScene
+    public class TestSceneComposeScreen : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
-
         [BackgroundDependencyLoader]
         private void load()
         {

From 2d8e5615e4970fc1f47a94ed2690d6f2c0cb8a99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 16:05:55 +0900
Subject: [PATCH 094/116] Extract timeline and layout logic from ComposeScreen

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 111 +-----------------
 .../Screens/Edit/EditorScreenWithTimeline.cs  | 107 +++++++++++++++++
 2 files changed, 112 insertions(+), 106 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 2a99d81516..1d93c6d4a4 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -1,112 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
-using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose
 {
-    public class ComposeScreen : EditorScreen
+    public class ComposeScreen : EditorScreenWithTimeline
     {
-        private const float vertical_margins = 10;
-        private const float horizontal_margins = 20;
-
-        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
-
-        [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] BindableBeatDivisor beatDivisor)
+        protected override Drawable CreateMainContent()
         {
-            if (beatDivisor != null)
-                this.beatDivisor.BindTo(beatDivisor);
-
-            Container composerContainer;
-
-            Children = new Drawable[]
-            {
-                new GridContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Content = new[]
-                    {
-                        new Drawable[]
-                        {
-                            new Container
-                            {
-                                Name = "Timeline",
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.Black.Opacity(0.5f)
-                                    },
-                                    new Container
-                                    {
-                                        Name = "Timeline content",
-                                        RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                                        Child = new GridContainer
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Content = new[]
-                                            {
-                                                new Drawable[]
-                                                {
-                                                    new Container
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Padding = new MarginPadding { Right = 5 },
-                                                        Child = new TimelineArea { RelativeSizeAxes = Axes.Both }
-                                                    },
-                                                    new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
-                                                },
-                                            },
-                                            ColumnDimensions = new[]
-                                            {
-                                                new Dimension(),
-                                                new Dimension(GridSizeMode.Absolute, 90),
-                                            }
-                                        },
-                                    }
-                                }
-                            }
-                        },
-                        new Drawable[]
-                        {
-                            composerContainer = new Container
-                            {
-                                Name = "Composer content",
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                            }
-                        }
-                    },
-                    RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 110) }
-                },
-            };
-
             var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
 
-            if (ruleset == null)
-            {
-                Logger.Log("Beatmap doesn't have a ruleset assigned.");
-                // ExitRequested?.Invoke();
-                return;
-            }
-
-            var composer = ruleset.CreateHitObjectComposer();
-
-            Drawable content;
+            var composer = ruleset?.CreateHitObjectComposer();
 
             if (composer != null)
             {
@@ -118,18 +25,10 @@ namespace osu.Game.Screens.Edit.Compose
 
                 // load the skinning hierarchy first.
                 // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
-                content = beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
-            }
-            else
-            {
-                content = new ScreenWhiteBox.UnderConstructionMessage($"{ruleset.Description}'s composer");
+                return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
             }
 
-            LoadComponentAsync(content, _ =>
-            {
-                composerContainer.Add(content);
-                content.FadeInFromZero(300, Easing.OutQuint);
-            });
+            return new ScreenWhiteBox.UnderConstructionMessage($"{ruleset.Description}'s composer");
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
new file mode 100644
index 0000000000..752356e8c4
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -0,0 +1,107 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class EditorScreenWithTimeline : EditorScreen
+    {
+        private const float vertical_margins = 10;
+        private const float horizontal_margins = 20;
+
+        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
+
+        [BackgroundDependencyLoader(true)]
+        private void load([CanBeNull] BindableBeatDivisor beatDivisor)
+        {
+            if (beatDivisor != null)
+                this.beatDivisor.BindTo(beatDivisor);
+
+            Container mainContent;
+
+            Children = new Drawable[]
+            {
+                new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                Name = "Timeline",
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = Color4.Black.Opacity(0.5f)
+                                    },
+                                    new Container
+                                    {
+                                        Name = "Timeline content",
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                                        Child = new GridContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Content = new[]
+                                            {
+                                                new Drawable[]
+                                                {
+                                                    new Container
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Padding = new MarginPadding { Right = 5 },
+                                                        Child = CreateTimeline()
+                                                    },
+                                                    new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                                },
+                                            },
+                                            ColumnDimensions = new[]
+                                            {
+                                                new Dimension(),
+                                                new Dimension(GridSizeMode.Absolute, 90),
+                                            }
+                                        },
+                                    }
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            mainContent = new Container
+                            {
+                                Name = "Main content",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                            }
+                        }
+                    },
+                    RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 110) }
+                },
+            };
+
+            LoadComponentAsync(CreateMainContent(), content =>
+            {
+                mainContent.Add(content);
+                content.FadeInFromZero(300, Easing.OutQuint);
+            });
+        }
+
+        protected abstract Drawable CreateMainContent();
+
+        protected virtual Drawable CreateTimeline() => new TimelineArea { RelativeSizeAxes = Axes.Both };
+    }
+}

From 0681bb9a2b27f063ae0153ca204b25a895334db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 16:49:10 +0900
Subject: [PATCH 095/116] Fix potential nullref

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 1d93c6d4a4..2e9094ebe6 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Compose
                 return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
             }
 
-            return new ScreenWhiteBox.UnderConstructionMessage($"{ruleset.Description}'s composer");
+            return new ScreenWhiteBox.UnderConstructionMessage(ruleset == null ? "This beatmap" : $"{ruleset.Description}'s composer");
         }
     }
 }

From 93d2c3d7a1c43cb9871f1bcb779b51cddcc086e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:03:20 +0900
Subject: [PATCH 096/116] Warn on incorrect null usage

---
 osu.sln.DotSettings | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index ed162eed6e..ae08a1666f 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -17,7 +17,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -738,6 +739,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

From 51bf600ea7a830d736a748342bd987e6cc4dc878 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:08:31 +0900
Subject: [PATCH 097/116] Use empty hitwindows instead of null

---
 .../Objects/CatchHitObject.cs                 |  2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  2 +-
 .../Objects/HoldNoteTick.cs                   |  2 +-
 osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs  |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Objects/SliderTailCircle.cs               |  2 +-
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs   |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   |  2 +-
 .../Objects/DrumRollTick.cs                   |  2 +-
 .../Objects/StrongHitObject.cs                |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 +-
 osu.Game.Rulesets.Taiko/Objects/SwellTick.cs  |  2 +-
 osu.Game/Rulesets/Objects/HitObject.cs        |  6 +---
 .../Objects/Legacy/Mania/ConvertHit.cs        |  2 +-
 .../Objects/Legacy/Mania/ConvertHold.cs       |  2 +-
 .../Objects/Legacy/Mania/ConvertSlider.cs     |  2 +-
 .../Objects/Legacy/Mania/ConvertSpinner.cs    |  2 +-
 .../Rulesets/Objects/Legacy/Osu/ConvertHit.cs |  2 +-
 .../Objects/Legacy/Osu/ConvertSlider.cs       |  2 +-
 .../Objects/Legacy/Osu/ConvertSpinner.cs      |  2 +-
 .../Objects/Legacy/Taiko/ConvertHit.cs        |  2 +-
 .../Objects/Legacy/Taiko/ConvertSlider.cs     |  2 +-
 .../Objects/Legacy/Taiko/ConvertSpinner.cs    |  2 +-
 osu.Game/Rulesets/Scoring/HitWindows.cs       | 35 +++++++++++++++++++
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  4 +--
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  |  2 +-
 27 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 77d7de989a..e4ad49ea50 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
         }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 
     public enum FruitVisualRepresentation
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 0c82cf7bbc..bdba813eed 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -101,6 +101,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         public override Judgement CreateJudgement() => new HoldNoteJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
index d0125f8793..ac6697a6dc 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     {
         public override Judgement CreateJudgement() => new HoldNoteTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
index a794e57c9e..a277517f9f 100644
--- a/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
@@ -30,6 +30,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 3ed1f2cdde..9bed123465 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -205,6 +205,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 7e540a577b..14c3369967 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -25,6 +25,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuSliderTailJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index af7cf5b144..a49f4cef8b 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -32,6 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 2e7b763966..2441a1449d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 4e02c76a8b..8956ca9c19 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -88,6 +88,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index c466ca7c8a..8a8be3e38d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
index d660149528..72a04698be 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index f96c033dce..e60984596d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -35,6 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoSwellJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
index 68212e8f12..91f4d3dbe7 100644
--- a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
     {
         public override Judgement CreateJudgement() => new TaikoSwellTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index a99fac09cc..eb8652443f 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -66,7 +66,6 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The hit windows for this <see cref="HitObject"/>.
         /// </summary>
-        [CanBeNull]
         public HitWindows HitWindows { get; set; }
 
         private readonly List<HitObject> nestedHitObjects = new List<HitObject>();
@@ -113,10 +112,7 @@ namespace osu.Game.Rulesets.Objects
             nestedHitObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             foreach (var h in nestedHitObjects)
-            {
-                h.HitWindows = HitWindows;
                 h.ApplyDefaults(controlPointInfo, difficulty);
-            }
         }
 
         protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
@@ -147,7 +143,7 @@ namespace osu.Game.Rulesets.Objects
         /// This will only be invoked if <see cref="HitWindows"/> hasn't been set externally (e.g. from a <see cref="BeatmapConverter{T}"/>.
         /// </para>
         /// </summary>
-        [CanBeNull]
+        [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
index 609bdd571a..883ef55df0 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index 350ee3185d..69e6f8379d 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
 
         public double Duration => EndTime - StartTime;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
index e372fbd273..4486c5d906 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index 067377d300..c6d1f1922c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
 
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
index c9851a0074..e40b5b4505 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
@@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public int ComboOffset { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index 1c1180702b..a163329d47 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public int ComboOffset { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index bc94ea1803..5d96a61633 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public float Y => Position.Y;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public bool NewCombo { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
index 709345170f..efb9810927 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertHit : HitObject
     {
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
index c173b3e11a..b365fd34ae 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertSlider : Legacy.ConvertSlider
     {
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 9a35ad2776..840ba51ac2 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 
         public double Duration => EndTime - StartTime;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index efc4cd9f5c..9e7e594104 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 
@@ -30,6 +31,17 @@ namespace osu.Game.Rulesets.Scoring
         private double meh;
         private double miss;
 
+        /// <summary>
+        /// An empty <see cref="HitWindows"/> with only <see cref="HitResult.Miss"/> and <see cref="HitResult.Perfect"/>.
+        /// No time values are provided (meaning instantaneous hit or miss).
+        /// </summary>
+        public static HitWindows Empty => new EmptyHitWindows();
+
+        public HitWindows()
+        {
+            Debug.Assert(GetRanges().Length >= 1, $"{nameof(HitWindows)}");
+        }
+
         /// <summary>
         /// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit.
         /// </summary>
@@ -168,6 +180,29 @@ namespace osu.Game.Rulesets.Scoring
         /// Defaults are provided but can be overridden to customise for a ruleset.
         /// </summary>
         protected virtual DifficultyRange[] GetRanges() => base_ranges;
+
+        public class EmptyHitWindows : HitWindows
+        {
+            private static readonly DifficultyRange[] ranges =
+            {
+                new DifficultyRange(HitResult.Perfect, 0, 0, 0),
+                new DifficultyRange(HitResult.Miss, 0, 0, 0),
+            };
+
+            public override bool IsHitResultAllowed(HitResult result)
+            {
+                switch (result)
+                {
+                    case HitResult.Great:
+                    case HitResult.Miss:
+                        return true;
+                }
+
+                return false;
+            }
+
+            protected override DifficultyRange[] GetRanges() => ranges;
+        }
     }
 
     public struct DifficultyRange
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index d68b0e94c5..d5b3df27df 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -426,11 +426,11 @@ namespace osu.Game.Rulesets.UI
             {
                 foreach (var h in Objects)
                 {
-                    if (h.HitWindows != null)
+                    if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
                         return h.HitWindows;
 
                     foreach (var n in h.NestedHitObjects)
-                        if (n.HitWindows != null)
+                        if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
                             return n.HitWindows;
                 }
 
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 920d11c910..54556f8648 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void onNewJudgement(JudgementResult result)
         {
-            if (result.HitObject.HitWindows == null)
+            if (result.HitObject.HitWindows.WindowFor(HitResult.Miss) == 0)
                 return;
 
             foreach (var c in Children)

From ad6b8d3e04eccee5eaabf496b7b3df2d77c79659 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:08:55 +0900
Subject: [PATCH 098/116] Add result offset bounding to result itself, rather
 than just transforms

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f8bc74b2a6..7f3bfd3b5c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 {
                     UpdateInitialTransforms();
 
-                    var judgementOffset = Math.Min(HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? double.MaxValue, Result?.TimeOffset ?? 0);
+                    var judgementOffset = Result?.TimeOffset ?? 0;
 
                     using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
                     {
@@ -379,7 +379,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
             var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
-            Result.TimeOffset = Time.Current - endTime;
+
+            Result.TimeOffset = Math.Min(HitObject.HitWindows.WindowFor(HitResult.Miss), Time.Current - endTime);
 
             switch (Result.Type)
             {

From 9f2a64843291fbe2e8dae6f86f8004559b75991b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:23:37 +0900
Subject: [PATCH 099/116] Add full asserts

---
 osu.Game/Rulesets/Scoring/HitWindows.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 9e7e594104..93e4dfc5fa 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 
@@ -39,7 +40,8 @@ namespace osu.Game.Rulesets.Scoring
 
         public HitWindows()
         {
-            Debug.Assert(GetRanges().Length >= 1, $"{nameof(HitWindows)}");
+            Debug.Assert(GetRanges().Any(r => r.Result == HitResult.Miss), $"{nameof(GetRanges)} should always contain {nameof(HitResult.Miss)}");
+            Debug.Assert(GetRanges().Any(r => r.Result != HitResult.Miss), $"{nameof(GetRanges)} should always contain at least one result type other than {nameof(HitResult.Miss)}.");
         }
 
         /// <summary>

From e6f857d0d8db175f6cae7b70df070227fb474387 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:03:20 +0900
Subject: [PATCH 100/116] Revert "Warn on incorrect null usage"

This reverts commit 93d2c3d7a1c43cb9871f1bcb779b51cddcc086e9.
---
 osu.sln.DotSettings | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index ae08a1666f..ed162eed6e 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -17,8 +17,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue"></s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -739,7 +738,6 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

From 4e273fc628d2bea152dc93f65e9cdbf144c9c610 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Oct 2019 19:50:05 +0900
Subject: [PATCH 101/116] Return correct allowed value for Perfect

Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
---
 osu.Game/Rulesets/Scoring/HitWindows.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 93e4dfc5fa..39d67f1071 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Scoring
             {
                 switch (result)
                 {
-                    case HitResult.Great:
+                    case HitResult.Perfect:
                     case HitResult.Miss:
                         return true;
                 }

From 65df7902f3f933baa68df1df3211f0077147b40f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 08:15:47 +0000
Subject: [PATCH 102/116] Bump ppy.osu.Framework.NativeLibs from 2019.813.0 to
 2019.1010.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index a15cae55c4..e59f613c98 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -124,6 +124,6 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.813.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1010.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From efa5cedf4fef1c3393fdb6ef5926873072c8e6c5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 08:16:07 +0000
Subject: [PATCH 103/116] Bump ppy.osu.Framework.Android from 2019.930.0 to
 2019.1010.0

Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Android.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Android.props b/osu.Android.props
index 51245351b6..fa940a7c89 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -62,6 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.930.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1010.0" />
   </ItemGroup>
 </Project>

From bc4c1a237140da50f9958fcaf3ee7b0535e945db Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 08:16:28 +0000
Subject: [PATCH 104/116] Bump ppy.osu.Framework from 2019.930.0 to 2019.1010.0

Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8cbc8b0af3..4e3130b64c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1010.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a15cae55c4..8a9dc01f38 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -118,7 +118,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1010.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.930.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />

From e50d8419fda384b0f57a11e0bf4d838ab66d8783 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 08:30:37 +0000
Subject: [PATCH 105/116] Bump ppy.osu.Framework.iOS from 2019.930.0 to
 2019.1010.0

Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index a15cae55c4..7069960ce1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -119,7 +119,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.930.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1010.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 5d6648d9c95df7f5e05b5008e280f525410ccfe7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Oct 2019 17:45:38 +0900
Subject: [PATCH 106/116] Update 2.2 references

---
 .../CatchRuleset__Tests_.xml                  |  4 +--
 .../ManiaRuleset__Tests_.xml                  |  4 +--
 .../runConfigurations/OsuRuleset__Tests_.xml  |  4 +--
 .../TaikoRuleset__Tests_.xml                  |  4 +--
 .../.idea/runConfigurations/Tournament.xml    |  4 +--
 .../.idea/runConfigurations/osu_.xml          |  4 +--
 .../.idea/runConfigurations/osu___Tests_.xml  |  4 +--
 .vscode/launch.json                           | 32 +++++++++----------
 .vscode/tasks.json                            |  2 +-
 README.md                                     |  4 +--
 osu.Desktop/osu.Desktop.csproj                |  2 +-
 .../.vscode/launch.json                       |  4 +--
 .../osu.Game.Rulesets.Catch.Tests.csproj      |  2 +-
 .../.vscode/launch.json                       |  4 +--
 .../osu.Game.Rulesets.Mania.Tests.csproj      |  2 +-
 .../.vscode/launch.json                       |  4 +--
 .../osu.Game.Rulesets.Osu.Tests.csproj        |  2 +-
 .../.vscode/launch.json                       |  4 +--
 .../osu.Game.Rulesets.Taiko.Tests.csproj      |  2 +-
 osu.Game.Tests/osu.Game.Tests.csproj          |  2 +-
 .../osu.Game.Tournament.Tests.csproj          |  2 +-
 21 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/.idea/.idea.osu/.idea/runConfigurations/CatchRuleset__Tests_.xml b/.idea/.idea.osu/.idea/runConfigurations/CatchRuleset__Tests_.xml
index 6463dd6ea5..5372b6f28a 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/CatchRuleset__Tests_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/CatchRuleset__Tests_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Catch.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" enabled="true" />
diff --git a/.idea/.idea.osu/.idea/runConfigurations/ManiaRuleset__Tests_.xml b/.idea/.idea.osu/.idea/runConfigurations/ManiaRuleset__Tests_.xml
index 0b63b2d966..45a94f37c0 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/ManiaRuleset__Tests_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/ManiaRuleset__Tests_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Mania.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" enabled="true" />
diff --git a/.idea/.idea.osu/.idea/runConfigurations/OsuRuleset__Tests_.xml b/.idea/.idea.osu/.idea/runConfigurations/OsuRuleset__Tests_.xml
index 750ece648b..1f09381e08 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/OsuRuleset__Tests_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/OsuRuleset__Tests_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Osu.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" enabled="true" />
diff --git a/.idea/.idea.osu/.idea/runConfigurations/TaikoRuleset__Tests_.xml b/.idea/.idea.osu/.idea/runConfigurations/TaikoRuleset__Tests_.xml
index 7b359a1ca0..ba530f0ddf 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/TaikoRuleset__Tests_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/TaikoRuleset__Tests_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Taiko.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" enabled="true" />
diff --git a/.idea/.idea.osu/.idea/runConfigurations/Tournament.xml b/.idea/.idea.osu/.idea/runConfigurations/Tournament.xml
index 3722f3dc04..89d5b45f67 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/Tournament.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/Tournament.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tournament" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <method v="2">
       <option name="Build" enabled="true" />
     </method>
diff --git a/.idea/.idea.osu/.idea/runConfigurations/osu_.xml b/.idea/.idea.osu/.idea/runConfigurations/osu_.xml
index 7ac6bb745d..f1d0957b8e 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/osu_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/osu_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <method v="2">
       <option name="Build" enabled="true" />
     </method>
diff --git a/.idea/.idea.osu/.idea/runConfigurations/osu___Tests_.xml b/.idea/.idea.osu/.idea/runConfigurations/osu___Tests_.xml
index 7fcb7c15ea..23b49abcad 100644
--- a/.idea/.idea.osu/.idea/runConfigurations/osu___Tests_.xml
+++ b/.idea/.idea.osu/.idea/runConfigurations/osu___Tests_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.0/osu.Game.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
     <method v="2">
       <option name="Build" enabled="true" />
     </method>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 57ff3e6b43..5940df2191 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,13 +6,13 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -23,13 +23,13 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -40,13 +40,13 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp3.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -56,13 +56,13 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp3.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -73,14 +73,14 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -91,14 +91,14 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -109,14 +109,14 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tournament tests (Debug)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
@@ -127,14 +127,14 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tournament tests (Release)",
             "linux": {
                 "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
+                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.0:${env:LD_LIBRARY_PATH}"
                 }
             },
             "console": "internalConsole"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index aba590f466..70e620bca2 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -95,7 +95,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore (netcoreapp2.2)",
+            "label": "Restore (netcoreapp3.0)",
             "type": "shell",
             "command": "dotnet",
             "args": [
diff --git a/README.md b/README.md
index aefeb2e96e..0460e9cbcf 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh
 
 ## Requirements
 
-- A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed.
+- A desktop platform with the [.NET Core SDK 3.0](https://www.microsoft.com/net/learn/get-started) or higher installed.
 - When running on linux, please have a system-wide ffmpeg installation available to support video decoding.
 - When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
 - When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2017+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
@@ -78,7 +78,7 @@ On Linux, the environment variable `LD_LIBRARY_PATH` must point to the build dir
 For example, you can run osu! with the following command:
 
 ```shell
-LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp2.2" dotnet run --project osu.Desktop
+LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp3.0" dotnet run --project osu.Desktop
 ```
 
 ### Testing with resource/framework modifications
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 2461351110..2d1282634f 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
index 5dfaf5ec39..4030d2d9e7 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp3.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 36342024b0..4b629902cb 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
index 492f894484..779eb4f277 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp3.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index 09bf9241f2..30511d672d 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
index ed03e99b9b..67338b7bbe 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp3.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 791043bcc6..3aea9e0387 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
index 3ef78bf6c8..7d929e6bbf 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp3.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp3.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index b0e0efdc68..717e795112 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 75e6354612..aa29fc802c 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 491cf54686..371ffcdf9e 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />

From a6588adbecd6ee4b201e90faefb1038c182586ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Oct 2019 17:48:56 +0900
Subject: [PATCH 107/116] Update cake bootstrap scripts

---
 build.ps1 | 86 +++----------------------------------------------------
 build.sh  | 41 ++------------------------
 2 files changed, 7 insertions(+), 120 deletions(-)
 mode change 100644 => 100755 build.ps1

diff --git a/build.ps1 b/build.ps1
old mode 100644
new mode 100755
index c6a0bf6d4a..8eb37f2de6
--- a/build.ps1
+++ b/build.ps1
@@ -1,82 +1,4 @@
-##########################################################################
-# This is a customized Cake bootstrapper script for PowerShell.
-##########################################################################
-
-<#
-
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-
-.DESCRIPTION
-This Powershell script restores NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-
-.LINK
-https://cakebuild.net
-
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build.cake",
-    [string]$Target,
-    [string]$Configuration,
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity,
-    [switch]$ShowDescription,
-    [Alias("WhatIf", "Noop")]
-    [switch]$DryRun,
-    [Parameter(Position = 0, Mandatory = $false, ValueFromRemainingArguments = $true)]
-    [string[]]$ScriptArgs
-)
-
-Write-Host "Preparing to run build script..."
-
-# Determine the script root for resolving other paths.
-if(!$PSScriptRoot) {
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-# Resolve the paths for resources used for debugging.
-$BUILD_DIR = Join-Path $PSScriptRoot "build"
-$TOOLS_DIR = Join-Path $BUILD_DIR "tools"
-$CAKE_CSPROJ = Join-Path $BUILD_DIR "cakebuild.csproj"
-
-# Install the required tools locally.
-Write-Host "Restoring cake tools..."
-Invoke-Expression "dotnet restore `"$CAKE_CSPROJ`" --packages `"$TOOLS_DIR`"" | Out-Null
-
-# Find the Cake executable
-$CAKE_EXECUTABLE = (Get-ChildItem -Path "$TOOLS_DIR/cake.coreclr/" -Filter Cake.dll -Recurse).FullName
-
-# Build Cake arguments
-$cakeArguments = @("$Script");
-if ($Target) { $cakeArguments += "-target=$Target" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-if ($Experimental) { $cakeArguments += "-experimental" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-Push-Location -Path $BUILD_DIR
-Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments"
-Pop-Location
-exit $LASTEXITCODE
+dotnet tool install Cake.Tool --global --version 0.35.0
+dotnet cake ./build/build.cake --bootstrap
+dotnet cake ./build/build.cake
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 8f1ef5b455..d20a9c12fa 100755
--- a/build.sh
+++ b/build.sh
@@ -1,38 +1,3 @@
-#!/usr/bin/env bash
-
-##########################################################################
-# This is a customized Cake bootstrapper script for Shell.
-##########################################################################
-
-echo "Preparing to run build script..."
-
-cd build
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-TOOLS_DIR=$SCRIPT_DIR/tools
-CAKE_BINARY_PATH=$TOOLS_DIR/"cake.coreclr"
-
-SCRIPT="build.cake"
-CAKE_CSPROJ=$SCRIPT_DIR/"cakebuild.csproj"
-
-# Parse arguments.
-CAKE_ARGUMENTS=()
-for i in "$@"; do
-    case $1 in
-        -s|--script) SCRIPT="$2"; shift ;;
-        --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
-        *) CAKE_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
-# Install the required tools locally.
-echo "Restoring cake tools..."
-dotnet restore $CAKE_CSPROJ --packages $TOOLS_DIR > /dev/null 2>&1
-
-# Search for the CakeBuild binary.
-CAKE_BINARY=$(find $CAKE_BINARY_PATH -name "Cake.dll")
-
-# Start Cake
-echo "Running build script..."
-
-dotnet "$CAKE_BINARY" $SCRIPT "${CAKE_ARGUMENTS[@]}"
+dotnet tool install Cake.Tool --global --version 0.35.0
+dotnet cake ./build/build.cake --bootstrap
+dotnet cake ./build/build.cake
\ No newline at end of file

From 3fd4b0da502ffe4ea9a5f6c24c41bee4d7f607d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Oct 2019 17:50:00 +0900
Subject: [PATCH 108/116] Update appveyor images

---
 appveyor.yml        | 2 +-
 appveyor_deploy.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index be1727e7d7..f59c0b162d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 clone_depth: 1
 version: '{branch}-{build}'
-image: Previous Visual Studio 2017
+image: Visual Studio 2019 Preview
 test: off
 build_script:
   - cmd: PowerShell -Version 2.0 .\build.ps1
diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index d36298175b..13635b943c 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -1,6 +1,6 @@
 clone_depth: 1
 version: '{build}'
-image: Previous Visual Studio 2017
+image: Visual Studio 2019 Preview
 test: off
 skip_non_tags: true
 build_script:

From d75275c0eee8deb444b462f0737eb33341235f3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Oct 2019 17:51:00 +0900
Subject: [PATCH 109/116] Remove cake csproj

---
 build/cakebuild.csproj | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 build/cakebuild.csproj

diff --git a/build/cakebuild.csproj b/build/cakebuild.csproj
deleted file mode 100644
index d5a6d44740..0000000000
--- a/build/cakebuild.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <PackAsTool>true</PackAsTool>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Cake" Version="0.34.1" />
-    <PackageReference Include="Cake.CoreCLR" Version="0.34.1" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 4a4830c717373ac7742fe3d64741a4cd674a8906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Oct 2019 17:51:56 +0900
Subject: [PATCH 110/116] Update cake dependencies

---
 build/build.cake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.cake b/build/build.cake
index 1d2588de49..cfdfebee61 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -1,5 +1,5 @@
-#addin "nuget:?package=CodeFileSanity&version=0.0.21"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.1.1"
+#addin "nuget:?package=CodeFileSanity&version=0.0.33"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.2.1"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
 var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 

From cb1f7e2dc7840f3016914e5702c575dfb2a8a133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Oct 2019 13:48:36 +0200
Subject: [PATCH 111/116] Fix platform dependency in buffered reader test

Tests for the line-buffered reader added in 7b1ff38 were subtly
dependent on the execution environment due to differing end-of-line
markers on Windows and Unix-based systems.

Because StreamReader discards all newlines when reading line-by-line,
LineBufferedReader used a StringBuilder to patch the peeked lines
back together with the remaining contents of the file being read.
As StringBuilder.AppendLine uses the environment-specific newline
delimiter, the delimiters after the peeked-but-unconsumed lines can
therefore be substituted by the platform-specific variants, causing
the test failures due to the overly-simplified way they were written.

Reformulate the test to avoid such issues from resurfacing again
by splitting lines by \r or \n and then testing each line individually.
Additionally remove all raw literals in favour of explicitly mixing
various line delimiter character sequences for additional coverage.
---
 .../Beatmaps/IO/LineBufferedReaderTest.cs     | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
index b582ca0a6f..25517ad615 100644
--- a/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.IO;
 using System.Text;
 using NUnit.Framework;
@@ -14,9 +15,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestReadLineByLine()
         {
-            const string contents = @"line 1
-line 2
-line 3";
+            const string contents = "line 1\rline 2\nline 3";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
@@ -31,9 +30,7 @@ line 3";
         [Test]
         public void TestPeekLineOnce()
         {
-            const string contents = @"line 1
-peek this
-line 3";
+            const string contents = "line 1\r\npeek this\nline 3";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
@@ -49,9 +46,7 @@ line 3";
         [Test]
         public void TestPeekLineMultipleTimes()
         {
-            const string contents = @"peek this once
-line 2
-peek this a lot";
+            const string contents = "peek this once\nline 2\rpeek this a lot";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
@@ -70,8 +65,7 @@ peek this a lot";
         [Test]
         public void TestPeekLineAtEndOfStream()
         {
-            const string contents = @"first line
-second line";
+            const string contents = "first line\r\nsecond line";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
@@ -100,8 +94,7 @@ second line";
         [Test]
         public void TestReadToEndNoPeeks()
         {
-            const string contents = @"first line
-second line";
+            const string contents = "first line\r\nsecond line";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
@@ -113,20 +106,19 @@ second line";
         [Test]
         public void TestReadToEndAfterReadsAndPeeks()
         {
-            const string contents = @"this line is gone
-this one shouldn't be
-these ones
-definitely not";
+            const string contents = "this line is gone\rthis one shouldn't be\r\nthese ones\ndefinitely not";
 
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
             using (var bufferedReader = new LineBufferedReader(stream))
             {
                 Assert.AreEqual("this line is gone", bufferedReader.ReadLine());
                 Assert.AreEqual("this one shouldn't be", bufferedReader.PeekLine());
-                const string ending = @"this one shouldn't be
-these ones
-definitely not";
-                Assert.AreEqual(ending, bufferedReader.ReadToEnd());
+
+                var endingLines = bufferedReader.ReadToEnd().Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                Assert.AreEqual(3, endingLines.Length);
+                Assert.AreEqual("this one shouldn't be", endingLines[0]);
+                Assert.AreEqual("these ones", endingLines[1]);
+                Assert.AreEqual("definitely not", endingLines[2]);
             }
         }
     }

From 44853c262c8573fc1161bfab9fe27c0abfa56a8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Oct 2019 13:55:58 +0900
Subject: [PATCH 112/116] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index fa940a7c89..0a831eceb2 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -62,6 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1010.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1011.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4e3130b64c..c2888c8e21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1010.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1011.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index fb6d5107ff..8ad7a58e36 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -118,8 +118,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1010.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1010.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1011.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1011.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9fb5c85a18d2ff4c0f3abb33b96bc490d8cad487 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 05:15:14 +0000
Subject: [PATCH 113/116] Bump ppy.osu.Game.Resources from 2019.913.0 to
 2019.1010.0

Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.913.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.913.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 0a831eceb2..85766665a9 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -61,7 +61,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1011.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c2888c8e21..ab7c40116b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2019.1011.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8ad7a58e36..925a217a13 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -117,7 +117,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2019.1011.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1011.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />

From d44acf20b40b75e9cc92ac2feb8c3d6f2779b1cc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 05:33:15 +0000
Subject: [PATCH 114/116] Bump ppy.osu.Framework.NativeLibs from 2019.1010.0 to
 2019.1011.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.1010.0 to 2019.1011.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1010.0...2019.1011.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 8ad7a58e36..7532bd5100 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -124,6 +124,6 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1010.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1011.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From 4f0354bdb63cc6216117db6e6f7148a2cf3a5f84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Oct 2019 14:56:54 +0900
Subject: [PATCH 115/116] Revert nativelibs update

---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index a73d40b37b..925a217a13 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -124,6 +124,6 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1011.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1010.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From 1faef2f97dbefda23b62dbb39494f0a6fe6b96f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Oct 2019 16:17:15 +0900
Subject: [PATCH 116/116] Update fastlane

---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7df9c46482..ab594aee74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.66.0)
+    excon (0.67.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -27,7 +27,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.131.0)
+    fastlane (2.133.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -37,9 +37,9 @@ GEM
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
       excon (>= 0.45.0, < 1.0.0)
-      faraday (~> 0.9)
+      faraday (< 0.16.0)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
+      faraday_middleware (< 0.16.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.21.2, < 0.24.0)
@@ -52,7 +52,7 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.2, < 2.0.0)
+      rubyzip (>= 1.3.0, < 2.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -102,7 +102,7 @@ GEM
     memoist (0.16.0)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0904)
+    mime-types-data (3.2019.1009)
     mini_magick (4.9.5)
     mini_portile2 (2.4.0)
     multi_json (1.13.1)
@@ -121,9 +121,9 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    rubyzip (1.2.4)
+    rubyzip (1.3.0)
     security (0.1.3)
-    signet (0.11.0)
+    signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)