Move Api classes and remove unused imports

diff --git a/src/Impostor.Plugins.Debugger/DebugPlugin.cs b/src/Impostor.Plugins.Debugger/DebugPlugin.cs
index de18d734427e8b1cc0117fe1d1f4fd31bdb5eb06..53c544a95d5d2139ff1f24880b608a198b851b88 100644 (file)
--- 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 c4931b7b94a0a7209442a1dd036f922815614811..dcd25a2061d499d4beabd850457f1ef0011f79be 100644 (file)
--- 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 b7884e17178e5acaaf3ba7efa191c6558734b15e..d995b5a055e87c4796739bcd7becee9e8ec8abbd 100644 (file)
--- 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 4d6d22dee0625b6ed156022624c489800296b07a..0c508c47425a0954eab44216463d8c84fe950700 100644 (file)
--- 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 815c26ca2e71e2a98afeebdc0c1c2c160f7d2559..4e4252f66661e8d560fb6f55543311bec4079375 100644 (file)
--- 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 69d91197e959dfd9890167911b7d6f33b1cddd08..f619dfaac5377ce5b390d7f20cd820ae4f6c1dc1 100644 (file)
--- 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 (file)
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 (file)
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<IClient> 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 (file)
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
-    {
-        /// <inheritdoc />
-        IClient IClientPlayer.Client => Client;
-
-        /// <inheritdoc />
-        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 (file)
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 (file)
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<IGame> 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 (file)
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 6082c14b1a2a71c5de1f60722c9b518e25fbd641..0f0a99c0b3203645fb17e6c3c42765542159fc6e 100644 (file)
--- 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 9a7217bd4a9c8fd68ef5e34a91ed95fd8737f1cf..25075d355b29052c0c9b3496c29dd57ab315e02c 100644 (file)
--- 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 (file)
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 dfeacd39bc0539b0649d4ec64bb462e17b38a287..71baab46804ec706ca3d5abeeedae4608c28874e 100644 (file)
--- 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 e9ff13e8f982773848f10097b20488631c3c71ec..632781b39daf3a2b4f350617bd2c5b20f25373ae 100644 (file)
--- 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 d09def40142b7004258160def1974701d90486f3..f090f749d0e0942e5711a61db7ecc76b9b12ecb0 100644 (file)
--- 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 (file)
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 9e15256dec7f99a95bd8b5ece2d6f01eac3501a9..390c3bf26817b26ce50df59e017710884a14609c 100644 (file)
--- 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<HazelConnection> _logger;
+        private readonly ILogger<Net.Hazel.HazelConnection> _logger;
 
-        public HazelConnection(Connection innerConnection, ILogger<HazelConnection> logger)
+        public HazelConnection(Connection innerConnection, ILogger<Net.Hazel.HazelConnection> 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 7f456190df8891cb964b5769790f9fa5b29968db..1bde8f858be3560a9dd0cbb77e4badcb47b564a8 100644 (file)
--- 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 a87db887881df5b6de1ed831aa8895ac93311cd2..2deddaf362616847a153218483fb0c78d9683662 100644 (file)
--- 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<HazelConnection>()
+                .OfType<Net.Hazel.HazelConnection>()
                 .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 4f08eb422022d4496f9f1910af85fc2253cede8a..32ad51432a19085aa3bc643a60d8f87f45adede2 100644 (file)
--- 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 (file)
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<IClient> 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 37a1402d697a930a52dad2fad015d71b56b82255..23ee7bbd4a329044f81fbdae81bfc577193659ac 100644 (file)
--- 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 (file)
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<IGame> 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 e54f8661d1836e121d6b325d177e261884fd7612..057c71662f9884eed287ade91b5b4870918002b6 100644 (file)
--- 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 462c26cec5f34e3b9719753eb527105327d7c8ee..290df705ed4f56099050bd9cb042874e9937b8a0 100644 (file)
--- 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<Matchmaker> _logger;
-        private readonly ILogger<HazelConnection> _connectionLogger;
+        private readonly ILogger<Net.Hazel.HazelConnection> _connectionLogger;
         private UdpConnectionListener _connection;
 
         public Matchmaker(
             ILogger<Matchmaker> logger,
             ClientManager clientManager,
-            ILogger<HazelConnection> connectionLogger)
+            ILogger<Net.Hazel.HazelConnection> 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 23847164773d7d31e1e377bf2478d0b2adddb6f2..cdbe44d03c8dc8f91565e78e2d5a404a25b67de0 100644 (file)
--- 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 8e18e04f63e34c0c74a1eb381f701dbb0869e7ea..c15f3294e97d472955f6458d6b3b72185f58523f 100644 (file)
--- 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 (file)
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
+    {
+        /// <inheritdoc />
+        IClient IClientPlayer.Client => Client;
+
+        /// <inheritdoc />
+        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 a744e8867b044027eac0a2c2ead00ff712ca9c14..596760178d9a75d511d54172217c2bc65989419f 100644 (file)
--- 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 (file)
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 888f6d4ee0fa778c8dbc2e0fa045be3f10c8b5eb..fdc2e8587dff6c091a479f8051a73a0ef41735ac 100644 (file)
--- 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 c0d06f64cbdd81d7dfbd4c56f0b862858e66c547..8e3549c349397bc0153bc00a201be72ee3a2589f 100644 (file)
--- 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 0b71ed75dcd12df69b82dd4efbd23fe132b082d7..84cece6f2518b3912ae17e90db1f21783c495387 100644 (file)
--- 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;