From 2ea5aec101513f14fb8a3cb83fb15a8a8f142559 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Sun, 20 Jun 2021 22:43:54 -0700 Subject: [PATCH] Remove NetMessage deprecated boilerplate (#4196) --- .../Managers/AdminMenuManager.cs | 4 +- .../Managers/ClientAdminManager.cs | 2 +- Content.Client/Chat/Managers/ChatManager.cs | 4 +- Content.Client/Eui/EuiManager.cs | 6 +-- .../Managers/ClientNotifyManager.cs | 6 +-- .../Preferences/ClientPreferencesManager.cs | 9 ++--- Content.Client/Sandbox/SandboxManager.cs | 11 +++--- .../Managers/StationEventManager.cs | 4 +- Content.Client/Voting/VoteManager.cs | 4 +- .../Administration/Managers/AdminManager.cs | 6 +-- Content.Server/Chat/Managers/ChatManager.cs | 4 +- Content.Server/EUI/EuiManager.cs | 6 +-- .../Managers/ServerNotifyManager.cs | 6 +-- .../Managers/ServerPreferencesManager.cs | 11 ++---- Content.Server/Sandbox/SandboxManager.cs | 10 ++--- .../StationEvents/StationEventSystem.cs | 4 +- Content.Server/Voting/Managers/VoteManager.cs | 4 +- .../Menu/AdminMenuPlayerListMessage.cs | 6 +-- .../Menu/AdminMenuPlayerListRequest.cs | 6 +-- .../Administration/MsgUpdateAdminStatus.cs | 9 +---- .../Chat/ChatMaxMsgLengthMessage.cs | 8 +--- Content.Shared/Chat/MsgChatMessage.cs | 8 +--- Content.Shared/Eui/MsgEuiCtl.cs | 9 +---- Content.Shared/Eui/MsgEuiMessage.cs | 9 +---- Content.Shared/Eui/MsgEuiState.cs | 9 +---- .../Managers/SharedNotifyManager.cs | 24 ++---------- .../Components/SharedButcherableComponent.cs | 2 +- .../Preferences/MsgDeleteCharacter.cs | 9 +---- .../Preferences/MsgPreferencesAndSettings.cs | 9 +---- .../Preferences/MsgSelectCharacter.cs | 9 +---- .../Preferences/MsgUpdateCharacter.cs | 9 +---- .../Sandbox/SharedSandboxManager.cs | 37 +++---------------- .../StationEvents/MsgRequestStationEvents.cs | 8 +--- .../StationEvents/MsgStationEvents.cs | 8 +--- .../Stunnable/SharedStunnableComponent.cs | 4 -- Content.Shared/Voting/MsgVoteCanCall.cs | 9 +---- Content.Shared/Voting/MsgVoteData.cs | 9 +---- 37 files changed, 73 insertions(+), 229 deletions(-) diff --git a/Content.Client/Administration/Managers/AdminMenuManager.cs b/Content.Client/Administration/Managers/AdminMenuManager.cs index 198b413b7a..38bc3b0abb 100644 --- a/Content.Client/Administration/Managers/AdminMenuManager.cs +++ b/Content.Client/Administration/Managers/AdminMenuManager.cs @@ -25,8 +25,8 @@ namespace Content.Client.Administration.Managers public void Initialize() { - _netManager.RegisterNetMessage(AdminMenuPlayerListRequest.NAME); - _netManager.RegisterNetMessage(AdminMenuPlayerListMessage.NAME, HandlePlayerListMessage); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(HandlePlayerListMessage); _commandWindows = new List(); // Reset the AdminMenu Window on disconnect diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs index f6955bef48..f34487932e 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -55,7 +55,7 @@ namespace Content.Client.Administration.Managers public void Initialize() { - _netMgr.RegisterNetMessage(MsgUpdateAdminStatus.NAME, UpdateMessageRx); + _netMgr.RegisterNetMessage(UpdateMessageRx); } private void UpdateMessageRx(MsgUpdateAdminStatus message) diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 2647db7659..5f77e97c15 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -127,8 +127,8 @@ namespace Content.Client.Chat.Managers public void Initialize() { - _netManager.RegisterNetMessage(MsgChatMessage.NAME, OnChatMessage); - _netManager.RegisterNetMessage(ChatMaxMsgLengthMessage.NAME, OnMaxLengthReceived); + _netManager.RegisterNetMessage(OnChatMessage); + _netManager.RegisterNetMessage(OnMaxLengthReceived); _speechBubbleRoot = new LayoutContainer(); LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide); diff --git a/Content.Client/Eui/EuiManager.cs b/Content.Client/Eui/EuiManager.cs index b52571e9a1..43e57c8bd3 100644 --- a/Content.Client/Eui/EuiManager.cs +++ b/Content.Client/Eui/EuiManager.cs @@ -17,9 +17,9 @@ namespace Content.Client.Eui public void Initialize() { - _net.RegisterNetMessage(MsgEuiCtl.NAME, RxMsgCtl); - _net.RegisterNetMessage(MsgEuiState.NAME, RxMsgState); - _net.RegisterNetMessage(MsgEuiMessage.NAME, RxMsgMessage); + _net.RegisterNetMessage(RxMsgCtl); + _net.RegisterNetMessage(RxMsgState); + _net.RegisterNetMessage(RxMsgMessage); } private void RxMsgMessage(MsgEuiMessage message) diff --git a/Content.Client/Notifications/Managers/ClientNotifyManager.cs b/Content.Client/Notifications/Managers/ClientNotifyManager.cs index 3e2a3ca573..4ba044ed9f 100644 --- a/Content.Client/Notifications/Managers/ClientNotifyManager.cs +++ b/Content.Client/Notifications/Managers/ClientNotifyManager.cs @@ -34,9 +34,9 @@ namespace Content.Client.Notifications.Managers { DebugTools.Assert(!_initialized); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyCursor), DoNotifyCursor); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyCoordinates), DoNotifyCoordinates); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyEntity), DoNotifyEntity); + _netManager.RegisterNetMessage(DoNotifyCursor); + _netManager.RegisterNetMessage(DoNotifyCoordinates); + _netManager.RegisterNetMessage(DoNotifyEntity); _initialized = true; } diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs index d62b95d5c2..60665757f6 100644 --- a/Content.Client/Preferences/ClientPreferencesManager.cs +++ b/Content.Client/Preferences/ClientPreferencesManager.cs @@ -24,11 +24,10 @@ namespace Content.Client.Preferences public void Initialize() { - _netManager.RegisterNetMessage(nameof(MsgPreferencesAndSettings), - HandlePreferencesAndSettings); - _netManager.RegisterNetMessage(nameof(MsgUpdateCharacter)); - _netManager.RegisterNetMessage(nameof(MsgSelectCharacter)); - _netManager.RegisterNetMessage(nameof(MsgDeleteCharacter)); + _netManager.RegisterNetMessage(HandlePreferencesAndSettings); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); } public void SelectCharacter(ICharacterProfile profile) diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs index 829edd23f7..1fc549548d 100644 --- a/Content.Client/Sandbox/SandboxManager.cs +++ b/Content.Client/Sandbox/SandboxManager.cs @@ -127,16 +127,15 @@ namespace Content.Client.Sandbox public void Initialize() { - _netManager.RegisterNetMessage(nameof(MsgSandboxStatus), - message => SetAllowed(message.SandboxAllowed)); + _netManager.RegisterNetMessage(message => SetAllowed(message.SandboxAllowed)); - _netManager.RegisterNetMessage(nameof(MsgSandboxGiveAccess)); + _netManager.RegisterNetMessage(); - _netManager.RegisterNetMessage(nameof(MsgSandboxRespawn)); + _netManager.RegisterNetMessage(); - _netManager.RegisterNetMessage(nameof(MsgSandboxGiveAghost)); + _netManager.RegisterNetMessage(); - _netManager.RegisterNetMessage(nameof(MsgSandboxSuicide)); + _netManager.RegisterNetMessage(); _gameHud.SandboxButtonToggled = SandboxButtonPressed; diff --git a/Content.Client/StationEvents/Managers/StationEventManager.cs b/Content.Client/StationEvents/Managers/StationEventManager.cs index 54917f361b..d43dda09f3 100644 --- a/Content.Client/StationEvents/Managers/StationEventManager.cs +++ b/Content.Client/StationEvents/Managers/StationEventManager.cs @@ -16,8 +16,8 @@ namespace Content.Client.StationEvents.Managers public void Initialize() { - _netManager.RegisterNetMessage(nameof(MsgRequestStationEvents)); - _netManager.RegisterNetMessage(nameof(MsgStationEvents), RxStationEvents); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(RxStationEvents); _netManager.Disconnect += OnNetManagerOnDisconnect; } diff --git a/Content.Client/Voting/VoteManager.cs b/Content.Client/Voting/VoteManager.cs index 4616cdaeb0..e73e098d9e 100644 --- a/Content.Client/Voting/VoteManager.cs +++ b/Content.Client/Voting/VoteManager.cs @@ -39,8 +39,8 @@ namespace Content.Client.Voting public void Initialize() { - _netManager.RegisterNetMessage(MsgVoteData.NAME, ReceiveVoteData); - _netManager.RegisterNetMessage(MsgVoteCanCall.NAME, ReceiveVoteCanCall); + _netManager.RegisterNetMessage(ReceiveVoteData); + _netManager.RegisterNetMessage(ReceiveVoteCanCall); _client.RunLevelChanged += ClientOnRunLevelChanged; } diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 78d8c225db..2815c6d9df 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -171,9 +171,9 @@ namespace Content.Server.Administration.Managers public void Initialize() { - _netMgr.RegisterNetMessage(MsgUpdateAdminStatus.NAME); - _netMgr.RegisterNetMessage(AdminMenuPlayerListRequest.NAME, HandlePlayerListRequest); - _netMgr.RegisterNetMessage(AdminMenuPlayerListMessage.NAME); + _netMgr.RegisterNetMessage(); + _netMgr.RegisterNetMessage(HandlePlayerListRequest); + _netMgr.RegisterNetMessage(); // Cache permissions for loaded console commands with the requisite attributes. foreach (var (cmdName, cmd) in _consoleHost.RegisteredCommands) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 76708b0424..17e24a7078 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -63,8 +63,8 @@ namespace Content.Server.Chat.Managers public void Initialize() { - _netManager.RegisterNetMessage(MsgChatMessage.NAME); - _netManager.RegisterNetMessage(ChatMaxMsgLengthMessage.NAME, OnMaxLengthRequest); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(OnMaxLengthRequest); // Tell all the connected players the chat's character limit var msg = _netManager.CreateNetMessage(); diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index 1e4f5ea950..51b20f02c4 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -36,9 +36,9 @@ namespace Content.Server.EUI public void Initialize() { - _net.RegisterNetMessage(MsgEuiCtl.NAME); - _net.RegisterNetMessage(MsgEuiState.NAME); - _net.RegisterNetMessage(MsgEuiMessage.NAME, RxMsgMessage); + _net.RegisterNetMessage(); + _net.RegisterNetMessage(); + _net.RegisterNetMessage(RxMsgMessage); } public void SendUpdates() diff --git a/Content.Server/Notification/Managers/ServerNotifyManager.cs b/Content.Server/Notification/Managers/ServerNotifyManager.cs index be4b012b9d..040001d9de 100644 --- a/Content.Server/Notification/Managers/ServerNotifyManager.cs +++ b/Content.Server/Notification/Managers/ServerNotifyManager.cs @@ -20,9 +20,9 @@ namespace Content.Server.Notification.Managers { DebugTools.Assert(!_initialized); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyCursor)); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyCoordinates)); - _netManager.RegisterNetMessage(nameof(MsgDoNotifyEntity)); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); _initialized = true; } diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index 7412d1c36e..bfe7fe87f7 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -38,13 +38,10 @@ namespace Content.Server.Preferences.Managers public void Init() { - _netManager.RegisterNetMessage(nameof(MsgPreferencesAndSettings)); - _netManager.RegisterNetMessage(nameof(MsgSelectCharacter), - HandleSelectCharacterMessage); - _netManager.RegisterNetMessage(nameof(MsgUpdateCharacter), - HandleUpdateCharacterMessage); - _netManager.RegisterNetMessage(nameof(MsgDeleteCharacter), - HandleDeleteCharacterMessage); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(HandleSelectCharacterMessage); + _netManager.RegisterNetMessage(HandleUpdateCharacterMessage); + _netManager.RegisterNetMessage(HandleDeleteCharacterMessage); } private async void HandleSelectCharacterMessage(MsgSelectCharacter message) diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index 8f4b1ad5e0..3cead22a89 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -45,11 +45,11 @@ namespace Content.Server.Sandbox public void Initialize() { - _netManager.RegisterNetMessage(nameof(MsgSandboxStatus)); - _netManager.RegisterNetMessage(nameof(MsgSandboxRespawn), SandboxRespawnReceived); - _netManager.RegisterNetMessage(nameof(MsgSandboxGiveAccess), SandboxGiveAccessReceived); - _netManager.RegisterNetMessage(nameof(MsgSandboxGiveAghost), SandboxGiveAghostReceived); - _netManager.RegisterNetMessage(nameof(MsgSandboxSuicide), SandboxSuicideReceived); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(SandboxRespawnReceived); + _netManager.RegisterNetMessage(SandboxGiveAccessReceived); + _netManager.RegisterNetMessage(SandboxGiveAghostReceived); + _netManager.RegisterNetMessage(SandboxSuicideReceived); _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; _entityManager.EventBus.SubscribeEvent(EventSource.Local, this, GameTickerOnOnRunLevelChanged); diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index 6873e23f40..ebd118dae9 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -183,8 +183,8 @@ namespace Content.Server.StationEvents // As such we'll always pause it by default. _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true); - _netManager.RegisterNetMessage(nameof(MsgRequestStationEvents), RxRequest); - _netManager.RegisterNetMessage(nameof(MsgStationEvents)); + _netManager.RegisterNetMessage(RxRequest); + _netManager.RegisterNetMessage(); } private void RxRequest(MsgRequestStationEvents msg) diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index 04a20d7e95..ec119400cf 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -43,8 +43,8 @@ namespace Content.Server.Voting.Managers public void Initialize() { - _netManager.RegisterNetMessage(MsgVoteData.NAME); - _netManager.RegisterNetMessage(MsgVoteCanCall.NAME); + _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; _adminMgr.OnPermsChanged += AdminPermsChanged; diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs index 2e5f2e4d74..67b45e057a 100644 --- a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs +++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs @@ -7,11 +7,7 @@ namespace Content.Shared.Administration.Menu { public class AdminMenuPlayerListMessage : NetMessage { - #region REQUIRED - public static readonly MsgGroups GROUP = MsgGroups.Command; - public static readonly string NAME = nameof(AdminMenuPlayerListMessage); - public AdminMenuPlayerListMessage(INetChannel channel) : base(NAME, GROUP) { } - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public List PlayersInfo = new(); diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs index 6e730e3503..c838b28dee 100644 --- a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs +++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs @@ -6,11 +6,7 @@ namespace Content.Shared.Administration.Menu { public class AdminMenuPlayerListRequest : NetMessage { - #region REQUIRED - public static readonly MsgGroups GROUP = MsgGroups.Command; - public static readonly string NAME = nameof(AdminMenuPlayerListRequest); - public AdminMenuPlayerListRequest(INetChannel channel) : base(NAME, GROUP) { } - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public override void ReadFromBuffer(NetIncomingMessage buffer) { diff --git a/Content.Shared/Administration/MsgUpdateAdminStatus.cs b/Content.Shared/Administration/MsgUpdateAdminStatus.cs index a8ac9813ae..7b55b6a8d1 100644 --- a/Content.Shared/Administration/MsgUpdateAdminStatus.cs +++ b/Content.Shared/Administration/MsgUpdateAdminStatus.cs @@ -7,14 +7,7 @@ namespace Content.Shared.Administration { public sealed class MsgUpdateAdminStatus : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgUpdateAdminStatus); - - public MsgUpdateAdminStatus(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public AdminData? Admin; public string[] AvailableCommands = Array.Empty(); diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs index 825f3b694d..7848184874 100644 --- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs +++ b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs @@ -10,13 +10,7 @@ namespace Content.Shared.Chat /// public sealed class ChatMaxMsgLengthMessage : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(ChatMaxMsgLengthMessage); - public ChatMaxMsgLengthMessage(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; /// /// The max length a player-sent message can get diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs index 8f9ea632eb..69c8a441f5 100644 --- a/Content.Shared/Chat/MsgChatMessage.cs +++ b/Content.Shared/Chat/MsgChatMessage.cs @@ -13,13 +13,7 @@ namespace Content.Shared.Chat [UsedImplicitly] public sealed class MsgChatMessage : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgChatMessage); - public MsgChatMessage(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; /// /// The channel the message is on. This can also change whether certain params are used. diff --git a/Content.Shared/Eui/MsgEuiCtl.cs b/Content.Shared/Eui/MsgEuiCtl.cs index b8f742ac55..265a9168cf 100644 --- a/Content.Shared/Eui/MsgEuiCtl.cs +++ b/Content.Shared/Eui/MsgEuiCtl.cs @@ -9,14 +9,7 @@ namespace Content.Shared.Eui /// public sealed class MsgEuiCtl : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgEuiCtl); - - public MsgEuiCtl(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public CtlType Type; public string OpenType = string.Empty; diff --git a/Content.Shared/Eui/MsgEuiMessage.cs b/Content.Shared/Eui/MsgEuiMessage.cs index 8ba829fc79..b598c40bb9 100644 --- a/Content.Shared/Eui/MsgEuiMessage.cs +++ b/Content.Shared/Eui/MsgEuiMessage.cs @@ -10,14 +10,7 @@ namespace Content.Shared.Eui { public sealed class MsgEuiMessage : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgEuiMessage); - - public MsgEuiMessage(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public uint Id; public EuiMessageBase Message = default!; diff --git a/Content.Shared/Eui/MsgEuiState.cs b/Content.Shared/Eui/MsgEuiState.cs index c8411f4b69..41b295ef31 100644 --- a/Content.Shared/Eui/MsgEuiState.cs +++ b/Content.Shared/Eui/MsgEuiState.cs @@ -10,14 +10,7 @@ namespace Content.Shared.Eui { public sealed class MsgEuiState : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgEuiState); - - public MsgEuiState(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public uint Id; public EuiStateBase State = default!; diff --git a/Content.Shared/Notification/Managers/SharedNotifyManager.cs b/Content.Shared/Notification/Managers/SharedNotifyManager.cs index 7ae578ab7e..8c9e4e8739 100644 --- a/Content.Shared/Notification/Managers/SharedNotifyManager.cs +++ b/Content.Shared/Notification/Managers/SharedNotifyManager.cs @@ -16,13 +16,7 @@ namespace Content.Shared.Notification.Managers protected class MsgDoNotifyCursor : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgDoNotifyCursor); - public MsgDoNotifyCursor(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public string Message { get; set; } = string.Empty; @@ -39,13 +33,7 @@ namespace Content.Shared.Notification.Managers protected class MsgDoNotifyCoordinates : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgDoNotifyCoordinates); - public MsgDoNotifyCoordinates(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public string Message { get; set; } = string.Empty; public EntityCoordinates Coordinates; @@ -65,13 +53,7 @@ namespace Content.Shared.Notification.Managers protected class MsgDoNotifyEntity : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgDoNotifyEntity); - public MsgDoNotifyEntity(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public string Message { get; set; } = string.Empty; public EntityUid Entity; diff --git a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs index d9b2a0ec50..f8c3188da4 100644 --- a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs @@ -21,7 +21,7 @@ namespace Content.Shared.Nutrition.Components [DataField("meat")] private string? _meatPrototype; - public bool CanDrop(CanDropEvent args) + bool IDraggable.CanDrop(CanDropEvent args) { return true; } diff --git a/Content.Shared/Preferences/MsgDeleteCharacter.cs b/Content.Shared/Preferences/MsgDeleteCharacter.cs index 49247287ee..f2c353476c 100644 --- a/Content.Shared/Preferences/MsgDeleteCharacter.cs +++ b/Content.Shared/Preferences/MsgDeleteCharacter.cs @@ -9,14 +9,7 @@ namespace Content.Shared.Preferences /// public class MsgDeleteCharacter : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgDeleteCharacter); - - public MsgDeleteCharacter(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public int Slot; diff --git a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs index 110bde6dc0..8056340641 100644 --- a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs +++ b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs @@ -12,14 +12,7 @@ namespace Content.Shared.Preferences /// public class MsgPreferencesAndSettings : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgPreferencesAndSettings); - - public MsgPreferencesAndSettings(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public PlayerPreferences Preferences = default!; public GameSettings Settings = default!; diff --git a/Content.Shared/Preferences/MsgSelectCharacter.cs b/Content.Shared/Preferences/MsgSelectCharacter.cs index 8d6ef00427..7e81df9f7b 100644 --- a/Content.Shared/Preferences/MsgSelectCharacter.cs +++ b/Content.Shared/Preferences/MsgSelectCharacter.cs @@ -9,14 +9,7 @@ namespace Content.Shared.Preferences /// public class MsgSelectCharacter : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSelectCharacter); - - public MsgSelectCharacter(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public int SelectedCharacterIndex; diff --git a/Content.Shared/Preferences/MsgUpdateCharacter.cs b/Content.Shared/Preferences/MsgUpdateCharacter.cs index df3b5afafc..21f93bd51b 100644 --- a/Content.Shared/Preferences/MsgUpdateCharacter.cs +++ b/Content.Shared/Preferences/MsgUpdateCharacter.cs @@ -12,14 +12,7 @@ namespace Content.Shared.Preferences /// public class MsgUpdateCharacter : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgUpdateCharacter); - - public MsgUpdateCharacter(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public int Slot; public ICharacterProfile Profile = default!; diff --git a/Content.Shared/Sandbox/SharedSandboxManager.cs b/Content.Shared/Sandbox/SharedSandboxManager.cs index 89eb1743ea..b87bd56fee 100644 --- a/Content.Shared/Sandbox/SharedSandboxManager.cs +++ b/Content.Shared/Sandbox/SharedSandboxManager.cs @@ -8,13 +8,7 @@ namespace Content.Shared.Sandbox { protected sealed class MsgSandboxStatus : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSandboxStatus); - public MsgSandboxStatus(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public bool SandboxAllowed { get; set; } @@ -31,13 +25,7 @@ namespace Content.Shared.Sandbox protected sealed class MsgSandboxRespawn : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSandboxRespawn); - public MsgSandboxRespawn(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public override void ReadFromBuffer(NetIncomingMessage buffer) { @@ -50,13 +38,8 @@ namespace Content.Shared.Sandbox protected sealed class MsgSandboxGiveAccess : NetMessage { - #region REQUIRED + public override MsgGroups MsgGroup => MsgGroups.Command; - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSandboxGiveAccess); - public MsgSandboxGiveAccess(INetChannel channel) : base(NAME, GROUP) { } - - #endregion public override void ReadFromBuffer(NetIncomingMessage buffer) { } @@ -69,13 +52,8 @@ namespace Content.Shared.Sandbox protected sealed class MsgSandboxGiveAghost : NetMessage { - #region REQUIRED + public override MsgGroups MsgGroup => MsgGroups.Command; - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSandboxGiveAghost); - public MsgSandboxGiveAghost(INetChannel channel) : base(NAME, GROUP) { } - - #endregion public override void ReadFromBuffer(NetIncomingMessage buffer) { } @@ -88,13 +66,8 @@ namespace Content.Shared.Sandbox protected sealed class MsgSandboxSuicide : NetMessage { - #region REQUIRED + public override MsgGroups MsgGroup => MsgGroups.Command; - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgSandboxSuicide); - public MsgSandboxSuicide(INetChannel channel) : base(NAME, GROUP) { } - - #endregion public override void ReadFromBuffer(NetIncomingMessage buffer) { } diff --git a/Content.Shared/StationEvents/MsgRequestStationEvents.cs b/Content.Shared/StationEvents/MsgRequestStationEvents.cs index 0619a417c6..a7390781a1 100644 --- a/Content.Shared/StationEvents/MsgRequestStationEvents.cs +++ b/Content.Shared/StationEvents/MsgRequestStationEvents.cs @@ -6,13 +6,7 @@ namespace Content.Shared.StationEvents { public class MsgRequestStationEvents : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgRequestStationEvents); - public MsgRequestStationEvents(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public override void ReadFromBuffer(NetIncomingMessage buffer) { diff --git a/Content.Shared/StationEvents/MsgStationEvents.cs b/Content.Shared/StationEvents/MsgStationEvents.cs index 3925707b6b..7c88c8e34e 100644 --- a/Content.Shared/StationEvents/MsgStationEvents.cs +++ b/Content.Shared/StationEvents/MsgStationEvents.cs @@ -10,13 +10,7 @@ namespace Content.Shared.StationEvents { public class MsgStationEvents : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgStationEvents); - public MsgStationEvents(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public string[] Events = Array.Empty(); diff --git a/Content.Shared/Stunnable/SharedStunnableComponent.cs b/Content.Shared/Stunnable/SharedStunnableComponent.cs index 5228d27db8..2f3e15f657 100644 --- a/Content.Shared/Stunnable/SharedStunnableComponent.cs +++ b/Content.Shared/Stunnable/SharedStunnableComponent.cs @@ -48,13 +48,9 @@ namespace Content.Shared.Stunnable [DataField("slowdownCap")] protected float _slowdownCap = 20f; - private float _helpKnockdownRemove = 1f; - [DataField("helpInterval")] private float _helpInterval = 1f; - [DataField("stunAlertId")] private string _stunAlertId = "stun"; - private bool _canHelp = true; protected CancellationTokenSource StatusRemoveCancellation = new(); diff --git a/Content.Shared/Voting/MsgVoteCanCall.cs b/Content.Shared/Voting/MsgVoteCanCall.cs index 926a9f24d5..dc9d3f592f 100644 --- a/Content.Shared/Voting/MsgVoteCanCall.cs +++ b/Content.Shared/Voting/MsgVoteCanCall.cs @@ -9,14 +9,7 @@ namespace Content.Shared.Voting /// public sealed class MsgVoteCanCall : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgVoteCanCall); - - public MsgVoteCanCall(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public bool CanCall; diff --git a/Content.Shared/Voting/MsgVoteData.cs b/Content.Shared/Voting/MsgVoteData.cs index 531e8eb401..de91996809 100644 --- a/Content.Shared/Voting/MsgVoteData.cs +++ b/Content.Shared/Voting/MsgVoteData.cs @@ -7,14 +7,7 @@ namespace Content.Shared.Voting { public sealed class MsgVoteData : NetMessage { - #region REQUIRED - - public const MsgGroups GROUP = MsgGroups.Command; - public const string NAME = nameof(MsgVoteData); - - public MsgVoteData(INetChannel channel) : base(NAME, GROUP) { } - - #endregion + public override MsgGroups MsgGroup => MsgGroups.Command; public int VoteId; public bool VoteActive;