Merge remote-tracking branch 'upstream/master' into selector-hiding

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -25,11 +25,7 @@ namespace osu.Desktop.Updater
         private UpdateManager updateManager;
         private NotificationOverlay notificationOverlay;
 
-        public void PrepareUpdate()
+        public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
-        {
-            // Squirrel returns execution to us after the update process is started, so it's safe to use Wait() here
-            UpdateManager.RestartAppWhenExited().Wait();
-        }
 
         [BackgroundDependencyLoader]
         private void load(NotificationOverlay notification, OsuGameBase game)
@@ -46,7 +42,7 @@ namespace osu.Desktop.Updater
         private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
             //should we schedule a retry on completion of this check?
-            bool scheduleRetry = true;
+            bool scheduleRecheck = true;
 
             try
             {
@@ -86,10 +82,11 @@ namespace osu.Desktop.Updater
                         //could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         //try again without deltas.
                         checkForUpdateAsync(false, notification);
-                        scheduleRetry = false;
+                        scheduleRecheck = false;
                     }
                     else
                     {
+                        notification.State = ProgressNotificationState.Cancelled;
                         Logger.Error(e, @"update failed!");
                     }
                 }
@@ -100,11 +97,8 @@ namespace osu.Desktop.Updater
             }
             finally
             {
-                if (scheduleRetry)
+                if (scheduleRecheck)
                 {
-                    if (notification != null)
-                        notification.State = ProgressNotificationState.Cancelled;
-
                     //check again in 30 minutes.
                     Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
                 }
@@ -134,8 +128,8 @@ namespace osu.Desktop.Updater
                     Text = @"Update ready to install. Click to restart!",
                     Activated = () =>
                     {
-                        updateManager.PrepareUpdate();
+                        updateManager.PrepareUpdateAsync()
-                        game.GracefullyExit();
+                                     .ContinueWith(_ => Schedule(() => game.GracefullyExit()));
                         return true;
                     }
                 };

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Tests.Visual;
@@ -17,8 +16,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
         }
 
-        [BackgroundDependencyLoader]
+        [Test]
-        private void load()
+        public void TestHyperDash()
         {
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
         }

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         {
             base.CreateNestedHitObjects();
 
-            var tickSamples = Samples.Select(s => new SampleInfo
+            var tickSamples = Samples.Select(s => new HitSampleInfo
             {
                 Bank = s.Bank,
                 Name = @"slidertick",
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public double Distance => Path.Distance;
 
-        public List<List<SampleInfo>> NodeSamples { get; set; } = new List<List<SampleInfo>>();
+        public List<List<HitSampleInfo>> NodeSamples { get; set; } = new List<List<HitSampleInfo>>();
 
         public double? LegacyLastTickOffset { get; set; }
     }

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

@@ -255,7 +255,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             /// </summary>
             /// <param name="time">The time to retrieve the sample info list from.</param>
             /// <returns></returns>
-            private List<SampleInfo> sampleInfoListAt(double time)
+            private List<HitSampleInfo> sampleInfoListAt(double time)
             {
                 var curveData = HitObject as IHasCurve;
 

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs

@@ -364,7 +364,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     break;
             }
 
-            bool isDoubleSample(SampleInfo sample) => sample.Name == SampleInfo.HIT_CLAP || sample.Name == SampleInfo.HIT_FINISH;
+            bool isDoubleSample(HitSampleInfo sample) => sample.Name == HitSampleInfo.HIT_CLAP || sample.Name == HitSampleInfo.HIT_FINISH;
 
             bool canGenerateTwoNotes = !convertType.HasFlag(PatternType.LowProbability);
             canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(HitObject.StartTime).Any(isDoubleSample);
@@ -443,7 +443,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 noteCount = 0;
             noteCount = Math.Min(TotalColumns - 1, noteCount);
 
-            bool ignoreHead = !sampleInfoListAt(startTime).Any(s => s.Name == SampleInfo.HIT_WHISTLE || s.Name == SampleInfo.HIT_FINISH || s.Name == SampleInfo.HIT_CLAP);
+            bool ignoreHead = !sampleInfoListAt(startTime).Any(s => s.Name == HitSampleInfo.HIT_WHISTLE || s.Name == HitSampleInfo.HIT_FINISH || s.Name == HitSampleInfo.HIT_CLAP);
 
             var rowPattern = new Pattern();
 
@@ -472,7 +472,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
         /// <returns></returns>
-        private List<SampleInfo> sampleInfoListAt(double time)
+        private List<HitSampleInfo> sampleInfoListAt(double time)
         {
             var curveData = HitObject as IHasCurve;
 

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             switch (TotalColumns)
             {
-                case 8 when HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && endTime - HitObject.StartTime < 1000:
+                case 8 when HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH) && endTime - HitObject.StartTime < 1000:
                     addToPattern(pattern, 0, generateHold);
                     break;
 
@@ -72,9 +72,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 };
 
                 if (hold.Head.Samples == null)
-                    hold.Head.Samples = new List<SampleInfo>();
+                    hold.Head.Samples = new List<HitSampleInfo>();
 
-                hold.Head.Samples.Add(new SampleInfo { Name = SampleInfo.HIT_NORMAL });
+                hold.Head.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_NORMAL });
 
                 hold.Tail.Samples = HitObject.Samples;
 

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs

@@ -79,9 +79,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (!convertType.HasFlag(PatternType.KeepSingle))
             {
-                if (HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && TotalColumns != 8)
+                if (HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH) && TotalColumns != 8)
                     convertType |= PatternType.Mirror;
-                else if (HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_CLAP))
+                else if (HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP))
                     convertType |= PatternType.Gathered;
             }
         }
@@ -263,7 +263,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <summary>
         /// Whether this hit object can generate a note in the special column.
         /// </summary>
-        private bool hasSpecialColumn => HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_CLAP) && HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH);
+        private bool hasSpecialColumn => HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP) && HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH);
 
         /// <summary>
         /// Generates a random pattern.
@@ -364,7 +364,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     break;
             }
 
-            if (HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_CLAP))
+            if (HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP))
                 p2 = 1;
 
             return GetRandomNoteCount(p2, p3, p4, p5);

osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs

@@ -248,9 +248,9 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void createCatmull(int repeats = 0)
         {
-            var repeatSamples = new List<List<SampleInfo>>();
+            var repeatSamples = new List<List<HitSampleInfo>>();
             for (int i = 0; i < repeats; i++)
-                repeatSamples.Add(new List<SampleInfo>());
+                repeatSamples.Add(new List<HitSampleInfo>());
 
             var slider = new Slider
             {
@@ -270,11 +270,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             addSlider(slider, 3, 1);
         }
 
-        private List<List<SampleInfo>> createEmptySamples(int repeats)
+        private List<List<HitSampleInfo>> createEmptySamples(int repeats)
         {
-            var repeatSamples = new List<List<SampleInfo>>();
+            var repeatSamples = new List<List<HitSampleInfo>>();
             for (int i = 0; i < repeats; i++)
-                repeatSamples.Add(new List<SampleInfo>());
+                repeatSamples.Add(new List<HitSampleInfo>());
             return repeatSamples;
         }
 

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

@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         private readonly ShakeContainer shakeContainer;
 
+        // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
+        public override bool HandlePositionalInput => true;
+
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {

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

@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         internal float LazyTravelDistance;
 
-        public List<List<SampleInfo>> NodeSamples { get; set; } = new List<List<SampleInfo>>();
+        public List<List<HitSampleInfo>> NodeSamples { get; set; } = new List<List<HitSampleInfo>>();
 
         private int repeatCount;
 
@@ -157,12 +157,12 @@ namespace osu.Game.Rulesets.Osu.Objects
             foreach (var e in
                 SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset))
             {
-                var firstSample = Samples.Find(s => s.Name == SampleInfo.HIT_NORMAL)
+                var firstSample = Samples.Find(s => s.Name == HitSampleInfo.HIT_NORMAL)
                                   ?? Samples.FirstOrDefault(); // TODO: remove this when guaranteed sort is present for samples (https://github.com/ppy/osu/issues/1933)
-                var sampleList = new List<SampleInfo>();
+                var sampleList = new List<HitSampleInfo>();
 
                 if (firstSample != null)
-                    sampleList.Add(new SampleInfo
+                    sampleList.Add(new HitSampleInfo
                     {
                         Bank = firstSample.Bank,
                         Volume = firstSample.Volume,
@@ -225,7 +225,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             }
         }
 
-        private List<SampleInfo> getNodeSamples(int nodeIndex) =>
+        private List<HitSampleInfo> getNodeSamples(int nodeIndex) =>
             nodeIndex < NodeSamples.Count ? NodeSamples[nodeIndex] : Samples;
 
         public override Judgement CreateJudgement() => new OsuJudgement();

osu.Game.Rulesets.Taiko.Tests/TestSceneInputDrum.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             typeof(InputDrum),
             typeof(DrumSampleMapping),
-            typeof(SampleInfo),
+            typeof(HitSampleInfo),
             typeof(SampleControlPoint)
         };
 

osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
             foreach (var s in samplePoints)
             {
                 var centre = s.GetSampleInfo();
-                var rim = s.GetSampleInfo(SampleInfo.HIT_CLAP);
+                var rim = s.GetSampleInfo(HitSampleInfo.HIT_CLAP);
 
                 // todo: this is ugly
                 centre.Namespace = "taiko";
@@ -43,9 +43,9 @@ namespace osu.Game.Rulesets.Taiko.Audio
             }
         }
 
-        private SkinnableSound addSound(SampleInfo sampleInfo)
+        private SkinnableSound addSound(HitSampleInfo hitSampleInfo)
         {
-            var drawable = new SkinnableSound(sampleInfo);
+            var drawable = new SkinnableSound(hitSampleInfo);
             Sounds.Add(drawable);
             return drawable;
         }

osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -79,9 +79,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             var curveData = obj as IHasCurve;
 
             // Old osu! used hit sounding to determine various hit type information
-            List<SampleInfo> samples = obj.Samples;
+            List<HitSampleInfo> samples = obj.Samples;
 
-            bool strong = samples.Any(s => s.Name == SampleInfo.HIT_FINISH);
+            bool strong = samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH);
 
             if (distanceData != null)
             {
@@ -117,15 +117,15 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                 if (!isForCurrentRuleset && tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
                 {
-                    List<List<SampleInfo>> allSamples = curveData != null ? curveData.NodeSamples : new List<List<SampleInfo>>(new[] { samples });
+                    List<List<HitSampleInfo>> allSamples = curveData != null ? curveData.NodeSamples : new List<List<HitSampleInfo>>(new[] { samples });
 
                     int i = 0;
 
                     for (double j = obj.StartTime; j <= obj.StartTime + taikoDuration + tickSpacing / 8; j += tickSpacing)
                     {
-                        List<SampleInfo> currentSamples = allSamples[i];
+                        List<HitSampleInfo> currentSamples = allSamples[i];
-                        bool isRim = currentSamples.Any(s => s.Name == SampleInfo.HIT_CLAP || s.Name == SampleInfo.HIT_WHISTLE);
+                        bool isRim = currentSamples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
-                        strong = currentSamples.Any(s => s.Name == SampleInfo.HIT_FINISH);
+                        strong = currentSamples.Any(s => s.Name == HitSampleInfo.HIT_FINISH);
 
                         if (isRim)
                         {
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             }
             else
             {
-                bool isRim = samples.Any(s => s.Name == SampleInfo.HIT_CLAP || s.Name == SampleInfo.HIT_WHISTLE);
+                bool isRim = samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
 
                 if (isRim)
                 {

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs

@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
 
         // Normal and clap samples are handled by the drum
-        protected override IEnumerable<SampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != SampleInfo.HIT_NORMAL && s.Name != SampleInfo.HIT_CLAP);
+        protected override IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
 
         protected override string SampleNamespace => "Taiko";
 

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -354,14 +354,14 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.IsNotNull(curveData);
                 Assert.AreEqual(new Vector2(192, 168), positionData.Position);
                 Assert.AreEqual(956, hitObjects[0].StartTime);
-                Assert.IsTrue(hitObjects[0].Samples.Any(s => s.Name == SampleInfo.HIT_NORMAL));
+                Assert.IsTrue(hitObjects[0].Samples.Any(s => s.Name == HitSampleInfo.HIT_NORMAL));
 
                 positionData = hitObjects[1] as IHasPosition;
 
                 Assert.IsNotNull(positionData);
                 Assert.AreEqual(new Vector2(304, 56), positionData.Position);
                 Assert.AreEqual(1285, hitObjects[1].StartTime);
-                Assert.IsTrue(hitObjects[1].Samples.Any(s => s.Name == SampleInfo.HIT_CLAP));
+                Assert.IsTrue(hitObjects[1].Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP));
             }
         }
 
@@ -384,7 +384,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual("soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First());
             }
 
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
         }
 
         [Test]
@@ -402,7 +402,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual("normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
             }
 
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
         }
 
         [Test]
@@ -422,7 +422,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(70, getTestableSampleInfo(hitObjects[3]).Volume);
             }
 
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
         }
 
         [Test]
@@ -438,34 +438,34 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var slider1 = (ConvertSlider)hitObjects[0];
 
                 Assert.AreEqual(1, slider1.NodeSamples[0].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider1.NodeSamples[0][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider1.NodeSamples[0][0].Name);
                 Assert.AreEqual(1, slider1.NodeSamples[1].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider1.NodeSamples[1][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider1.NodeSamples[1][0].Name);
                 Assert.AreEqual(1, slider1.NodeSamples[2].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider1.NodeSamples[2][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider1.NodeSamples[2][0].Name);
 
                 var slider2 = (ConvertSlider)hitObjects[1];
 
                 Assert.AreEqual(2, slider2.NodeSamples[0].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider2.NodeSamples[0][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider2.NodeSamples[0][0].Name);
-                Assert.AreEqual(SampleInfo.HIT_CLAP, slider2.NodeSamples[0][1].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_CLAP, slider2.NodeSamples[0][1].Name);
                 Assert.AreEqual(2, slider2.NodeSamples[1].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider2.NodeSamples[1][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider2.NodeSamples[1][0].Name);
-                Assert.AreEqual(SampleInfo.HIT_CLAP, slider2.NodeSamples[1][1].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_CLAP, slider2.NodeSamples[1][1].Name);
                 Assert.AreEqual(2, slider2.NodeSamples[2].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider2.NodeSamples[2][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider2.NodeSamples[2][0].Name);
-                Assert.AreEqual(SampleInfo.HIT_CLAP, slider2.NodeSamples[2][1].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_CLAP, slider2.NodeSamples[2][1].Name);
 
                 var slider3 = (ConvertSlider)hitObjects[2];
 
                 Assert.AreEqual(2, slider3.NodeSamples[0].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider3.NodeSamples[0][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider3.NodeSamples[0][0].Name);
-                Assert.AreEqual(SampleInfo.HIT_WHISTLE, slider3.NodeSamples[0][1].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_WHISTLE, slider3.NodeSamples[0][1].Name);
                 Assert.AreEqual(1, slider3.NodeSamples[1].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider3.NodeSamples[1][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider3.NodeSamples[1][0].Name);
                 Assert.AreEqual(2, slider3.NodeSamples[2].Count);
-                Assert.AreEqual(SampleInfo.HIT_NORMAL, slider3.NodeSamples[2][0].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_NORMAL, slider3.NodeSamples[2][0].Name);
-                Assert.AreEqual(SampleInfo.HIT_CLAP, slider3.NodeSamples[2][1].Name);
+                Assert.AreEqual(HitSampleInfo.HIT_CLAP, slider3.NodeSamples[2][1].Name);
             }
         }
 

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -101,14 +101,14 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsNotNull(curveData);
             Assert.AreEqual(new Vector2(192, 168), positionData.Position);
             Assert.AreEqual(956, beatmap.HitObjects[0].StartTime);
-            Assert.IsTrue(beatmap.HitObjects[0].Samples.Any(s => s.Name == SampleInfo.HIT_NORMAL));
+            Assert.IsTrue(beatmap.HitObjects[0].Samples.Any(s => s.Name == HitSampleInfo.HIT_NORMAL));
 
             positionData = beatmap.HitObjects[1] as IHasPosition;
 
             Assert.IsNotNull(positionData);
             Assert.AreEqual(new Vector2(304, 56), positionData.Position);
             Assert.AreEqual(1285, beatmap.HitObjects[1].StartTime);
-            Assert.IsTrue(beatmap.HitObjects[1].Samples.Any(s => s.Name == SampleInfo.HIT_CLAP));
+            Assert.IsTrue(beatmap.HitObjects[1].Samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP));
         }
 
         [TestCase(normal)]

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -108,7 +108,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var manager = osu.Dependencies.Get<BeatmapManager>();
 
                     // ReSharper disable once AccessToModifiedClosure
-                    manager.ItemAdded += (_, __) => Interlocked.Increment(ref itemAddRemoveFireCount);
+                    manager.ItemAdded += _ => Interlocked.Increment(ref itemAddRemoveFireCount);
                     manager.ItemRemoved += _ => Interlocked.Increment(ref itemAddRemoveFireCount);
 
                     var imported = await LoadOszIntoOsu(osu);

osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
         {
             typeof(ToolbarButton),
             typeof(ToolbarRulesetSelector),
-            typeof(ToolbarRulesetButton),
+            typeof(ToolbarRulesetTabButton),
             typeof(ToolbarNotificationButton),
         };
 

osu.Game.Tests/Visual/Online/TestSceneBeatmapAvailability.cs

@@ -0,0 +1,95 @@
+// 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.Overlays.BeatmapSet;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    [TestFixture]
+    public class TestSceneBeatmapAvailability : OsuTestScene
+    {
+        private readonly BeatmapAvailability container;
+
+        public TestSceneBeatmapAvailability()
+        {
+            Add(container = new BeatmapAvailability());
+        }
+
+        [Test]
+        public void TestUndownloadableWithLink()
+        {
+            AddStep("set undownloadable beatmapset with link", () => container.BeatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Availability = new BeatmapSetOnlineAvailability
+                    {
+                        DownloadDisabled = true,
+                        ExternalLink = @"https://osu.ppy.sh",
+                    },
+                },
+            });
+
+            visiblityAssert(true);
+        }
+
+        [Test]
+        public void TestUndownloadableNoLink()
+        {
+            AddStep("set undownloadable beatmapset without link", () => container.BeatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Availability = new BeatmapSetOnlineAvailability
+                    {
+                        DownloadDisabled = true,
+                    },
+                },
+            });
+
+            visiblityAssert(true);
+        }
+
+        [Test]
+        public void TestPartsRemovedWithLink()
+        {
+            AddStep("set parts-removed beatmapset with link", () => container.BeatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Availability = new BeatmapSetOnlineAvailability
+                    {
+                        DownloadDisabled = false,
+                        ExternalLink = @"https://osu.ppy.sh",
+                    },
+                },
+            });
+
+            visiblityAssert(true);
+        }
+
+        [Test]
+        public void TestNormal()
+        {
+            AddStep("set normal beatmapset", () => container.BeatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Availability = new BeatmapSetOnlineAvailability
+                    {
+                        DownloadDisabled = false,
+                    },
+                },
+            });
+
+            visiblityAssert(false);
+        }
+
+        private void visiblityAssert(bool shown)
+        {
+            AddAssert($"is container {(shown ? "visible" : "hidden")}", () => container.Alpha == (shown ? 1 : 0));
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneBeatmapSetOverlay : OsuTestScene
     {
-        private readonly BeatmapSetOverlay overlay;
+        private readonly TestBeatmapSetOverlay overlay;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -39,21 +39,22 @@ namespace osu.Game.Tests.Visual.Online
             typeof(Info),
             typeof(PreviewButton),
             typeof(SuccessRate),
+            typeof(BeatmapAvailability),
         };
 
-        private RulesetInfo maniaRuleset;
         private RulesetInfo taikoRuleset;
+        private RulesetInfo maniaRuleset;
 
         public TestSceneBeatmapSetOverlay()
         {
-            Add(overlay = new BeatmapSetOverlay());
+            Add(overlay = new TestBeatmapSetOverlay());
         }
 
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            maniaRuleset = rulesets.GetRuleset(3);
             taikoRuleset = rulesets.GetRuleset(1);
+            maniaRuleset = rulesets.GetRuleset(3);
         }
 
         [Test]
@@ -75,159 +76,53 @@ namespace osu.Game.Tests.Visual.Online
             {
                 overlay.ShowBeatmapSet(new BeatmapSetInfo
                 {
+                    OnlineBeatmapSetID = 1235,
                     Metadata = new BeatmapMetadata
                     {
-                        Title = @"Lachryma <Re:Queen’M>",
+                        Title = @"an awesome beatmap",
-                        Artist = @"Kaneko Chiharu",
+                        Artist = @"naru narusegawa",
-                        Source = @"SOUND VOLTEX III GRAVITY WARS",
+                        Source = @"hinata sou",
-                        Tags = @"sdvx grace the 5th kac original song contest konami bemani",
+                        Tags = @"test tag tag more tag",
                         Author = new User
                         {
-                            Username = @"Fresh Chicken",
+                            Username = @"BanchoBot",
-                            Id = 3984370,
+                            Id = 3,
                         },
                     },
                     OnlineInfo = new BeatmapSetOnlineInfo
                     {
-                        Preview = @"https://b.ppy.sh/preview/415886.mp3",
+                        Preview = @"https://b.ppy.sh/preview/12345.mp3",
-                        PlayCount = 681380,
+                        PlayCount = 123,
-                        FavouriteCount = 356,
+                        FavouriteCount = 456,
-                        Submitted = new DateTime(2016, 2, 10),
+                        Submitted = DateTime.Now,
-                        Ranked = new DateTime(2016, 6, 19),
+                        Ranked = DateTime.Now,
-                        Status = BeatmapSetOnlineStatus.Ranked,
+                        BPM = 111,
-                        BPM = 236,
                         HasVideo = true,
-                        Covers = new BeatmapSetOnlineCovers
+                        HasStoryboard = true,
-                        {
+                        Covers = new BeatmapSetOnlineCovers(),
-                            Cover = @"https://assets.ppy.sh/beatmaps/415886/covers/cover.jpg?1465651778",
-                        },
                     },
                     Metrics = new BeatmapSetMetrics { Ratings = Enumerable.Range(0, 11).ToArray() },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
                         {
-                            StarDifficulty = 1.36,
+                            StarDifficulty = 9.99,
-                            Version = @"BASIC",
+                            Version = @"TEST",
                             Ruleset = maniaRuleset,
                             BaseDifficulty = new BeatmapDifficulty
                             {
-                                CircleSize = 4,
+                                CircleSize = 1,
-                                DrainRate = 6.5f,
+                                DrainRate = 2.3f,
-                                OverallDifficulty = 6.5f,
+                                OverallDifficulty = 4.5f,
-                                ApproachRate = 5,
+                                ApproachRate = 6,
                             },
                             OnlineInfo = new BeatmapOnlineInfo
                             {
-                                Length = 115000,
+                                Length = 456000,
-                                CircleCount = 265,
+                                CircleCount = 111,
-                                SliderCount = 71,
+                                SliderCount = 12,
-                                PlayCount = 47906,
+                                PlayCount = 222,
-                                PassCount = 19899,
+                                PassCount = 21,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 2.22,
-                            Version = @"NOVICE",
-                            Ruleset = maniaRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 4,
-                                DrainRate = 7,
-                                OverallDifficulty = 7,
-                                ApproachRate = 5,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 118000,
-                                CircleCount = 592,
-                                SliderCount = 62,
-                                PlayCount = 162021,
-                                PassCount = 72116,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 3.49,
-                            Version = @"ADVANCED",
-                            Ruleset = maniaRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 4,
-                                DrainRate = 7.5f,
-                                OverallDifficulty = 7.5f,
-                                ApproachRate = 5,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 118000,
-                                CircleCount = 1042,
-                                SliderCount = 79,
-                                PlayCount = 225178,
-                                PassCount = 73001,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 4.24,
-                            Version = @"EXHAUST",
-                            Ruleset = maniaRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 4,
-                                DrainRate = 8,
-                                OverallDifficulty = 8,
-                                ApproachRate = 5,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 118000,
-                                CircleCount = 1352,
-                                SliderCount = 69,
-                                PlayCount = 131545,
-                                PassCount = 42703,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 5.26,
-                            Version = @"GRAVITY",
-                            Ruleset = maniaRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 4,
-                                DrainRate = 8.5f,
-                                OverallDifficulty = 8.5f,
-                                ApproachRate = 5,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 118000,
-                                CircleCount = 1730,
-                                SliderCount = 115,
-                                PlayCount = 117673,
-                                PassCount = 24241,
                             },
                             Metrics = new BeatmapMetrics
                             {
@@ -239,162 +134,68 @@ namespace osu.Game.Tests.Visual.Online
                 });
             });
 
-            AddStep(@"show second", () =>
+            downloadAssert(true);
+        }
+
+        [Test]
+        public void TestAvailability()
+        {
+            AddStep(@"show undownloadable", () =>
             {
                 overlay.ShowBeatmapSet(new BeatmapSetInfo
                 {
+                    OnlineBeatmapSetID = 1234,
                     Metadata = new BeatmapMetadata
                     {
-                        Title = @"Soumatou Labyrinth",
+                        Title = @"undownloadable beatmap",
-                        Artist = @"Yunomi with Momobako&miko",
+                        Artist = @"no one",
-                        Tags = @"mmbk.com yuzu__rinrin charlotte",
+                        Source = @"some source",
+                        Tags = @"another test tag tag more test tags",
                         Author = new User
                         {
-                            Username = @"komasy",
+                            Username = @"BanchoBot",
-                            Id = 1980256,
+                            Id = 3,
                         },
                     },
                     OnlineInfo = new BeatmapSetOnlineInfo
                     {
-                        Preview = @"https://b.ppy.sh/preview/625493.mp3",
+                        Availability = new BeatmapSetOnlineAvailability
-                        PlayCount = 22996,
-                        FavouriteCount = 58,
-                        Submitted = new DateTime(2016, 6, 11),
-                        Ranked = new DateTime(2016, 7, 12),
-                        Status = BeatmapSetOnlineStatus.Pending,
-                        BPM = 160,
-                        HasVideo = false,
-                        Covers = new BeatmapSetOnlineCovers
                         {
-                            Cover = @"https://assets.ppy.sh/beatmaps/625493/covers/cover.jpg?1499167472",
+                            DownloadDisabled = true,
+                            ExternalLink = "https://osu.ppy.sh",
                         },
+                        Preview = @"https://b.ppy.sh/preview/1234.mp3",
+                        PlayCount = 123,
+                        FavouriteCount = 456,
+                        Submitted = DateTime.Now,
+                        Ranked = DateTime.Now,
+                        BPM = 111,
+                        HasVideo = true,
+                        HasStoryboard = true,
+                        Covers = new BeatmapSetOnlineCovers(),
                     },
                     Metrics = new BeatmapSetMetrics { Ratings = Enumerable.Range(0, 11).ToArray() },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
                         {
-                            StarDifficulty = 1.40,
+                            StarDifficulty = 5.67,
-                            Version = @"yzrin's Kantan",
+                            Version = @"ANOTHER TEST",
                             Ruleset = taikoRuleset,
                             BaseDifficulty = new BeatmapDifficulty
                             {
-                                CircleSize = 2,
+                                CircleSize = 9,
-                                DrainRate = 7,
+                                DrainRate = 8,
-                                OverallDifficulty = 3,
+                                OverallDifficulty = 7,
-                                ApproachRate = 10,
+                                ApproachRate = 6,
                             },
                             OnlineInfo = new BeatmapOnlineInfo
                             {
-                                Length = 193000,
+                                Length = 123000,
-                                CircleCount = 262,
+                                CircleCount = 123,
-                                SliderCount = 0,
+                                SliderCount = 45,
-                                PlayCount = 3952,
+                                PlayCount = 567,
-                                PassCount = 1373,
+                                PassCount = 89,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 2.23,
-                            Version = @"Futsuu",
-                            Ruleset = taikoRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 2,
-                                DrainRate = 6,
-                                OverallDifficulty = 4,
-                                ApproachRate = 10,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 193000,
-                                CircleCount = 464,
-                                SliderCount = 0,
-                                PlayCount = 4833,
-                                PassCount = 920,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 3.19,
-                            Version = @"Muzukashii",
-                            Ruleset = taikoRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 2,
-                                DrainRate = 6,
-                                OverallDifficulty = 5,
-                                ApproachRate = 10,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 193000,
-                                CircleCount = 712,
-                                SliderCount = 0,
-                                PlayCount = 4405,
-                                PassCount = 854,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 3.97,
-                            Version = @"Charlotte's Oni",
-                            Ruleset = taikoRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 5,
-                                DrainRate = 6,
-                                OverallDifficulty = 5.5f,
-                                ApproachRate = 10,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 193000,
-                                CircleCount = 943,
-                                SliderCount = 0,
-                                PlayCount = 3950,
-                                PassCount = 693,
-                            },
-                            Metrics = new BeatmapMetrics
-                            {
-                                Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6).ToArray(),
-                                Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6).ToArray(),
-                            },
-                        },
-                        new BeatmapInfo
-                        {
-                            StarDifficulty = 5.08,
-                            Version = @"Labyrinth Oni",
-                            Ruleset = taikoRuleset,
-                            BaseDifficulty = new BeatmapDifficulty
-                            {
-                                CircleSize = 5,
-                                DrainRate = 5,
-                                OverallDifficulty = 6,
-                                ApproachRate = 10,
-                            },
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Length = 193000,
-                                CircleCount = 1068,
-                                SliderCount = 0,
-                                PlayCount = 5856,
-                                PassCount = 1207,
                             },
                             Metrics = new BeatmapMetrics
                             {
@@ -405,6 +206,8 @@ namespace osu.Game.Tests.Visual.Online
                     },
                 });
             });
+
+            downloadAssert(false);
         }
 
         [Test]
@@ -418,5 +221,15 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep(@"show without reload", overlay.Show);
         }
+
+        private void downloadAssert(bool shown)
+        {
+            AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.DownloadButtonsVisible == shown);
+        }
+
+        private class TestBeatmapSetOverlay : BeatmapSetOverlay
+        {
+            public bool DownloadButtonsVisible => Header.DownloadButtonsVisible;
+        }
     }
 }

osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs

@@ -0,0 +1,158 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Online;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Resources;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneDirectDownloadButton : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DownloadButton)
+        };
+
+        private TestDownloadButton downloadButton;
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Test]
+        public void TestDownloadableBeatmap()
+        {
+            createButton(true);
+            assertEnabled(true);
+        }
+
+        [Test]
+        public void TestUndownloadableBeatmap()
+        {
+            createButton(false);
+            assertEnabled(false);
+        }
+
+        [Test]
+        public void TestDownloadState()
+        {
+            AddUntilStep("ensure manager loaded", () => beatmaps != null);
+            ensureSoleilyRemoved();
+            createButtonWithBeatmap(createSoleily());
+            AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
+            AddStep("import soleily", () => beatmaps.Import(new[] { TestResources.GetTestBeatmapForImport() }));
+            AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
+            createButtonWithBeatmap(createSoleily());
+            AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
+            ensureSoleilyRemoved();
+            AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
+        }
+
+        private void ensureSoleilyRemoved()
+        {
+            AddStep("remove soleily", () =>
+            {
+                var beatmap = beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == 241526);
+
+                if (beatmap != null) beatmaps.Delete(beatmap);
+            });
+        }
+
+        private void assertEnabled(bool enabled)
+        {
+            AddAssert($"button {(enabled ? "enabled" : "disabled")}", () => downloadButton.DownloadEnabled == enabled);
+        }
+
+        private BeatmapSetInfo createSoleily()
+        {
+            return new BeatmapSetInfo
+            {
+                ID = 1,
+                OnlineBeatmapSetID = 241526,
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Availability = new BeatmapSetOnlineAvailability
+                    {
+                        DownloadDisabled = false,
+                        ExternalLink = string.Empty,
+                    },
+                },
+            };
+        }
+
+        private void createButtonWithBeatmap(BeatmapSetInfo beatmap)
+        {
+            AddStep("create button", () =>
+            {
+                Child = downloadButton = new TestDownloadButton(beatmap)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(75, 50),
+                };
+            });
+        }
+
+        private void createButton(bool downloadable)
+        {
+            AddStep("create button", () =>
+            {
+                Child = downloadButton = new TestDownloadButton(downloadable ? getDownloadableBeatmapSet() : getUndownloadableBeatmapSet())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(75, 50),
+                };
+            });
+        }
+
+        private BeatmapSetInfo getDownloadableBeatmapSet()
+        {
+            var normal = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo).BeatmapSetInfo;
+            normal.OnlineInfo.HasVideo = true;
+            normal.OnlineInfo.HasStoryboard = true;
+
+            return normal;
+        }
+
+        private BeatmapSetInfo getUndownloadableBeatmapSet()
+        {
+            var beatmap = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo).BeatmapSetInfo;
+            beatmap.Metadata.Artist = "test";
+            beatmap.Metadata.Title = "undownloadable";
+            beatmap.Metadata.AuthorString = "test";
+
+            beatmap.OnlineInfo.HasVideo = true;
+            beatmap.OnlineInfo.HasStoryboard = true;
+
+            beatmap.OnlineInfo.Availability = new BeatmapSetOnlineAvailability
+            {
+                DownloadDisabled = true,
+                ExternalLink = "http://osu.ppy.sh",
+            };
+
+            return beatmap;
+        }
+
+        private class TestDownloadButton : DownloadButton
+        {
+            public new bool DownloadEnabled => base.DownloadEnabled;
+
+            public DownloadState DownloadState => State.Value;
+
+            public TestDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+                : base(beatmapSet, noVideo)
+            {
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs

@@ -6,8 +6,11 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
@@ -21,25 +24,74 @@ namespace osu.Game.Tests.Visual.Online
             typeof(IconPill)
         };
 
+        private BeatmapSetInfo getUndownloadableBeatmapSet(RulesetInfo ruleset) => new BeatmapSetInfo
+        {
+            OnlineBeatmapSetID = 123,
+            Metadata = new BeatmapMetadata
+            {
+                Title = "undownloadable beatmap",
+                Artist = "test",
+                Source = "more tests",
+                Author = new User
+                {
+                    Username = "BanchoBot",
+                    Id = 3,
+                },
+            },
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Availability = new BeatmapSetOnlineAvailability
+                {
+                    DownloadDisabled = true,
+                },
+                Preview = @"https://b.ppy.sh/preview/12345.mp3",
+                PlayCount = 123,
+                FavouriteCount = 456,
+                BPM = 111,
+                HasVideo = true,
+                HasStoryboard = true,
+                Covers = new BeatmapSetOnlineCovers(),
+            },
+            Beatmaps = new List<BeatmapInfo>
+            {
+                new BeatmapInfo
+                {
+                    Ruleset = ruleset,
+                    Version = "Test",
+                    StarDifficulty = 6.42,
+                }
+            }
+        };
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            var beatmap = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            var ruleset = new OsuRuleset().RulesetInfo;
-            beatmap.BeatmapSetInfo.OnlineInfo.HasVideo = true;
-            beatmap.BeatmapSetInfo.OnlineInfo.HasStoryboard = true;
 
-            Child = new FillFlowContainer
+            var normal = CreateWorkingBeatmap(ruleset).BeatmapSetInfo;
+            normal.OnlineInfo.HasVideo = true;
+            normal.OnlineInfo.HasStoryboard = true;
+
+            var undownloadable = getUndownloadableBeatmapSet(ruleset);
+
+            Child = new BasicScrollContainer
             {
-                RelativeSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Both,
-                AutoSizeAxes = Axes.Y,
+                Child = new FillFlowContainer
-                Direction = FillDirection.Vertical,
-                Padding = new MarginPadding(20),
-                Spacing = new Vector2(0, 20),
-                Children = new Drawable[]
                 {
-                    new DirectGridPanel(beatmap.BeatmapSetInfo),
+                    RelativeSizeAxes = Axes.X,
-                    new DirectListPanel(beatmap.BeatmapSetInfo)
+                    AutoSizeAxes = Axes.Y,
-                }
+                    Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding(20),
+                    Spacing = new Vector2(0, 20),
+                    Children = new Drawable[]
+                    {
+                        new DirectGridPanel(normal),
+                        new DirectListPanel(normal),
+                        new DirectGridPanel(undownloadable),
+                        new DirectListPanel(undownloadable),
+                    },
+                },
             };
         }
     }

osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs

@@ -0,0 +1,40 @@
+// 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.Overlays.Profile.Header.Components;
+using System;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneProfileRulesetSelector : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ProfileRulesetSelector),
+            typeof(ProfileRulesetTabItem),
+        };
+
+        public TestSceneProfileRulesetSelector()
+        {
+            ProfileRulesetSelector selector;
+
+            Child = selector = new ProfileRulesetSelector
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+
+            AddStep("set osu! as default", () => selector.SetDefaultRuleset(new OsuRuleset().RulesetInfo));
+            AddStep("set mania as default", () => selector.SetDefaultRuleset(new ManiaRuleset().RulesetInfo));
+            AddStep("set taiko as default", () => selector.SetDefaultRuleset(new TaikoRuleset().RulesetInfo));
+            AddStep("set catch as default", () => selector.SetDefaultRuleset(new CatchRuleset().RulesetInfo));
+            AddStep("select default ruleset", selector.SelectDefaultRuleset);
+        }
+    }
+}

osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs

@@ -0,0 +1,79 @@
+// 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.Overlays.Toolbar;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.MathUtils;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneToolbarRulesetSelector : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ToolbarRulesetSelector),
+            typeof(ToolbarRulesetTabButton),
+        };
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Test]
+        public void TestDisplay()
+        {
+            ToolbarRulesetSelector selector = null;
+
+            AddStep("create selector", () =>
+            {
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.X,
+                    Height = Toolbar.HEIGHT,
+                    Child = selector = new ToolbarRulesetSelector()
+                };
+            });
+
+            AddStep("Select random", () =>
+            {
+                selector.Current.Value = selector.Items.ElementAt(RNG.Next(selector.Items.Count()));
+            });
+            AddStep("Toggle disabled state", () => selector.Current.Disabled = !selector.Current.Disabled);
+        }
+
+        [Test]
+        public void TestNonFirstRulesetInitialState()
+        {
+            TestSelector selector = null;
+
+            AddStep("create selector", () =>
+            {
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.X,
+                    Height = Toolbar.HEIGHT,
+                    Child = selector = new TestSelector()
+                };
+
+                selector.Current.Value = rulesets.GetRuleset(2);
+            });
+
+            AddAssert("mode line has moved", () => selector.ModeButtonLine.DrawPosition.X > 0);
+        }
+
+        private class TestSelector : ToolbarRulesetSelector
+        {
+            public new Drawable ModeButtonLine => base.ModeButtonLine;
+        }
+    }
+}

osu.Game/Audio/HitSampleInfo.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;
+
+namespace osu.Game.Audio
+{
+    /// <summary>
+    /// Describes a gameplay hit sample.
+    /// </summary>
+    [Serializable]
+    public class HitSampleInfo : ISampleInfo
+    {
+        public const string HIT_WHISTLE = @"hitwhistle";
+        public const string HIT_FINISH = @"hitfinish";
+        public const string HIT_NORMAL = @"hitnormal";
+        public const string HIT_CLAP = @"hitclap";
+
+        /// <summary>
+        /// An optional ruleset namespace.
+        /// </summary>
+        public string Namespace;
+
+        /// <summary>
+        /// The bank to load the sample from.
+        /// </summary>
+        public string Bank;
+
+        /// <summary>
+        /// The name of the sample to load.
+        /// </summary>
+        public string Name;
+
+        /// <summary>
+        /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
+        /// </summary>
+        public string Suffix;
+
+        /// <summary>
+        /// The sample volume.
+        /// </summary>
+        public int Volume { get; set; }
+
+        /// <summary>
+        /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
+        /// </summary>
+        public virtual IEnumerable<string> LookupNames
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Namespace))
+                {
+                    if (!string.IsNullOrEmpty(Suffix))
+                        yield return $"{Namespace}/{Bank}-{Name}{Suffix}";
+
+                    yield return $"{Namespace}/{Bank}-{Name}";
+                }
+
+                // check non-namespace as a fallback even when we have a namespace
+                if (!string.IsNullOrEmpty(Suffix))
+                    yield return $"{Bank}-{Name}{Suffix}";
+
+                yield return $"{Bank}-{Name}";
+            }
+        }
+
+        public HitSampleInfo Clone() => (HitSampleInfo)MemberwiseClone();
+    }
+}

osu.Game/Audio/ISampleInfo.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 System.Collections.Generic;
+
+namespace osu.Game.Audio
+{
+    public interface ISampleInfo
+    {
+        /// <summary>
+        /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
+        /// </summary>
+        IEnumerable<string> LookupNames { get; }
+
+        int Volume { get; }
+    }
+}

osu.Game/Audio/SampleInfo.cs

@@ -1,67 +1,24 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
 
 namespace osu.Game.Audio
 {
-    [Serializable]
+    /// <summary>
-    public class SampleInfo
+    /// Describes a gameplay sample.
+    /// </summary>
+    public class SampleInfo : ISampleInfo
     {
-        public const string HIT_WHISTLE = @"hitwhistle";
+        private readonly string sampleName;
-        public const string HIT_FINISH = @"hitfinish";
-        public const string HIT_NORMAL = @"hitnormal";
-        public const string HIT_CLAP = @"hitclap";
 
-        /// <summary>
+        public SampleInfo(string sampleName)
-        /// An optional ruleset namespace.
-        /// </summary>
-        public string Namespace;
-
-        /// <summary>
-        /// The bank to load the sample from.
-        /// </summary>
-        public string Bank;
-
-        /// <summary>
-        /// The name of the sample to load.
-        /// </summary>
-        public string Name;
-
-        /// <summary>
-        /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
-        /// </summary>
-        public string Suffix;
-
-        /// <summary>
-        /// The sample volume.
-        /// </summary>
-        public int Volume;
-
-        /// <summary>
-        /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
-        /// </summary>
-        public virtual IEnumerable<string> LookupNames
         {
-            get
+            this.sampleName = sampleName;
-            {
-                if (!string.IsNullOrEmpty(Namespace))
-                {
-                    if (!string.IsNullOrEmpty(Suffix))
-                        yield return $"{Namespace}/{Bank}-{Name}{Suffix}";
-
-                    yield return $"{Namespace}/{Bank}-{Name}";
-                }
-
-                // check non-namespace as a fallback even when we have a namespace
-                if (!string.IsNullOrEmpty(Suffix))
-                    yield return $"{Bank}-{Name}{Suffix}";
-
-                yield return $"{Bank}-{Name}";
-            }
         }
 
-        public SampleInfo Clone() => (SampleInfo)MemberwiseClone();
+        public IEnumerable<string> LookupNames => new[] { sampleName };
+
+        public int Volume { get; set; } = 100;
     }
 }

osu.Game/Beatmaps/BeatmapManager.cs

@@ -21,7 +21,6 @@ using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Beatmaps
@@ -29,7 +28,7 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
-    public partial class BeatmapManager : ArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>
+    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>
     {
         /// <summary>
         /// Fired when a single difficulty has been hidden.
@@ -41,16 +40,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public event Action<BeatmapInfo> BeatmapRestored;
 
-        /// <summary>
-        /// Fired when a beatmap download begins.
-        /// </summary>
-        public event Action<DownloadBeatmapSetRequest> BeatmapDownloadBegan;
-
-        /// <summary>
-        /// Fired when a beatmap download is interrupted, due to user cancellation or other failures.
-        /// </summary>
-        public event Action<DownloadBeatmapSetRequest> BeatmapDownloadFailed;
-
         /// <summary>
         /// A default representation of a WorkingBeatmap to use when no beatmap is available.
         /// </summary>
@@ -66,22 +55,17 @@ namespace osu.Game.Beatmaps
 
         private readonly BeatmapStore beatmaps;
 
-        private readonly IAPIProvider api;
-
         private readonly AudioManager audioManager;
 
         private readonly GameHost host;
 
-        private readonly List<DownloadBeatmapSetRequest> currentDownloads = new List<DownloadBeatmapSetRequest>();
-
         private readonly BeatmapUpdateQueue updateQueue;
 
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
-            : base(storage, contextFactory, new BeatmapStore(contextFactory), host)
+            : base(storage, contextFactory, api, new BeatmapStore(contextFactory), host)
         {
             this.rulesets = rulesets;
-            this.api = api;
             this.audioManager = audioManager;
             this.host = host;
 
@@ -94,6 +78,9 @@ namespace osu.Game.Beatmaps
             updateQueue = new BeatmapUpdateQueue(api);
         }
 
+        protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
+            new DownloadBeatmapSetRequest(set, minimiseDownloadSize);
+
         protected override Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
             if (archive != null)
@@ -158,86 +145,7 @@ namespace osu.Game.Beatmaps
             void resetIds() => beatmapSet.Beatmaps.ForEach(b => b.OnlineBeatmapID = null);
         }
 
-        /// <summary>
+        protected override bool CheckLocalAvailability(BeatmapSetInfo model, IQueryable<BeatmapSetInfo> items) => items.Any(b => b.OnlineBeatmapSetID == model.OnlineBeatmapSetID);
-        /// Downloads a beatmap.
-        /// This will post notifications tracking progress.
-        /// </summary>
-        /// <param name="beatmapSetInfo">The <see cref="BeatmapSetInfo"/> to be downloaded.</param>
-        /// <param name="noVideo">Whether the beatmap should be downloaded without video. Defaults to false.</param>
-        /// <returns>Downloading can happen</returns>
-        public bool Download(BeatmapSetInfo beatmapSetInfo, bool noVideo = false)
-        {
-            var existing = GetExistingDownload(beatmapSetInfo);
-
-            if (existing != null || api == null) return false;
-
-            var downloadNotification = new DownloadNotification
-            {
-                Text = $"Downloading {beatmapSetInfo}",
-            };
-
-            var request = new DownloadBeatmapSetRequest(beatmapSetInfo, noVideo);
-
-            request.DownloadProgressed += progress =>
-            {
-                downloadNotification.State = ProgressNotificationState.Active;
-                downloadNotification.Progress = progress;
-            };
-
-            request.Success += filename =>
-            {
-                Task.Factory.StartNew(async () =>
-                {
-                    // This gets scheduled back to the update thread, but we want the import to run in the background.
-                    await Import(downloadNotification, filename);
-                    currentDownloads.Remove(request);
-                }, TaskCreationOptions.LongRunning);
-            };
-
-            request.Failure += error =>
-            {
-                BeatmapDownloadFailed?.Invoke(request);
-
-                if (error is OperationCanceledException) return;
-
-                downloadNotification.State = ProgressNotificationState.Cancelled;
-                Logger.Error(error, "Beatmap download failed!");
-                currentDownloads.Remove(request);
-            };
-
-            downloadNotification.CancelRequested += () =>
-            {
-                request.Cancel();
-                currentDownloads.Remove(request);
-                downloadNotification.State = ProgressNotificationState.Cancelled;
-                return true;
-            };
-
-            currentDownloads.Add(request);
-            PostNotification?.Invoke(downloadNotification);
-
-            // don't run in the main api queue as this is a long-running task.
-            Task.Factory.StartNew(() =>
-            {
-                try
-                {
-                    request.Perform(api);
-                }
-                catch
-                {
-                    // no need to handle here as exceptions will filter down to request.Failure above.
-                }
-            }, TaskCreationOptions.LongRunning);
-            BeatmapDownloadBegan?.Invoke(request);
-            return true;
-        }
-
-        /// <summary>
-        /// Get an existing download request if it exists.
-        /// </summary>
-        /// <param name="beatmap">The <see cref="BeatmapSetInfo"/> whose download request is wanted.</param>
-        /// <returns>The <see cref="DownloadBeatmapSetRequest"/> object if it exists, or null.</returns>
-        public DownloadBeatmapSetRequest GetExistingDownload(BeatmapSetInfo beatmap) => currentDownloads.Find(d => d.BeatmapSet.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID);
 
         /// <summary>
         /// Delete a beatmap difficulty.
@@ -406,22 +314,6 @@ namespace osu.Game.Beatmaps
             protected override Track GetTrack() => null;
         }
 
-        private class DownloadNotification : ProgressNotification
-        {
-            public override bool IsImportant => false;
-
-            protected override Notification CreateCompletionNotification() => new SilencedProgressCompletionNotification
-            {
-                Activated = CompletionClickAction,
-                Text = CompletionText
-            };
-
-            private class SilencedProgressCompletionNotification : ProgressCompletionNotification
-            {
-                public override bool IsImportant => false;
-            }
-        }
-
         private class BeatmapUpdateQueue
         {
             private readonly IAPIProvider api;

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -41,7 +41,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
+            private string getPathForFile(string filename) => BeatmapSetInfo.Files.FirstOrDefault(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase))?.FileInfo.StoragePath;
 
             private TextureStore textureStore;
 

osu.Game/Beatmaps/BeatmapSetInfo.cs

@@ -9,7 +9,7 @@ using osu.Game.Database;
 
 namespace osu.Game.Beatmaps
 {
-    public class BeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete
+    public class BeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<BeatmapSetInfo>
     {
         public int ID { get; set; }
 
@@ -49,5 +49,7 @@ namespace osu.Game.Beatmaps
         public override string ToString() => Metadata?.ToString() ?? base.ToString();
 
         public bool Protected { get; set; }
+
+        public bool Equals(BeatmapSetInfo other) => OnlineBeatmapSetID == other?.OnlineBeatmapSetID;
     }
 }

osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs

@@ -65,6 +65,11 @@ namespace osu.Game.Beatmaps
         /// The amount of people who have favourited this beatmap set.
         /// </summary>
         public int FavouriteCount { get; set; }
+
+        /// <summary>
+        /// The availability of this beatmap set.
+        /// </summary>
+        public BeatmapSetOnlineAvailability Availability { get; set; }
     }
 
     public class BeatmapSetOnlineCovers
@@ -84,4 +89,13 @@ namespace osu.Game.Beatmaps
         [JsonProperty(@"list@2x")]
         public string List { get; set; }
     }
+
+    public class BeatmapSetOnlineAvailability
+    {
+        [JsonProperty(@"download_disabled")]
+        public bool DownloadDisabled { get; set; }
+
+        [JsonProperty(@"more_information")]
+        public string ExternalLink { get; set; }
+    }
 }

osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs

@@ -24,8 +24,8 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// Create a SampleInfo based on the sample settings in this control point.
         /// </summary>
         /// <param name="sampleName">The name of the same.</param>
-        /// <returns>A populated <see cref="SampleInfo"/>.</returns>
+        /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        public SampleInfo GetSampleInfo(string sampleName = SampleInfo.HIT_NORMAL) => new SampleInfo
+        public HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL) => new HitSampleInfo
         {
             Bank = SampleBank,
             Name = sampleName,
@@ -33,15 +33,15 @@ namespace osu.Game.Beatmaps.ControlPoints
         };
 
         /// <summary>
-        /// Applies <see cref="SampleBank"/> and <see cref="SampleVolume"/> to a <see cref="SampleInfo"/> if necessary, returning the modified <see cref="SampleInfo"/>.
+        /// Applies <see cref="SampleBank"/> and <see cref="SampleVolume"/> to a <see cref="HitSampleInfo"/> if necessary, returning the modified <see cref="HitSampleInfo"/>.
         /// </summary>
-        /// <param name="sampleInfo">The <see cref="SampleInfo"/>. This will not be modified.</param>
+        /// <param name="hitSampleInfo">The <see cref="HitSampleInfo"/>. This will not be modified.</param>
-        /// <returns>The modified <see cref="SampleInfo"/>. This does not share a reference with <paramref name="sampleInfo"/>.</returns>
+        /// <returns>The modified <see cref="HitSampleInfo"/>. This does not share a reference with <paramref name="hitSampleInfo"/>.</returns>
-        public virtual SampleInfo ApplyTo(SampleInfo sampleInfo)
+        public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
         {
-            var newSampleInfo = sampleInfo.Clone();
+            var newSampleInfo = hitSampleInfo.Clone();
-            newSampleInfo.Bank = sampleInfo.Bank ?? SampleBank;
+            newSampleInfo.Bank = hitSampleInfo.Bank ?? SampleBank;
-            newSampleInfo.Volume = sampleInfo.Volume > 0 ? sampleInfo.Volume : SampleVolume;
+            newSampleInfo.Volume = hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume;
             return newSampleInfo;
         }
 

osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs

@@ -2,9 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK.Graphics;
+using osu.Game.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
@@ -49,7 +50,7 @@ namespace osu.Game.Beatmaps.Drawables
             Child = new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = Color4.Black,
+                Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.1f)),
             };
         }
 

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -193,9 +193,9 @@ namespace osu.Game.Beatmaps.Formats
         {
             public int CustomSampleBank;
 
-            public override SampleInfo ApplyTo(SampleInfo sampleInfo)
+            public override HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
             {
-                var baseInfo = base.ApplyTo(sampleInfo);
+                var baseInfo = base.ApplyTo(hitSampleInfo);
 
                 if (string.IsNullOrEmpty(baseInfo.Suffix) && CustomSampleBank > 1)
                     baseInfo.Suffix = CustomSampleBank.ToString();

osu.Game/Database/ArchiveModelManager.cs

@@ -31,12 +31,10 @@ namespace osu.Game.Database
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
     /// <typeparam name="TFileModel">The associated file join type.</typeparam>
-    public abstract class ArchiveModelManager<TModel, TFileModel> : ArchiveModelManager, ICanAcceptFiles
+    public abstract class ArchiveModelManager<TModel, TFileModel> : ArchiveModelManager, ICanAcceptFiles, IModelManager<TModel>
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete
         where TFileModel : INamedFileInfo, new()
     {
-        public delegate void ItemAddedDelegate(TModel model, bool existing);
-
         /// <summary>
         /// Set an endpoint for notifications to be posted to.
         /// </summary>
@@ -46,7 +44,7 @@ namespace osu.Game.Database
         /// Fired when a new <see cref="TModel"/> becomes available in the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
-        public event ItemAddedDelegate ItemAdded;
+        public event Action<TModel> ItemAdded;
 
         /// <summary>
         /// Fired when a <see cref="TModel"/> is removed from the database.
@@ -67,56 +65,12 @@ namespace osu.Game.Database
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
 
-        private readonly List<Action> queuedEvents = new List<Action>();
-
-        /// <summary>
-        /// Allows delaying of outwards events until an operation is confirmed (at a database level).
-        /// </summary>
-        private bool delayingEvents;
-
-        /// <summary>
-        /// Begin delaying outwards events.
-        /// </summary>
-        private void delayEvents() => delayingEvents = true;
-
-        /// <summary>
-        /// Flush delayed events and disable delaying.
-        /// </summary>
-        /// <param name="perform">Whether the flushed events should be performed.</param>
-        private void flushEvents(bool perform)
-        {
-            Action[] events;
-
-            lock (queuedEvents)
-            {
-                events = queuedEvents.ToArray();
-                queuedEvents.Clear();
-            }
-
-            if (perform)
-            {
-                foreach (var a in events)
-                    a.Invoke();
-            }
-
-            delayingEvents = false;
-        }
-
-        private void handleEvent(Action a)
-        {
-            if (delayingEvents)
-                lock (queuedEvents)
-                    queuedEvents.Add(a);
-            else
-                a.Invoke();
-        }
-
         protected ArchiveModelManager(Storage storage, IDatabaseContextFactory contextFactory, MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> modelStore, IIpcHost importHost = null)
         {
             ContextFactory = contextFactory;
 
             ModelStore = modelStore;
-            ModelStore.ItemAdded += item => handleEvent(() => ItemAdded?.Invoke(item, false));
+            ModelStore.ItemAdded += item => handleEvent(() => ItemAdded?.Invoke(item));
             ModelStore.ItemRemoved += s => handleEvent(() => ItemRemoved?.Invoke(s));
 
             Files = new FileStore(contextFactory, storage);
@@ -345,8 +299,6 @@ namespace osu.Game.Database
                             {
                                 Undelete(existing);
                                 LogForModel(item, $"Found existing {HumanisedModelName} for {item} (ID {existing.ID}) – skipping import.");
-                                handleEvent(() => ItemAdded?.Invoke(existing, true));
-
                                 // existing item will be used; rollback new import and exit early.
                                 rollback();
                                 flushEvents(true);
@@ -632,6 +584,54 @@ namespace osu.Game.Database
 
             throw new InvalidFormatException($"{path} is not a valid archive");
         }
+
+        #region Event handling / delaying
+
+        private readonly List<Action> queuedEvents = new List<Action>();
+
+        /// <summary>
+        /// Allows delaying of outwards events until an operation is confirmed (at a database level).
+        /// </summary>
+        private bool delayingEvents;
+
+        /// <summary>
+        /// Begin delaying outwards events.
+        /// </summary>
+        private void delayEvents() => delayingEvents = true;
+
+        /// <summary>
+        /// Flush delayed events and disable delaying.
+        /// </summary>
+        /// <param name="perform">Whether the flushed events should be performed.</param>
+        private void flushEvents(bool perform)
+        {
+            Action[] events;
+
+            lock (queuedEvents)
+            {
+                events = queuedEvents.ToArray();
+                queuedEvents.Clear();
+            }
+
+            if (perform)
+            {
+                foreach (var a in events)
+                    a.Invoke();
+            }
+
+            delayingEvents = false;
+        }
+
+        private void handleEvent(Action a)
+        {
+            if (delayingEvents)
+                lock (queuedEvents)
+                    queuedEvents.Add(a);
+            else
+                a.Invoke();
+        }
+
+        #endregion
     }
 
     public abstract class ArchiveModelManager

osu.Game/Database/DownloadableArchiveModelManager.cs

@@ -0,0 +1,143 @@
+// 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 Humanizer;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Online.API;
+using osu.Game.Overlays.Notifications;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// An <see cref="ArchiveModelManager{TModel, TFileModel}"/> that has the ability to download models using an <see cref="IAPIProvider"/> and
+    /// import them into the store.
+    /// </summary>
+    /// <typeparam name="TModel">The model type.</typeparam>
+    /// <typeparam name="TFileModel">The associated file join type.</typeparam>
+    public abstract class DownloadableArchiveModelManager<TModel, TFileModel> : ArchiveModelManager<TModel, TFileModel>, IModelDownloader<TModel>
+        where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete, IEquatable<TModel>
+        where TFileModel : INamedFileInfo, new()
+    {
+        public event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
+
+        public event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
+
+        private readonly IAPIProvider api;
+
+        private readonly List<ArchiveDownloadRequest<TModel>> currentDownloads = new List<ArchiveDownloadRequest<TModel>>();
+
+        private readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> modelStore;
+
+        protected DownloadableArchiveModelManager(Storage storage, IDatabaseContextFactory contextFactory, IAPIProvider api, MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> modelStore, IIpcHost importHost = null)
+            : base(storage, contextFactory, modelStore, importHost)
+        {
+            this.api = api;
+            this.modelStore = modelStore;
+        }
+
+        /// <summary>
+        /// Creates the download request for this <see cref="TModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle.</param>
+        /// <returns>The request object.</returns>
+        protected abstract ArchiveDownloadRequest<TModel> CreateDownloadRequest(TModel model, bool minimiseDownloadSize);
+
+        /// <summary>
+        /// Begin a download for the requested <see cref="TModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle.</param>
+        /// <returns>Whether the download was started.</returns>
+        public bool Download(TModel model, bool minimiseDownloadSize = false)
+        {
+            if (!canDownload(model)) return false;
+
+            var request = CreateDownloadRequest(model, minimiseDownloadSize);
+
+            DownloadNotification notification = new DownloadNotification
+            {
+                Text = $"Downloading {request.Model}",
+            };
+
+            request.DownloadProgressed += progress =>
+            {
+                notification.State = ProgressNotificationState.Active;
+                notification.Progress = progress;
+            };
+
+            request.Success += filename =>
+            {
+                Task.Factory.StartNew(async () =>
+                {
+                    // This gets scheduled back to the update thread, but we want the import to run in the background.
+                    await Import(notification, filename);
+                    currentDownloads.Remove(request);
+                }, TaskCreationOptions.LongRunning);
+            };
+
+            request.Failure += error =>
+            {
+                DownloadFailed?.Invoke(request);
+
+                if (error is OperationCanceledException) return;
+
+                notification.State = ProgressNotificationState.Cancelled;
+                Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
+                currentDownloads.Remove(request);
+            };
+
+            notification.CancelRequested += () =>
+            {
+                request.Cancel();
+                currentDownloads.Remove(request);
+                notification.State = ProgressNotificationState.Cancelled;
+                return true;
+            };
+
+            currentDownloads.Add(request);
+            PostNotification?.Invoke(notification);
+
+            Task.Factory.StartNew(() => request.Perform(api), TaskCreationOptions.LongRunning);
+
+            DownloadBegan?.Invoke(request);
+
+            return true;
+        }
+
+        public bool IsAvailableLocally(TModel model) => CheckLocalAvailability(model, modelStore.ConsumableItems.Where(m => !m.DeletePending));
+
+        /// <summary>
+        /// Performs implementation specific comparisons to determine whether a given model is present in the local store.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> whose existence needs to be checked.</param>
+        /// <param name="items">The usable items present in the store.</param>
+        /// <returns>Whether the <see cref="TModel"/> exists.</returns>
+        protected abstract bool CheckLocalAvailability(TModel model, IQueryable<TModel> items);
+
+        public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Model.Equals(model));
+
+        private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null;
+
+        private class DownloadNotification : ProgressNotification
+        {
+            public override bool IsImportant => false;
+
+            protected override Notification CreateCompletionNotification() => new SilencedProgressCompletionNotification
+            {
+                Activated = CompletionClickAction,
+                Text = CompletionText
+            };
+
+            private class SilencedProgressCompletionNotification : ProgressCompletionNotification
+            {
+                public override bool IsImportant => false;
+            }
+        }
+    }
+}

osu.Game/Database/IModelDownloader.cs

@@ -0,0 +1,48 @@
+// 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.Online.API;
+using System;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// Represents a <see cref="IModelManager{TModel}"/> that can download new models from an external source.
+    /// </summary>
+    /// <typeparam name="TModel">The model type.</typeparam>
+    public interface IModelDownloader<TModel> : IModelManager<TModel>
+        where TModel : class
+    {
+        /// <summary>
+        /// Fired when a <see cref="TModel"/> download begins.
+        /// </summary>
+        event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
+
+        /// <summary>
+        /// Fired when a <see cref="TModel"/> download is interrupted, either due to user cancellation or failure.
+        /// </summary>
+        event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
+
+        /// <summary>
+        /// Checks whether a given <see cref="TModel"/> is already available in the local store.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> whose existence needs to be checked.</param>
+        /// <returns>Whether the <see cref="TModel"/> exists.</returns>
+        bool IsAvailableLocally(TModel model);
+
+        /// <summary>
+        /// Begin a download for the requested <see cref="TModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle..</param>
+        /// <returns>Whether the download was started.</returns>
+        bool Download(TModel model, bool minimiseDownloadSize);
+
+        /// <summary>
+        /// Gets an existing <see cref="TModel"/> download request if it exists.
+        /// </summary>
+        /// <param name="model">The <see cref="TModel"/> whose request is wanted.</param>
+        /// <returns>The <see cref="ArchiveDownloadRequest{TModel}"/> object if it exists, otherwise null.</returns>
+        ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model);
+    }
+}

osu.Game/Database/IModelManager.cs

@@ -0,0 +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 System;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// Represents a model manager that publishes events when <see cref="TModel"/>s are added or removed.
+    /// </summary>
+    /// <typeparam name="TModel">The model type.</typeparam>
+    public interface IModelManager<out TModel>
+        where TModel : class
+    {
+        event Action<TModel> ItemAdded;
+
+        event Action<TModel> ItemRemoved;
+    }
+}

osu.Game/Graphics/UserInterface/OsuDropdown.cs

@@ -96,7 +96,9 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-            protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour };
+            protected override Menu CreateSubMenu() => new OsuMenu(Direction.Vertical);
+
+            protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour };
 
             protected override ScrollContainer<Drawable> CreateScrollContainer(Direction direction) => new OsuScrollContainer(direction);
 

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -210,7 +210,7 @@ namespace osu.Game.Graphics.UserInterface
                     MaxHeight = 400;
                 }
 
-                protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
+                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
 
                 private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
                 {

osu.Game/Online/API/ArchiveDownloadRequest.cs

@@ -0,0 +1,24 @@
+// 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;
+
+namespace osu.Game.Online.API
+{
+    public abstract class ArchiveDownloadRequest<TModel> : APIDownloadRequest
+        where TModel : class
+    {
+        public readonly TModel Model;
+
+        public float Progress;
+
+        public event Action<float> DownloadProgressed;
+
+        protected ArchiveDownloadRequest(TModel model)
+        {
+            Model = model;
+
+            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
+        }
+    }
+}

osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs

@@ -2,28 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
-using System;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class DownloadBeatmapSetRequest : APIDownloadRequest
+    public class DownloadBeatmapSetRequest : ArchiveDownloadRequest<BeatmapSetInfo>
     {
-        public readonly BeatmapSetInfo BeatmapSet;
-
-        public float Progress;
-
-        public event Action<float> DownloadProgressed;
-
         private readonly bool noVideo;
 
         public DownloadBeatmapSetRequest(BeatmapSetInfo set, bool noVideo)
+            : base(set)
         {
             this.noVideo = noVideo;
-            BeatmapSet = set;
-
-            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
         }
 
-        protected override string Target => $@"beatmapsets/{BeatmapSet.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
+        protected override string Target => $@"beatmapsets/{Model.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
     }
 }

osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs

@@ -63,6 +63,9 @@ namespace osu.Game.Online.API.Requests.Responses
             set => Author.Id = value;
         }
 
+        [JsonProperty(@"availability")]
+        private BeatmapSetOnlineAvailability availability { get; set; }
+
         [JsonProperty(@"beatmaps")]
         private IEnumerable<APIBeatmap> beatmaps { get; set; }
 
@@ -87,6 +90,7 @@ namespace osu.Game.Online.API.Requests.Responses
                     Submitted = submitted,
                     Ranked = ranked,
                     LastUpdated = lastUpdated,
+                    Availability = availability,
                 },
                 Beatmaps = beatmaps?.Select(b => b.ToBeatmap(rulesets)).ToList(),
             };

osu.Game/Online/DownloadState.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.
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Online
 {
     public enum DownloadState
     {

osu.Game/Online/DownloadTrackingComposite.cs

@@ -2,23 +2,24 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
+using osu.Game.Database;
-using osu.Game.Online.API.Requests;
+using osu.Game.Online.API;
 
-namespace osu.Game.Overlays.Direct
+namespace osu.Game.Online
 {
     /// <summary>
     /// A component which tracks a beatmap through potential download/import/deletion.
     /// </summary>
-    public abstract class DownloadTrackingComposite : CompositeDrawable
+    public abstract class DownloadTrackingComposite<TModel, TModelManager> : CompositeDrawable
+        where TModel : class, IEquatable<TModel>
+        where TModelManager : class, IModelDownloader<TModel>
     {
-        public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
+        protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
-        private BeatmapManager beatmaps;
+        private TModelManager manager;
 
         /// <summary>
         /// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
@@ -27,58 +28,39 @@ namespace osu.Game.Overlays.Direct
 
         protected readonly Bindable<double> Progress = new Bindable<double>();
 
-        protected DownloadTrackingComposite(BeatmapSetInfo beatmapSet = null)
+        protected DownloadTrackingComposite(TModel model = null)
         {
-            BeatmapSet.Value = beatmapSet;
+            Model.Value = model;
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager beatmaps)
+        private void load(TModelManager manager)
         {
-            this.beatmaps = beatmaps;
+            this.manager = manager;
 
-            BeatmapSet.BindValueChanged(setInfo =>
+            Model.BindValueChanged(modelInfo =>
             {
-                if (setInfo.NewValue == null)
+                if (modelInfo.NewValue == null)
                     attachDownload(null);
-                else if (beatmaps.GetAllUsableBeatmapSetsEnumerable().Any(s => s.OnlineBeatmapSetID == setInfo.NewValue.OnlineBeatmapSetID))
+                else if (manager.IsAvailableLocally(modelInfo.NewValue))
                     State.Value = DownloadState.LocallyAvailable;
                 else
-                    attachDownload(beatmaps.GetExistingDownload(setInfo.NewValue));
+                    attachDownload(manager.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
-            beatmaps.BeatmapDownloadBegan += download =>
+            manager.DownloadBegan += download =>
             {
-                if (download.BeatmapSet.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID)
+                if (download.Model.Equals(Model.Value))
                     attachDownload(download);
             };
 
-            beatmaps.ItemAdded += setAdded;
+            manager.ItemAdded += itemAdded;
-            beatmaps.ItemRemoved += setRemoved;
+            manager.ItemRemoved += itemRemoved;
         }
 
-        #region Disposal
+        private ArchiveDownloadRequest<TModel> attachedRequest;
 
-        protected override void Dispose(bool isDisposing)
+        private void attachDownload(ArchiveDownloadRequest<TModel> request)
-        {
-            base.Dispose(isDisposing);
-
-            if (beatmaps != null)
-            {
-                beatmaps.BeatmapDownloadBegan -= attachDownload;
-                beatmaps.ItemAdded -= setAdded;
-            }
-
-            State.UnbindAll();
-
-            attachDownload(null);
-        }
-
-        #endregion
-
-        private DownloadBeatmapSetRequest attachedRequest;
-
-        private void attachDownload(DownloadBeatmapSetRequest request)
         {
             if (attachedRequest != null)
             {
@@ -118,16 +100,35 @@ namespace osu.Game.Overlays.Direct
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
-        private void setAdded(BeatmapSetInfo s, bool existing) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
+        private void itemAdded(TModel s) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
 
-        private void setRemoved(BeatmapSetInfo s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
+        private void itemRemoved(TModel s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
 
-        private void setDownloadStateFromManager(BeatmapSetInfo s, DownloadState state) => Schedule(() =>
+        private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
         {
-            if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID)
+            if (!s.Equals(Model.Value))
                 return;
 
             State.Value = state;
         });
+
+        #region Disposal
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (manager != null)
+            {
+                manager.DownloadBegan -= attachDownload;
+                manager.ItemAdded -= itemAdded;
+            }
+
+            State.UnbindAll();
+
+            attachDownload(null);
+        }
+
+        #endregion
     }
 }

osu.Game/OsuGameBase.cs

@@ -183,7 +183,7 @@ namespace osu.Game
             }
 
             BeatmapManager.ItemRemoved += i => ScoreManager.Delete(getBeatmapScores(i), true);
-            BeatmapManager.ItemAdded += (i, existing) => ScoreManager.Undelete(getBeatmapScores(i), true);
+            BeatmapManager.ItemAdded += i => ScoreManager.Undelete(getBeatmapScores(i), true);
 
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));

osu.Game/Overlays/BeatmapSet/BeatmapAvailability.cs

@@ -0,0 +1,83 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapAvailability : Container
+    {
+        private BeatmapSetInfo beatmapSet;
+
+        private bool downloadDisabled => BeatmapSet?.OnlineInfo.Availability?.DownloadDisabled ?? false;
+        private bool hasExternalLink => !string.IsNullOrEmpty(BeatmapSet?.OnlineInfo.Availability?.ExternalLink);
+
+        private readonly LinkFlowContainer textContainer;
+
+        public BeatmapAvailability()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Padding = new MarginPadding { Top = 10, Right = 20 };
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black.Opacity(0.6f),
+                },
+                textContainer = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 14))
+                {
+                    Direction = FillDirection.Full,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding(10),
+                },
+            };
+        }
+
+        public BeatmapSetInfo BeatmapSet
+        {
+            get => beatmapSet;
+
+            set
+            {
+                if (value == beatmapSet)
+                    return;
+
+                beatmapSet = value;
+
+                if (downloadDisabled || hasExternalLink)
+                {
+                    Show();
+                    updateText();
+                }
+                else
+                    Hide();
+            }
+        }
+
+        private void updateText()
+        {
+            textContainer.Clear();
+            textContainer.AddParagraph(downloadDisabled
+                ? "This beatmap is currently not available for download."
+                : "Portions of this beatmap have been removed at the request of the creator or a third-party rights holder.", t => t.Colour = Color4.Orange);
+
+            if (hasExternalLink)
+            {
+                textContainer.NewParagraph();
+                textContainer.NewParagraph();
+                textContainer.AddLink("Check here for more information.", BeatmapSet.OnlineInfo.Availability.ExternalLink, creationParameters: t => t.Font = OsuFont.GetFont(size: 10));
+            }
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs

@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Direct;
 using osu.Game.Users;
@@ -19,7 +20,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
-    public class DownloadButton : DownloadTrackingComposite, IHasTooltip
+    public class DownloadButton : BeatmapDownloadTrackingComposite, IHasTooltip
     {
         private readonly bool noVideo;
 

osu.Game/Overlays/BeatmapSet/Header.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -12,6 +13,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Overlays.Direct;
 using osuTK;
@@ -20,7 +22,7 @@ using DownloadButton = osu.Game.Overlays.BeatmapSet.Buttons.DownloadButton;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class Header : DownloadTrackingComposite
+    public class Header : BeatmapDownloadTrackingComposite
     {
         private const float transition_duration = 200;
         private const float tabs_height = 50;
@@ -32,9 +34,12 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
         private readonly FillFlowContainer downloadButtonsContainer;
+        private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
         public Details Details;
 
+        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
+
         public readonly BeatmapPicker Picker;
 
         private readonly FavouriteButton favouriteButton;
@@ -99,7 +104,8 @@ namespace osu.Game.Overlays.BeatmapSet
                         },
                         new Container
                         {
-                            RelativeSizeAxes = Axes.Both,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
                             Padding = new MarginPadding
                             {
                                 Top = 20,
@@ -148,6 +154,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                             Margin = new MarginPadding { Top = 20 },
                                             Child = author = new AuthorInfo(),
                                         },
+                                        beatmapAvailability = new BeatmapAvailability(),
                                         new Container
                                         {
                                             RelativeSizeAxes = Axes.X,
@@ -166,13 +173,14 @@ namespace osu.Game.Overlays.BeatmapSet
                                         },
                                     },
                                 },
-                                loading = new LoadingAnimation
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                }
                             }
                         },
+                        loading = new LoadingAnimation
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(1.5f),
+                        },
                         new FillFlowContainer
                         {
                             Anchor = Anchor.BottomRight,
@@ -213,7 +221,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             BeatmapSet.BindValueChanged(setInfo =>
             {
-                Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
+                Picker.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
                 cover.BeatmapSet = setInfo.NewValue;
 
                 if (setInfo.NewValue == null)
@@ -250,11 +258,17 @@ namespace osu.Game.Overlays.BeatmapSet
         {
             if (BeatmapSet.Value == null) return;
 
+            if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
+            {
+                downloadButtonsContainer.Clear();
+                return;
+            }
+
             switch (State.Value)
             {
                 case DownloadState.LocallyAvailable:
                     // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new osu.Game.Overlays.Direct.DownloadButton(BeatmapSet.Value)
+                    downloadButtonsContainer.Child = new Direct.DownloadButton(BeatmapSet.Value)
                     {
                         Width = 50,
                         RelativeSizeAxes = Axes.Y

osu.Game/Overlays/BeatmapSetOverlay.cs

@@ -27,12 +27,10 @@ namespace osu.Game.Overlays
         public const float TOP_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
 
-        private readonly Header header;
+        protected readonly Header Header;
 
         private RulesetStore rulesets;
 
-        private readonly OsuScrollContainer scroll;
-
         private readonly Bindable<BeatmapSetInfo> beatmapSet = new Bindable<BeatmapSetInfo>();
 
         // receive input outside our bounds so we can trigger a close event on ourselves.
@@ -40,6 +38,7 @@ namespace osu.Game.Overlays
 
         public BeatmapSetOverlay()
         {
+            OsuScrollContainer scroll;
             Info info;
             ScoresContainer scores;
 
@@ -61,7 +60,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new Header(),
+                            Header = new Header(),
                             info = new Info(),
                             scores = new ScoresContainer(),
                         },
@@ -69,13 +68,15 @@ namespace osu.Game.Overlays
                 },
             };
 
-            header.BeatmapSet.BindTo(beatmapSet);
+            Header.BeatmapSet.BindTo(beatmapSet);
             info.BeatmapSet.BindTo(beatmapSet);
 
-            header.Picker.Beatmap.ValueChanged += b =>
+            Header.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
                 scores.Beatmap = b.NewValue;
+
+                scroll.ScrollToStart();
             };
         }
 
@@ -104,7 +105,7 @@ namespace osu.Game.Overlays
             req.Success += res =>
             {
                 beatmapSet.Value = res.ToBeatmapSet(rulesets);
-                header.Picker.Beatmap.Value = header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
+                Header.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
             };
             API.Queue(req);
             Show();
@@ -119,11 +120,14 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        /// <summary>
+        /// Show an already fully-populated beatmap set.
+        /// </summary>
+        /// <param name="set">The set to show.</param>
         public void ShowBeatmapSet(BeatmapSetInfo set)
         {
             beatmapSet.Value = set;
             Show();
-            scroll.ScrollTo(0);
         }
     }
 }

osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs

@@ -0,0 +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 osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Online;
+
+namespace osu.Game.Overlays.Direct
+{
+    public abstract class BeatmapDownloadTrackingComposite : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    {
+        public Bindable<BeatmapSetInfo> BeatmapSet => Model;
+
+        protected BeatmapDownloadTrackingComposite(BeatmapSetInfo set = null)
+            : base(set)
+        {
+        }
+    }
+}

osu.Game/Overlays/Direct/DirectListPanel.cs

@@ -27,6 +27,7 @@ namespace osu.Game.Overlays.Direct
         private const float height = 70;
 
         private FillFlowContainer statusContainer;
+        protected DownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -149,7 +150,7 @@ namespace osu.Game.Overlays.Direct
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
                                     AutoSizeAxes = Axes.Both,
-                                    Child = new DownloadButton(SetInfo)
+                                    Child = DownloadButton = new DownloadButton(SetInfo)
                                     {
                                         Size = new Vector2(height - vertical_padding * 3),
                                         Margin = new MarginPadding { Left = vertical_padding * 2, Right = vertical_padding },

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -34,6 +35,7 @@ namespace osu.Game.Overlays.Direct
 
         public PreviewTrack Preview => PlayButton.Preview;
         public Bindable<bool> PreviewPlaying => PlayButton.Playing;
+
         protected abstract PlayButton PlayButton { get; }
         protected abstract Box PreviewBar { get; }
 
@@ -43,6 +45,8 @@ namespace osu.Game.Overlays.Direct
 
         protected DirectPanel(BeatmapSetInfo setInfo)
         {
+            Debug.Assert(setInfo.OnlineBeatmapSetID != null);
+
             SetInfo = setInfo;
         }
 
@@ -117,12 +121,11 @@ namespace osu.Game.Overlays.Direct
 
         protected override bool OnClick(ClickEvent e)
         {
-            ShowInformation();
+            Debug.Assert(SetInfo.OnlineBeatmapSetID != null);
+            beatmapSetOverlay?.FetchAndShowBeatmapSet(SetInfo.OnlineBeatmapSetID.Value);
             return true;
         }
 
-        protected void ShowInformation() => beatmapSetOverlay?.ShowBeatmapSet(SetInfo);
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Overlays/Direct/DownloadButton.cs

@@ -9,21 +9,22 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osuTK;
 
 namespace osu.Game.Overlays.Direct
 {
-    public class DownloadButton : DownloadTrackingComposite
+    public class DownloadButton : BeatmapDownloadTrackingComposite
     {
+        protected bool DownloadEnabled => button.Enabled.Value;
+
         private readonly bool noVideo;
         private readonly SpriteIcon icon;
         private readonly SpriteIcon checkmark;
         private readonly Box background;
 
         private OsuColour colours;
-
         private readonly ShakeContainer shakeContainer;
-
         private readonly OsuAnimatedButton button;
 
         public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
@@ -72,11 +73,18 @@ namespace osu.Game.Overlays.Direct
             FinishTransforms(true);
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
+        [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, OsuGame game, BeatmapManager beatmaps)
         {
             this.colours = colours;
 
+            if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
+            {
+                button.Enabled.Value = false;
+                button.TooltipText = "This beatmap is currently not available for download.";
+                return;
+            }
+
             button.Action = () =>
             {
                 switch (State.Value)

osu.Game/Overlays/Direct/DownloadProgressBar.cs

@@ -7,11 +7,12 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Direct
 {
-    public class DownloadProgressBar : DownloadTrackingComposite
+    public class DownloadProgressBar : BeatmapDownloadTrackingComposite
     {
         private readonly ProgressBar progressBar;
 

osu.Game/Overlays/Music/PlaylistList.cs

@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Music
             [BackgroundDependencyLoader]
             private void load(BeatmapManager beatmaps, IBindable<WorkingBeatmap> beatmap)
             {
-                beatmaps.GetAllUsableBeatmapSets().ForEach(b => addBeatmapSet(b, false));
+                beatmaps.GetAllUsableBeatmapSets().ForEach(addBeatmapSet);
                 beatmaps.ItemAdded += addBeatmapSet;
                 beatmaps.ItemRemoved += removeBeatmapSet;
 
@@ -83,11 +83,8 @@ namespace osu.Game.Overlays.Music
                 beatmapBacking.ValueChanged += _ => updateSelectedSet();
             }
 
-            private void addBeatmapSet(BeatmapSetInfo obj, bool existing) => Schedule(() =>
+            private void addBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
             {
-                if (existing)
-                    return;
-
                 var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) };
 
                 items.Add(newItem);

osu.Game/Overlays/MusicController.cs

@@ -218,15 +218,9 @@ namespace osu.Game.Overlays
             beatmapSets.Insert(index, beatmapSetInfo);
         }
 
-        private void handleBeatmapAdded(BeatmapSetInfo obj, bool existing)
+        private void handleBeatmapAdded(BeatmapSetInfo set) => Schedule(() => beatmapSets.Add(set));
-        {
-            if (existing)
-                return;
 
-            Schedule(() => beatmapSets.Add(obj));
+        private void handleBeatmapRemoved(BeatmapSetInfo set) => Schedule(() => beatmapSets.RemoveAll(s => s.ID == set.ID));
-        }
-
-        private void handleBeatmapRemoved(BeatmapSetInfo obj) => Schedule(() => beatmapSets.RemoveAll(s => s.ID == obj.ID));
 
         protected override void LoadComplete()
         {
@@ -259,6 +253,12 @@ namespace osu.Game.Overlays
         {
             base.Update();
 
+            if (pendingBeatmapSwitch != null)
+            {
+                pendingBeatmapSwitch();
+                pendingBeatmapSwitch = null;
+            }
+
             var track = current?.TrackLoaded ?? false ? current.Track : null;
 
             if (track?.IsDummyDevice == false)
@@ -368,15 +368,12 @@ namespace osu.Game.Overlays
                 mod.ApplyToClock(track);
         }
 
-        private ScheduledDelegate pendingBeatmapSwitch;
+        private Action pendingBeatmapSwitch;
 
         private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
         {
-            //we might be off-screen when this update comes in.
+            // avoid using scheduler as our scheduler may not be run for a long time, holding references to beatmaps.
-            //rather than Scheduling, manually handle this to avoid possible memory contention.
+            pendingBeatmapSwitch = delegate
-            pendingBeatmapSwitch?.Cancel();
-
-            pendingBeatmapSwitch = Schedule(delegate
             {
                 // todo: this can likely be replaced with WorkingBeatmap.GetBeatmapAsync()
                 Task.Run(() =>
@@ -416,7 +413,7 @@ namespace osu.Game.Overlays
 
                     playerContainer.Add(newBackground);
                 });
-            });
+            };
         }
 
         protected override void PopIn()

osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs

@@ -0,0 +1,66 @@
+// 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.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public class ProfileRulesetSelector : RulesetSelector
+    {
+        private Color4 accentColour = Color4.White;
+
+        public ProfileRulesetSelector()
+        {
+            TabContainer.Masking = false;
+            TabContainer.Spacing = new Vector2(10, 0);
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            accentColour = colours.Seafoam;
+
+            foreach (TabItem<RulesetInfo> tabItem in TabContainer)
+                ((ProfileRulesetTabItem)tabItem).AccentColour = accentColour;
+        }
+
+        public void SetDefaultRuleset(RulesetInfo ruleset)
+        {
+            // Todo: This method shouldn't exist, but bindables don't provide the concept of observing a change to the default value
+            foreach (TabItem<RulesetInfo> tabItem in TabContainer)
+                ((ProfileRulesetTabItem)tabItem).IsDefault = ((ProfileRulesetTabItem)tabItem).Value.ID == ruleset.ID;
+        }
+
+        public void SelectDefaultRuleset()
+        {
+            // Todo: This method shouldn't exist, but bindables don't provide the concept of observing a change to the default value
+            foreach (TabItem<RulesetInfo> tabItem in TabContainer)
+            {
+                if (((ProfileRulesetTabItem)tabItem).IsDefault)
+                {
+                    Current.Value = ((ProfileRulesetTabItem)tabItem).Value;
+                    return;
+                }
+            }
+        }
+
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ProfileRulesetTabItem(value)
+        {
+            AccentColour = accentColour
+        };
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            Direction = FillDirection.Horizontal,
+            AutoSizeAxes = Axes.Both,
+        };
+    }
+}

osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs

@@ -0,0 +1,125 @@
+// 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.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public class ProfileRulesetTabItem : TabItem<RulesetInfo>, IHasAccentColour
+    {
+        private readonly OsuSpriteText text;
+        private readonly SpriteIcon icon;
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (accentColour == value)
+                    return;
+
+                accentColour = value;
+
+                updateState();
+            }
+        }
+
+        private bool isDefault;
+
+        public bool IsDefault
+        {
+            get => isDefault;
+            set
+            {
+                if (isDefault == value)
+                    return;
+
+                isDefault = value;
+
+                icon.FadeTo(isDefault ? 1 : 0, 200, Easing.OutQuint);
+            }
+        }
+
+        public ProfileRulesetTabItem(RulesetInfo value)
+            : base(value)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(3, 0),
+                    Children = new Drawable[]
+                    {
+                        text = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Text = value.Name,
+                        },
+                        icon = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                            Icon = FontAwesome.Solid.Star,
+                            Size = new Vector2(12),
+                        },
+                    }
+                },
+                new HoverClickSounds()
+            };
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            base.OnHover(e);
+            updateState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            updateState();
+        }
+
+        protected override void OnActivated() => updateState();
+
+        protected override void OnDeactivated() => updateState();
+
+        private void updateState()
+        {
+            text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+
+            if (IsHovered || Active.Value)
+            {
+                text.FadeColour(Color4.White, 120, Easing.InQuad);
+                icon.FadeColour(Color4.White, 120, Easing.InQuad);
+            }
+            else
+            {
+                text.FadeColour(AccentColour, 120, Easing.InQuad);
+                icon.FadeColour(AccentColour, 120, Easing.InQuad);
+            }
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs

@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Runtime;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 
@@ -14,37 +12,17 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
     {
         protected override string Header => "Garbage Collector";
 
-        private readonly Bindable<LatencyMode> latencyMode = new Bindable<LatencyMode>();
-        private Bindable<GCLatencyMode> configLatencyMode;
-
         [BackgroundDependencyLoader]
         private void load(FrameworkDebugConfigManager config)
         {
             Children = new Drawable[]
             {
-                new SettingsEnumDropdown<LatencyMode>
-                {
-                    LabelText = "Active mode",
-                    Bindable = latencyMode
-                },
                 new SettingsButton
                 {
                     Text = "Force garbage collection",
                     Action = GC.Collect
                 },
             };
-
-            configLatencyMode = config.GetBindable<GCLatencyMode>(DebugSetting.ActiveGCMode);
-            configLatencyMode.BindValueChanged(mode => latencyMode.Value = (LatencyMode)mode.NewValue, true);
-            latencyMode.BindValueChanged(mode => configLatencyMode.Value = (GCLatencyMode)mode.NewValue);
-        }
-
-        private enum LatencyMode
-        {
-            Batch = GCLatencyMode.Batch,
-            Interactive = GCLatencyMode.Interactive,
-            LowLatency = GCLatencyMode.LowLatency,
-            SustainedLowLatency = GCLatencyMode.SustainedLowLatency
         }
     }
 }

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -319,7 +319,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     BackgroundColour = colours.Gray3;
                 }
 
-                protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
+                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
 
                 private class DrawableUserDropdownMenuItem : DrawableOsuDropdownMenuItem
                 {

osu.Game/Overlays/Settings/Sections/SkinSection.cs

@@ -82,13 +82,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
 
-        private void itemAdded(SkinInfo s, bool existing)
+        private void itemAdded(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
-        {
-            if (existing)
-                return;
-
-            Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
-        }
 
         protected override void Dispose(bool isDisposing)
         {

osu.Game/Overlays/SettingsSubPanel.cs

@@ -34,6 +34,8 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override bool DimMainContent => false; // dimming is handled by main overlay
+
         private class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
         {
             private AspectContainer aspect;

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -23,6 +24,7 @@ namespace osu.Game.Overlays.Toolbar
         public Action OnHome;
 
         private ToolbarUserButton userButton;
+        private ToolbarRulesetSelector rulesetSelector;
 
         protected override bool BlockPositionalInput => false;
 
@@ -40,7 +42,7 @@ namespace osu.Game.Overlays.Toolbar
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuGame osuGame)
+        private void load(OsuGame osuGame, Bindable<RulesetInfo> parentRuleset)
         {
             Children = new Drawable[]
             {
@@ -57,7 +59,7 @@ namespace osu.Game.Overlays.Toolbar
                         {
                             Action = () => OnHome?.Invoke()
                         },
-                        new ToolbarRulesetSelector()
+                        rulesetSelector = new ToolbarRulesetSelector()
                     }
                 },
                 new FillFlowContainer
@@ -84,6 +86,9 @@ namespace osu.Game.Overlays.Toolbar
                 }
             };
 
+            // Bound after the selector is added to the hierarchy to give it a chance to load the available rulesets
+            rulesetSelector.Current.BindTo(parentRuleset);
+
             State.ValueChanged += visibility =>
             {
                 if (overlayActivationMode.Value == OverlayActivation.Disabled)

osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs

@@ -1,58 +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.Effects;
-using osu.Game.Rulesets;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Toolbar
-{
-    public class ToolbarRulesetButton : ToolbarButton
-    {
-        private RulesetInfo ruleset;
-
-        public RulesetInfo Ruleset
-        {
-            get => ruleset;
-            set
-            {
-                ruleset = value;
-
-                var rInstance = ruleset.CreateInstance();
-
-                TooltipMain = rInstance.Description;
-                TooltipSub = $"Play some {rInstance.Description}";
-                SetIcon(rInstance.CreateIcon());
-            }
-        }
-
-        public bool Active
-        {
-            set
-            {
-                if (value)
-                {
-                    IconContainer.Colour = Color4.White;
-                    IconContainer.EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = new Color4(255, 194, 224, 100),
-                        Radius = 15,
-                        Roundness = 15,
-                    };
-                }
-                else
-                {
-                    IconContainer.Colour = new Color4(255, 194, 224, 255);
-                    IconContainer.EdgeEffect = new EdgeEffectParameters();
-                }
-            }
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            IconContainer.Scale *= 1.4f;
-        }
-    }
-}

osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs

@@ -1,51 +1,43 @@
 // 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 osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osuTK;
-using osuTK.Input;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osuTK.Input;
+using System.Linq;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarRulesetSelector : Container
+    public class ToolbarRulesetSelector : RulesetSelector
     {
         private const float padding = 10;
 
-        private readonly FillFlowContainer modeButtons;
+        protected Drawable ModeButtonLine { get; private set; }
-        private readonly Drawable modeButtonLine;
-        private ToolbarRulesetButton activeButton;
-
-        private RulesetStore rulesets;
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
+        }
 
-            Children = new[]
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new[]
             {
-                new OpaqueBackground(),
+                new OpaqueBackground
-                modeButtons = new FillFlowContainer
                 {
-                    RelativeSizeAxes = Axes.Y,
+                    Depth = 1,
-                    AutoSizeAxes = Axes.X,
-                    Direction = FillDirection.Horizontal,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Padding = new MarginPadding { Left = padding, Right = padding },
                 },
-                modeButtonLine = new Container
+                ModeButtonLine = new Container
                 {
                     Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3),
                     Anchor = Anchor.BottomLeft,
@@ -58,35 +50,54 @@ namespace osu.Game.Overlays.Toolbar
                         Radius = 15,
                         Roundness = 15,
                     },
-                    Children = new[]
+                    Child = new Box
                     {
-                        new Box
+                        RelativeSizeAxes = Axes.Both,
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        }
                     }
                 }
-            };
+            });
         }
 
-        [BackgroundDependencyLoader]
+        protected override void LoadComplete()
-        private void load(RulesetStore rulesets, Bindable<RulesetInfo> parentRuleset)
         {
-            this.rulesets = rulesets;
+            base.LoadComplete();
 
-            foreach (var r in rulesets.AvailableRulesets)
+            Current.BindDisabledChanged(disabled => this.FadeColour(disabled ? Color4.Gray : Color4.White, 300), true);
+            Current.BindValueChanged(_ => moveLineToCurrent(), true);
+        }
+
+        private bool hasInitialPosition;
+
+        // Scheduled to allow the flow layout to be computed before the line position is updated
+        private void moveLineToCurrent() => ScheduleAfterChildren(() =>
+        {
+            foreach (var tabItem in TabContainer)
             {
-                modeButtons.Add(new ToolbarRulesetButton
+                if (tabItem.Value == Current.Value)
                 {
-                    Ruleset = r,
+                    ModeButtonLine.MoveToX(tabItem.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
-                    Action = delegate { ruleset.Value = r; }
+                    break;
-                });
+                }
             }
 
-            ruleset.ValueChanged += rulesetChanged;
+            hasInitialPosition = true;
-            ruleset.DisabledChanged += disabledChanged;
+        });
-            ruleset.BindTo(parentRuleset);
+
-        }
+        public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;
+
+        public override bool HandlePositionalInput => !Current.Disabled && base.HandlePositionalInput;
+
+        public override bool PropagatePositionalInputSubTree => !Current.Disabled && base.PropagatePositionalInputSubTree;
+
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ToolbarRulesetTabButton(value);
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            RelativeSizeAxes = Axes.Y,
+            AutoSizeAxes = Axes.X,
+            Direction = FillDirection.Horizontal,
+            Padding = new MarginPadding { Left = padding, Right = padding },
+        };
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -96,46 +107,13 @@ namespace osu.Game.Overlays.Toolbar
             {
                 int requested = e.Key - Key.Number1;
 
-                RulesetInfo found = rulesets.AvailableRulesets.Skip(requested).FirstOrDefault();
+                RulesetInfo found = Rulesets.AvailableRulesets.Skip(requested).FirstOrDefault();
                 if (found != null)
-                    ruleset.Value = found;
+                    Current.Value = found;
                 return true;
             }
 
             return false;
         }
-
-        public override bool HandleNonPositionalInput => !ruleset.Disabled && base.HandleNonPositionalInput;
-        public override bool HandlePositionalInput => !ruleset.Disabled && base.HandlePositionalInput;
-
-        public override bool PropagatePositionalInputSubTree => !ruleset.Disabled && base.PropagatePositionalInputSubTree;
-
-        private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
-
-        private void rulesetChanged(ValueChangedEvent<RulesetInfo> e)
-        {
-            foreach (ToolbarRulesetButton m in modeButtons.Children.Cast<ToolbarRulesetButton>())
-            {
-                bool isActive = m.Ruleset.ID == e.NewValue.ID;
-                m.Active = isActive;
-                if (isActive)
-                    activeButton = m;
-            }
-
-            activeMode.Invalidate();
-        }
-
-        private Cached activeMode = new Cached();
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (!activeMode.IsValid)
-            {
-                modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, Easing.OutQuint);
-                activeMode.Validate();
-            }
-        }
     }
 }

osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs

@@ -0,0 +1,76 @@
+// 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.Effects;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osuTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Overlays.Toolbar
+{
+    public class ToolbarRulesetTabButton : TabItem<RulesetInfo>
+    {
+        private readonly RulesetButton ruleset;
+
+        public ToolbarRulesetTabButton(RulesetInfo value)
+            : base(value)
+        {
+            AutoSizeAxes = Axes.X;
+            RelativeSizeAxes = Axes.Y;
+            Child = ruleset = new RulesetButton
+            {
+                Active = false,
+            };
+
+            var rInstance = value.CreateInstance();
+
+            ruleset.TooltipMain = rInstance.Description;
+            ruleset.TooltipSub = $"Play some {rInstance.Description}";
+            ruleset.SetIcon(rInstance.CreateIcon());
+        }
+
+        protected override void OnActivated() => ruleset.Active = true;
+
+        protected override void OnDeactivated() => ruleset.Active = false;
+
+        private class RulesetButton : ToolbarButton
+        {
+            public bool Active
+            {
+                set
+                {
+                    if (value)
+                    {
+                        IconContainer.Colour = Color4.White;
+                        IconContainer.EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Glow,
+                            Colour = new Color4(255, 194, 224, 100),
+                            Radius = 15,
+                            Roundness = 15,
+                        };
+                    }
+                    else
+                    {
+                        IconContainer.Colour = new Color4(255, 194, 224, 255);
+                        IconContainer.EdgeEffect = new EdgeEffectParameters();
+                    }
+                }
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                Parent.Click();
+                return base.OnClick(e);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                IconContainer.Scale *= 1.4f;
+            }
+        }
+    }
+}

osu.Game/Overlays/UserProfileOverlay.cs

@@ -32,7 +32,8 @@ namespace osu.Game.Overlays
 
         public void ShowUser(User user, bool fetchOnline = true)
         {
-            if (user == User.SYSTEM_USER) return;
+            if (user == User.SYSTEM_USER)
+                return;
 
             Show();
 
@@ -76,7 +77,7 @@ namespace osu.Game.Overlays
                 {
                     Colour = OsuColour.Gray(34),
                     RelativeSizeAxes = Axes.Both
-                }
+                },
             });
             sectionsContainer.SelectedSection.ValueChanged += section =>
             {

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected SkinnableSound Samples;
 
-        protected virtual IEnumerable<SampleInfo> GetSamples() => HitObject.Samples;
+        protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
         private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
         public IEnumerable<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : Enumerable.Empty<DrawableHitObject>();
@@ -77,10 +77,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private bool judgementOccurred;
 
-        public bool Interactive = true;
-        public override bool HandleNonPositionalInput => Interactive;
-        public override bool HandlePositionalInput => Interactive;
-
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
         protected override bool RequiresChildrenUpdate => true;
@@ -108,7 +104,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             var samples = GetSamples().ToArray();
 
-            if (samples.Any())
+            if (samples.Length > 0)
             {
                 if (HitObject.SampleControlPoint == null)
                     throw new ArgumentNullException(nameof(HitObject.SampleControlPoint), $"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."

osu.Game/Rulesets/Objects/HitObject.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual double StartTime { get; set; }
 
-        private List<SampleInfo> samples;
+        private List<HitSampleInfo> samples;
 
         /// <summary>
         /// The samples to be played when this hit object is hit.
@@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Objects
         /// and can be treated as the default samples for the hit object.
         /// </para>
         /// </summary>
-        public List<SampleInfo> Samples
+        public List<HitSampleInfo> Samples
         {
-            get => samples ?? (samples = new List<SampleInfo>());
+            get => samples ?? (samples = new List<HitSampleInfo>());
             set => samples = value;
         }
 

osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<HitSampleInfo>> nodeSamples)
         {
             newCombo |= forceNewCombo;
             comboOffset += extraComboOffset;

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -180,7 +180,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     }
 
                     // Generate the final per-node samples
-                    var nodeSamples = new List<List<SampleInfo>>(nodes);
+                    var nodeSamples = new List<List<HitSampleInfo>>(nodes);
                     for (int i = 0; i < nodes; i++)
                         nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
@@ -291,7 +291,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="repeatCount">The slider repeat count.</param>
         /// <param name="nodeSamples">The samples to be played when the slider nodes are hit. This includes the head and tail of the slider.</param>
         /// <returns>The hit object.</returns>
-        protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples);
+        protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<HitSampleInfo>> nodeSamples);
 
         /// <summary>
         /// Creates a legacy Spinner-type hit object.
@@ -312,14 +312,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="endTime">The hold end time.</param>
         protected abstract HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double endTime);
 
-        private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
+        private List<HitSampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
         {
             // Todo: This should return the normal SampleInfos if the specified sample file isn't found, but that's a pretty edge-case scenario
             if (!string.IsNullOrEmpty(bankInfo.Filename))
             {
-                return new List<SampleInfo>
+                return new List<HitSampleInfo>
                 {
-                    new FileSampleInfo
+                    new FileHitSampleInfo
                     {
                         Filename = bankInfo.Filename,
                         Volume = bankInfo.Volume
@@ -327,12 +327,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 };
             }
 
-            var soundTypes = new List<SampleInfo>
+            var soundTypes = new List<HitSampleInfo>
             {
-                new LegacySampleInfo
+                new LegacyHitSampleInfo
                 {
                     Bank = bankInfo.Normal,
-                    Name = SampleInfo.HIT_NORMAL,
+                    Name = HitSampleInfo.HIT_NORMAL,
                     Volume = bankInfo.Volume,
                     CustomSampleBank = bankInfo.CustomSampleBank
                 }
@@ -340,10 +340,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             if (type.HasFlag(LegacySoundType.Finish))
             {
-                soundTypes.Add(new LegacySampleInfo
+                soundTypes.Add(new LegacyHitSampleInfo
                 {
                     Bank = bankInfo.Add,
-                    Name = SampleInfo.HIT_FINISH,
+                    Name = HitSampleInfo.HIT_FINISH,
                     Volume = bankInfo.Volume,
                     CustomSampleBank = bankInfo.CustomSampleBank
                 });
@@ -351,10 +351,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             if (type.HasFlag(LegacySoundType.Whistle))
             {
-                soundTypes.Add(new LegacySampleInfo
+                soundTypes.Add(new LegacyHitSampleInfo
                 {
                     Bank = bankInfo.Add,
-                    Name = SampleInfo.HIT_WHISTLE,
+                    Name = HitSampleInfo.HIT_WHISTLE,
                     Volume = bankInfo.Volume,
                     CustomSampleBank = bankInfo.CustomSampleBank
                 });
@@ -362,10 +362,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             if (type.HasFlag(LegacySoundType.Clap))
             {
-                soundTypes.Add(new LegacySampleInfo
+                soundTypes.Add(new LegacyHitSampleInfo
                 {
                     Bank = bankInfo.Add,
-                    Name = SampleInfo.HIT_CLAP,
+                    Name = HitSampleInfo.HIT_CLAP,
                     Volume = bankInfo.Volume,
                     CustomSampleBank = bankInfo.CustomSampleBank
                 });
@@ -387,7 +387,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
-        private class LegacySampleInfo : SampleInfo
+        private class LegacyHitSampleInfo : HitSampleInfo
         {
             public int CustomSampleBank
             {
@@ -399,7 +399,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             }
         }
 
-        private class FileSampleInfo : SampleInfo
+        private class FileHitSampleInfo : HitSampleInfo
         {
             public string Filename;
 

osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Distance => Path.Distance;
 
-        public List<List<SampleInfo>> NodeSamples { get; set; }
+        public List<List<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
         public double EndTime => StartTime + this.SpanCount() * Distance / Velocity;

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<HitSampleInfo>> nodeSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             };
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<HitSampleInfo>> nodeSamples)
         {
             newCombo |= forceNewCombo;
             comboOffset += extraComboOffset;

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
             return new ConvertHit();
         }
 
-        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples)
+        protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<HitSampleInfo>> nodeSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Types/IHasRepeats.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// n-1: The last repeat.<br />
         /// n: The last node.
         /// </summary>
-        List<List<SampleInfo>> NodeSamples { get; }
+        List<List<HitSampleInfo>> NodeSamples { get; }
     }
 
     public static class HasRepeatsExtensions

osu.Game/Rulesets/RulesetSelector.cs

@@ -0,0 +1,23 @@
+// 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.UserInterface;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Rulesets
+{
+    public abstract class RulesetSelector : TabControl<RulesetInfo>
+    {
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; }
+
+        protected override Dropdown<RulesetInfo> CreateDropdown() => null;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            foreach (var r in Rulesets.AvailableRulesets)
+                AddItem(r);
+        }
+    }
+}

osu.Game/Screens/Edit/Editor.cs

@@ -24,11 +24,13 @@ 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.Users;
 
 namespace osu.Game.Screens.Edit
 {
-    public class Editor : OsuScreen
+    public class Editor : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
 
@@ -206,6 +208,20 @@ namespace osu.Game.Screens.Edit
             return true;
         }
 
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == GlobalAction.Back)
+            {
+                // as we don't want to display the back button, manual handling of exit action is required.
+                this.Exit();
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool OnReleased(GlobalAction action) => action == GlobalAction.Back;
+
         public override void OnResuming(IScreen last)
         {
             Beatmap.Value.Track?.Stop();

osu.Game/Screens/Multi/Match/Components/ReadyButton.cs

@@ -54,11 +54,8 @@ namespace osu.Game.Screens.Multi.Match.Components
             hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
         }
 
-        private void beatmapAdded(BeatmapSetInfo model, bool existing)
+        private void beatmapAdded(BeatmapSetInfo model)
         {
-            if (Beatmap.Value == null)
-                return;
-
             if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
                 Schedule(() => hasBeatmap = true);
         }

osu.Game/Screens/Multi/Match/MatchSubScreen.cs

@@ -195,6 +195,7 @@ namespace osu.Game.Screens.Multi.Match
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
             Mods.Value = e.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+
             if (e.NewValue?.Ruleset != null)
                 Ruleset.Value = e.NewValue.Ruleset;
         }
@@ -202,7 +203,7 @@ namespace osu.Game.Screens.Multi.Match
         /// <summary>
         /// Handle the case where a beatmap is imported (and can be used by this match).
         /// </summary>
-        private void beatmapAdded(BeatmapSetInfo model, bool existing) => Schedule(() =>
+        private void beatmapAdded(BeatmapSetInfo model) => Schedule(() =>
         {
             if (Beatmap.Value != beatmapManager.DefaultBeatmap)
                 return;

osu.Game/Screens/Play/ComboEffects.cs

@@ -0,0 +1,42 @@
+// 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.Audio;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    public class ComboEffects : CompositeDrawable
+    {
+        private readonly ScoreProcessor processor;
+
+        private SkinnableSound comboBreakSample;
+
+        public ComboEffects(ScoreProcessor processor)
+        {
+            this.processor = processor;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            processor.Combo.BindValueChanged(onComboChange, true);
+        }
+
+        private void onComboChange(ValueChangedEvent<int> combo)
+        {
+            if (combo.NewValue == 0 && combo.OldValue > 20)
+                comboBreakSample?.Play();
+        }
+    }
+}

osu.Game/Screens/Play/Player.cs

@@ -127,7 +127,11 @@ namespace osu.Game.Screens.Play
                     Child = new LocalSkinOverrideContainer(working.Skin)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = DrawableRuleset
+                        Children = new Drawable[]
+                        {
+                            DrawableRuleset,
+                            new ComboEffects(ScoreProcessor)
+                        }
                     }
                 },
                 new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -148,40 +148,37 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet)
+        public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
-            Schedule(() =>
+            int? previouslySelectedID = null;
+            CarouselBeatmapSet existingSet = beatmapSets.FirstOrDefault(b => b.BeatmapSet.ID == beatmapSet.ID);
+
+            // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
+            if (existingSet?.State?.Value == CarouselItemState.Selected)
+                previouslySelectedID = selectedBeatmap?.Beatmap.ID;
+
+            var newSet = createCarouselSet(beatmapSet);
+
+            if (existingSet != null)
+                root.RemoveChild(existingSet);
+
+            if (newSet == null)
             {
-                int? previouslySelectedID = null;
-                CarouselBeatmapSet existingSet = beatmapSets.FirstOrDefault(b => b.BeatmapSet.ID == beatmapSet.ID);
-
-                // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
-                if (existingSet?.State?.Value == CarouselItemState.Selected)
-                    previouslySelectedID = selectedBeatmap?.Beatmap.ID;
-
-                var newSet = createCarouselSet(beatmapSet);
-
-                if (existingSet != null)
-                    root.RemoveChild(existingSet);
-
-                if (newSet == null)
-                {
-                    itemsCache.Invalidate();
-                    return;
-                }
-
-                root.AddChild(newSet);
-
-                applyActiveCriteria(false, false);
-
-                //check if we can/need to maintain our current selection.
-                if (previouslySelectedID != null)
-                    select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.Beatmap.ID == previouslySelectedID) ?? newSet);
-
                 itemsCache.Invalidate();
-                Schedule(() => BeatmapSetsChanged?.Invoke());
+                return;
-            });
+            }
-        }
+
+            root.AddChild(newSet);
+
+            applyActiveCriteria(false, false);
+
+            //check if we can/need to maintain our current selection.
+            if (previouslySelectedID != null)
+                select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.Beatmap.ID == previouslySelectedID) ?? newSet);
+
+            itemsCache.Invalidate();
+            Schedule(() => BeatmapSetsChanged?.Invoke());
+        });
 
         /// <summary>
         /// Selects a given beatmap on the carousel.

osu.Game/Screens/Select/SongSelect.cs

@@ -578,7 +578,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void onBeatmapSetAdded(BeatmapSetInfo s, bool existing) => Carousel.UpdateBeatmapSet(s);
+        private void onBeatmapSetAdded(BeatmapSetInfo s) => Carousel.UpdateBeatmapSet(s);
         private void onBeatmapSetRemoved(BeatmapSetInfo s) => Carousel.RemoveBeatmapSet(s);
         private void onBeatmapRestored(BeatmapInfo b) => Carousel.UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));
         private void onBeatmapHidden(BeatmapInfo b) => Carousel.UpdateBeatmapSet(beatmaps.QueryBeatmapSet(s => s.ID == b.BeatmapSetInfoID));

osu.Game/Skinning/LocalSkinOverrideContainer.cs

@@ -23,6 +23,7 @@ namespace osu.Game.Skinning
         private readonly Bindable<bool> beatmapHitsounds = new Bindable<bool>();
 
         private readonly ISkin skin;
+
         private ISkinSource fallbackSource;
 
         public LocalSkinOverrideContainer(ISkin skin)

osu.Game/Skinning/SkinnableSound.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -13,14 +14,19 @@ namespace osu.Game.Skinning
 {
     public class SkinnableSound : SkinReloadableDrawable
     {
-        private readonly SampleInfo[] samples;
+        private readonly ISampleInfo[] hitSamples;
         private SampleChannel[] channels;
 
         private AudioManager audio;
 
-        public SkinnableSound(params SampleInfo[] samples)
+        public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
         {
-            this.samples = samples;
+            this.hitSamples = hitSamples.ToArray();
+        }
+
+        public SkinnableSound(ISampleInfo hitSamples)
+        {
+            this.hitSamples = new[] { hitSamples };
         }
 
         [BackgroundDependencyLoader]
@@ -35,7 +41,7 @@ namespace osu.Game.Skinning
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
-            channels = samples.Select(s =>
+            channels = hitSamples.Select(s =>
             {
                 var ch = loadChannel(s, skin.GetSample);
                 if (ch == null && allowFallback)
@@ -44,7 +50,7 @@ namespace osu.Game.Skinning
             }).Where(c => c != null).ToArray();
         }
 
-        private SampleChannel loadChannel(SampleInfo info, Func<string, SampleChannel> getSampleFunction)
+        private SampleChannel loadChannel(ISampleInfo info, Func<string, SampleChannel> getSampleFunction)
         {
             foreach (var lookup in info.LookupNames)
             {

osu.Game/Utils/ZipUtils.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Utils
@@ -10,6 +11,9 @@ namespace osu.Game.Utils
     {
         public static bool IsZipArchive(string path)
         {
+            if (!File.Exists(path))
+                return false;
+
             try
             {
                 using (var arc = ZipArchive.Open(path))

osu.Game/osu.Game.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.609.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.627.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.625.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.628.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -104,9 +104,9 @@
     <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.609.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.627.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.625.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.628.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.625.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.628.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS/Info.plist

@@ -6,6 +6,8 @@
 	<string>sh.ppy.osulazer</string>
 	<key>CFBundleName</key>
 	<string>osu!</string>
+	<key>CFBundleDisplayName</key>
+	<string>osu!</string>
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>