diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs index 0330c5fbfa..4c487c8288 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs @@ -1153,7 +1153,7 @@ namespace osu.Game.Tests.Visual.Multiplayer }); AddStep("open user style selection", () => this.ChildrenOfType().Single().ShowUserStyleSelect()); - AddUntilStep("style selection screen opened", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); + AddUntilStep("style selection screen opened", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); AddStep("change beatmap", () => { @@ -1166,7 +1166,7 @@ namespace osu.Game.Tests.Visual.Multiplayer }); AddWaitStep("wait for potential beatmap change", 2); - AddAssert("style selection screen still open", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); + AddAssert("style selection screen still open", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); } /// @@ -1190,7 +1190,7 @@ namespace osu.Game.Tests.Visual.Multiplayer }); AddStep("open user style selection", () => this.ChildrenOfType().Single().ShowUserStyleSelect()); - AddUntilStep("style selection screen opened", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); + AddUntilStep("style selection screen opened", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() == true); AddStep("change beatmap set", () => { @@ -1203,7 +1203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer }); AddUntilStep("selected beatmap changed", () => Beatmap.Value.BeatmapInfo.Equals(importedSet2.Beatmaps.First())); - AddUntilStep("style selection screen closed", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() != true); + AddUntilStep("style selection screen closed", () => this.ChildrenOfType().SingleOrDefault()?.IsCurrentScreen() != true); } private void enterGameplay() diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs index 346625b50c..3f9a727077 100644 --- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs +++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs @@ -248,7 +248,7 @@ namespace osu.Game.Tests.Visual.Playlists AddUntilStep("original beatmap", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0])); AddStep("enter freestyle select", () => playlistsScreen.Stack.ChildrenOfType().Single(b => b.IsPresent).TriggerClick()); - AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelectV2 selectScreen && selectScreen.CarouselItemsPresented); + AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelect selectScreen && selectScreen.CarouselItemsPresented); AddStep("select next beatmap", () => InputManager.Key(Key.Down)); AddStep("abort", () => playlistsScreen.Stack.CurrentScreen.Exit()); @@ -287,7 +287,7 @@ namespace osu.Game.Tests.Visual.Playlists AddUntilStep("original beatmap", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0])); AddStep("enter freestyle select", () => playlistsScreen.Stack.ChildrenOfType().Single(b => b.IsPresent).TriggerClick()); - AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelectV2 selectScreen && selectScreen.CarouselItemsPresented); + AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelect selectScreen && selectScreen.CarouselItemsPresented); AddStep("select next beatmap", () => InputManager.Key(Key.Down)); AddStep("select (beatmap)", () => InputManager.Key(Key.Enter)); diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelectV2.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelect.cs similarity index 94% rename from osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelectV2.cs rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelect.cs index d32ab89777..8b0fc78690 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelectV2.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelect.cs @@ -12,7 +12,7 @@ using osu.Game.Online.Rooms; namespace osu.Game.Screens.OnlinePlay.Multiplayer { - public partial class MultiplayerMatchFreestyleSelectV2 : OnlinePlayFreestyleSelectV2 + public partial class MultiplayerMatchFreestyleSelect : OnlinePlayFreestyleSelect { [Resolved] private MultiplayerClient client { get; set; } = null!; @@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer private LoadingLayer loadingLayer = null!; private IDisposable? selectionOperation; - public MultiplayerMatchFreestyleSelectV2(PlaylistItem item) + public MultiplayerMatchFreestyleSelect(PlaylistItem item) : base(item) { } diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs index fcbb38c8ed..ed4f431d4e 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs @@ -506,7 +506,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer return; // Check if we need to make this the current screen as a result of the beatmap set changing while the user's selecting a style. - if (this.GetChildScreen() is MultiplayerMatchFreestyleSelectV2) + if (this.GetChildScreen() is MultiplayerMatchFreestyleSelect) { MultiplayerPlaylistItem item = client.Room.CurrentPlaylistItem; @@ -722,7 +722,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer return; MultiplayerPlaylistItem item = client.Room.CurrentPlaylistItem; - this.Push(new MultiplayerMatchFreestyleSelectV2(new PlaylistItem(item))); + this.Push(new MultiplayerMatchFreestyleSelect(new PlaylistItem(item))); } /// diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelectV2.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs similarity index 95% rename from osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelectV2.cs rename to osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs index 73fd651a01..0ff3ade809 100644 --- a/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelectV2.cs +++ b/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs @@ -17,7 +17,7 @@ using SongSelect = osu.Game.Screens.SelectV2.SongSelect; namespace osu.Game.Screens.OnlinePlay { - public abstract partial class OnlinePlayFreestyleSelectV2 : SongSelect, IHandlePresentBeatmap, IOnlinePlaySubScreen + public abstract partial class OnlinePlayFreestyleSelect : SongSelect, IHandlePresentBeatmap, IOnlinePlaySubScreen { private readonly PlaylistItem item; @@ -30,7 +30,7 @@ namespace osu.Game.Screens.OnlinePlay [Resolved] private RealmAccess realm { get; set; } = null!; - protected OnlinePlayFreestyleSelectV2(PlaylistItem item) + protected OnlinePlayFreestyleSelect(PlaylistItem item) { this.item = item; diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs index bab4d691bb..16570e68e9 100644 --- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs +++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs @@ -696,7 +696,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists if (!this.IsCurrentScreen() || SelectedItem.Value == null) return; - this.Push(new PlaylistsRoomFreestyleSelectV2(SelectedItem.Value) + this.Push(new PlaylistsRoomFreestyleSelect(SelectedItem.Value) { Beatmap = { BindTarget = UserBeatmap }, Ruleset = { BindTarget = UserRuleset } diff --git a/osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelectV2.cs b/osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelect.cs similarity index 83% rename from osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelectV2.cs rename to osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelect.cs index ead76dac8d..6c16d917fa 100644 --- a/osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelectV2.cs +++ b/osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelect.cs @@ -9,12 +9,12 @@ using osu.Game.Rulesets; namespace osu.Game.Screens.OnlinePlay { - public partial class PlaylistsRoomFreestyleSelectV2 : OnlinePlayFreestyleSelectV2 + public partial class PlaylistsRoomFreestyleSelect : OnlinePlayFreestyleSelect { public new readonly Bindable Beatmap = new Bindable(); public new readonly Bindable Ruleset = new Bindable(); - public PlaylistsRoomFreestyleSelectV2(PlaylistItem item) + public PlaylistsRoomFreestyleSelect(PlaylistItem item) : base(item) { }