diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableGameplayLeaderboardScore.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableGameplayLeaderboardScore.cs index 1363ef12a9..e17f1349b3 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableGameplayLeaderboardScore.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableGameplayLeaderboardScore.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers; using osu.Game.Graphics; using osu.Game.Online.API.Requests.Responses; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osuTK.Graphics; namespace osu.Game.Tests.Visual.Gameplay diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs index 45e14053e0..764a8569e6 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs @@ -21,7 +21,7 @@ using osu.Game.Rulesets.Osu; using osu.Game.Scoring; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Tests.Gameplay; using osuTK.Graphics; diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlayRulesetLayouts.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlayRulesetLayouts.cs index e67c2d9f09..131b901d6f 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlayRulesetLayouts.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlayRulesetLayouts.cs @@ -25,7 +25,7 @@ using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Scoring; using osu.Game.Screens.Play; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Skinning; using osu.Game.Tests.Gameplay; using osu.Game.Tests.Visual.Spectator; diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs index 76daffbbad..824e4f6a1c 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs @@ -15,7 +15,7 @@ using osu.Game.Rulesets.Scoring; using osu.Game.Screens.Edit; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Tests.Gameplay; using osuTK.Input; diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs index 6e4f3af70a..e42e8f994e 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs @@ -21,7 +21,7 @@ using osu.Game.Rulesets.Osu.UI; using osu.Game.Rulesets.Scoring; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Skinning; using osu.Game.Tests.Gameplay; diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboardProvider.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboardProvider.cs index 7e728a84ca..e45c4607f9 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboardProvider.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboardProvider.cs @@ -10,7 +10,7 @@ using osu.Game.Online.Leaderboards; using osu.Game.Rulesets.Osu; using osu.Game.Scoring; using osu.Game.Screens.Play; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Tests.Gameplay; namespace osu.Game.Tests.Visual.Gameplay diff --git a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs index 955737578a..801a748105 100644 --- a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs +++ b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs @@ -21,7 +21,7 @@ using osu.Game.Online.Spectator; using osu.Game.Replays.Legacy; using osu.Game.Rulesets.Scoring; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Tests.Visual.Multiplayer { diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs index c39708352e..68a2fec0ea 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs @@ -10,7 +10,7 @@ using osu.Framework.Timing; using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.Multiplayer; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Tests.Visual.Multiplayer { diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs index 53e265decb..3cf95b3304 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs @@ -9,7 +9,7 @@ using osu.Game.Online.API; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Osu.Mods; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Tests.Visual.Multiplayer { diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs index 6141820cb7..6e5add006a 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs @@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus; using osu.Game.Screens.OnlinePlay.Multiplayer; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Tests.Visual.Multiplayer { diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPositionDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPositionDisplay.cs index 9123f63f56..05430cae33 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPositionDisplay.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPositionDisplay.cs @@ -12,7 +12,7 @@ using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets.Osu; using osu.Game.Screens.OnlinePlay.Multiplayer; using osu.Game.Screens.Play; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Tests.Gameplay; namespace osu.Game.Tests.Visual.Multiplayer diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs index 6d445cc619..b52075ac99 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs @@ -48,9 +48,9 @@ using osu.Game.Screens.OnlinePlay.Match.Components; using osu.Game.Screens.OnlinePlay.Playlists; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Play.PlayerSettings; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.SelectV2; using osu.Game.Tests.Beatmaps.IO; using osu.Game.Tests.Resources; diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs index 4c67f778a2..e4e79e6459 100644 --- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs +++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs @@ -4,9 +4,9 @@ using osu.Game.Overlays.BeatmapSet; using osu.Framework.Graphics; using osu.Framework.Bindables; -using osu.Game.Screens.Select.Leaderboards; using osu.Framework.Allocation; using osu.Game.Overlays; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Tests.Visual.Online { diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneSoloResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneSoloResultsScreen.cs index e75c831a7f..266adf1ee8 100644 --- a/osu.Game.Tests/Visual/Ranking/TestSceneSoloResultsScreen.cs +++ b/osu.Game.Tests/Visual/Ranking/TestSceneSoloResultsScreen.cs @@ -19,8 +19,8 @@ using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.Leaderboards; using osu.Game.Rulesets; using osu.Game.Scoring; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Tests.Resources; namespace osu.Game.Tests.Visual.Ranking diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs index 1c3a5e4bab..4609bd8936 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs @@ -25,7 +25,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu.Mods; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; using osu.Game.Users; diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs index f47eafc937..2434924393 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs @@ -20,9 +20,9 @@ using osu.Game.Rulesets.Osu.Mods; using osu.Game.Scoring; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; using osu.Game.Screens.Select; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; using osuTK.Input; diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index 4684615305..e58cf8aaef 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables.Cards; using osu.Game.Input; using osu.Game.Input.Bindings; using osu.Game.Localisation; +using osu.Game.Online.Leaderboards; using osu.Game.Overlays; using osu.Game.Overlays.Dashboard.Friends; using osu.Game.Overlays.Mods.Input; @@ -22,7 +23,6 @@ using osu.Game.Screens.Edit.Compose.Components; using osu.Game.Screens.OnlinePlay.Lounge.Components; using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Skinning; using osu.Game.Users; diff --git a/osu.Game/Extensions/ModelExtensions.cs b/osu.Game/Extensions/ModelExtensions.cs index 7c9d929999..3b17ee104f 100644 --- a/osu.Game/Extensions/ModelExtensions.cs +++ b/osu.Game/Extensions/ModelExtensions.cs @@ -8,7 +8,7 @@ using osu.Game.IO; using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Users; namespace osu.Game.Extensions diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs index 87fb54a5a9..eb0c82e790 100644 --- a/osu.Game/Online/API/Requests/GetScoresRequest.cs +++ b/osu.Game/Online/API/Requests/GetScoresRequest.cs @@ -4,7 +4,6 @@ using System; using osu.Game.Beatmaps; using osu.Game.Rulesets; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets.Mods; using System.Collections.Generic; @@ -12,6 +11,7 @@ using System.Globalization; using System.Linq; using osu.Framework.IO.Network; using osu.Game.Extensions; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Online.API.Requests { diff --git a/osu.Game/Online/Leaderboards/LeaderboardManager.cs b/osu.Game/Online/Leaderboards/LeaderboardManager.cs index de53acc3f6..d4a258a307 100644 --- a/osu.Game/Online/Leaderboards/LeaderboardManager.cs +++ b/osu.Game/Online/Leaderboards/LeaderboardManager.cs @@ -18,7 +18,7 @@ using osu.Game.Online.API.Requests; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using Realms; namespace osu.Game.Online.Leaderboards diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardSortMode.cs b/osu.Game/Online/Leaderboards/LeaderboardSortMode.cs similarity index 95% rename from osu.Game/Screens/Select/Leaderboards/LeaderboardSortMode.cs rename to osu.Game/Online/Leaderboards/LeaderboardSortMode.cs index d5fb2f3c54..2f2418763d 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardSortMode.cs +++ b/osu.Game/Online/Leaderboards/LeaderboardSortMode.cs @@ -4,7 +4,7 @@ using osu.Framework.Localisation; using osu.Game.Localisation; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Online.Leaderboards { public enum LeaderboardSortMode { diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 9674213a9e..6cdada3156 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -70,8 +70,8 @@ using osu.Game.Screens.OnlinePlay.Matchmaking.Queue; using osu.Game.Screens.OnlinePlay.Multiplayer; using osu.Game.Screens.OnlinePlay.Playlists; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.SelectV2; using osu.Game.Seasonal; using osu.Game.Skinning; diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs index 12fbc4c790..ed00f4b0e2 100644 --- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs +++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs @@ -1,13 +1,13 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Graphics.UserInterface; using osu.Framework.Allocation; using osuTK.Graphics; using osu.Framework.Graphics.UserInterface; using osu.Framework.Input.Events; using osu.Framework.Graphics; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Overlays.BeatmapSet { diff --git a/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs b/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs index b161ee49c6..a3e406ac8d 100644 --- a/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs +++ b/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs @@ -3,10 +3,10 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Screens.Select.Leaderboards; using osu.Framework.Graphics.Sprites; using osu.Game.Graphics.Sprites; using osu.Game.Resources.Localisation.Web; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Overlays.BeatmapSet.Scores { diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs index cc06383274..63729319db 100644 --- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs +++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs @@ -19,7 +19,7 @@ using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osuTK; using APIUser = osu.Game.Online.API.Requests.Responses.APIUser; diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs index 2eec0399d6..fc367554e7 100644 --- a/osu.Game/Scoring/ScoreInfoExtensions.cs +++ b/osu.Game/Scoring/ScoreInfoExtensions.cs @@ -7,8 +7,8 @@ using System.Linq; using osu.Game.Beatmaps; using osu.Game.Models; using osu.Game.Online.API.Requests.Responses; +using osu.Game.Online.Leaderboards; using osu.Game.Rulesets.Scoring; -using osu.Game.Screens.Select.Leaderboards; using Realms; namespace osu.Game.Scoring diff --git a/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs b/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs index 2c9b97114d..32762135e5 100644 --- a/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs +++ b/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs @@ -18,8 +18,8 @@ using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Scoring; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Users; namespace osu.Game.Screens.Edit.GameplayTest diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs index 4cc6f3469d..d7cbd02918 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs @@ -17,8 +17,8 @@ using osu.Game.Online.Multiplayer; using osu.Game.Online.Rooms; using osu.Game.Scoring; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Users; using osuTK; diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPositionDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPositionDisplay.cs index a2b9db5a06..f2cbc41d16 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPositionDisplay.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPositionDisplay.cs @@ -18,7 +18,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Online.API; using osu.Game.Online.API.Requests.Responses; using osu.Game.Screens.Play; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osuTK; using osuTK.Graphics; diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs index e557c6821b..070cda327a 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs @@ -8,8 +8,8 @@ using osu.Framework.Audio; using osu.Game.Beatmaps; using osu.Game.Scoring; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate { diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs index f0b0709ab2..ad7966587e 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs @@ -17,7 +17,7 @@ using osu.Game.Online.Rooms; using osu.Game.Online.Spectator; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Spectate; using osu.Game.Users; using osuTK; diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs index 69a1e3b763..ecd45370fc 100644 --- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs +++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs @@ -12,8 +12,8 @@ using osu.Game.Online.Rooms; using osu.Game.Rulesets; using osu.Game.Scoring; using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Users; namespace osu.Game.Screens.OnlinePlay.Playlists diff --git a/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboard.cs index ddb926ebf1..cd3ee73018 100644 --- a/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboard.cs +++ b/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboard.cs @@ -12,7 +12,7 @@ using osu.Framework.Graphics.Containers; using osu.Game.Configuration; using osu.Game.Graphics.Containers; using osu.Game.Localisation.SkinComponents; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Skinning; using osuTK; using osuTK.Graphics; diff --git a/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboardScore.cs index ef27d027c2..f7220e98ac 100644 --- a/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboardScore.cs +++ b/osu.Game/Screens/Play/HUD/DrawableGameplayLeaderboardScore.cs @@ -16,7 +16,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Online.API; using osu.Game.Rulesets.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Users; using osu.Game.Users.Drawables; using osu.Game.Utils; diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs b/osu.Game/Screens/Play/Leaderboards/BeatmapLeaderboardScope.cs similarity index 95% rename from osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs rename to osu.Game/Screens/Play/Leaderboards/BeatmapLeaderboardScope.cs index 497e456881..555a2a72c5 100644 --- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs +++ b/osu.Game/Screens/Play/Leaderboards/BeatmapLeaderboardScope.cs @@ -4,7 +4,7 @@ using osu.Framework.Localisation; using osu.Game.Localisation; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { public enum BeatmapLeaderboardScope { diff --git a/osu.Game/Screens/Select/Leaderboards/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/Leaderboards/GameplayLeaderboardScore.cs similarity index 98% rename from osu.Game/Screens/Select/Leaderboards/GameplayLeaderboardScore.cs rename to osu.Game/Screens/Play/Leaderboards/GameplayLeaderboardScore.cs index dfe95b8ccd..eb65306ae4 100644 --- a/osu.Game/Screens/Select/Leaderboards/GameplayLeaderboardScore.cs +++ b/osu.Game/Screens/Play/Leaderboards/GameplayLeaderboardScore.cs @@ -9,10 +9,9 @@ using osu.Game.Online.Spectator; using osu.Game.Rulesets.Scoring; using osu.Game.Scoring; using osu.Game.Scoring.Legacy; -using osu.Game.Screens.Play; using osu.Game.Users; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { /// /// Represents a score shown on a gameplay leaderboard. diff --git a/osu.Game/Screens/Select/Leaderboards/IGameplayLeaderboardProvider.cs b/osu.Game/Screens/Play/Leaderboards/IGameplayLeaderboardProvider.cs similarity index 94% rename from osu.Game/Screens/Select/Leaderboards/IGameplayLeaderboardProvider.cs rename to osu.Game/Screens/Play/Leaderboards/IGameplayLeaderboardProvider.cs index 9c4875477c..350569f46f 100644 --- a/osu.Game/Screens/Select/Leaderboards/IGameplayLeaderboardProvider.cs +++ b/osu.Game/Screens/Play/Leaderboards/IGameplayLeaderboardProvider.cs @@ -3,7 +3,7 @@ using osu.Framework.Bindables; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { /// /// Provides a leaderboard to show during gameplay. diff --git a/osu.Game/Screens/Select/Leaderboards/MultiSpectatorLeaderboardProvider.cs b/osu.Game/Screens/Play/Leaderboards/MultiSpectatorLeaderboardProvider.cs similarity index 95% rename from osu.Game/Screens/Select/Leaderboards/MultiSpectatorLeaderboardProvider.cs rename to osu.Game/Screens/Play/Leaderboards/MultiSpectatorLeaderboardProvider.cs index 19ae12a6ca..a6f75e6ca1 100644 --- a/osu.Game/Screens/Select/Leaderboards/MultiSpectatorLeaderboardProvider.cs +++ b/osu.Game/Screens/Play/Leaderboards/MultiSpectatorLeaderboardProvider.cs @@ -5,7 +5,7 @@ using System; using osu.Framework.Timing; using osu.Game.Online.Multiplayer; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { public partial class MultiSpectatorLeaderboardProvider : MultiplayerLeaderboardProvider { diff --git a/osu.Game/Screens/Select/Leaderboards/MultiplayerLeaderboardProvider.cs b/osu.Game/Screens/Play/Leaderboards/MultiplayerLeaderboardProvider.cs similarity index 99% rename from osu.Game/Screens/Select/Leaderboards/MultiplayerLeaderboardProvider.cs rename to osu.Game/Screens/Play/Leaderboards/MultiplayerLeaderboardProvider.cs index 08af8926df..01bc56c1b5 100644 --- a/osu.Game/Screens/Select/Leaderboards/MultiplayerLeaderboardProvider.cs +++ b/osu.Game/Screens/Play/Leaderboards/MultiplayerLeaderboardProvider.cs @@ -24,7 +24,7 @@ using osu.Game.Online.Spectator; using osu.Game.Rulesets.Scoring; using osuTK.Graphics; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { [LongRunningLoad] public partial class MultiplayerLeaderboardProvider : CompositeComponent, IGameplayLeaderboardProvider diff --git a/osu.Game/Screens/Select/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs b/osu.Game/Screens/Play/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs similarity index 98% rename from osu.Game/Screens/Select/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs rename to osu.Game/Screens/Play/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs index ea0a2b68dc..7efbfe23a8 100644 --- a/osu.Game/Screens/Select/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs +++ b/osu.Game/Screens/Play/Leaderboards/PlaylistsGameplayLeaderboardProvider.cs @@ -9,9 +9,8 @@ using osu.Framework.Caching; using osu.Framework.Graphics; using osu.Game.Online.API; using osu.Game.Online.Rooms; -using osu.Game.Screens.Play; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { [LongRunningLoad] public partial class PlaylistsGameplayLeaderboardProvider : Component, IGameplayLeaderboardProvider diff --git a/osu.Game/Screens/Select/Leaderboards/SoloGameplayLeaderboardProvider.cs b/osu.Game/Screens/Play/Leaderboards/SoloGameplayLeaderboardProvider.cs similarity index 98% rename from osu.Game/Screens/Select/Leaderboards/SoloGameplayLeaderboardProvider.cs rename to osu.Game/Screens/Play/Leaderboards/SoloGameplayLeaderboardProvider.cs index fd4ad142a4..62d1220c50 100644 --- a/osu.Game/Screens/Select/Leaderboards/SoloGameplayLeaderboardProvider.cs +++ b/osu.Game/Screens/Play/Leaderboards/SoloGameplayLeaderboardProvider.cs @@ -9,9 +9,8 @@ using osu.Framework.Caching; using osu.Framework.Graphics; using osu.Game.Online.Leaderboards; using osu.Game.Scoring; -using osu.Game.Screens.Play; -namespace osu.Game.Screens.Select.Leaderboards +namespace osu.Game.Screens.Play.Leaderboards { public partial class SoloGameplayLeaderboardProvider : Component, IGameplayLeaderboardProvider { diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index df535169b3..d082ce6a57 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -34,8 +34,8 @@ using osu.Game.Performance; using osu.Game.Screens.Footer; using osu.Game.Screens.Menu; using osu.Game.Screens.Play.HUD; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Play.PlayerSettings; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Skinning; using osu.Game.Users; using osu.Game.Utils; diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs index b9a6de54b4..cd769d7615 100644 --- a/osu.Game/Screens/Play/ReplayPlayer.cs +++ b/osu.Game/Screens/Play/ReplayPlayer.cs @@ -15,9 +15,9 @@ using osu.Game.Configuration; using osu.Game.Input.Bindings; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Play.PlayerSettings; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select.Leaderboards; using osu.Game.Skinning; using osu.Game.Users; diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs index 1e9222e40a..ee891dd816 100644 --- a/osu.Game/Screens/Play/SoloPlayer.cs +++ b/osu.Game/Screens/Play/SoloPlayer.cs @@ -13,7 +13,7 @@ using osu.Game.Online.API; using osu.Game.Online.Rooms; using osu.Game.Online.Solo; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Screens.Play { diff --git a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs index d635fa9fe9..c0950929ba 100644 --- a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs +++ b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs @@ -6,7 +6,7 @@ using osu.Framework.Extensions.ObjectExtensions; using osu.Framework.Screens; using osu.Game.Online.Spectator; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Users; namespace osu.Game.Screens.Play diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs index 5e0095611c..1ed6f70f23 100644 --- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs +++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs @@ -12,7 +12,7 @@ using osu.Game.Extensions; using osu.Game.Online.API; using osu.Game.Online.Leaderboards; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; namespace osu.Game.Screens.Ranking { diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs deleted file mode 100644 index deb3c3ae7a..0000000000 --- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (c) ppy Pty Ltd . 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 System.Threading; -using osu.Framework.Allocation; -using osu.Framework.Bindables; -using osu.Game.Beatmaps; -using osu.Game.Online.API; -using osu.Game.Online.Leaderboards; -using osu.Game.Rulesets; -using osu.Game.Rulesets.Mods; -using osu.Game.Scoring; - -namespace osu.Game.Screens.Select.Leaderboards -{ - public partial class BeatmapLeaderboard : Leaderboard - { - public Action? ScoreSelected; - - private BeatmapInfo? beatmapInfo; - - public BeatmapInfo? BeatmapInfo - { - get => beatmapInfo; - set - { - if (beatmapInfo == null && value == null) - return; - - if (beatmapInfo?.Equals(value) == true) - return; - - beatmapInfo = value; - - // Refetch is scheduled, which can cause scores to be outdated if the leaderboard is not currently updating. - // As scores are potentially used by other components, clear them eagerly to ensure a more correct state. - SetScores(null); - - RefetchScores(); - } - } - - private bool filterMods; - - /// - /// Whether to apply the game's currently selected mods as a filter when retrieving scores. - /// - public bool FilterMods - { - get => filterMods; - set - { - if (value == filterMods) - return; - - filterMods = value; - - RefetchScores(); - } - } - - private readonly IBindable fetchedScores = new Bindable(); - - [Resolved] - private IBindable ruleset { get; set; } = null!; - - [Resolved] - private IBindable> mods { get; set; } = null!; - - [Resolved] - private LeaderboardManager leaderboardManager { get; set; } = null!; - - [BackgroundDependencyLoader] - private void load() - { - ruleset.ValueChanged += _ => RefetchScores(); - mods.ValueChanged += _ => - { - if (filterMods) - RefetchScores(); - }; - } - - private bool initialFetchComplete; - - protected override bool IsOnlineScope => Scope != BeatmapLeaderboardScope.Local; - - protected override APIRequest? FetchScores(CancellationToken cancellationToken) - { - var fetchBeatmapInfo = BeatmapInfo; - var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo?.Ruleset; - - // Without this check, an initial fetch will be performed and clear global cache. - if (fetchBeatmapInfo == null) - return null; - - // For now, we forcefully refresh to keep things simple. - // In the future, removing this requirement may be deemed useful, but will need ample testing of edge case scenarios - // (like returning from gameplay after setting a new score, returning to song select after main menu). - leaderboardManager.FetchWithCriteria(new LeaderboardCriteria(fetchBeatmapInfo, fetchRuleset, Scope, filterMods ? mods.Value.Where(m => m.UserPlayable).ToArray() : null), - forceRefresh: true); - - if (!initialFetchComplete) - { - // only bind this after the first fetch to avoid reading stale scores. - fetchedScores.BindTo(leaderboardManager.Scores); - fetchedScores.BindValueChanged(_ => updateScores(), true); - initialFetchComplete = true; - } - - return null; - } - - private void updateScores() - { - var scores = fetchedScores.Value; - - if (scores == null) return; - - if (scores.FailState == null) - Schedule(() => SetScores(scores.TopScores, scores.UserScore)); - else - Schedule(() => SetErrorState((LeaderboardState)scores.FailState)); - } - - protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index) => new LeaderboardScore(model, index, IsOnlineScope, Scope != BeatmapLeaderboardScope.Friend) - { - Action = () => ScoreSelected?.Invoke(model) - }; - - protected override LeaderboardScore CreateDrawableTopScore(ScoreInfo model) => new LeaderboardScore(model, model.Position, false, Scope != BeatmapLeaderboardScope.Friend) - { - Action = () => ScoreSelected?.Invoke(model) - }; - } -} diff --git a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs b/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs index f4a223985d..5b3f27ce64 100644 --- a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs +++ b/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs @@ -12,8 +12,9 @@ using osu.Game.Configuration; using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Localisation; +using osu.Game.Online.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Select; -using osu.Game.Screens.Select.Leaderboards; using osuTK; namespace osu.Game.Screens.SelectV2 diff --git a/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs b/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs index 3c91185c21..18b1bc2e27 100644 --- a/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs +++ b/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs @@ -33,7 +33,7 @@ using osu.Game.Overlays; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; -using osu.Game.Screens.Select.Leaderboards; +using osu.Game.Screens.Play.Leaderboards; using osuTK; using osuTK.Graphics;