Remove Impostor.Shared

src/Impostor.Api/Events/Attributes/EventListenerAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
     public class EventListenerAttribute : Attribute

src/Impostor.Api/Events/EventPriority.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public enum EventPriority
     {

src/Impostor.Api/Events/Game/GameCreatedEvent.cs

@@ -1,6 +1,6 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     /// <summary>
     ///     Called whenever a new <see cref="IGame"/> is created.

src/Impostor.Api/Events/Game/GameDestroyedEvent.cs

@@ -1,6 +1,6 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     /// <summary>
     ///     Called whenever a new <see cref="IGame"/> is destroyed.

src/Impostor.Api/Events/Game/IGameEvent.cs

@@ -1,6 +1,6 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public interface IGameEvent : IEvent
     {

src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs

@@ -1,7 +1,7 @@
-using Impostor.Server.Games;
-using Impostor.Server.Net;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public class PlayerJoinedGameEvent : IGameEvent
     {

src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs

@@ -1,7 +1,7 @@
-using Impostor.Server.Games;
-using Impostor.Server.Net;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
 
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public class PlayerLeftGameEvent : IGameEvent
     {

src/Impostor.Api/Events/IEvent.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public interface IEvent
     {

src/Impostor.Api/Events/IEventCancelable.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public interface IEventCancelable : IEvent
     {

src/Impostor.Api/Events/IEventListener.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Events
+namespace Impostor.Api.Events
 {
     public interface IEventListener
     {

src/Impostor.Api/Events/Managers/IEventManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Impostor.Server.Events.Managers
+namespace Impostor.Api.Events.Managers
 {
     public interface IEventManager
     {

src/Impostor.Api/Exceptions/ImpostorException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Impostor.Server
+namespace Impostor.Api
 {
     public class ImpostorException : Exception
     {

src/Impostor.Api/Games/Extensions/GameManagerExtensions.cs

@@ -1,8 +1,8 @@
 using System.Linq;
-using Impostor.Server.Games.Managers;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Games.Managers;
+using Impostor.Api.Innersloth.Data;
 
-namespace Impostor.Server.Games
+namespace Impostor.Api.Games
 {
     public static class GameManagerExtensions
     {

src/Impostor.Api/Games/GameCode.cs

@@ -1,7 +1,7 @@
 using System;
-using Impostor.Shared.Innersloth;
+using Impostor.Api.Innersloth;
 
-namespace Impostor.Server.Games
+namespace Impostor.Api.Games
 {
     public readonly struct GameCode : IEquatable<GameCode>
     {

src/Impostor.Api/Games/GameJoinError.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Games
+namespace Impostor.Api.Games
 {
     public enum GameJoinError
     {

src/Impostor.Api/Games/GameJoinResult.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Impostor.Server.Net;
+using Impostor.Api.Net;
 
-namespace Impostor.Server.Games
+namespace Impostor.Api.Games
 {
     public readonly struct GameJoinResult
     {

src/Impostor.Api/Games/IGame.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Net;
-using Impostor.Server.Net;
-using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 
-namespace Impostor.Server.Games
+namespace Impostor.Api.Games
 {
     public interface IGame
     {

src/Impostor.Api/Games/Managers/IGameManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Impostor.Server.Games.Managers
+namespace Impostor.Api.Games.Managers
 {
     public interface IGameManager
     {

src/Impostor.Api/Impostor.Api.csproj

@@ -2,16 +2,11 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <RootNamespace>Impostor.Server</RootNamespace>
-        <Nullable>enable</Nullable>
         <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
         <CodeAnalysisRuleSet>ProjectRules.ruleset</CodeAnalysisRuleSet>
+        <LangVersion>9</LangVersion>
     </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Impostor.Shared\Impostor.Shared.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-rc.1.20451.14" />
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.1.20451.14" />

src/Impostor.Api/Innersloth/Data/AlterGameTags.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Api.Innersloth.Data
 {
     public enum AlterGameTags : byte
     {

src/Impostor.Api/Innersloth/Data/DisconnectReason.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Api.Innersloth.Data
 {
     public enum DisconnectReason
     {

src/Impostor.Api/Innersloth/Data/GameKeywords.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Api.Innersloth.Data
 {
     [Flags]
     public enum GameKeywords : uint

src/Impostor.Api/Innersloth/Data/GameStates.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Api.Innersloth.Data
 {
     public enum GameStates : byte
     {

src/Impostor.Api/Innersloth/Data/MapFlags.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Shared.Innersloth.Data
+namespace Impostor.Api.Innersloth.Data
 {
     [Flags]
     public enum MapFlags

src/Impostor.Api/Innersloth/FloatRange.cs

@@ -1,6 +1,6 @@
-using Impostor.Shared.Unity;
+using Impostor.Api.Unity;
 
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public class FloatRange
     {

src/Impostor.Api/Innersloth/GameCodeParser.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public static class GameCodeParser
     {

src/Impostor.Api/Innersloth/GameData/GameDataTag.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Innersloth.GameData
+namespace Impostor.Api.Innersloth.GameData
 {
     public static class GameDataTag
     {

src/Impostor.Api/Innersloth/GameOptionsData.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Innersloth.Data;
 
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public class GameOptionsData
     {

src/Impostor.Api/Innersloth/GameVersion.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public class GameVersion
     {

src/Impostor.Api/Innersloth/RegionInfo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public class RegionInfo
     {

src/Impostor.Api/Innersloth/ServerInfo.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Net;
 
-namespace Impostor.Shared.Innersloth
+namespace Impostor.Api.Innersloth
 {
     public class ServerInfo
     {

src/Impostor.Api/Net/Extensions/GameMessageWriterExtensions.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using Impostor.Server.Net.Messages;
+using Impostor.Api.Net.Messages;
 
-namespace Impostor.Server.Net
+namespace Impostor.Api.Net
 {
     public static class GameMessageWriterExtensions
     {

src/Impostor.Api/Net/IClient.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Impostor.Server.Net
+namespace Impostor.Api.Net
 {
     /// <summary>
     ///     Represents a connected game client.

src/Impostor.Api/Net/IClientPlayer.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Net
+namespace Impostor.Api.Net
 {
     /// <summary>
     ///     Represents a player in <see cref="IGame"/>.

src/Impostor.Api/Net/IConnection.cs

@@ -1,8 +1,8 @@
 using System.Net;
-using Impostor.Server.Games;
-using Impostor.Server.Net.Messages;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 
-namespace Impostor.Server.Net
+namespace Impostor.Api.Net
 {
     /// <summary>
     ///     Represents the connection of the client.

src/Impostor.Api/Net/LimboStates.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Server.Net
+namespace Impostor.Api.Net
 {
     [Flags]
     public enum LimboStates

src/Impostor.Api/Net/Manager/IClientManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Impostor.Server.Net.Manager
+namespace Impostor.Api.Net.Manager
 {
     public interface IClientManager
     {

src/Impostor.Api/Net/Messages/IConnectionMessageWriter.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     /// <summary>
     ///     Represents the message writer for <see cref="IConnection"/>.

src/Impostor.Api/Net/Messages/IGameMessageWriter.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     /// <summary>
     ///     Represents the message writer for <see cref="IGame"/>.

src/Impostor.Api/Net/Messages/IMessage.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     public interface IMessage
     {

src/Impostor.Api/Net/Messages/IMessageReader.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     public interface IMessageReader
     {

src/Impostor.Api/Net/Messages/IMessageWriter.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net;
-using Impostor.Server.Games;
+using Impostor.Api.Games;
 
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     /// <summary>
     ///     Base message writer.

src/Impostor.Api/Net/Messages/MessageType.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Server.Net.Messages
+namespace Impostor.Api.Net.Messages
 {
     /// <summary>
     ///     Specifies how a message should be sent between connections.

src/Impostor.Api/Plugins/IPlugin.cs

@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
-using Impostor.Server.Events;
+using Impostor.Api.Events;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Impostor.Server.Plugins
+namespace Impostor.Api.Plugins
 {
     public interface IPlugin : IEventListener
     {

src/Impostor.Api/Plugins/PluginBase.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Impostor.Server.Plugins
+namespace Impostor.Api.Plugins
 {
     public class PluginBase : IPlugin
     {

src/Impostor.Api/Unity/Mathf.cs

@@ -1,4 +1,4 @@
-namespace Impostor.Shared.Unity
+namespace Impostor.Api.Unity
 {
     public static class Mathf
     {

src/Impostor.Patcher/Impostor.Patcher.Shared/AmongUsModifier.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Gameloop.Vdf;
 using Gameloop.Vdf.Linq;
 using Impostor.Patcher.Shared.Events;
-using Impostor.Shared.Innersloth;
+using Impostor.Patcher.Shared.Innersloth;
 using ErrorEventArgs = Impostor.Patcher.Shared.Events.ErrorEventArgs;
 
 namespace Impostor.Patcher.Shared

src/Impostor.Patcher/Impostor.Patcher.Shared/Impostor.Patcher.Shared.csproj

@@ -6,7 +6,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Impostor.Shared\Impostor.Shared.csproj" />
         <PackageReference Include="Gameloop.Vdf" Version="0.6.1" />
     </ItemGroup>
     

src/Impostor.Patcher/Impostor.Patcher.Shared/Innersloth/RegionInfo.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.IO;
+
+namespace Impostor.Patcher.Shared.Innersloth
+{
+    public class RegionInfo
+    {
+        public RegionInfo(string name, string ping, IReadOnlyList<ServerInfo> servers)
+        {
+            Name = name;
+            Ping = ping;
+            Servers = servers;
+        }
+
+        public string Name { get; }
+        public string Ping { get; }
+        public IReadOnlyList<ServerInfo> Servers { get; }
+
+        public void Serialize(BinaryWriter writer)
+        {
+            writer.Write(0);
+            writer.Write(Name);
+            writer.Write(Ping);
+            writer.Write(Servers.Count);
+
+            foreach (var server in Servers)
+            {
+                server.Serialize(writer);
+            }
+        }
+
+        public static RegionInfo Deserialize(BinaryReader reader)
+        {
+            var unknown = reader.ReadInt32();
+            var name = reader.ReadString();
+            var ping = reader.ReadString();
+            var servers = new List<ServerInfo>();
+            var serverCount = reader.ReadInt32();
+
+            for (var i = 0; i < serverCount; i++)
+            {
+                servers.Add(ServerInfo.Deserialize(reader));
+            }
+
+            return new RegionInfo(name, ping, servers);
+        }
+    }
+}

src/Impostor.Patcher/Impostor.Patcher.Shared/Innersloth/ServerInfo.cs

@@ -0,0 +1,37 @@
+using System.IO;
+using System.Net;
+
+namespace Impostor.Patcher.Shared.Innersloth
+{
+    public class ServerInfo
+    {
+        public string Name { get; }
+        public string Ip { get; }
+        public ushort Port { get; }
+
+        public ServerInfo(string name, string ip, ushort port)
+        {
+            Name = name;
+            Ip = ip;
+            Port = port;
+        }
+        
+        public void Serialize(BinaryWriter writer)
+        {
+            writer.Write(Name);
+            writer.Write(IPAddress.Parse(Ip).GetAddressBytes());
+            writer.Write(Port);
+            writer.Write(0);
+        }
+
+        public static ServerInfo Deserialize(BinaryReader reader)
+        {
+            var name = reader.ReadString();
+            var ip = new IPAddress(reader.ReadBytes(4)).ToString();
+            var port = reader.ReadUInt16();
+            var unknown = reader.ReadInt32();
+            
+            return new ServerInfo(name, ip, port);
+        }
+    }
+}

src/Impostor.Plugins.Debugger/DebugPlugin.cs

@@ -1,4 +1,4 @@
-using Impostor.Server.Plugins;
+using Impostor.Api.Plugins;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;

src/Impostor.Plugins.Debugger/Pages/Index.razor

@@ -1,9 +1,9 @@
 @page "/"
-@using Impostor.Server.Events
-@using Impostor.Server.Events.Managers
-@using Impostor.Server.Games.Managers
 @implements IDisposable
-@implements IEventListener
+@using Impostor.Api.Events.Managers
+@using Impostor.Api.Games.Managers
+@using Impostor.Api.Events
+@implements Impostor.Api.Events.IEventListener
 @inject IEventManager EventManager
 @inject IGameManager GameManager
 

src/Impostor.Server/Events/EventHandler.cs

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Events
+using Impostor.Api.Events;
+
+namespace Impostor.Server.Events
 {
     internal readonly struct EventHandler
     {

src/Impostor.Server/Events/EventManager.cs

@@ -4,7 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using Impostor.Server.Events.Managers;
+using Impostor.Api.Events;
+using Impostor.Api.Events.Managers;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Impostor.Server.Events

src/Impostor.Server/Events/RegisteredEventListener.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
+using Impostor.Api.Events;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Impostor.Server.Events

src/Impostor.Server/Events/TemporaryEventRegister.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Impostor.Api.Events;
 
 namespace Impostor.Server.Events
 {

src/Impostor.Server/GameData/InnerNetObject.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Net.Messages;
+using Impostor.Api.Net.Messages;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData
 {

src/Impostor.Server/GameData/Objects/Components/InnerCustomNetworkTransform.cs

@@ -1,6 +1,6 @@
 using System.Numerics;
-using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Net.Messages;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Server.GameData.Objects.Components

src/Impostor.Server/GameData/Objects/Components/InnerPlayerPhysics.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Net.Messages;
+using Impostor.Api.Net.Messages;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects.Components
 {

src/Impostor.Server/GameData/Objects/Components/InnerVoteBanSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects.Components

src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects

src/Impostor.Server/GameData/Objects/InnerGameData.TaskInfo.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Net.Messages;
+using Impostor.Api.Net.Messages;
+using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects
 {

src/Impostor.Server/GameData/Objects/InnerGameData.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.GameData.Objects.Components;
-using Impostor.Server.Games;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects

src/Impostor.Server/GameData/Objects/InnerLobbyBehaviour.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects

src/Impostor.Server/GameData/Objects/InnerMeetingHud.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects

src/Impostor.Server/GameData/Objects/InnerPlayerControl.cs

@@ -1,6 +1,7 @@
 using System;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.GameData.Objects.Components;
-using Impostor.Server.Games;
 using Impostor.Server.Net.Messages;
 using Microsoft.Extensions.DependencyInjection;
 

src/Impostor.Server/GameData/Objects/InnerShipStatus.cs

@@ -1,4 +1,5 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.GameData.Objects

src/Impostor.Server/Impostor.Server.csproj

@@ -23,7 +23,6 @@
     <ItemGroup>
         <ProjectReference Include="..\Impostor.Api\Impostor.Api.csproj" />
         <ProjectReference Include="..\Impostor.Hazel\Impostor.Hazel.csproj" />
-        <ProjectReference Include="..\Impostor.Shared\Impostor.Shared.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/Impostor.Server/Net/Client.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Threading.Tasks;
+using Impostor.Api.Games;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Data;
-using Impostor.Server.Games;
 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;
 
 namespace Impostor.Server.Net

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

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Net
+using Impostor.Api.Net;
+
+namespace Impostor.Server.Net
 {
     internal abstract partial class ClientBase : IClient
     {

src/Impostor.Server/Net/ClientBase.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Messages;
 using Impostor.Server.Net.State;

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

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Net.Hazel
+using Impostor.Api.Net;
+
+namespace Impostor.Server.Net.Hazel
 {
     internal partial class HazelConnection : IConnection
     {

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

@@ -2,6 +2,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using Hazel;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Hazel.Messages;
 using Impostor.Server.Net.Hazel.Messages;
 using Impostor.Server.Net.Messages;

src/Impostor.Server/Net/Hazel/Messages/BufferMessageReader.cs

@@ -2,6 +2,7 @@
 using System.Buffers.Binary;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel.Messages

src/Impostor.Server/Net/Hazel/Messages/HazelConnectionMessageWriter.cs

@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Messages;
 

src/Impostor.Server/Net/Hazel/Messages/HazelGameMessageWriter.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Hazel;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Messages;
 using Impostor.Server.Net.State;

src/Impostor.Server/Net/Hazel/Messages/HazelMessage.cs

@@ -1,5 +1,6 @@
 using System;
 using Hazel;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Hazel.Messages;
 using Impostor.Server.Net.Messages;
 

src/Impostor.Server/Net/Hazel/Messages/HazelMessageWriter.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Net;
 using Hazel;
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
 
 namespace Impostor.Server.Hazel.Messages

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

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Manager;
 
 namespace Impostor.Server.Net.Manager
 {

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

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Data;
 using Impostor.Server.Net.Factories;
 using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth;
-using Impostor.Shared.Innersloth.Data;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Server.Net.Manager

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Impostor.Server.Games;
-using Impostor.Server.Games.Managers;
+using Impostor.Api.Games;
+using Impostor.Api.Games.Managers;
 
 namespace Impostor.Server.Net.Manager
 {

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

@@ -4,14 +4,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using Impostor.Api;
+using Impostor.Api.Events;
+using Impostor.Api.Events.Managers;
+using Impostor.Api.Games;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
 using Impostor.Server.Data;
-using Impostor.Server.Events;
-using Impostor.Server.Events.Managers;
-using Impostor.Server.Games;
 using Impostor.Server.Net.Redirector;
 using Impostor.Server.Net.State;
-using Impostor.Shared.Innersloth;
-using Impostor.Shared.Innersloth.Data;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

src/Impostor.Server/Net/Messages/Message00HostGame.cs

@@ -1,4 +1,5 @@
-using Impostor.Shared.Innersloth;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Messages/Message01JoinGame.cs

@@ -1,5 +1,6 @@
 using System;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Messages/Message04RemovePlayer.cs

@@ -1,4 +1,5 @@
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Messages/Message07JoinedGame.cs

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Net.Messages
+using Impostor.Api.Net.Messages;
+
+namespace Impostor.Server.Net.Messages
 {
     internal static class Message07JoinedGame
     {

src/Impostor.Server/Net/Messages/Message10AlterGame.cs

@@ -1,4 +1,5 @@
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Messages/Message11KickPlayer.cs

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Net.Messages
+using Impostor.Api.Net.Messages;
+
+namespace Impostor.Server.Net.Messages
 {
     internal static class Message11KickPlayer
     {

src/Impostor.Server/Net/Messages/Message12WaitForHost.cs

@@ -1,4 +1,6 @@
-namespace Impostor.Server.Net.Messages
+using Impostor.Api.Net.Messages;
+
+namespace Impostor.Server.Net.Messages
 {
     internal static class Message12WaitForHost
     {

src/Impostor.Server/Net/Messages/Message13Redirect.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Messages/Message16GetGameListV2.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
-using Impostor.Server.Games;
-using Impostor.Shared.Innersloth;
+using Impostor.Api.Games;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Messages
 {

src/Impostor.Server/Net/Redirector/ClientRedirector.cs

@@ -1,10 +1,11 @@
 using System.Threading.Tasks;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Data;
 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 Serilog;
 using ILogger = Serilog.ILogger;
 

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

@@ -1,4 +1,5 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Impostor.Api.Net;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -1,4 +1,5 @@
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Impostor.Api.Innersloth.GameData;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.GameData;
 using Impostor.Server.GameData.Objects;
-using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth.GameData;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Impostor.Server.Net.State

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

@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
-using Impostor.Server.Games;
+using Impostor.Api.Games;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -1,6 +1,8 @@
 using System.Linq;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth.Data;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -1,8 +1,10 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Impostor.Server.Events;
-using Impostor.Server.Net.Messages;
-using Impostor.Shared.Innersloth.Data;
+using Impostor.Api;
+using Impostor.Api.Events;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.State
 {

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

@@ -4,15 +4,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Impostor.Server.Events.Managers;
-using Impostor.Server.Games;
+using Impostor.Api.Events.Managers;
+using Impostor.Api.Games;
+using Impostor.Api.Innersloth;
+using Impostor.Api.Innersloth.Data;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Messages;
 using Impostor.Server.Hazel;
 using Impostor.Server.Hazel.Messages;
 using Impostor.Server.Net.Manager;
 using Impostor.Server.Net.Messages;
 using Impostor.Server.Net.Redirector;
-using Impostor.Shared.Innersloth;
-using Impostor.Shared.Innersloth.Data;
 using Serilog;
 using ILogger = Serilog.ILogger;