From 58d00dc6579d28e131e635f04d95b4ee33baa8ce Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Sat, 24 Oct 2020 21:56:51 +0200 Subject: [PATCH] Remove login from Impostor.Api assembly --- .../Events/Game/Net/PlayerChatEvent.cs | 6 +++--- .../Events/Game/Net/PlayerDestroyedEvent.cs | 6 +++--- .../Events/Game/Net/PlayerSpawnedEvent.cs | 6 +++--- .../Extensions/SystemTypesExtensions.cs | 2 +- .../Games/Extensions/GameManagerExtensions.cs | 2 +- src/Impostor.Api/Games/IGame.cs | 6 +----- src/Impostor.Api/Innersloth/AlterGameTags.cs | 7 +++++++ .../Innersloth/{Data => }/ChatNoteType.cs | 2 +- .../Innersloth/Data/AlterGameTags.cs | 7 ------- .../Innersloth/{Data => }/DeathReason.cs | 4 ++-- .../Innersloth/{Data => }/DisconnectReason.cs | 4 ++-- .../Innersloth/{Data => }/GameKeywords.cs | 4 ++-- .../Innersloth/GameOptionsData.cs | 1 - .../Innersloth/{Data => }/GameStates.cs | 2 +- .../Innersloth/{Data => }/MapFlags.cs | 4 ++-- .../Innersloth/{Data => }/MapId.cs | 2 +- src/Impostor.Api/Innersloth/Net/IGameNet.cs | 16 --------------- .../Objects/Systems => }/SystemTypeHelpers.cs | 2 +- .../{Net/Objects/Systems => }/SystemTypes.cs | 2 +- src/Impostor.Api/Net/IClientPlayer.cs | 12 +++++------ src/Impostor.Api/Net/Inner/IGameNet.cs | 18 +++++++++++++++++ src/Impostor.Api/Net/Inner/IInnerNetObject.cs | 9 +++++++++ .../Net/Inner/Objects/IInnerGameData.cs | 7 +++++++ .../Net/Inner/Objects/IInnerLobbyBehaviour.cs | 7 +++++++ .../Net/Inner/Objects/IInnerPlayerControl.cs | 6 ++++++ .../Net/Inner/Objects/IInnerShipStatus.cs | 7 +++++++ .../Net/Inner/Objects/IInnerVoteBanSystem.cs | 7 +++++++ src/Impostor.Api/Net/LimboStates.cs | 2 +- .../Net/Messages/C2S/Message10AlterGameC2S.cs | 2 +- .../Net/Messages/S2C/Message01JoinGameS2C.cs | 2 +- .../Messages/S2C/Message04RemovePlayerS2C.cs | 2 +- .../Net/Messages/S2C/Message10AlterGameS2C.cs | 2 +- src/Impostor.Api/Plugins/IPlugin.cs | 2 -- src/Impostor.Server/Events/EventManager.cs | 1 - .../Events/Register/TemporaryEventRegister.cs | 1 - .../Extensions/MessageReaderExtensions.cs | 12 +++++------ .../Extensions/NodeLocatorExtensions.cs | 10 ++-------- src/Impostor.Server/Net/Client.cs | 2 -- .../Net/Factories/ClientFactory.cs | 1 - .../Net/Inner}/GameDataTag.cs | 2 +- .../Net/Inner}/GameObject.cs | 4 ++-- .../Net/Inner}/InnerNetObject.cs | 8 +++++--- .../Components/InnerCustomNetworkTransform.cs | 12 ++++++----- .../Objects/Components/InnerPlayerPhysics.cs | 8 +++++--- .../Objects/Components/InnerVoteBanSystem.cs | 9 ++++++--- .../Objects/InnerGameData.PlayerInfo.cs | 6 +++--- .../Inner}/Objects/InnerGameData.TaskInfo.cs | 4 ++-- .../Net/Inner}/Objects/InnerGameData.cs | 17 +++++++++------- .../Net/Inner}/Objects/InnerLobbyBehaviour.cs | 9 +++++---- .../Objects/InnerMeetingHud.PlayerVoteArea.cs | 4 ++-- .../Net/Inner}/Objects/InnerMeetingHud.cs | 16 ++++++++------- .../Net/Inner}/Objects/InnerPlayerControl.cs | 19 ++++++++++-------- .../Net/Inner}/Objects/InnerShipStatus.cs | 20 +++++++++++-------- .../Inner}/Objects/Systems/IActivatable.cs | 2 +- .../Net/Inner}/Objects/Systems/ISystemType.cs | 2 +- .../Systems/ShipStatus/DoorsSystemType.cs | 4 ++-- .../ShipStatus/HudOverrideSystemType.cs | 2 +- .../Systems/ShipStatus/LifeSuppSystemType.cs | 2 +- .../Systems/ShipStatus/MedScanSystem.cs | 2 +- .../Systems/ShipStatus/ReactorSystemType.cs | 2 +- .../Systems/ShipStatus/SabotageSystemType.cs | 2 +- .../ShipStatus/SecurityCameraSystemType.cs | 2 +- .../Systems/ShipStatus/SwitchSystem.cs | 2 +- .../Net/Inner}/RpcCalls.cs | 2 +- .../Net/Inner}/SpawnFlags.cs | 2 +- .../Net/Manager/ClientManager.cs | 2 -- .../Net/Manager/GameManager.cs | 2 -- .../Net/Redirector/ClientRedirector.cs | 1 - .../Net/State/ClientPlayer.Api.cs | 4 ++++ src/Impostor.Server/Net/State/ClientPlayer.cs | 6 +++--- src/Impostor.Server/Net/State/Game.Api.cs | 2 +- src/Impostor.Server/Net/State/Game.Data.cs | 10 +++++----- .../Net/State/Game.Incoming.cs | 2 +- .../Net/State/Game.Outgoing.cs | 2 +- src/Impostor.Server/Net/State/Game.State.cs | 2 +- src/Impostor.Server/Net/State/Game.cs | 2 -- src/Impostor.Server/Net/State/GameNet.Api.cs | 17 ++++++++++++++++ src/Impostor.Server/Net/State/GameNet.cs | 10 +++------- 78 files changed, 241 insertions(+), 182 deletions(-) create mode 100644 src/Impostor.Api/Innersloth/AlterGameTags.cs rename src/Impostor.Api/Innersloth/{Data => }/ChatNoteType.cs (62%) delete mode 100644 src/Impostor.Api/Innersloth/Data/AlterGameTags.cs rename src/Impostor.Api/Innersloth/{Data => }/DeathReason.cs (54%) rename src/Impostor.Api/Innersloth/{Data => }/DisconnectReason.cs (96%) rename src/Impostor.Api/Innersloth/{Data => }/GameKeywords.cs (81%) rename src/Impostor.Api/Innersloth/{Data => }/GameStates.cs (75%) rename src/Impostor.Api/Innersloth/{Data => }/MapFlags.cs (65%) rename src/Impostor.Api/Innersloth/{Data => }/MapId.cs (82%) delete mode 100644 src/Impostor.Api/Innersloth/Net/IGameNet.cs rename src/Impostor.Api/Innersloth/{Net/Objects/Systems => }/SystemTypeHelpers.cs (93%) rename src/Impostor.Api/Innersloth/{Net/Objects/Systems => }/SystemTypes.cs (89%) create mode 100644 src/Impostor.Api/Net/Inner/IGameNet.cs create mode 100644 src/Impostor.Api/Net/Inner/IInnerNetObject.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/IInnerShipStatus.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/IInnerVoteBanSystem.cs rename src/{Impostor.Api => Impostor.Server}/Extensions/MessageReaderExtensions.cs (51%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/GameDataTag.cs (89%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/GameObject.cs (88%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/InnerNetObject.cs (70%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Components/InnerCustomNetworkTransform.cs (91%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Components/InnerPlayerPhysics.cs (85%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Components/InnerVoteBanSystem.cs (87%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerGameData.PlayerInfo.cs (93%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerGameData.TaskInfo.cs (86%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerGameData.cs (91%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerLobbyBehaviour.cs (69%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerMeetingHud.PlayerVoteArea.cs (93%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerMeetingHud.cs (92%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerPlayerControl.cs (96%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/InnerShipStatus.cs (90%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/IActivatable.cs (57%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ISystemType.cs (79%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/DoorsSystemType.cs (93%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/HudOverrideSystemType.cs (87%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/LifeSuppSystemType.cs (94%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/MedScanSystem.cs (91%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/ReactorSystemType.cs (94%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/SabotageSystemType.cs (89%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs (86%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/Objects/Systems/ShipStatus/SwitchSystem.cs (91%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/RpcCalls.cs (95%) rename src/{Impostor.Api/Innersloth/Net => Impostor.Server/Net/Inner}/SpawnFlags.cs (76%) create mode 100644 src/Impostor.Server/Net/State/GameNet.Api.cs diff --git a/src/Impostor.Api/Events/Game/Net/PlayerChatEvent.cs b/src/Impostor.Api/Events/Game/Net/PlayerChatEvent.cs index bbf0256..cac481c 100644 --- a/src/Impostor.Api/Events/Game/Net/PlayerChatEvent.cs +++ b/src/Impostor.Api/Events/Game/Net/PlayerChatEvent.cs @@ -1,11 +1,11 @@ using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net.Objects; +using Impostor.Api.Net.Inner.Objects; namespace Impostor.Api.Events.Net { public class PlayerChatEvent : IGameEvent { - public PlayerChatEvent(IGame game, InnerPlayerControl playerControl, string message) + public PlayerChatEvent(IGame game, IInnerPlayerControl playerControl, string message) { Game = game; PlayerControl = playerControl; @@ -14,7 +14,7 @@ namespace Impostor.Api.Events.Net public IGame Game { get; } - public InnerPlayerControl PlayerControl { get; } + public IInnerPlayerControl PlayerControl { get; } public string Message { get; } } diff --git a/src/Impostor.Api/Events/Game/Net/PlayerDestroyedEvent.cs b/src/Impostor.Api/Events/Game/Net/PlayerDestroyedEvent.cs index a3b2289..6d5d8c4 100644 --- a/src/Impostor.Api/Events/Game/Net/PlayerDestroyedEvent.cs +++ b/src/Impostor.Api/Events/Game/Net/PlayerDestroyedEvent.cs @@ -1,11 +1,11 @@ using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net.Objects; +using Impostor.Api.Net.Inner.Objects; namespace Impostor.Api.Events.Net { public class PlayerDestroyedEvent : IGameEvent { - public PlayerDestroyedEvent(IGame game, InnerPlayerControl playerControl) + public PlayerDestroyedEvent(IGame game, IInnerPlayerControl playerControl) { Game = game; PlayerControl = playerControl; @@ -13,6 +13,6 @@ namespace Impostor.Api.Events.Net public IGame Game { get; } - public InnerPlayerControl PlayerControl { get; } + public IInnerPlayerControl PlayerControl { get; } } } \ No newline at end of file diff --git a/src/Impostor.Api/Events/Game/Net/PlayerSpawnedEvent.cs b/src/Impostor.Api/Events/Game/Net/PlayerSpawnedEvent.cs index d91e0d1..9b1664a 100644 --- a/src/Impostor.Api/Events/Game/Net/PlayerSpawnedEvent.cs +++ b/src/Impostor.Api/Events/Game/Net/PlayerSpawnedEvent.cs @@ -1,11 +1,11 @@ using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net.Objects; +using Impostor.Api.Net.Inner.Objects; namespace Impostor.Api.Events.Net { public class PlayerSpawnedEvent : IGameEvent { - public PlayerSpawnedEvent(IGame game, InnerPlayerControl playerControl) + public PlayerSpawnedEvent(IGame game, IInnerPlayerControl playerControl) { Game = game; PlayerControl = playerControl; @@ -13,6 +13,6 @@ namespace Impostor.Api.Events.Net public IGame Game { get; } - public InnerPlayerControl PlayerControl { get; } + public IInnerPlayerControl PlayerControl { get; } } } \ No newline at end of file diff --git a/src/Impostor.Api/Extensions/SystemTypesExtensions.cs b/src/Impostor.Api/Extensions/SystemTypesExtensions.cs index e927e2e..68f1efd 100644 --- a/src/Impostor.Api/Extensions/SystemTypesExtensions.cs +++ b/src/Impostor.Api/Extensions/SystemTypesExtensions.cs @@ -1,4 +1,4 @@ -using Impostor.Api.Innersloth.Net.Objects.Systems; +using Impostor.Api.Innersloth; namespace Impostor.Api { diff --git a/src/Impostor.Api/Games/Extensions/GameManagerExtensions.cs b/src/Impostor.Api/Games/Extensions/GameManagerExtensions.cs index 1f4bd5d..9a5a2b4 100644 --- a/src/Impostor.Api/Games/Extensions/GameManagerExtensions.cs +++ b/src/Impostor.Api/Games/Extensions/GameManagerExtensions.cs @@ -1,6 +1,6 @@ using System.Linq; using Impostor.Api.Games.Managers; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; namespace Impostor.Api.Games { diff --git a/src/Impostor.Api/Games/IGame.cs b/src/Impostor.Api/Games/IGame.cs index b098f7d..17f67f1 100644 --- a/src/Impostor.Api/Games/IGame.cs +++ b/src/Impostor.Api/Games/IGame.cs @@ -2,9 +2,8 @@ using System.Net; using System.Threading.Tasks; using Impostor.Api.Innersloth; -using Impostor.Api.Innersloth.Data; -using Impostor.Api.Innersloth.Net; using Impostor.Api.Net; +using Impostor.Api.Net.Inner; using Impostor.Api.Net.Messages; namespace Impostor.Api.Games @@ -35,9 +34,6 @@ namespace Impostor.Api.Games IClientPlayer GetClientPlayer(int clientId); - T FindObjectByNetId(uint netId) - where T : InnerNetObject; - /// /// Send the message to all players. /// diff --git a/src/Impostor.Api/Innersloth/AlterGameTags.cs b/src/Impostor.Api/Innersloth/AlterGameTags.cs new file mode 100644 index 0000000..46d1b2e --- /dev/null +++ b/src/Impostor.Api/Innersloth/AlterGameTags.cs @@ -0,0 +1,7 @@ +namespace Impostor.Api.Innersloth +{ + public enum AlterGameTags : byte + { + ChangePrivacy = 1, + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Data/ChatNoteType.cs b/src/Impostor.Api/Innersloth/ChatNoteType.cs similarity index 62% rename from src/Impostor.Api/Innersloth/Data/ChatNoteType.cs rename to src/Impostor.Api/Innersloth/ChatNoteType.cs index 04c3278..c163601 100644 --- a/src/Impostor.Api/Innersloth/Data/ChatNoteType.cs +++ b/src/Impostor.Api/Innersloth/ChatNoteType.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { public enum ChatNoteType : byte { diff --git a/src/Impostor.Api/Innersloth/Data/AlterGameTags.cs b/src/Impostor.Api/Innersloth/Data/AlterGameTags.cs deleted file mode 100644 index ee13ae2..0000000 --- a/src/Impostor.Api/Innersloth/Data/AlterGameTags.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Impostor.Api.Innersloth.Data -{ - public enum AlterGameTags : byte - { - ChangePrivacy = 1 - } -} \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Data/DeathReason.cs b/src/Impostor.Api/Innersloth/DeathReason.cs similarity index 54% rename from src/Impostor.Api/Innersloth/Data/DeathReason.cs rename to src/Impostor.Api/Innersloth/DeathReason.cs index c473bfb..a07ac05 100644 --- a/src/Impostor.Api/Innersloth/Data/DeathReason.cs +++ b/src/Impostor.Api/Innersloth/DeathReason.cs @@ -1,9 +1,9 @@ -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { public enum DeathReason { Exile = 0, Kill = 1, - Disconnect = 2 + Disconnect = 2, } } \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Data/DisconnectReason.cs b/src/Impostor.Api/Innersloth/DisconnectReason.cs similarity index 96% rename from src/Impostor.Api/Innersloth/Data/DisconnectReason.cs rename to src/Impostor.Api/Innersloth/DisconnectReason.cs index e1a8e3a..9526f58 100644 --- a/src/Impostor.Api/Innersloth/Data/DisconnectReason.cs +++ b/src/Impostor.Api/Innersloth/DisconnectReason.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { public enum DisconnectReason { @@ -49,6 +49,6 @@ FocusLostBackground = 207, IntentionalLeaving = 208, FocusLost = 209, - NewConnection = 210 + NewConnection = 210, } } \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Data/GameKeywords.cs b/src/Impostor.Api/Innersloth/GameKeywords.cs similarity index 81% rename from src/Impostor.Api/Innersloth/Data/GameKeywords.cs rename to src/Impostor.Api/Innersloth/GameKeywords.cs index f3b37cc..bbb463f 100644 --- a/src/Impostor.Api/Innersloth/Data/GameKeywords.cs +++ b/src/Impostor.Api/Innersloth/GameKeywords.cs @@ -1,6 +1,6 @@ using System; -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { [Flags] public enum GameKeywords : uint @@ -14,6 +14,6 @@ namespace Impostor.Api.Innersloth.Data Arabic = 32, Filipone = 64, Polish = 128, - English = 256 + English = 256, } } \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/GameOptionsData.cs b/src/Impostor.Api/Innersloth/GameOptionsData.cs index 5ffc1ff..f58f191 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.Innersloth.Data; using Impostor.Api.Net.Messages; namespace Impostor.Api.Innersloth diff --git a/src/Impostor.Api/Innersloth/Data/GameStates.cs b/src/Impostor.Api/Innersloth/GameStates.cs similarity index 75% rename from src/Impostor.Api/Innersloth/Data/GameStates.cs rename to src/Impostor.Api/Innersloth/GameStates.cs index 986e2d2..8abc8c7 100644 --- a/src/Impostor.Api/Innersloth/Data/GameStates.cs +++ b/src/Impostor.Api/Innersloth/GameStates.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { public enum GameStates : byte { diff --git a/src/Impostor.Api/Innersloth/Data/MapFlags.cs b/src/Impostor.Api/Innersloth/MapFlags.cs similarity index 65% rename from src/Impostor.Api/Innersloth/Data/MapFlags.cs rename to src/Impostor.Api/Innersloth/MapFlags.cs index 66e0c95..ad462a2 100644 --- a/src/Impostor.Api/Innersloth/Data/MapFlags.cs +++ b/src/Impostor.Api/Innersloth/MapFlags.cs @@ -1,12 +1,12 @@ using System; -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { [Flags] public enum MapFlags { Skeld = 1, MiraHQ = 2, - Polus = 4 + Polus = 4, } } \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Data/MapId.cs b/src/Impostor.Api/Innersloth/MapId.cs similarity index 82% rename from src/Impostor.Api/Innersloth/Data/MapId.cs rename to src/Impostor.Api/Innersloth/MapId.cs index 97d79d4..c075d73 100644 --- a/src/Impostor.Api/Innersloth/Data/MapId.cs +++ b/src/Impostor.Api/Innersloth/MapId.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Data +namespace Impostor.Api.Innersloth { public static class MapId { diff --git a/src/Impostor.Api/Innersloth/Net/IGameNet.cs b/src/Impostor.Api/Innersloth/Net/IGameNet.cs deleted file mode 100644 index b1061f0..0000000 --- a/src/Impostor.Api/Innersloth/Net/IGameNet.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Impostor.Api.Innersloth.Net.Objects; -using Impostor.Api.Innersloth.Net.Objects.Components; - -namespace Impostor.Api.Innersloth.Net -{ - public interface IGameNet - { - InnerLobbyBehaviour LobbyBehaviour { get; } - - InnerGameData GameData { get; } - - InnerVoteBanSystem VoteBan { get; } - - InnerShipStatus ShipStatus { get; } - } -} \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypeHelpers.cs b/src/Impostor.Api/Innersloth/SystemTypeHelpers.cs similarity index 93% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypeHelpers.cs rename to src/Impostor.Api/Innersloth/SystemTypeHelpers.cs index 46e68ff..ad88c28 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypeHelpers.cs +++ b/src/Impostor.Api/Innersloth/SystemTypeHelpers.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -namespace Impostor.Api.Innersloth.Net.Objects.Systems +namespace Impostor.Api.Innersloth { internal class SystemTypeHelpers { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypes.cs b/src/Impostor.Api/Innersloth/SystemTypes.cs similarity index 89% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypes.cs rename to src/Impostor.Api/Innersloth/SystemTypes.cs index 0ff4220..7e600a1 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/SystemTypes.cs +++ b/src/Impostor.Api/Innersloth/SystemTypes.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Net.Objects.Systems +namespace Impostor.Api.Innersloth { public enum SystemTypes : byte { diff --git a/src/Impostor.Api/Net/IClientPlayer.cs b/src/Impostor.Api/Net/IClientPlayer.cs index dcb8fc4..1a21bc3 100644 --- a/src/Impostor.Api/Net/IClientPlayer.cs +++ b/src/Impostor.Api/Net/IClientPlayer.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net; -using Impostor.Api.Innersloth.Net.Objects; +using Impostor.Api.Net.Inner; +using Impostor.Api.Net.Inner.Objects; namespace Impostor.Api.Net { @@ -25,16 +25,16 @@ namespace Impostor.Api.Net /// LimboStates Limbo { get; set; } - InnerPlayerControl Character { get; } + IInnerPlayerControl Character { get; } public bool IsHost { get; } /// - /// Checks if the specified is owned by . + /// Checks if the specified is owned by . /// - /// The . + /// The . /// Returns true if owned by . - bool IsOwner(InnerNetObject netObject); + bool IsOwner(IInnerNetObject netObject); ValueTask KickAsync(); diff --git a/src/Impostor.Api/Net/Inner/IGameNet.cs b/src/Impostor.Api/Net/Inner/IGameNet.cs new file mode 100644 index 0000000..933a4de --- /dev/null +++ b/src/Impostor.Api/Net/Inner/IGameNet.cs @@ -0,0 +1,18 @@ +using Impostor.Api.Net.Inner.Objects; + +namespace Impostor.Api.Net.Inner +{ + /// + /// Holds all data that is serialized over the network through GameData packets. + /// + public interface IGameNet + { + IInnerLobbyBehaviour LobbyBehaviour { get; } + + IInnerGameData GameData { get; } + + IInnerVoteBanSystem VoteBan { get; } + + IInnerShipStatus ShipStatus { get; } + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/IInnerNetObject.cs b/src/Impostor.Api/Net/Inner/IInnerNetObject.cs new file mode 100644 index 0000000..c171377 --- /dev/null +++ b/src/Impostor.Api/Net/Inner/IInnerNetObject.cs @@ -0,0 +1,9 @@ +namespace Impostor.Api.Net.Inner +{ + public interface IInnerNetObject + { + public uint NetId { get; } + + public int OwnerId { get; } + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs new file mode 100644 index 0000000..f908289 --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs @@ -0,0 +1,7 @@ +namespace Impostor.Api.Net.Inner.Objects +{ + public interface IInnerGameData : IInnerNetObject + { + + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs new file mode 100644 index 0000000..98f0f40 --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs @@ -0,0 +1,7 @@ +namespace Impostor.Api.Net.Inner.Objects +{ + public interface IInnerLobbyBehaviour : IInnerNetObject + { + + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs new file mode 100644 index 0000000..1b5c3ba --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs @@ -0,0 +1,6 @@ +namespace Impostor.Api.Net.Inner.Objects +{ + public interface IInnerPlayerControl + { + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerShipStatus.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerShipStatus.cs new file mode 100644 index 0000000..c0a05ae --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerShipStatus.cs @@ -0,0 +1,7 @@ +namespace Impostor.Api.Net.Inner.Objects +{ + public interface IInnerShipStatus : IInnerNetObject + { + + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerVoteBanSystem.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerVoteBanSystem.cs new file mode 100644 index 0000000..d0a816d --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerVoteBanSystem.cs @@ -0,0 +1,7 @@ +namespace Impostor.Api.Net.Inner.Objects +{ + public interface IInnerVoteBanSystem : IInnerNetObject + { + + } +} \ No newline at end of file diff --git a/src/Impostor.Api/Net/LimboStates.cs b/src/Impostor.Api/Net/LimboStates.cs index d6e66bd..44c493e 100644 --- a/src/Impostor.Api/Net/LimboStates.cs +++ b/src/Impostor.Api/Net/LimboStates.cs @@ -8,6 +8,6 @@ namespace Impostor.Api.Net PreSpawn = 1, NotLimbo = 2, WaitingForHost = 4, - All = PreSpawn | NotLimbo | WaitingForHost + All = PreSpawn | NotLimbo | WaitingForHost, } } \ No newline at end of file diff --git a/src/Impostor.Api/Net/Messages/C2S/Message10AlterGameC2S.cs b/src/Impostor.Api/Net/Messages/C2S/Message10AlterGameC2S.cs index dd143c0..330f3b5 100644 --- a/src/Impostor.Api/Net/Messages/C2S/Message10AlterGameC2S.cs +++ b/src/Impostor.Api/Net/Messages/C2S/Message10AlterGameC2S.cs @@ -1,4 +1,4 @@ -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; namespace Impostor.Api.Net.Messages.C2S { diff --git a/src/Impostor.Api/Net/Messages/S2C/Message01JoinGameS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message01JoinGameS2C.cs index e683815..c455201 100644 --- a/src/Impostor.Api/Net/Messages/S2C/Message01JoinGameS2C.cs +++ b/src/Impostor.Api/Net/Messages/S2C/Message01JoinGameS2C.cs @@ -1,5 +1,5 @@ using System; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; namespace Impostor.Api.Net.Messages.S2C { diff --git a/src/Impostor.Api/Net/Messages/S2C/Message04RemovePlayerS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message04RemovePlayerS2C.cs index abbb844..77b447d 100644 --- a/src/Impostor.Api/Net/Messages/S2C/Message04RemovePlayerS2C.cs +++ b/src/Impostor.Api/Net/Messages/S2C/Message04RemovePlayerS2C.cs @@ -1,4 +1,4 @@ -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; namespace Impostor.Api.Net.Messages.S2C { diff --git a/src/Impostor.Api/Net/Messages/S2C/Message10AlterGameS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message10AlterGameS2C.cs index 469cd84..fa155df 100644 --- a/src/Impostor.Api/Net/Messages/S2C/Message10AlterGameS2C.cs +++ b/src/Impostor.Api/Net/Messages/S2C/Message10AlterGameS2C.cs @@ -1,4 +1,4 @@ -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; namespace Impostor.Api.Net.Messages.S2C { diff --git a/src/Impostor.Api/Plugins/IPlugin.cs b/src/Impostor.Api/Plugins/IPlugin.cs index a4c3a55..fd0f38f 100644 --- a/src/Impostor.Api/Plugins/IPlugin.cs +++ b/src/Impostor.Api/Plugins/IPlugin.cs @@ -1,7 +1,5 @@ using System.Threading.Tasks; using Impostor.Api.Events; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; namespace Impostor.Api.Plugins { diff --git a/src/Impostor.Server/Events/EventManager.cs b/src/Impostor.Server/Events/EventManager.cs index e5139d4..438c1c2 100644 --- a/src/Impostor.Server/Events/EventManager.cs +++ b/src/Impostor.Server/Events/EventManager.cs @@ -2,7 +2,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Threading.Tasks; using Impostor.Api.Events; using Impostor.Api.Events.Managers; diff --git a/src/Impostor.Server/Events/Register/TemporaryEventRegister.cs b/src/Impostor.Server/Events/Register/TemporaryEventRegister.cs index 52cf629..1446ad1 100644 --- a/src/Impostor.Server/Events/Register/TemporaryEventRegister.cs +++ b/src/Impostor.Server/Events/Register/TemporaryEventRegister.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; -using Impostor.Api.Events; namespace Impostor.Server.Events.Register { diff --git a/src/Impostor.Api/Extensions/MessageReaderExtensions.cs b/src/Impostor.Server/Extensions/MessageReaderExtensions.cs similarity index 51% rename from src/Impostor.Api/Extensions/MessageReaderExtensions.cs rename to src/Impostor.Server/Extensions/MessageReaderExtensions.cs index 94e7d99..5f25e89 100644 --- a/src/Impostor.Api/Extensions/MessageReaderExtensions.cs +++ b/src/Impostor.Server/Extensions/MessageReaderExtensions.cs @@ -1,12 +1,12 @@ -using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net; -using Impostor.Api.Net.Messages; +using Impostor.Api.Net.Messages; +using Impostor.Server.Net.Inner; +using Impostor.Server.Net.State; -namespace Impostor.Api +namespace Impostor.Server { - public static class MessageReaderExtensions + internal static class MessageReaderExtensions { - public static T ReadNetObject(this IMessageReader reader, IGame game) + public static T ReadNetObject(this IMessageReader reader, Game game) where T : InnerNetObject { return game.FindObjectByNetId(reader.ReadPackedUInt32()); diff --git a/src/Impostor.Server/Extensions/NodeLocatorExtensions.cs b/src/Impostor.Server/Extensions/NodeLocatorExtensions.cs index 671017d..370bca6 100644 --- a/src/Impostor.Server/Extensions/NodeLocatorExtensions.cs +++ b/src/Impostor.Server/Extensions/NodeLocatorExtensions.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; - +using System.Threading.Tasks; using Impostor.Server.Net.Redirector; -namespace Impostor.Server.Extensions +namespace Impostor.Server { public static class NodeLocatorExtensions { diff --git a/src/Impostor.Server/Net/Client.cs b/src/Impostor.Server/Net/Client.cs index 65defdf..cceb48c 100644 --- a/src/Impostor.Server/Net/Client.cs +++ b/src/Impostor.Server/Net/Client.cs @@ -3,14 +3,12 @@ using System.Threading.Tasks; using Impostor.Api; using Impostor.Api.Games; using Impostor.Api.Innersloth; -using Impostor.Api.Innersloth.Data; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; using Impostor.Hazel; using Impostor.Server.Config; -using Impostor.Server.Net.Hazel; using Impostor.Server.Net.Manager; using Microsoft.Extensions.Logging; diff --git a/src/Impostor.Server/Net/Factories/ClientFactory.cs b/src/Impostor.Server/Net/Factories/ClientFactory.cs index c04044c..ad1fdc7 100644 --- a/src/Impostor.Server/Net/Factories/ClientFactory.cs +++ b/src/Impostor.Server/Net/Factories/ClientFactory.cs @@ -1,6 +1,5 @@ using System; using Impostor.Api.Net; -using Impostor.Server.Net.Hazel; using Microsoft.Extensions.DependencyInjection; namespace Impostor.Server.Net.Factories diff --git a/src/Impostor.Api/Innersloth/Net/GameDataTag.cs b/src/Impostor.Server/Net/Inner/GameDataTag.cs similarity index 89% rename from src/Impostor.Api/Innersloth/Net/GameDataTag.cs rename to src/Impostor.Server/Net/Inner/GameDataTag.cs index ae2c879..fa9ddb8 100644 --- a/src/Impostor.Api/Innersloth/Net/GameDataTag.cs +++ b/src/Impostor.Server/Net/Inner/GameDataTag.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Net +namespace Impostor.Server.Net.Inner { public static class GameDataTag { diff --git a/src/Impostor.Api/Innersloth/Net/GameObject.cs b/src/Impostor.Server/Net/Inner/GameObject.cs similarity index 88% rename from src/Impostor.Api/Innersloth/Net/GameObject.cs rename to src/Impostor.Server/Net/Inner/GameObject.cs index c58e4fb..9b53d70 100644 --- a/src/Impostor.Api/Innersloth/Net/GameObject.cs +++ b/src/Impostor.Server/Net/Inner/GameObject.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -namespace Impostor.Api.Innersloth.Net +namespace Impostor.Server.Net.Inner { - public class GameObject + internal class GameObject { public GameObject() { diff --git a/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs b/src/Impostor.Server/Net/Inner/InnerNetObject.cs similarity index 70% rename from src/Impostor.Api/Innersloth/Net/InnerNetObject.cs rename to src/Impostor.Server/Net/Inner/InnerNetObject.cs index dc877a2..78f1a55 100644 --- a/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs +++ b/src/Impostor.Server/Net/Inner/InnerNetObject.cs @@ -1,10 +1,12 @@ using System.Threading.Tasks; using Impostor.Api.Net; +using Impostor.Api.Net.Inner; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.State; -namespace Impostor.Api.Innersloth.Net +namespace Impostor.Server.Net.Inner { - public abstract class InnerNetObject : GameObject + internal abstract class InnerNetObject : GameObject, IInnerNetObject { private const int HostInheritId = -2; @@ -14,7 +16,7 @@ namespace Impostor.Api.Innersloth.Net public SpawnFlags SpawnFlags { get; internal set; } - public abstract ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader); + public abstract ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader); public abstract bool Serialize(IMessageWriter writer, bool initialState); diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs similarity index 91% rename from src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs rename to src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs index ae5f6fe..75e331e 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs @@ -1,13 +1,15 @@ -using System; -using System.Numerics; +using System.Numerics; 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; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects.Components +namespace Impostor.Server.Net.Inner.Objects.Components { - public class InnerCustomNetworkTransform : InnerNetObject + internal class InnerCustomNetworkTransform : InnerNetObject { private static readonly FloatRange XRange = new FloatRange(-40f, 40f); private static readonly FloatRange YRange = new FloatRange(-40f, 40f); @@ -46,7 +48,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components return new Vector2(XRange.Lerp(v1), YRange.Lerp(v2)); } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader) { if (call == RpcCalls.SnapTo) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs similarity index 85% rename from src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs rename to src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs index 5b1e883..08738f7 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs @@ -1,12 +1,14 @@ using System; using System.Threading.Tasks; +using Impostor.Api; using Impostor.Api.Net; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.State; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects.Components +namespace Impostor.Server.Net.Inner.Objects.Components { - public class InnerPlayerPhysics : InnerNetObject + internal class InnerPlayerPhysics : InnerNetObject { private readonly ILogger _logger; @@ -15,7 +17,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components _logger = logger; } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader) { if (call != RpcCalls.EnterVent && call != RpcCalls.ExitVent) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs similarity index 87% rename from src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs rename to src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs index 4b20af9..58b9b54 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs @@ -1,13 +1,16 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Impostor.Api; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.State; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects.Components +namespace Impostor.Server.Net.Inner.Objects.Components { - public class InnerVoteBanSystem : InnerNetObject + internal class InnerVoteBanSystem : InnerNetObject, IInnerVoteBanSystem { private readonly ILogger _logger; private readonly Dictionary _votes; @@ -18,7 +21,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components _votes = new Dictionary(); } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader) { if (call != RpcCalls.AddVote) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.PlayerInfo.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.PlayerInfo.cs similarity index 93% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.PlayerInfo.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerGameData.PlayerInfo.cs index 7ddd8a3..677aa5f 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.PlayerInfo.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.PlayerInfo.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public partial class InnerGameData + internal partial class InnerGameData { public class PlayerInfo { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.TaskInfo.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs similarity index 86% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.TaskInfo.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs index cdca500..5dfa5c2 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.TaskInfo.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.TaskInfo.cs @@ -1,8 +1,8 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public partial class InnerGameData + internal partial class InnerGameData { public class TaskInfo { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs similarity index 91% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs index 0ecd4df..04cf1cd 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs @@ -2,22 +2,24 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; -using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net.Objects.Components; +using Impostor.Api; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.Inner.Objects.Components; +using Impostor.Server.Net.State; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public partial class InnerGameData : InnerNetObject + internal partial class InnerGameData : InnerNetObject, IInnerGameData { private readonly ILogger _logger; - private readonly IGame _game; + private readonly Game _game; private readonly ConcurrentDictionary _allPlayers; - public InnerGameData(ILogger logger, IGame game, IServiceProvider serviceProvider) + public InnerGameData(ILogger logger, Game game, IServiceProvider serviceProvider) { _logger = logger; _game = game; @@ -41,7 +43,8 @@ namespace Impostor.Api.Innersloth.Net.Objects return _allPlayers.TryGetValue(id, out var player) ? player : null; } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, + IMessageReader reader) { switch (call) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs b/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs similarity index 69% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs index eac946e..63448ed 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs @@ -1,11 +1,13 @@ using System.Threading.Tasks; using Impostor.Api.Games; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.State; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public class InnerLobbyBehaviour : InnerNetObject + internal class InnerLobbyBehaviour : InnerNetObject, IInnerLobbyBehaviour { private readonly IGame _game; @@ -16,8 +18,7 @@ namespace Impostor.Api.Innersloth.Net.Objects Components.Add(this); } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, - IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader) { throw new System.NotImplementedException(); } diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.PlayerVoteArea.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs similarity index 93% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.PlayerVoteArea.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs index 82f0ef6..fbf2510 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.PlayerVoteArea.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs @@ -1,8 +1,8 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public partial class InnerMeetingHud + internal partial class InnerMeetingHud { public class PlayerVoteArea { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs similarity index 92% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs index 51d918d..42c9518 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs @@ -1,21 +1,22 @@ using System; using System.Linq; using System.Threading.Tasks; -using Impostor.Api.Games; +using Impostor.Api; using Impostor.Api.Net; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.State; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public partial class InnerMeetingHud : InnerNetObject + internal partial class InnerMeetingHud : InnerNetObject { private readonly ILogger _logger; - private readonly IGame _game; - private readonly IGameNet _gameNet; + private readonly Game _game; + private readonly GameNet _gameNet; private PlayerVoteArea[] _playerStates; - public InnerMeetingHud(ILogger logger, IGame game) + public InnerMeetingHud(ILogger logger, Game game) { _logger = logger; _game = game; @@ -39,7 +40,8 @@ namespace Impostor.Api.Innersloth.Net.Objects .ToArray(); } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, + IMessageReader reader) { switch (call) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs similarity index 96% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs index 6650ce7..d761771 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs @@ -1,24 +1,26 @@ using System; using System.Threading.Tasks; +using Impostor.Api; using Impostor.Api.Events.Managers; using Impostor.Api.Events.Net; -using Impostor.Api.Games; -using Impostor.Api.Innersloth.Data; -using Impostor.Api.Innersloth.Net.Objects.Components; +using Impostor.Api.Innersloth; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.Inner.Objects.Components; +using Impostor.Server.Net.State; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public class InnerPlayerControl : InnerNetObject + internal class InnerPlayerControl : InnerNetObject, IInnerPlayerControl { private readonly ILogger _logger; private readonly IEventManager _eventManager; - private readonly IGame _game; + private readonly Game _game; - public InnerPlayerControl(ILogger logger, IServiceProvider serviceProvider, IEventManager eventManager, IGame game) + public InnerPlayerControl(ILogger logger, IServiceProvider serviceProvider, IEventManager eventManager, Game game) { _logger = logger; _eventManager = eventManager; @@ -37,7 +39,8 @@ namespace Impostor.Api.Innersloth.Net.Objects public InnerGameData.PlayerInfo PlayerInfo { get; internal set; } - public override async ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, + IMessageReader reader) { switch (call) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs b/src/Impostor.Server/Net/Inner/Objects/InnerShipStatus.cs similarity index 90% rename from src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs rename to src/Impostor.Server/Net/Inner/Objects/InnerShipStatus.cs index a33bd65..cab8be1 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerShipStatus.cs @@ -1,22 +1,25 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net.Objects.Systems; -using Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus; +using Impostor.Api; +using Impostor.Api.Innersloth; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages; +using Impostor.Server.Net.Inner.Objects.Systems; +using Impostor.Server.Net.Inner.Objects.Systems.ShipStatus; +using Impostor.Server.Net.State; using Microsoft.Extensions.Logging; -namespace Impostor.Api.Innersloth.Net.Objects +namespace Impostor.Server.Net.Inner.Objects { - public class InnerShipStatus : InnerNetObject + internal class InnerShipStatus : InnerNetObject, IInnerShipStatus { private readonly ILogger _logger; - private readonly IGame _game; + private readonly Game _game; private readonly Dictionary _systems; - public InnerShipStatus(ILogger logger, IGame game) + public InnerShipStatus(ILogger logger, Game game) { _logger = logger; _game = game; @@ -43,7 +46,8 @@ namespace Impostor.Api.Innersloth.Net.Objects Components.Add(this); } - public override ValueTask HandleRpc(IClientPlayer sender, IClientPlayer? target, RpcCalls call, IMessageReader reader) + public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, + IMessageReader reader) { switch (call) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/IActivatable.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/IActivatable.cs similarity index 57% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/IActivatable.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/IActivatable.cs index eaae0a2..e595b25 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/IActivatable.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/IActivatable.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Net.Objects.Systems +namespace Impostor.Server.Net.Inner.Objects.Systems { public interface IActivatable { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ISystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs similarity index 79% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ISystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs index 0b25e94..a6ef88e 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ISystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ISystemType.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems +namespace Impostor.Server.Net.Inner.Objects.Systems { public interface ISystemType { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/DoorsSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs similarity index 93% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/DoorsSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs index 05a2916..fc01578 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/DoorsSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/DoorsSystemType.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using Impostor.Api.Games; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class DoorsSystemType : ISystemType { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/HudOverrideSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs similarity index 87% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/HudOverrideSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs index fe29bb0..42aa8d3 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/HudOverrideSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/HudOverrideSystemType.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class HudOverrideSystemType : ISystemType, IActivatable { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/LifeSuppSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs similarity index 94% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/LifeSuppSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs index fd8b01a..f644024 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/LifeSuppSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/LifeSuppSystemType.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class LifeSuppSystemType : ISystemType, IActivatable { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/MedScanSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs similarity index 91% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/MedScanSystem.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs index f93fb8e..007b9d0 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/MedScanSystem.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/MedScanSystem.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class MedScanSystem : ISystemType { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/ReactorSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs similarity index 94% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/ReactorSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs index d3f1973..4380918 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/ReactorSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/ReactorSystemType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class ReactorSystemType : ISystemType, IActivatable { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SabotageSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs similarity index 89% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SabotageSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs index f442b91..193cfe8 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SabotageSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SabotageSystemType.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class SabotageSystemType : ISystemType { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs similarity index 86% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs index 4e16b31..df41b68 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SecurityCameraSystemType.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class SecurityCameraSystemType : ISystemType { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SwitchSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs similarity index 91% rename from src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SwitchSystem.cs rename to src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs index 6d46d01..925774a 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Systems/ShipStatus/SwitchSystem.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Systems/ShipStatus/SwitchSystem.cs @@ -1,6 +1,6 @@ using Impostor.Api.Net.Messages; -namespace Impostor.Api.Innersloth.Net.Objects.Systems.ShipStatus +namespace Impostor.Server.Net.Inner.Objects.Systems.ShipStatus { public class SwitchSystem : ISystemType, IActivatable { diff --git a/src/Impostor.Api/Innersloth/Net/RpcCalls.cs b/src/Impostor.Server/Net/Inner/RpcCalls.cs similarity index 95% rename from src/Impostor.Api/Innersloth/Net/RpcCalls.cs rename to src/Impostor.Server/Net/Inner/RpcCalls.cs index 86d068c..ce48965 100644 --- a/src/Impostor.Api/Innersloth/Net/RpcCalls.cs +++ b/src/Impostor.Server/Net/Inner/RpcCalls.cs @@ -1,4 +1,4 @@ -namespace Impostor.Api.Innersloth.Net +namespace Impostor.Server.Net.Inner { public enum RpcCalls : byte { diff --git a/src/Impostor.Api/Innersloth/Net/SpawnFlags.cs b/src/Impostor.Server/Net/Inner/SpawnFlags.cs similarity index 76% rename from src/Impostor.Api/Innersloth/Net/SpawnFlags.cs rename to src/Impostor.Server/Net/Inner/SpawnFlags.cs index 0372196..1860098 100644 --- a/src/Impostor.Api/Innersloth/Net/SpawnFlags.cs +++ b/src/Impostor.Server/Net/Inner/SpawnFlags.cs @@ -1,6 +1,6 @@ using System; -namespace Impostor.Api.Innersloth.Net +namespace Impostor.Server.Net.Inner { [Flags] public enum SpawnFlags : byte diff --git a/src/Impostor.Server/Net/Manager/ClientManager.cs b/src/Impostor.Server/Net/Manager/ClientManager.cs index f6d4c40..828ca60 100644 --- a/src/Impostor.Server/Net/Manager/ClientManager.cs +++ b/src/Impostor.Server/Net/Manager/ClientManager.cs @@ -3,7 +3,6 @@ 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.Manager; using Impostor.Api.Net.Messages; @@ -11,7 +10,6 @@ using Impostor.Api.Net.Messages.S2C; using Impostor.Hazel; using Impostor.Server.Config; using Impostor.Server.Net.Factories; -using Impostor.Server.Net.Hazel; using Microsoft.Extensions.Logging; namespace Impostor.Server.Net.Manager diff --git a/src/Impostor.Server/Net/Manager/GameManager.cs b/src/Impostor.Server/Net/Manager/GameManager.cs index a7ea1dc..1cf68fa 100644 --- a/src/Impostor.Server/Net/Manager/GameManager.cs +++ b/src/Impostor.Server/Net/Manager/GameManager.cs @@ -10,9 +10,7 @@ using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Games.Managers; using Impostor.Api.Innersloth; -using Impostor.Api.Innersloth.Data; using Impostor.Server.Config; -using Impostor.Server.Extensions; using Impostor.Server.Net.Redirector; using Impostor.Server.Net.State; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs index cab531b..3dad4b3 100644 --- a/src/Impostor.Server/Net/Redirector/ClientRedirector.cs +++ b/src/Impostor.Server/Net/Redirector/ClientRedirector.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Impostor.Api.Innersloth; -using Impostor.Api.Innersloth.Data; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.C2S; using Impostor.Api.Net.Messages.S2C; diff --git a/src/Impostor.Server/Net/State/ClientPlayer.Api.cs b/src/Impostor.Server/Net/State/ClientPlayer.Api.cs index b8b48f5..e617cfb 100644 --- a/src/Impostor.Server/Net/State/ClientPlayer.Api.cs +++ b/src/Impostor.Server/Net/State/ClientPlayer.Api.cs @@ -1,5 +1,6 @@ using Impostor.Api.Games; using Impostor.Api.Net; +using Impostor.Api.Net.Inner.Objects; namespace Impostor.Server.Net.State { @@ -10,5 +11,8 @@ namespace Impostor.Server.Net.State /// IGame IClientPlayer.Game => Game; + + /// + IInnerPlayerControl IClientPlayer.Character => Character; } } \ No newline at end of file diff --git a/src/Impostor.Server/Net/State/ClientPlayer.cs b/src/Impostor.Server/Net/State/ClientPlayer.cs index 86a6a21..5f2dc93 100644 --- a/src/Impostor.Server/Net/State/ClientPlayer.cs +++ b/src/Impostor.Server/Net/State/ClientPlayer.cs @@ -1,9 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Impostor.Api.Innersloth.Net; -using Impostor.Api.Innersloth.Net.Objects; using Impostor.Api.Net; +using Impostor.Api.Net.Inner; +using Impostor.Server.Net.Inner.Objects; using Microsoft.Extensions.Logging; namespace Impostor.Server.Net.State @@ -48,7 +48,7 @@ namespace Impostor.Server.Net.State } /// - public bool IsOwner(InnerNetObject netObject) + public bool IsOwner(IInnerNetObject netObject) { return Client.Id == netObject.OwnerId; } diff --git a/src/Impostor.Server/Net/State/Game.Api.cs b/src/Impostor.Server/Net/State/Game.Api.cs index f7c73fb..0a764e3 100644 --- a/src/Impostor.Server/Net/State/Game.Api.cs +++ b/src/Impostor.Server/Net/State/Game.Api.cs @@ -1,6 +1,6 @@ using Impostor.Api.Games; -using Impostor.Api.Innersloth.Net; using Impostor.Api.Net; +using Impostor.Api.Net.Inner; 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 b327edc..f3a8ff9 100644 --- a/src/Impostor.Server/Net/State/Game.Data.cs +++ b/src/Impostor.Server/Net/State/Game.Data.cs @@ -4,13 +4,13 @@ using System.Threading; using System.Threading.Tasks; using Impostor.Api; using Impostor.Api.Events.Net; -using Impostor.Api.Innersloth.Data; -using Impostor.Api.Innersloth.Net; -using Impostor.Api.Innersloth.Net.Objects; -using Impostor.Api.Innersloth.Net.Objects.Components; +using Impostor.Api.Innersloth; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; using Impostor.Hazel; +using Impostor.Server.Net.Inner; +using Impostor.Server.Net.Inner.Objects; +using Impostor.Server.Net.Inner.Objects.Components; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -237,7 +237,7 @@ namespace Impostor.Server.Net.State var netId = reader.ReadPackedUInt32(); if (_allObjectsFast.TryGetValue(netId, out var obj)) { - obj.HandleRpc(sender, target, (RpcCalls) reader.ReadByte(), reader); + await obj.HandleRpc(sender, target, (RpcCalls) reader.ReadByte(), reader); } else { diff --git a/src/Impostor.Server/Net/State/Game.Incoming.cs b/src/Impostor.Server/Net/State/Game.Incoming.cs index 308bed4..4d1342b 100644 --- a/src/Impostor.Server/Net/State/Game.Incoming.cs +++ b/src/Impostor.Server/Net/State/Game.Incoming.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using Impostor.Api.Games; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Hazel; diff --git a/src/Impostor.Server/Net/State/Game.Outgoing.cs b/src/Impostor.Server/Net/State/Game.Outgoing.cs index ca77abe..3f2ef68 100644 --- a/src/Impostor.Server/Net/State/Game.Outgoing.cs +++ b/src/Impostor.Server/Net/State/Game.Outgoing.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; diff --git a/src/Impostor.Server/Net/State/Game.State.cs b/src/Impostor.Server/Net/State/Game.State.cs index bfa9893..27b65a8 100644 --- a/src/Impostor.Server/Net/State/Game.State.cs +++ b/src/Impostor.Server/Net/State/Game.State.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Impostor.Api; using Impostor.Api.Events; -using Impostor.Api.Innersloth.Data; +using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Hazel; diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs index 01c7903..b48a5b2 100644 --- a/src/Impostor.Server/Net/State/Game.cs +++ b/src/Impostor.Server/Net/State/Game.cs @@ -7,8 +7,6 @@ using System.Threading.Tasks; using Impostor.Api.Events.Managers; using Impostor.Api.Games; using Impostor.Api.Innersloth; -using Impostor.Api.Innersloth.Data; -using Impostor.Api.Innersloth.Net; using Impostor.Api.Net; using Impostor.Api.Net.Messages; using Impostor.Api.Net.Messages.S2C; diff --git a/src/Impostor.Server/Net/State/GameNet.Api.cs b/src/Impostor.Server/Net/State/GameNet.Api.cs new file mode 100644 index 0000000..34ea0fe --- /dev/null +++ b/src/Impostor.Server/Net/State/GameNet.Api.cs @@ -0,0 +1,17 @@ +using Impostor.Api.Net.Inner; +using Impostor.Api.Net.Inner.Objects; + +namespace Impostor.Server.Net.State +{ + /// + internal partial class GameNet : IGameNet + { + IInnerLobbyBehaviour IGameNet.LobbyBehaviour => LobbyBehaviour; + + IInnerGameData IGameNet.GameData => GameData; + + IInnerVoteBanSystem IGameNet.VoteBan => VoteBan; + + IInnerShipStatus IGameNet.ShipStatus => ShipStatus; + } +} \ No newline at end of file diff --git a/src/Impostor.Server/Net/State/GameNet.cs b/src/Impostor.Server/Net/State/GameNet.cs index f29aa32..c5542f9 100644 --- a/src/Impostor.Server/Net/State/GameNet.cs +++ b/src/Impostor.Server/Net/State/GameNet.cs @@ -1,13 +1,9 @@ -using Impostor.Api.Innersloth.Net; -using Impostor.Api.Innersloth.Net.Objects; -using Impostor.Api.Innersloth.Net.Objects.Components; +using Impostor.Server.Net.Inner.Objects; +using Impostor.Server.Net.Inner.Objects.Components; namespace Impostor.Server.Net.State { - /// - /// Holds all data that is serialized over the network through GameData packets. - /// - public class GameNet : IGameNet + internal partial class GameNet { public InnerLobbyBehaviour LobbyBehaviour { get; internal set; } -- 2.39.5