Move implementation to individual classes

osu.Game/Screens/Play/Player.cs

@@ -9,6 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -832,23 +833,24 @@ namespace osu.Game.Screens.Play
             HUDOverlay.HoldingForHUD.BindValueChanged(_ => updateLeaderboardExpandedState());
             LocalUserPlaying.BindValueChanged(_ => updateLeaderboardExpandedState(), true);
 
-            LoadComponentAsync(CreateGameplayLeaderboard(), leaderboard =>
+            var gameplayLeaderboard = CreateGameplayLeaderboard();
+
+            if (gameplayLeaderboard != null)
             {
-                if (!LoadedBeatmapSuccessfully)
+                LoadComponentAsync(gameplayLeaderboard, leaderboard =>
-                    return;
+                {
+                    if (!LoadedBeatmapSuccessfully)
+                        return;
 
-                leaderboard.Expanded.BindTo(LeaderboardExpandedState);
+                    leaderboard.Expanded.BindTo(LeaderboardExpandedState);
 
-                AddLeaderboardToHUD(leaderboard);
+                    AddLeaderboardToHUD(leaderboard);
-            });
+                });
+            }
         }
 
-        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+        [CanBeNull]
-
+        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => null;
-        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User)
-        {
-            Scores = { BindTarget = LeaderboardScores }
-        };
 
         protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.LeaderboardFlow.Add(leaderboard);
 

osu.Game/Screens/Play/ReplayPlayer.cs

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
@@ -14,6 +15,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
@@ -55,6 +57,14 @@ namespace osu.Game.Screens.Play
         // Don't re-import replay scores as they're already present in the database.
         protected override Task ImportScore(Score score) => Task.CompletedTask;
 
+        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+
+        protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
+            new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+            {
+                Scores = { BindTarget = LeaderboardScores }
+            };
+
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)

osu.Game/Screens/Play/SoloPlayer.cs

@@ -5,12 +5,14 @@
 
 using System;
 using System.Diagnostics;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Solo;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.Play
 {
@@ -40,6 +42,14 @@ namespace osu.Game.Screens.Play
             return new CreateSoloScoreRequest(Beatmap.Value.BeatmapInfo, rulesetId, Game.VersionHash);
         }
 
+        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+
+        protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
+            new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+            {
+                Scores = { BindTarget = LeaderboardScores }
+            };
+
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
@@ -115,11 +114,19 @@ namespace osu.Game.Screens.Select
                 var replayGeneratingMod = Mods.Value.OfType<ICreateReplayData>().FirstOrDefault();
 
                 if (replayGeneratingMod != null)
-                    player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods));
+                {
+                    player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))
+                    {
+                        LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
+                    };
+                }
                 else
-                    player = new SoloPlayer();
+                {
-
+                    player = new SoloPlayer
-                ((IBindableList<ScoreInfo>)player.LeaderboardScores).BindTo(playBeatmapDetailArea.Leaderboard.Scores);
+                    {
+                        LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
+                    };
+                }
 
                 return player;
             }