Fix imports

diff --git a/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs b/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs
index 17aa8ec815d41b03e3356a788d885747f3ffa97c..1cd063bf24db478a2d5d3e8ee20eb7783870b910 100644 (file)
--- a/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs
+++ b/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs
@@ -1,5 +1,4 @@
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Events.Client
 {

diff --git a/src/Impostor.Api/Games/Extensions/GameExtensions.cs b/src/Impostor.Api/Games/Extensions/GameExtensions.cs
index e30050f948d1ca59190d0bd5a855a066d57728bd..731965567432280d9ca43abb52adcfbcf0d957a3 100644 (file)
--- a/src/Impostor.Api/Games/Extensions/GameExtensions.cs
+++ b/src/Impostor.Api/Games/Extensions/GameExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Games
 {

diff --git a/src/Impostor.Api/Games/IGame.cs b/src/Impostor.Api/Games/IGame.cs
index 8d95a1c6779f5aa3e0d1c3fc211746648d0f41dd..f76382b12624d48e3a0ded3e8ce0c417e8912609 100644 (file)
--- a/src/Impostor.Api/Games/IGame.cs
+++ b/src/Impostor.Api/Games/IGame.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Games
 {

diff --git a/src/Impostor.Api/GlobalUsings.cs b/src/Impostor.Api/GlobalUsings.cs
new file mode 100644 (file)
index 0000000..7c6461c
--- /dev/null
+++ b/src/Impostor.Api/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Impostor.Hazel.Abstractions;

diff --git a/src/Impostor.Api/Innersloth/Customization/PlayerOutfit.cs b/src/Impostor.Api/Innersloth/Customization/PlayerOutfit.cs
index a54b88954593a247530a65e2bc0e7c9b31bac2d5..d2fe21d7cf1b1b7ddb47565f158905869817566f 100644 (file)
--- a/src/Impostor.Api/Innersloth/Customization/PlayerOutfit.cs
+++ b/src/Impostor.Api/Innersloth/Customization/PlayerOutfit.cs
@@ -1,5 +1,3 @@
-using Impostor.Api.Net.Messages;
-
 namespace Impostor.Api.Innersloth.Customization
 {
     public class PlayerOutfit

diff --git a/src/Impostor.Api/Innersloth/GameOptionsData.cs b/src/Impostor.Api/Innersloth/GameOptionsData.cs
index 7c229d9d2227573d70a2613070aa44fa1b6db9b0..71a6e438e2987243a58bcf738818162c3b574d79 100644 (file)
--- a/src/Impostor.Api/Innersloth/GameOptionsData.cs
+++ b/src/Impostor.Api/Innersloth/GameOptionsData.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Innersloth
 {

diff --git a/src/Impostor.Api/Innersloth/PlatformSpecificData.cs b/src/Impostor.Api/Innersloth/PlatformSpecificData.cs
index 61f1aeb21b8bf5cd3b4ae08247bdb185e5c0faf7..ac3954f652dcdb3f2e0fbc8846196fee89cacdab 100644 (file)
--- a/src/Impostor.Api/Innersloth/PlatformSpecificData.cs
+++ b/src/Impostor.Api/Innersloth/PlatformSpecificData.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Innersloth
 {

diff --git a/src/Impostor.Api/Innersloth/RoleOptionsData.cs b/src/Impostor.Api/Innersloth/RoleOptionsData.cs
index 3e6d6bfc21003e5e22550007da95a7d88eba0da7..85356cf50818c1a1b9231355f66e89fdde496d7b 100644 (file)
--- a/src/Impostor.Api/Innersloth/RoleOptionsData.cs
+++ b/src/Impostor.Api/Innersloth/RoleOptionsData.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Innersloth
 {

diff --git a/src/Impostor.Api/Net/Custom/ICustomRootMessage.cs b/src/Impostor.Api/Net/Custom/ICustomRootMessage.cs
index 352cc1b81a27c4993c4ea80046971b8c5d09e363..9a475f531bccf11d9c89045aa179d49f7d80155d 100644 (file)
--- a/src/Impostor.Api/Net/Custom/ICustomRootMessage.cs
+++ b/src/Impostor.Api/Net/Custom/ICustomRootMessage.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Net.Custom
 {

diff --git a/src/Impostor.Api/Net/Custom/ICustomRpc.cs b/src/Impostor.Api/Net/Custom/ICustomRpc.cs
index 262b573b257529a71b662e8abc806592059f78e1..48df22032ce259e54f3d36a95b27bd747c0d184d 100644 (file)
--- a/src/Impostor.Api/Net/Custom/ICustomRpc.cs
+++ b/src/Impostor.Api/Net/Custom/ICustomRpc.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Net.Custom
 {

diff --git a/src/Impostor.Api/Net/IClient.cs b/src/Impostor.Api/Net/IClient.cs
index ceb8f2d6e4196c33c3810605e50db72d5456794a..09b20bea26e085069f55cdcb7c6a703c250cdabb 100644 (file)
--- a/src/Impostor.Api/Net/IClient.cs
+++ b/src/Impostor.Api/Net/IClient.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Impostor.Api.Innersloth;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Net
 {

diff --git a/src/Impostor.Api/Net/IHazelConnection.cs b/src/Impostor.Api/Net/IHazelConnection.cs
index 09f17c3c15fe21d46200d2390385ccbcb34d0638..bf8ce8159efae5f8979bc00c642e2c0211794037 100644 (file)
--- a/src/Impostor.Api/Net/IHazelConnection.cs
+++ b/src/Impostor.Api/Net/IHazelConnection.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Threading.Tasks;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Api.Net
 {

diff --git a/src/Impostor.Api/Net/MessageReaderExtensions.cs b/src/Impostor.Api/Net/MessageReaderExtensions.cs
index 3115a33b5adcf301b30006875480b809f3212576..1f77947d9a5e017de5baf72b61f2d7182835d7ef 100644 (file)
--- a/src/Impostor.Api/Net/MessageReaderExtensions.cs
+++ b/src/Impostor.Api/Net/MessageReaderExtensions.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Impostor.Api.Games;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Unity;
-using Impostor.Hazel.Abstractions;
 
 namespace Impostor.Api.Net;
 

diff --git a/src/Impostor.Api/Net/MessageWriterExtensions.cs b/src/Impostor.Api/Net/MessageWriterExtensions.cs
index 061dac2fa43cc3d32997fc46202349d878e11b3a..ddf3ba7ee44baa4f2faa194adf54f723be41a4b6 100644 (file)
--- a/src/Impostor.Api/Net/MessageWriterExtensions.cs
+++ b/src/Impostor.Api/Net/MessageWriterExtensions.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Impostor.Api.Games;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Unity;
-using Impostor.Hazel.Abstractions;
 
 namespace Impostor.Api.Net;
 

diff --git a/src/Impostor.Api/Net/Messages/S2C/Message16GetGameListS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message16GetGameListS2C.cs
index 584673c885a71e5bc353cf6116d50ee6a94dc7a0..656959c62ce3b5e08b4f28a09cb405ad7dc33c74 100644 (file)
--- a/src/Impostor.Api/Net/Messages/S2C/Message16GetGameListS2C.cs
+++ b/src/Impostor.Api/Net/Messages/S2C/Message16GetGameListS2C.cs
@@ -18,7 +18,7 @@ namespace Impostor.Api.Net.Messages.S2C
                 writer.StartMessage(0);
                 writer.Write(game.PublicIp.Address);
                 writer.Write((ushort)game.PublicIp.Port);
-                writer.Write(game.Code);
+                game.Code.Serialize(writer);
                 writer.Write(game.DisplayName ?? game.Host?.Client.Name ?? string.Empty);
                 writer.Write((byte)game.PlayerCount);
                 writer.WritePacked(1); // TODO: What does Age do?

diff --git a/src/Impostor.Api/Net/Messages/S2C/Message22QueryPlatformIdsS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message22QueryPlatformIdsS2C.cs
index c3e8594eb2574732a14aeb511d6e1c3b482aa3dc..6fc57dee8a799f47728128fcbf6e8b2bb0591f87 100644 (file)
--- a/src/Impostor.Api/Net/Messages/S2C/Message22QueryPlatformIdsS2C.cs
+++ b/src/Impostor.Api/Net/Messages/S2C/Message22QueryPlatformIdsS2C.cs
@@ -10,7 +10,7 @@ namespace Impostor.Api.Net.Messages.S2C
         public static void Serialize(IMessageWriter writer, GameCode gameCode, IEnumerable<PlatformSpecificData> playerSpecificDatas)
         {
             writer.StartMessage(MessageFlags.QueryPlatformIds);
-            writer.Write(gameCode);
+            gameCode.Serialize(writer);
             foreach (var playerSpecificData in playerSpecificDatas)
             {
                 playerSpecificData.Serialize(writer);

diff --git a/src/Impostor.Benchmarks/Data/MessageWriter.cs b/src/Impostor.Benchmarks/Data/MessageWriter.cs
index e1c346c760e25258dc4fb5f87e6f701eddc3ced0..ad7f871c8c054f23f75c6d1d592791f68265f17d 100644 (file)
--- a/src/Impostor.Benchmarks/Data/MessageWriter.cs
+++ b/src/Impostor.Benchmarks/Data/MessageWriter.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Text;
 using Impostor.Api.Games;
-using Impostor.Api.Net.Messages;
+using Impostor.Hazel.Abstractions;
 
 namespace Impostor.Benchmarks.Data
 {

diff --git a/src/Impostor.Client.App/Program.cs b/src/Impostor.Client.App/Program.cs
index ba039a57290c919937b21fe51f215baade242f95..057677ba53586ae60cc6385e493d327f4fe80aee 100644 (file)
--- a/src/Impostor.Client.App/Program.cs
+++ b/src/Impostor.Client.App/Program.cs
@@ -2,9 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api.Innersloth;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.C2S;
 using Impostor.Hazel;
+using Impostor.Hazel.Abstractions;
 using Impostor.Hazel.Udp;
 using Serilog;
 

diff --git a/src/Impostor.Server/Events/Client/ClientConnectionEvent.cs b/src/Impostor.Server/Events/Client/ClientConnectionEvent.cs
index e4bb594f995cca840322df96ed6bd18e779648a0..4bf93927af5ef6807ba29caf0d569e17692e04f9 100644 (file)
--- a/src/Impostor.Server/Events/Client/ClientConnectionEvent.cs
+++ b/src/Impostor.Server/Events/Client/ClientConnectionEvent.cs
@@ -1,6 +1,5 @@
 using Impostor.Api.Events.Client;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Events.Client
 {

diff --git a/src/Impostor.Server/GlobalUsings.cs b/src/Impostor.Server/GlobalUsings.cs
new file mode 100644 (file)
index 0000000..7c6461c
--- /dev/null
+++ b/src/Impostor.Server/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Impostor.Hazel.Abstractions;

diff --git a/src/Impostor.Server/Net/ClientBase.cs b/src/Impostor.Server/Net/ClientBase.cs
index 0a321f823c151169de06740fe3871ca7dc4bc8da..eb5b14d78b4f26a36cc2ea6efd62def28afdaa6f 100644 (file)
--- a/src/Impostor.Server/Net/ClientBase.cs
+++ b/src/Impostor.Server/Net/ClientBase.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.State;
 
 namespace Impostor.Server.Net

diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.cs
index fab5ff551b8b2b8059052e336903efea415eaf25..ceb6bd24089f35d2e4edd39075fb585265a2a93a 100644 (file)
--- a/src/Impostor.Server/Net/Hazel/HazelConnection.cs
+++ b/src/Impostor.Server/Net/Hazel/HazelConnection.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using System.Threading.Tasks;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
 using Microsoft.Extensions.Logging;
 

diff --git a/src/Impostor.Server/Net/Inner/InnerNetObject.cs b/src/Impostor.Server/Net/Inner/InnerNetObject.cs
index 62339c1ff216d14d742bc8df608fda2d9f27d7a0..1fde00684c38c64fc15aa8b6c1c994a0fe48872c 100644 (file)
--- a/src/Impostor.Server/Net/Inner/InnerNetObject.cs
+++ b/src/Impostor.Server/Net/Inner/InnerNetObject.cs
@@ -3,7 +3,6 @@ using Impostor.Api.Games;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.State;
 
 namespace Impostor.Server.Net.Inner

diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs
index b73b835f883c909df99220af17497d7bca384116..3e90de35d94895da0804e1b3b5784367c3b3fd5a 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using System.Threading.Tasks;
+using Impostor.Api.Net;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Inner.Objects.Components;
 

diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs
index 4f2c3aa25a96d1fabd4e8bca338fbcefda49e378..880d874224c61ab148259f75929f81945a652e2a 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs
@@ -6,7 +6,6 @@ using Impostor.Api.Events.Managers;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Events.Player;
 using Impostor.Server.Net.Inner.Objects.ShipStatus;

diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs
index 45fd9ea8ee53e5ca584e40f976bbdf413f6195f5..d35165adeb0a65cfbdf71d4d200e258d67cf8cbf 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs
@@ -4,7 +4,6 @@ using Impostor.Api.Events.Managers;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Events.Player;
 using Impostor.Server.Net.State;

diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs
index 6877907116508a8ba816e9b47547bb151c8031a8..5fcf38bbbc4e2906ff6bdd5022d6a8f38dcb459a 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs
@@ -6,7 +6,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.Logging;

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs
index 4502513dc14ac31df3dabf7ada123ff40a8de4cf..84a376136a665a33336d30dcbf49ee79c082a0c8 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs
@@ -1,7 +1,6 @@
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
index c66cbd79203ff59c11c448a625c1bc356e1f3bd3..47fe4a0e78277700edef015744db24a977334cc4 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
@@ -8,7 +8,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Net.Inner.Objects.Components;
 using Impostor.Server.Net.State;

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs b/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs
index 225b438fed18ddd01d8a598c2ede77f6e803dd95..b64d5773168cf0de52bc3da395d5d3b3457ac272 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 using Impostor.Server.Net.State;
 
 namespace Impostor.Server.Net.Inner.Objects

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs
index fcd320f32cc4970a2a840d229c4a126210015f84..2e9f1768e9fa76ef3d213425a51701f95f088300 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs
@@ -1,6 +1,5 @@
 using Impostor.Api.Events.Player;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 using TVoteType = Impostor.Api.Events.Player.VoteType;
 
 namespace Impostor.Server.Net.Inner.Objects

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.VoterState.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.VoterState.cs
index 56dc958b40003aac5e5f392cdce0c5d5a82c0e46..934ea2cb1b009a476b001d57a4b0fb3786e360b3 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.VoterState.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.VoterState.cs
@@ -1,5 +1,3 @@
-using Impostor.Api.Net.Messages;
-
 namespace Impostor.Server.Net.Inner.Objects
 {
     internal partial class InnerMeetingHud

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
index 001ecf8fdf93081e62ea9a13d966b81c9507c9e2..c36278f0ff45ad9883d4a8f882aa2be8814feb70 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
@@ -11,7 +11,6 @@ using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Events.Meeting;
 using Impostor.Server.Events.Player;

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
index 48de45d85a83cba1b7644df2f2d15264eb5818ad..793d9ce98e842effacef93457837fcc1417b6429 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
@@ -11,7 +11,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Inner.Objects;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Api.Utils;
 using Impostor.Server.Events.Player;

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
index 5f9f206c56070fc45b14b6aae38263010e5da36e..12e218653d6e39f0a332ea85981942f29a4f1c66 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Innersloth.Customization;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Utils;
 
 namespace Impostor.Server.Net.Inner.Objects

diff --git a/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs b/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
index 6a462a3c491ceb89159ee4e70f308bff058be5da..2984488b9e5a64e45c08298e0f87b0860bede41e 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
@@ -10,7 +10,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Inner.Objects.ShipStatus;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.Rpcs;
 using Impostor.Server.Net.Inner.Objects.Systems;
 using Impostor.Server.Net.Inner.Objects.Systems.ShipStatus;

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs
index 441d7c35b7884750ce8cbe227b7c78dfaccb288d..d1d309b4682fa10d86381bced28a99f17ed8e6bf 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs
@@ -1,6 +1,4 @@
-using Impostor.Api.Net.Messages;
-
-namespace Impostor.Server.Net.Inner.Objects.Systems
+namespace Impostor.Server.Net.Inner.Objects.Systems
 {
     public interface ISystemType
     {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/AutoDoorsSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/AutoDoorsSystemType.cs
index 5a145750839de260e8988fcdcb5acb93d697d93e..953e37364011ab905550816292f6811ebc66e0ce 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/AutoDoorsSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/AutoDoorsSystemType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs
index 2bc71301b76f727eeed9eec084609841c771adf9..c947e1a9489e306b1acabf8788cb8b1a3da6f9df 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Impostor.Api.Innersloth;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ElectricalDoors.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ElectricalDoors.cs
index cadb995ca10794f1bbc78899f3407dd1140fb0d3..e806c19fe30e1da8bfbf2a97fc51babe79b076ac 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ElectricalDoors.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ElectricalDoors.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HeliSabotageSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HeliSabotageSystemType.cs
index d72ed5b635e2e9c523f61f61e224f384a8d8d4c6..74da1a6b1e2e6b4b95eceeb6e120bfd85df96ca6 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HeliSabotageSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HeliSabotageSystemType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs
index 4349233f01e71e1a366db97f2aabb746e121179e..1dfb13015b1179bffd774e699d2cdcdfbe6d7549 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs
index 681ebe163f6ebeefb896df145b5ea708ab21c996..8e6920369800d6853f0a84d389b1c5420dbed9ea 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs
index 4c2287fee441416d98f9bff5cb28963c5a5b2cd3..bd67ed49ee3d06796bbd254cb82d920892f56542 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MovingPlatformBehaviour.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MovingPlatformBehaviour.cs
index 82cfb1fbd7e1e9c0f762651b5c2d1cb8c2cbda29..debb6197602a99b4c0bbd23741e577b92b643410 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MovingPlatformBehaviour.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MovingPlatformBehaviour.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs
index 7bc2ab373d6c6bcc99419f864ae9ba3db7c26651..de6aa2136b17dc13c441940c2d27cec8e126a06f 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs
index 73c10c38fcad0b7c0e45a5f400419ea37795b421..c40d65218f84489f42e67ad70c9caae90a195c9a 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs
index d7964556060b6e174d7066be74e4f0461f968694..33096a5130ce85aa2700f504594a5b63974f52bf 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs
index eb2b57260e97f9cfe5afd6b8288b04e6265b0e1e..d21c4b126c6029aadc5cc7c179793305a34fd491 100644 (file)
--- a/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs
@@ -1,5 +1,4 @@
 using System;
-using Impostor.Api.Net.Messages;
 
 namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus
 {

diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs
index fdcc15d36c126efa8494e421647a0d6f2f530515..18f06089feb5ed47a60ab819883d975146713559 100644 (file)
--- a/src/Impostor.Server/Net/Manager/ClientManager.cs
+++ b/src/Impostor.Server/Net/Manager/ClientManager.cs
@@ -8,7 +8,6 @@ using Impostor.Api.Config;
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
 using Impostor.Server.Events.Client;
 using Impostor.Server.Net.Factories;

diff --git a/src/Impostor.Server/Net/Messages/MessageWriterProvider.cs b/src/Impostor.Server/Net/Messages/MessageWriterProvider.cs
index 707860eac380db02bf3202fbb3ea10ed65e287b8..f30b7297769a8f376970bbe727ac4e9ac931c4df 100644 (file)
--- a/src/Impostor.Server/Net/Messages/MessageWriterProvider.cs
+++ b/src/Impostor.Server/Net/Messages/MessageWriterProvider.cs
@@ -1,5 +1,4 @@
-using Impostor.Api.Net.Messages;
-using Impostor.Hazel;
+using Impostor.Hazel;
 
 namespace Impostor.Server.Net.Messages
 {

diff --git a/src/Impostor.Server/Net/State/Game.Api.cs b/src/Impostor.Server/Net/State/Game.Api.cs
index a35858568fa0c36e5b357f8c39e0651f632f9405..62a7ef1ad6d67ed12621bff4b70ae2ec83d66cd4 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Api.cs
+++ b/src/Impostor.Server/Net/State/Game.Api.cs
@@ -6,7 +6,6 @@ using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
 
 namespace Impostor.Server.Net.State

diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs
index e90102b3454a6ac799736ca9a1e5804078429a46..64d8f051922c5a21f33fe3147d17a0c3126e2775 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Data.cs
+++ b/src/Impostor.Server/Net/State/Game.Data.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Inner;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Unity;
 using Impostor.Server.Events.Meeting;
 using Impostor.Server.Events.Player;

diff --git a/src/Impostor.Server/Net/State/Game.Incoming.cs b/src/Impostor.Server/Net/State/Game.Incoming.cs
index 176740df91ed21719eaa1cca3d2569bef499132c..4c9e7b8804e645e4776e098b71c9ff3825295d9e 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Incoming.cs
+++ b/src/Impostor.Server/Net/State/Game.Incoming.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
 using Impostor.Server.Events;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/Impostor.Server/Net/State/Game.Outgoing.cs b/src/Impostor.Server/Net/State/Game.Outgoing.cs
index c03319da39b777eebfc3c98628ea76ff76e37176..ddb794bae76a67cf2a462c31a4b0d62895b8e396 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Outgoing.cs
+++ b/src/Impostor.Server/Net/State/Game.Outgoing.cs
@@ -45,12 +45,12 @@ namespace Impostor.Server.Net.State
             if (targetClientId == null || targetClientId < 0)
             {
                 writer.StartMessage(MessageFlags.GameData);
-                writer.Write(Code);
+                Code.Serialize(writer);
             }
             else
             {
                 writer.StartMessage(MessageFlags.GameDataTo);
-                writer.Write(Code);
+                Code.Serialize(writer);
                 writer.WritePacked(targetClientId.Value);
             }
 

diff --git a/src/Impostor.Server/Net/State/Game.State.cs b/src/Impostor.Server/Net/State/Game.State.cs
index ae688d8bfb2f206bc7c584cf1d724f41dfc2df18..935880bbd05ad21eaffca7c0e66b0f295e796b8a 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.State.cs
+++ b/src/Impostor.Server/Net/State/Game.State.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
 using Impostor.Server.Events;
 using Impostor.Server.Net.Hazel;

diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs
index 63680f898a6a66c2c4298381c8e4ed80dac23264..ed701f05ff0461bb392a5afd484ccc9101abc64a 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.cs
+++ b/src/Impostor.Server/Net/State/Game.cs
@@ -11,7 +11,6 @@ using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Server.Events;
 using Impostor.Server.Net.Manager;

diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs
index ed972ca1703f1355a3f2de673773f47942fb5fe9..0ab343f43bc412a676c4c2e9ee6bbea24e647110 100644 (file)
--- a/src/Impostor.Server/Program.cs
+++ b/src/Impostor.Server/Program.cs
@@ -9,7 +9,6 @@ using Impostor.Api.Games;
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Net.Custom;
 using Impostor.Api.Net.Manager;
-using Impostor.Api.Net.Messages;
 using Impostor.Api.Utils;
 using Impostor.Hazel.Extensions;
 using Impostor.Server.Events;

diff --git a/src/Impostor.Server/Recorder/PacketRecorder.cs b/src/Impostor.Server/Recorder/PacketRecorder.cs
index 704f26bd35b8459025c75ee103fdae3ff430b7fc..f49e4b089c2748bb64277a64821a63e3bc68a853 100644 (file)
--- a/src/Impostor.Server/Recorder/PacketRecorder.cs
+++ b/src/Impostor.Server/Recorder/PacketRecorder.cs
@@ -6,7 +6,6 @@ using System.Threading.Channels;
 using System.Threading.Tasks;
 using Impostor.Api.Config;
 using Impostor.Api.Games;
-using Impostor.Api.Net.Messages;
 using Impostor.Server.Net;
 using Impostor.Server.Utils;
 using Microsoft.Extensions.Hosting;

diff --git a/src/Impostor.Tools.Proxy/Program.cs b/src/Impostor.Tools.Proxy/Program.cs
index c7f9cfac6fdc38acaf5fd46f80fc9b511955e013..2485fd3e6603166fd6c000adf504b5509de369f6 100644 (file)
--- a/src/Impostor.Tools.Proxy/Program.cs
+++ b/src/Impostor.Tools.Proxy/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Impostor.Api.Net.Messages;
+using Impostor.Hazel.Abstractions;
 using Impostor.Hazel;
 using Impostor.Hazel.Extensions;
 using Impostor.Hazel.Udp;

diff --git a/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs b/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs
index 292899aa5a4d9068bcfdc3ce1c52b9bbdb147b19..97e686047e12285e451e462f4ed96ccbcbec3036 100644 (file)
--- a/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs
+++ b/src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Messages;
+using Impostor.Hazel.Abstractions;
 
 namespace Impostor.Tools.ServerReplay.Mocks
 {

diff --git a/src/Impostor.Tools.ServerReplay/Program.cs b/src/Impostor.Tools.ServerReplay/Program.cs
index c55b1933ad655b7c904263337e2499c553cc1791..6b80c0843016374e8077bac5630ffb01897e7ae4 100644 (file)
--- a/src/Impostor.Tools.ServerReplay/Program.cs
+++ b/src/Impostor.Tools.ServerReplay/Program.cs
@@ -14,6 +14,7 @@ using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.C2S;
 using Impostor.Api.Utils;
 using Impostor.Hazel;
+using Impostor.Hazel.Abstractions;
 using Impostor.Hazel.Extensions;
 using Impostor.Server;
 using Impostor.Server.Events;