Move Api classes and remove unused imports

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;

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;

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
 {

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
 {

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
 {

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;
 

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
 {

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
 {

src/Impostor.Server/Net/ClientBase.Api.cs

@@ -1,5 +1,4 @@
-// ReSharper disable once CheckNamespace
-namespace Impostor.Server.Net
+namespace Impostor.Server.Net
 {
     internal abstract partial class ClientBase : IClient
     {

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;
 

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

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
 {

src/Impostor.Server/Net/Hazel/HazelConnection.Api.cs

@@ -1,7 +1,4 @@
-using Impostor.Server.Net;
-
-// ReSharper disable once CheckNamespace
-namespace Impostor.Server.Hazel
+namespace Impostor.Server.Net.Hazel
 {
     internal partial class HazelConnection : IConnection
     {

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;

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;

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);
             }

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
     {

src/Impostor.Server/Net/Manager/ClientManager.Api.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 
-// ReSharper disable once CheckNamespace
 namespace Impostor.Server.Net.Manager
 {
     internal partial class ClientManager : IClientManager

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;

src/Impostor.Server/Net/Manager/GameManager.Api.cs

@@ -3,7 +3,6 @@ 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

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;

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);

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;

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;

src/Impostor.Server/Net/State/ClientPlayer.Api.cs

@@ -1,6 +1,5 @@
 using Impostor.Server.Games;
 
-// ReSharper disable once CheckNamespace
 namespace Impostor.Server.Net.State
 {
     internal partial class ClientPlayer

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
 {

src/Impostor.Server/Net/State/Game.Api.cs

@@ -1,6 +1,5 @@
 using Impostor.Server.Games;
 
-// ReSharper disable once CheckNamespace
 namespace Impostor.Server.Net.State
 {
     internal partial class Game : IGame

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
 {

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;

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;