sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

RealtimeMultiplayer -> Multiplayer

Browse Source
This commit is contained in:
Dean Herbert
2020-12-25 13:38:11 +09:00
parent 12e4bbdc5b
commit 5d4b73baa5
127 changed files with 260 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs → osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
View File

@ -6,32 +6,32 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.RealtimeMultiplayer;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Lounge.Components;
namespace osu.Game.Tests.Visual.RealtimeMultiplayer
namespace osu.Game.Tests.Visual.Multiplayer
{
public abstract class RealtimeMultiplayerTestScene : MultiplayerTestScene
public abstract class MultiplayerTestScene : RoomTestScene
{
[Cached(typeof(StatefulMultiplayerClient))]
public TestRealtimeMultiplayerClient Client { get; }
public TestMultiplayerClient Client { get; }
[Cached(typeof(IRoomManager))]
public TestRealtimeRoomManager RoomManager { get; }
public TestMultiplayerRoomManager RoomManager { get; }
[Cached]
public Bindable<FilterCriteria> Filter { get; }
protected override Container<Drawable> Content => content;
private readonly TestRealtimeRoomContainer content;
private readonly TestMultiplayerRoomContainer content;
private readonly bool joinRoom;
protected RealtimeMultiplayerTestScene(bool joinRoom = true)
protected MultiplayerTestScene(bool joinRoom = true)
{
this.joinRoom = joinRoom;
base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });
base.Content.Add(content = new TestMultiplayerRoomContainer { RelativeSizeAxes = Axes.Both });
Client = content.Client;
RoomManager = content.RoomManager;

6
osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs → osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -9,12 +9,12 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.API;
using osu.Game.Online.RealtimeMultiplayer;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.RealtimeMultiplayer
namespace osu.Game.Tests.Visual.Multiplayer
{
public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
public class TestMultiplayerClient : StatefulMultiplayerClient
{
public override IBindable<bool> IsConnected => isConnected;
private readonly Bindable<bool> isConnected = new Bindable<bool>(true);

16
osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs → osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
View File

@ -5,34 +5,34 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.RealtimeMultiplayer;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Lounge.Components;
namespace osu.Game.Tests.Visual.RealtimeMultiplayer
namespace osu.Game.Tests.Visual.Multiplayer
{
public class TestRealtimeRoomContainer : Container
public class TestMultiplayerRoomContainer : Container
{
protected override Container<Drawable> Content => content;
private readonly Container content;
[Cached(typeof(StatefulMultiplayerClient))]
public readonly TestRealtimeMultiplayerClient Client;
public readonly TestMultiplayerClient Client;
[Cached(typeof(IRoomManager))]
public readonly TestRealtimeRoomManager RoomManager;
public readonly TestMultiplayerRoomManager RoomManager;
[Cached]
public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
public TestRealtimeRoomContainer()
public TestMultiplayerRoomContainer()
{
RelativeSizeAxes = Axes.Both;
AddRangeInternal(new Drawable[]
{
Client = new TestRealtimeMultiplayerClient(),
RoomManager = new TestRealtimeRoomManager(),
Client = new TestMultiplayerClient(),
RoomManager = new TestMultiplayerRoomManager(),
content = new Container { RelativeSizeAxes = Axes.Both }
});
}

8
osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs → osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
View File

@ -8,15 +8,15 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.RealtimeMultiplayer;
using osu.Game.Screens.Multi.Multiplayer;
namespace osu.Game.Tests.Visual.RealtimeMultiplayer
namespace osu.Game.Tests.Visual.Multiplayer
{
public class TestRealtimeRoomManager : RealtimeRoomManager
public class TestMultiplayerRoomManager : MultiplayerRoomManager
{
[Resolved]
private IAPIProvider api { get; set; }

4
osu.Game/Tests/Visual/MultiplayerTestScene.cs → osu.Game/Tests/Visual/RoomTestScene.cs
View File

@ -4,11 +4,11 @@
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
namespace osu.Game.Tests.Visual
{
public abstract class MultiplayerTestScene : ScreenTestScene
public abstract class RoomTestScene : ScreenTestScene
{
[Cached]
private readonly Bindable<Room> currentRoom = new Bindable<Room>();