h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-26 15:50:29 +08:00
Code Issues Releases Wiki Activity

Separate IMatchmakingClient and IMultiplayerClient

Browse Source 
Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dan Balasescu
2025-09-04 11:36:47 +09:00
Unverified
parent 0225c1a867
commit 3786efaa5e
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+1 -2
View File
@@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using osu.Game.Online.API;
using osu.Game.Online.Matchmaking;
using osu.Game.Online.Rooms;
namespace osu.Game.Online.Multiplayer
@@ -14,7 +13,7 @@ namespace osu.Game.Online.Multiplayer
/// <summary>
/// An interface defining a multiplayer client instance.
/// </summary>
public interface IMultiplayerClient : IStatefulUserHubClient, IMatchmakingClient
public interface IMultiplayerClient : IStatefulUserHubClient
{
/// <summary>
/// Signals that the room has changed state.
osu.Game/Online/Multiplayer/MultiplayerClient.cs
+1 -1
View File
@@ -27,7 +27,7 @@ using osu.Game.Utils;
namespace osu.Game.Online.Multiplayer
{
public abstract partial class MultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer, IMatchmakingServer
public abstract partial class MultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer, IMatchmakingServer, IMatchmakingClient
{
public Action<Notification>? PostNotification { protected get; set; }
osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+8 -8
View File
@@ -72,14 +72,14 @@ namespace osu.Game.Online.Multiplayer
connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemChanged), ((IMultiplayerClient)this).PlaylistItemChanged);
connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMultiplayerClient)this).DisconnectRequested);
connection.On(nameof(IMultiplayerClient.MatchmakingQueueJoined), ((IMultiplayerClient)this).MatchmakingQueueJoined);
connection.On(nameof(IMultiplayerClient.MatchmakingQueueLeft), ((IMultiplayerClient)this).MatchmakingQueueLeft);
connection.On(nameof(IMultiplayerClient.MatchmakingRoomInvited), ((IMultiplayerClient)this).MatchmakingRoomInvited);
connection.On<long>(nameof(IMultiplayerClient.MatchmakingRoomReady), ((IMultiplayerClient)this).MatchmakingRoomReady);
connection.On<MatchmakingLobbyStatus>(nameof(IMultiplayerClient.MatchmakingLobbyStatusChanged), ((IMultiplayerClient)this).MatchmakingLobbyStatusChanged);
connection.On<MatchmakingQueueStatus>(nameof(IMultiplayerClient.MatchmakingQueueStatusChanged), ((IMultiplayerClient)this).MatchmakingQueueStatusChanged);
connection.On<int, long>(nameof(IMultiplayerClient.MatchmakingItemSelected), ((IMultiplayerClient)this).MatchmakingItemSelected);
connection.On<int, long>(nameof(IMultiplayerClient.MatchmakingItemDeselected), ((IMultiplayerClient)this).MatchmakingItemDeselected);
connection.On(nameof(IMatchmakingClient.MatchmakingQueueJoined), ((IMatchmakingClient)this).MatchmakingQueueJoined);
connection.On(nameof(IMatchmakingClient.MatchmakingQueueLeft), ((IMatchmakingClient)this).MatchmakingQueueLeft);
connection.On(nameof(IMatchmakingClient.MatchmakingRoomInvited), ((IMatchmakingClient)this).MatchmakingRoomInvited);
connection.On<long>(nameof(IMatchmakingClient.MatchmakingRoomReady), ((IMatchmakingClient)this).MatchmakingRoomReady);
connection.On<MatchmakingLobbyStatus>(nameof(IMatchmakingClient.MatchmakingLobbyStatusChanged), ((IMatchmakingClient)this).MatchmakingLobbyStatusChanged);
connection.On<MatchmakingQueueStatus>(nameof(IMatchmakingClient.MatchmakingQueueStatusChanged), ((IMatchmakingClient)this).MatchmakingQueueStatusChanged);
connection.On<int, long>(nameof(IMatchmakingClient.MatchmakingItemSelected), ((IMatchmakingClient)this).MatchmakingItemSelected);
connection.On<int, long>(nameof(IMatchmakingClient.MatchmakingItemDeselected), ((IMatchmakingClient)this).MatchmakingItemDeselected);
};
IsConnected.BindTo(connector.IsConnected);
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+5 -5
View File
@@ -762,13 +762,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override async Task MatchmakingJoinQueue(MatchmakingSettings settings)
{
await ((IMultiplayerClient)this).MatchmakingQueueJoined().ConfigureAwait(false);
await ((IMultiplayerClient)this).MatchmakingQueueStatusChanged(new MatchmakingQueueStatus.Searching()).ConfigureAwait(false);
await ((IMatchmakingClient)this).MatchmakingQueueJoined().ConfigureAwait(false);
await ((IMatchmakingClient)this).MatchmakingQueueStatusChanged(new MatchmakingQueueStatus.Searching()).ConfigureAwait(false);
}
public override async Task MatchmakingLeaveQueue()
{
await ((IMultiplayerClient)this).MatchmakingQueueLeft().ConfigureAwait(false);
await ((IMatchmakingClient)this).MatchmakingQueueLeft().ConfigureAwait(false);
}
public override Task MatchmakingAcceptInvitation()
@@ -794,12 +794,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
if (existingId == playlistItemId)
return;
await ((IMultiplayerClient)this).MatchmakingItemDeselected(clone(userId), clone(existingId)).ConfigureAwait(false);
await ((IMatchmakingClient)this).MatchmakingItemDeselected(clone(userId), clone(existingId)).ConfigureAwait(false);
}
matchmakingUserPicks[userId] = playlistItemId;
await ((IMultiplayerClient)this).MatchmakingItemSelected(clone(userId), clone(playlistItemId)).ConfigureAwait(false);
await ((IMatchmakingClient)this).MatchmakingItemSelected(clone(userId), clone(playlistItemId)).ConfigureAwait(false);
}
#region API Room Handling