From e5db56317ad9398aa9c6ab5862edbc5492e4d858 Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 18 Dec 2022 20:16:37 +0100 Subject: [PATCH] Fix imports --- src/Impostor.Api/Events/Client/IClientConnectionEvent.cs | 1 - src/Impostor.Api/Games/Extensions/GameExtensions.cs | 1 - src/Impostor.Api/Games/IGame.cs | 1 - src/Impostor.Api/GlobalUsings.cs | 1 + src/Impostor.Api/Innersloth/Customization/PlayerOutfit.cs | 2 -- src/Impostor.Api/Innersloth/GameOptionsData.cs | 1 - src/Impostor.Api/Innersloth/PlatformSpecificData.cs | 1 - src/Impostor.Api/Innersloth/RoleOptionsData.cs | 1 - src/Impostor.Api/Net/Custom/ICustomRootMessage.cs | 1 - src/Impostor.Api/Net/Custom/ICustomRpc.cs | 1 - src/Impostor.Api/Net/IClient.cs | 1 - src/Impostor.Api/Net/IHazelConnection.cs | 1 - src/Impostor.Api/Net/MessageReaderExtensions.cs | 1 - src/Impostor.Api/Net/MessageWriterExtensions.cs | 1 - src/Impostor.Api/Net/Messages/S2C/Message16GetGameListS2C.cs | 2 +- .../Net/Messages/S2C/Message22QueryPlatformIdsS2C.cs | 2 +- src/Impostor.Benchmarks/Data/MessageWriter.cs | 2 +- src/Impostor.Client.App/Program.cs | 2 +- src/Impostor.Server/Events/Client/ClientConnectionEvent.cs | 1 - src/Impostor.Server/GlobalUsings.cs | 1 + src/Impostor.Server/Net/ClientBase.cs | 1 - src/Impostor.Server/Net/Hazel/HazelConnection.cs | 1 - src/Impostor.Server/Net/Inner/InnerNetObject.cs | 1 - .../Objects/Components/InnerCustomNetworkTransform.Api.cs | 1 + .../Inner/Objects/Components/InnerCustomNetworkTransform.cs | 1 - .../Net/Inner/Objects/Components/InnerPlayerPhysics.cs | 1 - .../Net/Inner/Objects/Components/InnerVoteBanSystem.cs | 1 - .../Net/Inner/Objects/InnerGameData.TaskInfo.cs | 1 - src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs | 1 - src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs | 1 - .../Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs | 1 - .../Net/Inner/Objects/InnerMeetingHud.VoterState.cs | 2 -- src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs | 1 - src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs | 1 - src/Impostor.Server/Net/Inner/Objects/InnerPlayerInfo.cs | 1 - .../Net/Inner/Objects/ShipStatus/InnerShipStatus.cs | 1 - src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs | 4 +--- .../Inner/Objects/Systems/ShipStatus/AutoDoorsSystemType.cs | 1 - .../Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs | 1 - .../Net/Inner/Objects/Systems/ShipStatus/ElectricalDoors.cs | 1 - .../Objects/Systems/ShipStatus/HeliSabotageSystemType.cs | 1 - .../Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs | 1 - .../Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs | 1 - .../Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs | 1 - .../Objects/Systems/ShipStatus/MovingPlatformBehaviour.cs | 1 - .../Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs | 1 - .../Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs | 1 - .../Objects/Systems/ShipStatus/SecurityCameraSystemType.cs | 1 - .../Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs | 1 - src/Impostor.Server/Net/Manager/ClientManager.cs | 1 - src/Impostor.Server/Net/Messages/MessageWriterProvider.cs | 3 +-- src/Impostor.Server/Net/State/Game.Api.cs | 1 - src/Impostor.Server/Net/State/Game.Data.cs | 1 - src/Impostor.Server/Net/State/Game.Incoming.cs | 1 - src/Impostor.Server/Net/State/Game.Outgoing.cs | 4 ++-- src/Impostor.Server/Net/State/Game.State.cs | 1 - src/Impostor.Server/Net/State/Game.cs | 1 - src/Impostor.Server/Program.cs | 1 - src/Impostor.Server/Recorder/PacketRecorder.cs | 1 - src/Impostor.Tools.Proxy/Program.cs | 2 +- src/Impostor.Tools.ServerReplay/Mocks/MockHazelConnection.cs | 2 +- src/Impostor.Tools.ServerReplay/Program.cs | 1 + 62 files changed, 14 insertions(+), 64 deletions(-) create mode 100644 src/Impostor.Api/GlobalUsings.cs create mode 100644 src/Impostor.Server/GlobalUsings.cs diff --git a/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs b/src/Impostor.Api/Events/Client/IClientConnectionEvent.cs index 17aa8ec..1cd063b 100644 --- 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 e30050f..7319655 100644 --- 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 8d95a1c..f76382b 100644 --- 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 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 a54b889..d2fe21d 100644 --- 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 7c229d9..71a6e43 100644 --- 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 61f1aeb..ac3954f 100644 --- 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 3e6d6bf..85356cf 100644 --- 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 352cc1b..9a475f5 100644 --- 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 262b573..48df220 100644 --- 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 ceb8f2d..09b20be 100644 --- 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 09f17c3..bf8ce81 100644 --- 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 3115a33..1f77947 100644 --- 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 061dac2..ddf3ba7 100644 --- 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 584673c..656959c 100644 --- 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 c3e8594..6fc57de 100644 --- 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 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 e1c346c..ad7f871 100644 --- 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 ba039a5..057677b 100644 --- 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 e4bb594..4bf9392 100644 --- 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 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 0a321f8..eb5b14d 100644 --- 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 fab5ff5..ceb6bd2 100644 --- 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 62339c1..1fde006 100644 --- 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 b73b835..3e90de3 100644 --- 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 4f2c3aa..880d874 100644 --- 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 45fd9ea..d35165a 100644 --- 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 6877907..5fcf38b 100644 --- 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 4502513..84a3761 100644 --- 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 c66cbd7..47fe4a0 100644 --- 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 225b438..b64d577 100644 --- 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 fcd320f..2e9f176 100644 --- 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 56dc958..934ea2c 100644 --- 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 001ecf8..c36278f 100644 --- 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 48de45d..793d9ce 100644 --- 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 5f9f206..12e2186 100644 --- 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 6a462a3..2984488 100644 --- 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 441d7c3..d1d309b 100644 --- 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 5a14575..953e373 100644 --- 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 2bc7130..c947e1a 100644 --- 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 cadb995..e806c19 100644 --- 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 d72ed5b..74da1a6 100644 --- 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 4349233..1dfb130 100644 --- 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 681ebe1..8e69203 100644 --- 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 4c2287f..bd67ed4 100644 --- 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 82cfb1f..debb619 100644 --- 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 7bc2ab3..de6aa21 100644 --- 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 73c10c3..c40d652 100644 --- 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 d796455..33096a5 100644 --- 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 eb2b572..d21c4b1 100644 --- 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 fdcc15d..18f0608 100644 --- 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 707860e..f30b729 100644 --- 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 a358585..62a7ef1 100644 --- 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 e90102b..64d8f05 100644 --- 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 176740d..4c9e7b8 100644 --- 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 c03319d..ddb794b 100644 --- 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 ae688d8..935880b 100644 --- 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 63680f8..ed701f0 100644 --- 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 ed972ca..0ab343f 100644 --- 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 704f26b..f49e4b0 100644 --- 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 c7f9cfa..2485fd3 100644 --- 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 292899a..97e6860 100644 --- 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 c55b193..6b80c08 100644 --- 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; -- 2.39.5