From 3a57b21c89e6917a25ba9a748a7be7e1d86985e2 Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Fri, 25 Oct 2024 02:38:41 -0400
Subject: [PATCH] Move `LocalUserStatisticsProvider` to non-base game class and
 make dependency optional

---
 osu.Game/OsuGame.cs             |  5 ++++-
 osu.Game/OsuGameBase.cs         |  4 ----
 osu.Game/Users/UserRankPanel.cs | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b420578024..f7e6184dac 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1069,7 +1069,10 @@ namespace osu.Game
                 ScreenStack.Push(CreateLoader().With(l => l.RelativeSizeAxes = Axes.Both));
             });
 
-            loadComponentSingleFile(new UserStatisticsWatcher(LocalUserStatisticsProvider), Add, true);
+            LocalUserStatisticsProvider statisticsProvider;
+
+            loadComponentSingleFile(statisticsProvider = new LocalUserStatisticsProvider(), Add, true);
+            loadComponentSingleFile(new UserStatisticsWatcher(statisticsProvider), Add, true);
             loadComponentSingleFile(Toolbar = new Toolbar
             {
                 OnHome = delegate
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 7404eb232f..d4704d1c72 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -213,8 +213,6 @@ namespace osu.Game
 
         private MetadataClient metadataClient;
 
-        protected LocalUserStatisticsProvider LocalUserStatisticsProvider { get; private set; }
-
         private RealmAccess realm;
 
         protected SafeAreaContainer SafeAreaContainer { get; private set; }
@@ -330,7 +328,6 @@ namespace osu.Game
             dependencies.CacheAs(SpectatorClient = new OnlineSpectatorClient(endpoints));
             dependencies.CacheAs(MultiplayerClient = new OnlineMultiplayerClient(endpoints));
             dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints));
-            dependencies.CacheAs(LocalUserStatisticsProvider = new LocalUserStatisticsProvider());
 
             base.Content.Add(new BeatmapOnlineChangeIngest(beatmapUpdater, realm, metadataClient));
 
@@ -373,7 +370,6 @@ namespace osu.Game
             base.Content.Add(SpectatorClient);
             base.Content.Add(MultiplayerClient);
             base.Content.Add(metadataClient);
-            base.Content.Add(LocalUserStatisticsProvider);
 
             base.Content.Add(rulesetConfigCache);
 
diff --git a/osu.Game/Users/UserRankPanel.cs b/osu.Game/Users/UserRankPanel.cs
index 70885940e1..a761ddaea7 100644
--- a/osu.Game/Users/UserRankPanel.cs
+++ b/osu.Game/Users/UserRankPanel.cs
@@ -45,19 +45,22 @@ namespace osu.Game.Users
         }
 
         [Resolved]
-        private LocalUserStatisticsProvider statisticsProvider { get; set; } = null!;
+        private LocalUserStatisticsProvider? statisticsProvider { get; set; }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            statistics.BindTo(statisticsProvider.Statistics);
-            statistics.BindValueChanged(stats =>
+            if (statisticsProvider != null)
             {
-                loadingLayer.State.Value = stats.NewValue == null ? Visibility.Visible : Visibility.Hidden;
-                globalRankDisplay.Content = stats.NewValue?.GlobalRank?.ToLocalisableString("\\##,##0") ?? "-";
-                countryRankDisplay.Content = stats.NewValue?.CountryRank?.ToLocalisableString("\\##,##0") ?? "-";
-            }, true);
+                statistics.BindTo(statisticsProvider.Statistics);
+                statistics.BindValueChanged(stats =>
+                {
+                    loadingLayer.State.Value = stats.NewValue == null ? Visibility.Visible : Visibility.Hidden;
+                    globalRankDisplay.Content = stats.NewValue?.GlobalRank?.ToLocalisableString("\\##,##0") ?? "-";
+                    countryRankDisplay.Content = stats.NewValue?.CountryRank?.ToLocalisableString("\\##,##0") ?? "-";
+                }, true);
+            }
         }
 
         protected override Drawable CreateLayout()