From: AeonLucid Date: Mon, 19 Oct 2020 10:15:27 +0000 (+0200) Subject: Move Api classes and remove unused imports X-Git-Tag: v1.2.2~96^2~72 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=d44224a91c59f9221a8ad40af2ce660582e5582e;p=rhonda%2Fimpostor.git Move Api classes and remove unused imports --- diff --git a/src/Impostor.Plugins.Debugger/DebugPlugin.cs b/src/Impostor.Plugins.Debugger/DebugPlugin.cs index de18d73..53c544a 100644 --- a/src/Impostor.Plugins.Debugger/DebugPlugin.cs +++ b/src/Impostor.Plugins.Debugger/DebugPlugin.cs @@ -1,5 +1,4 @@ -using System; -using Impostor.Server.Plugins; +using Impostor.Server.Plugins; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Impostor.Server.Api/Games/IGame.cs b/src/Impostor.Server.Api/Games/IGame.cs index c4931b7..dcd25a2 100644 --- a/src/Impostor.Server.Api/Games/IGame.cs +++ b/src/Impostor.Server.Api/Games/IGame.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.Net; -using System.Threading.Tasks; using Impostor.Server.Net; using Impostor.Server.Net.Messages; using Impostor.Shared.Innersloth; diff --git a/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs b/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs index b7884e1..d995b5a 100644 --- a/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs +++ b/src/Impostor.Server.Api/Net/Extensions/GameMessageWriterExtensions.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Impostor.Server.Net.Messages; -using Impostor.Shared.Innersloth.Data; namespace Impostor.Server.Net { diff --git a/src/Impostor.Server.Api/Net/IClient.cs b/src/Impostor.Server.Api/Net/IClient.cs index 4d6d22d..0c508c4 100644 --- a/src/Impostor.Server.Api/Net/IClient.cs +++ b/src/Impostor.Server.Api/Net/IClient.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Threading.Tasks; -using Impostor.Server.Net.Messages; namespace Impostor.Server.Net { diff --git a/src/Impostor.Server.Api/Net/IClientPlayer.cs b/src/Impostor.Server.Api/Net/IClientPlayer.cs index 815c26c..4e4252f 100644 --- a/src/Impostor.Server.Api/Net/IClientPlayer.cs +++ b/src/Impostor.Server.Api/Net/IClientPlayer.cs @@ -1,7 +1,5 @@ using System.Threading.Tasks; using Impostor.Server.Games; -using Impostor.Server.Net.Manager; -using Impostor.Shared.Innersloth.Data; namespace Impostor.Server.Net { diff --git a/src/Impostor.Server.Api/Net/IConnection.cs b/src/Impostor.Server.Api/Net/IConnection.cs index 69d9119..f619dfa 100644 --- a/src/Impostor.Server.Api/Net/IConnection.cs +++ b/src/Impostor.Server.Api/Net/IConnection.cs @@ -1,6 +1,4 @@ -using System; -using System.Net; -using System.Threading.Tasks; +using System.Net; using Impostor.Server.Games; using Impostor.Server.Net.Messages; diff --git a/src/Impostor.Server/Api/ClientBase.Api.cs b/src/Impostor.Server/Api/ClientBase.Api.cs deleted file mode 100644 index 1a375d2..0000000 --- a/src/Impostor.Server/Api/ClientBase.Api.cs +++ /dev/null @@ -1,10 +0,0 @@ -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Net -{ - internal abstract partial class ClientBase : IClient - { - IConnection IClient.Connection => Connection; - - IClientPlayer IClient.Player => Player; - } -} \ No newline at end of file diff --git a/src/Impostor.Server/Api/ClientManager.Api.cs b/src/Impostor.Server/Api/ClientManager.Api.cs deleted file mode 100644 index 597dd5a..0000000 --- a/src/Impostor.Server/Api/ClientManager.Api.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; - -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Net.Manager -{ - internal partial class ClientManager : IClientManager - { - IEnumerable IClientManager.Clients => _clients.Values; - } -} \ No newline at end of file diff --git a/src/Impostor.Server/Api/ClientPlayer.Api.cs b/src/Impostor.Server/Api/ClientPlayer.Api.cs deleted file mode 100644 index b945f08..0000000 --- a/src/Impostor.Server/Api/ClientPlayer.Api.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Impostor.Server.Games; - -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Net.State -{ - internal partial class ClientPlayer - { - /// - IClient IClientPlayer.Client => Client; - - /// - IGame IClientPlayer.Game => Game; - } -} \ No newline at end of file diff --git a/src/Impostor.Server/Api/Game.Api.cs b/src/Impostor.Server/Api/Game.Api.cs deleted file mode 100644 index 74743a9..0000000 --- a/src/Impostor.Server/Api/Game.Api.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Impostor.Server.Games; - -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Net.State -{ - internal partial class Game : IGame - { - IClientPlayer IGame.Host => Host; - } -} \ No newline at end of file diff --git a/src/Impostor.Server/Api/GameManager.Api.cs b/src/Impostor.Server/Api/GameManager.Api.cs deleted file mode 100644 index 05010d3..0000000 --- a/src/Impostor.Server/Api/GameManager.Api.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Impostor.Server.Games; -using Impostor.Server.Games.Managers; - -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Net.Manager -{ - internal partial class GameManager : IGameManager - { - IEnumerable IGameManager.Games => _games.Select(kv => kv.Value); - - IGame IGameManager.Find(GameCode code) => Find(code); - } -} \ No newline at end of file diff --git a/src/Impostor.Server/Api/HazelConnection.Api.cs b/src/Impostor.Server/Api/HazelConnection.Api.cs deleted file mode 100644 index d70a8b8..0000000 --- a/src/Impostor.Server/Api/HazelConnection.Api.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Impostor.Server.Net; - -// ReSharper disable once CheckNamespace -namespace Impostor.Server.Hazel -{ - internal partial class HazelConnection : IConnection - { - IClient IConnection.Client => Client; - } -} \ No newline at end of file diff --git a/src/Impostor.Server/GameData/Objects/InnerGameData.TaskInfo.cs b/src/Impostor.Server/GameData/Objects/InnerGameData.TaskInfo.cs index 6082c14..0f0a99c 100644 --- a/src/Impostor.Server/GameData/Objects/InnerGameData.TaskInfo.cs +++ b/src/Impostor.Server/GameData/Objects/InnerGameData.TaskInfo.cs @@ -1,5 +1,4 @@ -using Hazel; -using Impostor.Server.Net.Messages; +using Impostor.Server.Net.Messages; namespace Impostor.Server.GameData.Objects { diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs index 9a7217b..25075d3 100644 --- a/src/Impostor.Server/Net/Client.cs +++ b/src/Impostor.Server/Net/Client.cs @@ -2,15 +2,12 @@ using System; using System.Threading.Tasks; using Impostor.Server.Data; using Impostor.Server.Games; -using Impostor.Server.Games.Managers; -using Impostor.Server.Hazel; +using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; using Impostor.Server.Net.Messages; using Impostor.Shared.Innersloth; using Impostor.Shared.Innersloth.Data; using Microsoft.Extensions.Logging; -using Serilog; -using ILogger = Serilog.ILogger; namespace Impostor.Server.Net { diff --git a/src/Impostor.Server/Net/ClientBase.Api.cs b/src/Impostor.Server/Net/ClientBase.Api.cs new file mode 100644 index 0000000..c227d9b --- /dev/null +++ b/src/Impostor.Server/Net/ClientBase.Api.cs @@ -0,0 +1,9 @@ +namespace Impostor.Server.Net +{ + internal abstract partial class ClientBase : IClient + { + IConnection IClient.Connection => Connection; + + IClientPlayer IClient.Player => Player; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/ClientBase.cs b/src/Impostor.Server/Net/ClientBase.cs index dfeacd3..71baab4 100644 --- a/src/Impostor.Server/Net/ClientBase.cs +++ b/src/Impostor.Server/Net/ClientBase.cs @@ -1,8 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; -using Hazel; -using Impostor.Server.Hazel; +using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Messages; using Impostor.Server.Net.State; diff --git a/src/Impostor.Server/Net/Factories/ClientFactory.cs b/src/Impostor.Server/Net/Factories/ClientFactory.cs index e9ff13e..632781b 100644 --- a/src/Impostor.Server/Net/Factories/ClientFactory.cs +++ b/src/Impostor.Server/Net/Factories/ClientFactory.cs @@ -1,6 +1,5 @@ using System; -using System.Threading.Tasks; -using Impostor.Server.Hazel; +using Impostor.Server.Net.Hazel; using Microsoft.Extensions.DependencyInjection; namespace Impostor.Server.Net.Factories diff --git a/src/Impostor.Server/Net/Factories/IClientFactory.cs b/src/Impostor.Server/Net/Factories/IClientFactory.cs index d09def4..f090f74 100644 --- a/src/Impostor.Server/Net/Factories/IClientFactory.cs +++ b/src/Impostor.Server/Net/Factories/IClientFactory.cs @@ -1,4 +1,4 @@ -using Impostor.Server.Hazel; +using Impostor.Server.Net.Hazel; namespace Impostor.Server.Net.Factories { diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.Api.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.Api.cs new file mode 100644 index 0000000..324782d --- /dev/null +++ b/src/Impostor.Server/Net/Hazel/HazelConnection.Api.cs @@ -0,0 +1,7 @@ +namespace Impostor.Server.Net.Hazel +{ + internal partial class HazelConnection : IConnection + { + IClient IConnection.Client => Client; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.cs index 9e15256..390c3bf 100644 --- a/src/Impostor.Server/Net/Hazel/HazelConnection.cs +++ b/src/Impostor.Server/Net/Hazel/HazelConnection.cs @@ -3,17 +3,17 @@ using System.Net; using System.Threading.Tasks; using Hazel; using Impostor.Server.Hazel.Messages; -using Impostor.Server.Net; +using Impostor.Server.Net.Hazel.Messages; using Impostor.Server.Net.Messages; using Microsoft.Extensions.Logging; -namespace Impostor.Server.Hazel +namespace Impostor.Server.Net.Hazel { internal partial class HazelConnection { - private readonly ILogger _logger; + private readonly ILogger _logger; - public HazelConnection(Connection innerConnection, ILogger logger) + public HazelConnection(Connection innerConnection, ILogger logger) { _logger = logger; InnerConnection = innerConnection; diff --git a/src/Impostor.Server/Net/Hazel/Messages/HazelConnectionMessageWriter.cs b/src/Impostor.Server/Net/Hazel/Messages/HazelConnectionMessageWriter.cs index 7f45619..1bde8f8 100644 --- a/src/Impostor.Server/Net/Hazel/Messages/HazelConnectionMessageWriter.cs +++ b/src/Impostor.Server/Net/Hazel/Messages/HazelConnectionMessageWriter.cs @@ -6,9 +6,9 @@ namespace Impostor.Server.Hazel.Messages { internal class HazelConnectionMessageWriter : HazelMessageWriter, IConnectionMessageWriter { - private readonly HazelConnection _connection; + private readonly Net.Hazel.HazelConnection _connection; - public HazelConnectionMessageWriter(MessageType type, HazelConnection connection) + public HazelConnectionMessageWriter(MessageType type, Net.Hazel.HazelConnection connection) : base(type) { _connection = connection; diff --git a/src/Impostor.Server/Net/Hazel/Messages/HazelGameMessageWriter.cs b/src/Impostor.Server/Net/Hazel/Messages/HazelGameMessageWriter.cs index a87db88..2deddaf 100644 --- a/src/Impostor.Server/Net/Hazel/Messages/HazelGameMessageWriter.cs +++ b/src/Impostor.Server/Net/Hazel/Messages/HazelGameMessageWriter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Hazel; -using Impostor.Server.Games; using Impostor.Server.Net; using Impostor.Server.Net.Messages; using Impostor.Server.Net.State; @@ -25,7 +24,7 @@ namespace Impostor.Server.Hazel.Messages return _game.Players .Where(filter) .Select(p => p.Client.Connection) - .OfType() + .OfType() .Select(c => c.InnerConnection); } @@ -53,7 +52,7 @@ namespace Impostor.Server.Hazel.Messages public ValueTask SendToAsync(int id) { if (_game.TryGetPlayer(id, out var player) - && player.Client.Connection is HazelConnection hazelConnection) + && player.Client.Connection is Net.Hazel.HazelConnection hazelConnection) { hazelConnection.InnerConnection.Send(Writer); } diff --git a/src/Impostor.Server/Net/Hazel/Messages/HazelMessage.cs b/src/Impostor.Server/Net/Hazel/Messages/HazelMessage.cs index 4f08eb4..32ad514 100644 --- a/src/Impostor.Server/Net/Hazel/Messages/HazelMessage.cs +++ b/src/Impostor.Server/Net/Hazel/Messages/HazelMessage.cs @@ -1,8 +1,9 @@ using System; using Hazel; +using Impostor.Server.Hazel.Messages; using Impostor.Server.Net.Messages; -namespace Impostor.Server.Hazel.Messages +namespace Impostor.Server.Net.Hazel.Messages { internal class HazelMessage : IMessage, IDisposable { diff --git a/src/Impostor.Server/Net/Manager/ClientManager.Api.cs b/src/Impostor.Server/Net/Manager/ClientManager.Api.cs new file mode 100644 index 0000000..ba06596 --- /dev/null +++ b/src/Impostor.Server/Net/Manager/ClientManager.Api.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace Impostor.Server.Net.Manager +{ + internal partial class ClientManager : IClientManager + { + IEnumerable IClientManager.Clients => _clients.Values; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs index 37a1402..23ee7bb 100644 --- a/src/Impostor.Server/Net/Manager/ClientManager.cs +++ b/src/Impostor.Server/Net/Manager/ClientManager.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Impostor.Server.Data; -using Impostor.Server.Hazel; using Impostor.Server.Net.Factories; +using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Messages; using Impostor.Shared.Innersloth; using Impostor.Shared.Innersloth.Data; diff --git a/src/Impostor.Server/Net/Manager/GameManager.Api.cs b/src/Impostor.Server/Net/Manager/GameManager.Api.cs new file mode 100644 index 0000000..68b10cf --- /dev/null +++ b/src/Impostor.Server/Net/Manager/GameManager.Api.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using System.Linq; +using Impostor.Server.Games; +using Impostor.Server.Games.Managers; + +namespace Impostor.Server.Net.Manager +{ + internal partial class GameManager : IGameManager + { + IEnumerable IGameManager.Games => _games.Select(kv => kv.Value); + + IGame IGameManager.Find(GameCode code) => Find(code); + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/Manager/GameManager.cs b/src/Impostor.Server/Net/Manager/GameManager.cs index e54f866..057c716 100644 --- a/src/Impostor.Server/Net/Manager/GameManager.cs +++ b/src/Impostor.Server/Net/Manager/GameManager.cs @@ -8,7 +8,6 @@ using Impostor.Server.Data; using Impostor.Server.Events; using Impostor.Server.Events.Managers; using Impostor.Server.Games; -using Impostor.Server.Games.Managers; using Impostor.Server.Net.Redirector; using Impostor.Server.Net.State; using Impostor.Shared.Innersloth; diff --git a/src/Impostor.Server/Net/Matchmaker.cs b/src/Impostor.Server/Net/Matchmaker.cs index 462c26c..290df70 100644 --- a/src/Impostor.Server/Net/Matchmaker.cs +++ b/src/Impostor.Server/Net/Matchmaker.cs @@ -4,11 +4,7 @@ using System.Net.Sockets; using System.Threading.Tasks; using Hazel; using Hazel.Udp; -using Impostor.Server.Games; -using Impostor.Server.Hazel.Messages; using Impostor.Server.Net.Manager; -using Impostor.Server.Net.Messages; -using Impostor.Server.Net.State; using Microsoft.Extensions.Logging; namespace Impostor.Server.Hazel @@ -17,13 +13,13 @@ namespace Impostor.Server.Hazel { private readonly ClientManager _clientManager; private readonly ILogger _logger; - private readonly ILogger _connectionLogger; + private readonly ILogger _connectionLogger; private UdpConnectionListener _connection; public Matchmaker( ILogger logger, ClientManager clientManager, - ILogger connectionLogger) + ILogger connectionLogger) { _logger = logger; _clientManager = clientManager; @@ -56,7 +52,7 @@ namespace Impostor.Server.Hazel var clientVersion = e.HandshakeData.ReadInt32(); var name = e.HandshakeData.ReadString(); - var connection = new HazelConnection(e.Connection, _connectionLogger); + var connection = new Net.Hazel.HazelConnection(e.Connection, _connectionLogger); // Register client await _clientManager.RegisterConnectionAsync(connection, name, clientVersion); diff --git a/src/Impostor.Server/Net/MatchmakerService.cs b/src/Impostor.Server/Net/MatchmakerService.cs index 2384716..cdbe44d 100644 --- a/src/Impostor.Server/Net/MatchmakerService.cs +++ b/src/Impostor.Server/Net/MatchmakerService.cs @@ -3,7 +3,6 @@ using System.Threading; using System.Threading.Tasks; using Impostor.Server.Data; using Impostor.Server.Hazel; -using Impostor.Server.Net.Manager; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs index 8e18e04..c15f329 100644 --- a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs +++ b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Impostor.Server.Data; -using Impostor.Server.Hazel; +using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; using Impostor.Server.Net.Messages; using Impostor.Shared.Innersloth; diff --git a/src/Impostor.Server/Net/State/ClientPlayer.Api.cs b/src/Impostor.Server/Net/State/ClientPlayer.Api.cs new file mode 100644 index 0000000..d1003e5 --- /dev/null +++ b/src/Impostor.Server/Net/State/ClientPlayer.Api.cs @@ -0,0 +1,13 @@ +using Impostor.Server.Games; + +namespace Impostor.Server.Net.State +{ + internal partial class ClientPlayer + { + /// + IClient IClientPlayer.Client => Client; + + /// + IGame IClientPlayer.Game => Game; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/State/ClientPlayer.cs b/src/Impostor.Server/Net/State/ClientPlayer.cs index a744e88..5967601 100644 --- a/src/Impostor.Server/Net/State/ClientPlayer.cs +++ b/src/Impostor.Server/Net/State/ClientPlayer.cs @@ -1,6 +1,4 @@ using System.Threading.Tasks; -using Impostor.Server.Games; -using Impostor.Shared.Innersloth.Data; namespace Impostor.Server.Net.State { diff --git a/src/Impostor.Server/Net/State/Game.Api.cs b/src/Impostor.Server/Net/State/Game.Api.cs new file mode 100644 index 0000000..96ba18a --- /dev/null +++ b/src/Impostor.Server/Net/State/Game.Api.cs @@ -0,0 +1,9 @@ +using Impostor.Server.Games; + +namespace Impostor.Server.Net.State +{ + internal partial class Game : IGame + { + IClientPlayer IGame.Host => Host; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/State/Game.Incoming.cs b/src/Impostor.Server/Net/State/Game.Incoming.cs index 888f6d4..fdc2e85 100644 --- a/src/Impostor.Server/Net/State/Game.Incoming.cs +++ b/src/Impostor.Server/Net/State/Game.Incoming.cs @@ -2,7 +2,6 @@ using Impostor.Server.Games; using Impostor.Server.Net.Messages; using Impostor.Shared.Innersloth.Data; -using Impostor.Shared.Innersloth.GameData; namespace Impostor.Server.Net.State { diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs index c0d06f6..8e3549c 100644 --- a/src/Impostor.Server/Net/State/Game.cs +++ b/src/Impostor.Server/Net/State/Game.cs @@ -6,7 +6,6 @@ using System.Net; using System.Threading.Tasks; using Impostor.Server.Events.Managers; using Impostor.Server.Games; -using Impostor.Server.Games.Managers; using Impostor.Server.Hazel; using Impostor.Server.Hazel.Messages; using Impostor.Server.Net.Manager; diff --git a/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs b/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs index 0b71ed7..84cece6 100644 --- a/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs +++ b/src/Impostor.Tests/Hazel/BufferMessageReaderTests.cs @@ -1,5 +1,5 @@ using Hazel; -using Impostor.Server.Hazel.Messages; +using Impostor.Server.Net.Hazel.Messages; using Impostor.Server.Net.Messages; using Xunit;