tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NetMessage deprecated boilerplate (#4196)

Browse Source
This commit is contained in:
mirrorcult
2021-06-20 22:43:54 -07:00
committed by GitHub
parent 64813d9c56
commit 2ea5aec101
37 changed files with 73 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Administration/Managers/AdminMenuManager.cs
View File

@@ -25,8 +25,8 @@ namespace Content.Client.Administration.Managers
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<AdminMenuPlayerListRequest>(AdminMenuPlayerListRequest.NAME); _netManager.RegisterNetMessage<AdminMenuPlayerListRequest>();
_netManager.RegisterNetMessage<AdminMenuPlayerListMessage>(AdminMenuPlayerListMessage.NAME, HandlePlayerListMessage); _netManager.RegisterNetMessage<AdminMenuPlayerListMessage>(HandlePlayerListMessage);
_commandWindows = new List<SS14Window>(); _commandWindows = new List<SS14Window>();
// Reset the AdminMenu Window on disconnect // Reset the AdminMenu Window on disconnect

2
Content.Client/Administration/Managers/ClientAdminManager.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Client.Administration.Managers
public void Initialize() public void Initialize()
{ {
_netMgr.RegisterNetMessage<MsgUpdateAdminStatus>(MsgUpdateAdminStatus.NAME, UpdateMessageRx); _netMgr.RegisterNetMessage<MsgUpdateAdminStatus>(UpdateMessageRx);
} }
private void UpdateMessageRx(MsgUpdateAdminStatus message) private void UpdateMessageRx(MsgUpdateAdminStatus message)

4
Content.Client/Chat/Managers/ChatManager.cs
View File

@@ -127,8 +127,8 @@ namespace Content.Client.Chat.Managers
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME, OnChatMessage); _netManager.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
_netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(ChatMaxMsgLengthMessage.NAME, OnMaxLengthReceived); _netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(OnMaxLengthReceived);
_speechBubbleRoot = new LayoutContainer(); _speechBubbleRoot = new LayoutContainer();
LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide); LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide);

6
Content.Client/Eui/EuiManager.cs
View File

@@ -17,9 +17,9 @@ namespace Content.Client.Eui
public void Initialize() public void Initialize()
{ {
_net.RegisterNetMessage<MsgEuiCtl>(MsgEuiCtl.NAME, RxMsgCtl); _net.RegisterNetMessage<MsgEuiCtl>(RxMsgCtl);
_net.RegisterNetMessage<MsgEuiState>(MsgEuiState.NAME, RxMsgState); _net.RegisterNetMessage<MsgEuiState>(RxMsgState);
_net.RegisterNetMessage<MsgEuiMessage>(MsgEuiMessage.NAME, RxMsgMessage); _net.RegisterNetMessage<MsgEuiMessage>(RxMsgMessage);
} }
private void RxMsgMessage(MsgEuiMessage message) private void RxMsgMessage(MsgEuiMessage message)

6
Content.Client/Notifications/Managers/ClientNotifyManager.cs
View File

@@ -34,9 +34,9 @@ namespace Content.Client.Notifications.Managers
{ {
DebugTools.Assert(!_initialized); DebugTools.Assert(!_initialized);
_netManager.RegisterNetMessage<MsgDoNotifyCursor>(nameof(MsgDoNotifyCursor), DoNotifyCursor); _netManager.RegisterNetMessage<MsgDoNotifyCursor>(DoNotifyCursor);
_netManager.RegisterNetMessage<MsgDoNotifyCoordinates>(nameof(MsgDoNotifyCoordinates), DoNotifyCoordinates); _netManager.RegisterNetMessage<MsgDoNotifyCoordinates>(DoNotifyCoordinates);
_netManager.RegisterNetMessage<MsgDoNotifyEntity>(nameof(MsgDoNotifyEntity), DoNotifyEntity); _netManager.RegisterNetMessage<MsgDoNotifyEntity>(DoNotifyEntity);
_initialized = true; _initialized = true;
} }

9
Content.Client/Preferences/ClientPreferencesManager.cs
View File

@@ -24,11 +24,10 @@ namespace Content.Client.Preferences
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgPreferencesAndSettings>(nameof(MsgPreferencesAndSettings), _netManager.RegisterNetMessage<MsgPreferencesAndSettings>(HandlePreferencesAndSettings);
HandlePreferencesAndSettings); _netManager.RegisterNetMessage<MsgUpdateCharacter>();
_netManager.RegisterNetMessage<MsgUpdateCharacter>(nameof(MsgUpdateCharacter)); _netManager.RegisterNetMessage<MsgSelectCharacter>();
_netManager.RegisterNetMessage<MsgSelectCharacter>(nameof(MsgSelectCharacter)); _netManager.RegisterNetMessage<MsgDeleteCharacter>();
_netManager.RegisterNetMessage<MsgDeleteCharacter>(nameof(MsgDeleteCharacter));
} }
public void SelectCharacter(ICharacterProfile profile) public void SelectCharacter(ICharacterProfile profile)

11
Content.Client/Sandbox/SandboxManager.cs
View File

@@ -127,16 +127,15 @@ namespace Content.Client.Sandbox
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgSandboxStatus>(nameof(MsgSandboxStatus), _netManager.RegisterNetMessage<MsgSandboxStatus>(message => SetAllowed(message.SandboxAllowed));
message => SetAllowed(message.SandboxAllowed));
_netManager.RegisterNetMessage<MsgSandboxGiveAccess>(nameof(MsgSandboxGiveAccess)); _netManager.RegisterNetMessage<MsgSandboxGiveAccess>();
_netManager.RegisterNetMessage<MsgSandboxRespawn>(nameof(MsgSandboxRespawn)); _netManager.RegisterNetMessage<MsgSandboxRespawn>();
_netManager.RegisterNetMessage<MsgSandboxGiveAghost>(nameof(MsgSandboxGiveAghost)); _netManager.RegisterNetMessage<MsgSandboxGiveAghost>();
_netManager.RegisterNetMessage<MsgSandboxSuicide>(nameof(MsgSandboxSuicide)); _netManager.RegisterNetMessage<MsgSandboxSuicide>();
_gameHud.SandboxButtonToggled = SandboxButtonPressed; _gameHud.SandboxButtonToggled = SandboxButtonPressed;

4
Content.Client/StationEvents/Managers/StationEventManager.cs
View File

@@ -16,8 +16,8 @@ namespace Content.Client.StationEvents.Managers
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgRequestStationEvents>(nameof(MsgRequestStationEvents)); _netManager.RegisterNetMessage<MsgRequestStationEvents>();
_netManager.RegisterNetMessage<MsgStationEvents>(nameof(MsgStationEvents), RxStationEvents); _netManager.RegisterNetMessage<MsgStationEvents>(RxStationEvents);
_netManager.Disconnect += OnNetManagerOnDisconnect; _netManager.Disconnect += OnNetManagerOnDisconnect;
} }

4
Content.Client/Voting/VoteManager.cs
View File

@@ -39,8 +39,8 @@ namespace Content.Client.Voting
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgVoteData>(MsgVoteData.NAME, ReceiveVoteData); _netManager.RegisterNetMessage<MsgVoteData>(ReceiveVoteData);
_netManager.RegisterNetMessage<MsgVoteCanCall>(MsgVoteCanCall.NAME, ReceiveVoteCanCall); _netManager.RegisterNetMessage<MsgVoteCanCall>(ReceiveVoteCanCall);
_client.RunLevelChanged += ClientOnRunLevelChanged; _client.RunLevelChanged += ClientOnRunLevelChanged;
} }

6
Content.Server/Administration/Managers/AdminManager.cs
View File

@@ -171,9 +171,9 @@ namespace Content.Server.Administration.Managers
public void Initialize() public void Initialize()
{ {
_netMgr.RegisterNetMessage<MsgUpdateAdminStatus>(MsgUpdateAdminStatus.NAME); _netMgr.RegisterNetMessage<MsgUpdateAdminStatus>();
_netMgr.RegisterNetMessage<AdminMenuPlayerListRequest>(AdminMenuPlayerListRequest.NAME, HandlePlayerListRequest); _netMgr.RegisterNetMessage<AdminMenuPlayerListRequest>(HandlePlayerListRequest);
_netMgr.RegisterNetMessage<AdminMenuPlayerListMessage>(AdminMenuPlayerListMessage.NAME); _netMgr.RegisterNetMessage<AdminMenuPlayerListMessage>();
// Cache permissions for loaded console commands with the requisite attributes. // Cache permissions for loaded console commands with the requisite attributes.
foreach (var (cmdName, cmd) in _consoleHost.RegisteredCommands) foreach (var (cmdName, cmd) in _consoleHost.RegisteredCommands)

4
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -63,8 +63,8 @@ namespace Content.Server.Chat.Managers
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME); _netManager.RegisterNetMessage<MsgChatMessage>();
_netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(ChatMaxMsgLengthMessage.NAME, OnMaxLengthRequest); _netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(OnMaxLengthRequest);
// Tell all the connected players the chat's character limit // Tell all the connected players the chat's character limit
var msg = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>(); var msg = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>();

6
Content.Server/EUI/EuiManager.cs
View File

@@ -36,9 +36,9 @@ namespace Content.Server.EUI
public void Initialize() public void Initialize()
{ {
_net.RegisterNetMessage<MsgEuiCtl>(MsgEuiCtl.NAME); _net.RegisterNetMessage<MsgEuiCtl>();
_net.RegisterNetMessage<MsgEuiState>(MsgEuiState.NAME); _net.RegisterNetMessage<MsgEuiState>();
_net.RegisterNetMessage<MsgEuiMessage>(MsgEuiMessage.NAME, RxMsgMessage); _net.RegisterNetMessage<MsgEuiMessage>(RxMsgMessage);
} }
public void SendUpdates() public void SendUpdates()

6
Content.Server/Notification/Managers/ServerNotifyManager.cs
View File

@@ -20,9 +20,9 @@ namespace Content.Server.Notification.Managers
{ {
DebugTools.Assert(!_initialized); DebugTools.Assert(!_initialized);
_netManager.RegisterNetMessage<MsgDoNotifyCursor>(nameof(MsgDoNotifyCursor)); _netManager.RegisterNetMessage<MsgDoNotifyCursor>();
_netManager.RegisterNetMessage<MsgDoNotifyCoordinates>(nameof(MsgDoNotifyCoordinates)); _netManager.RegisterNetMessage<MsgDoNotifyCoordinates>();
_netManager.RegisterNetMessage<MsgDoNotifyEntity>(nameof(MsgDoNotifyEntity)); _netManager.RegisterNetMessage<MsgDoNotifyEntity>();
_initialized = true; _initialized = true;
} }

11
Content.Server/Preferences/Managers/ServerPreferencesManager.cs
View File

@@ -38,13 +38,10 @@ namespace Content.Server.Preferences.Managers
public void Init() public void Init()
{ {
_netManager.RegisterNetMessage<MsgPreferencesAndSettings>(nameof(MsgPreferencesAndSettings)); _netManager.RegisterNetMessage<MsgPreferencesAndSettings>();
_netManager.RegisterNetMessage<MsgSelectCharacter>(nameof(MsgSelectCharacter), _netManager.RegisterNetMessage<MsgSelectCharacter>(HandleSelectCharacterMessage);
HandleSelectCharacterMessage); _netManager.RegisterNetMessage<MsgUpdateCharacter>(HandleUpdateCharacterMessage);
_netManager.RegisterNetMessage<MsgUpdateCharacter>(nameof(MsgUpdateCharacter), _netManager.RegisterNetMessage<MsgDeleteCharacter>(HandleDeleteCharacterMessage);
HandleUpdateCharacterMessage);
_netManager.RegisterNetMessage<MsgDeleteCharacter>(nameof(MsgDeleteCharacter),
HandleDeleteCharacterMessage);
} }
private async void HandleSelectCharacterMessage(MsgSelectCharacter message) private async void HandleSelectCharacterMessage(MsgSelectCharacter message)

10
Content.Server/Sandbox/SandboxManager.cs
View File

@@ -45,11 +45,11 @@ namespace Content.Server.Sandbox
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgSandboxStatus>(nameof(MsgSandboxStatus)); _netManager.RegisterNetMessage<MsgSandboxStatus>();
_netManager.RegisterNetMessage<MsgSandboxRespawn>(nameof(MsgSandboxRespawn), SandboxRespawnReceived); _netManager.RegisterNetMessage<MsgSandboxRespawn>(SandboxRespawnReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAccess>(nameof(MsgSandboxGiveAccess), SandboxGiveAccessReceived); _netManager.RegisterNetMessage<MsgSandboxGiveAccess>(SandboxGiveAccessReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAghost>(nameof(MsgSandboxGiveAghost), SandboxGiveAghostReceived); _netManager.RegisterNetMessage<MsgSandboxGiveAghost>(SandboxGiveAghostReceived);
_netManager.RegisterNetMessage<MsgSandboxSuicide>(nameof(MsgSandboxSuicide), SandboxSuicideReceived); _netManager.RegisterNetMessage<MsgSandboxSuicide>(SandboxSuicideReceived);
_playerManager.PlayerStatusChanged += OnPlayerStatusChanged; _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
_entityManager.EventBus.SubscribeEvent<GameRunLevelChangedEvent>(EventSource.Local, this, GameTickerOnOnRunLevelChanged); _entityManager.EventBus.SubscribeEvent<GameRunLevelChangedEvent>(EventSource.Local, this, GameTickerOnOnRunLevelChanged);

4
Content.Server/StationEvents/StationEventSystem.cs
View File

@@ -183,8 +183,8 @@ namespace Content.Server.StationEvents
// As such we'll always pause it by default. // As such we'll always pause it by default.
_configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true); _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true);
_netManager.RegisterNetMessage<MsgRequestStationEvents>(nameof(MsgRequestStationEvents), RxRequest); _netManager.RegisterNetMessage<MsgRequestStationEvents>(RxRequest);
_netManager.RegisterNetMessage<MsgStationEvents>(nameof(MsgStationEvents)); _netManager.RegisterNetMessage<MsgStationEvents>();
} }
private void RxRequest(MsgRequestStationEvents msg) private void RxRequest(MsgRequestStationEvents msg)

4
Content.Server/Voting/Managers/VoteManager.cs
View File

@@ -43,8 +43,8 @@ namespace Content.Server.Voting.Managers
public void Initialize() public void Initialize()
{ {
_netManager.RegisterNetMessage<MsgVoteData>(MsgVoteData.NAME); _netManager.RegisterNetMessage<MsgVoteData>();
_netManager.RegisterNetMessage<MsgVoteCanCall>(MsgVoteCanCall.NAME); _netManager.RegisterNetMessage<MsgVoteCanCall>();
_playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
_adminMgr.OnPermsChanged += AdminPermsChanged; _adminMgr.OnPermsChanged += AdminPermsChanged;

6
Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
View File

@@ -7,11 +7,7 @@ namespace Content.Shared.Administration.Menu
{ {
public class AdminMenuPlayerListMessage : NetMessage public class AdminMenuPlayerListMessage : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public static readonly MsgGroups GROUP = MsgGroups.Command;
public static readonly string NAME = nameof(AdminMenuPlayerListMessage);
public AdminMenuPlayerListMessage(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public List<PlayerInfo> PlayersInfo = new(); public List<PlayerInfo> PlayersInfo = new();

6
Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
View File

@@ -6,11 +6,7 @@ namespace Content.Shared.Administration.Menu
{ {
public class AdminMenuPlayerListRequest : NetMessage public class AdminMenuPlayerListRequest : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public static readonly MsgGroups GROUP = MsgGroups.Command;
public static readonly string NAME = nameof(AdminMenuPlayerListRequest);
public AdminMenuPlayerListRequest(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public override void ReadFromBuffer(NetIncomingMessage buffer) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {

9
Content.Shared/Administration/MsgUpdateAdminStatus.cs
View File

@@ -7,14 +7,7 @@ namespace Content.Shared.Administration
{ {
public sealed class MsgUpdateAdminStatus : NetMessage public sealed class MsgUpdateAdminStatus : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgUpdateAdminStatus);
public MsgUpdateAdminStatus(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public AdminData? Admin; public AdminData? Admin;
public string[] AvailableCommands = Array.Empty<string>(); public string[] AvailableCommands = Array.Empty<string>();

8
Content.Shared/Chat/ChatMaxMsgLengthMessage.cs
View File

@@ -10,13 +10,7 @@ namespace Content.Shared.Chat
/// </summary> /// </summary>
public sealed class ChatMaxMsgLengthMessage : NetMessage public sealed class ChatMaxMsgLengthMessage : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(ChatMaxMsgLengthMessage);
public ChatMaxMsgLengthMessage(INetChannel channel) : base(NAME, GROUP) { }
#endregion
/// <summary> /// <summary>
/// The max length a player-sent message can get /// The max length a player-sent message can get

8
Content.Shared/Chat/MsgChatMessage.cs
View File

@@ -13,13 +13,7 @@ namespace Content.Shared.Chat
[UsedImplicitly] [UsedImplicitly]
public sealed class MsgChatMessage : NetMessage public sealed class MsgChatMessage : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgChatMessage);
public MsgChatMessage(INetChannel channel) : base(NAME, GROUP) { }
#endregion
/// <summary> /// <summary>
/// The channel the message is on. This can also change whether certain params are used. /// The channel the message is on. This can also change whether certain params are used.

9
Content.Shared/Eui/MsgEuiCtl.cs
View File

@@ -9,14 +9,7 @@ namespace Content.Shared.Eui
/// </summary> /// </summary>
public sealed class MsgEuiCtl : NetMessage public sealed class MsgEuiCtl : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgEuiCtl);
public MsgEuiCtl(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public CtlType Type; public CtlType Type;
public string OpenType = string.Empty; public string OpenType = string.Empty;

9
Content.Shared/Eui/MsgEuiMessage.cs
View File

@@ -10,14 +10,7 @@ namespace Content.Shared.Eui
{ {
public sealed class MsgEuiMessage : NetMessage public sealed class MsgEuiMessage : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgEuiMessage);
public MsgEuiMessage(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public uint Id; public uint Id;
public EuiMessageBase Message = default!; public EuiMessageBase Message = default!;

9
Content.Shared/Eui/MsgEuiState.cs
View File

@@ -10,14 +10,7 @@ namespace Content.Shared.Eui
{ {
public sealed class MsgEuiState : NetMessage public sealed class MsgEuiState : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgEuiState);
public MsgEuiState(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public uint Id; public uint Id;
public EuiStateBase State = default!; public EuiStateBase State = default!;

24
Content.Shared/Notification/Managers/SharedNotifyManager.cs
View File

@@ -16,13 +16,7 @@ namespace Content.Shared.Notification.Managers
protected class MsgDoNotifyCursor : NetMessage protected class MsgDoNotifyCursor : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgDoNotifyCursor);
public MsgDoNotifyCursor(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public string Message { get; set; } = string.Empty; public string Message { get; set; } = string.Empty;
@@ -39,13 +33,7 @@ namespace Content.Shared.Notification.Managers
protected class MsgDoNotifyCoordinates : NetMessage protected class MsgDoNotifyCoordinates : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgDoNotifyCoordinates);
public MsgDoNotifyCoordinates(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public string Message { get; set; } = string.Empty; public string Message { get; set; } = string.Empty;
public EntityCoordinates Coordinates; public EntityCoordinates Coordinates;
@@ -65,13 +53,7 @@ namespace Content.Shared.Notification.Managers
protected class MsgDoNotifyEntity : NetMessage protected class MsgDoNotifyEntity : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgDoNotifyEntity);
public MsgDoNotifyEntity(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public string Message { get; set; } = string.Empty; public string Message { get; set; } = string.Empty;
public EntityUid Entity; public EntityUid Entity;

2
Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Shared.Nutrition.Components
[DataField("meat")] [DataField("meat")]
private string? _meatPrototype; private string? _meatPrototype;
public bool CanDrop(CanDropEvent args) bool IDraggable.CanDrop(CanDropEvent args)
{ {
return true; return true;
} }

9
Content.Shared/Preferences/MsgDeleteCharacter.cs
View File

@@ -9,14 +9,7 @@ namespace Content.Shared.Preferences
/// </summary> /// </summary>
public class MsgDeleteCharacter : NetMessage public class MsgDeleteCharacter : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgDeleteCharacter);
public MsgDeleteCharacter(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public int Slot; public int Slot;

9
Content.Shared/Preferences/MsgPreferencesAndSettings.cs
View File

@@ -12,14 +12,7 @@ namespace Content.Shared.Preferences
/// </summary> /// </summary>
public class MsgPreferencesAndSettings : NetMessage public class MsgPreferencesAndSettings : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgPreferencesAndSettings);
public MsgPreferencesAndSettings(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public PlayerPreferences Preferences = default!; public PlayerPreferences Preferences = default!;
public GameSettings Settings = default!; public GameSettings Settings = default!;

9
Content.Shared/Preferences/MsgSelectCharacter.cs
View File

@@ -9,14 +9,7 @@ namespace Content.Shared.Preferences
/// </summary> /// </summary>
public class MsgSelectCharacter : NetMessage public class MsgSelectCharacter : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgSelectCharacter);
public MsgSelectCharacter(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public int SelectedCharacterIndex; public int SelectedCharacterIndex;

9
Content.Shared/Preferences/MsgUpdateCharacter.cs
View File

@@ -12,14 +12,7 @@ namespace Content.Shared.Preferences
/// </summary> /// </summary>
public class MsgUpdateCharacter : NetMessage public class MsgUpdateCharacter : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgUpdateCharacter);
public MsgUpdateCharacter(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public int Slot; public int Slot;
public ICharacterProfile Profile = default!; public ICharacterProfile Profile = default!;

37
Content.Shared/Sandbox/SharedSandboxManager.cs
View File

@@ -8,13 +8,7 @@ namespace Content.Shared.Sandbox
{ {
protected sealed class MsgSandboxStatus : NetMessage protected sealed class MsgSandboxStatus : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgSandboxStatus);
public MsgSandboxStatus(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public bool SandboxAllowed { get; set; } public bool SandboxAllowed { get; set; }
@@ -31,13 +25,7 @@ namespace Content.Shared.Sandbox
protected sealed class MsgSandboxRespawn : NetMessage protected sealed class MsgSandboxRespawn : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgSandboxRespawn);
public MsgSandboxRespawn(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public override void ReadFromBuffer(NetIncomingMessage buffer) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
@@ -50,13 +38,8 @@ namespace Content.Shared.Sandbox
protected sealed class MsgSandboxGiveAccess : NetMessage 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) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
} }
@@ -69,13 +52,8 @@ namespace Content.Shared.Sandbox
protected sealed class MsgSandboxGiveAghost : NetMessage 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) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
} }
@@ -88,13 +66,8 @@ namespace Content.Shared.Sandbox
protected sealed class MsgSandboxSuicide : NetMessage 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) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
} }

8
Content.Shared/StationEvents/MsgRequestStationEvents.cs
View File

@@ -6,13 +6,7 @@ namespace Content.Shared.StationEvents
{ {
public class MsgRequestStationEvents : NetMessage public class MsgRequestStationEvents : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgRequestStationEvents);
public MsgRequestStationEvents(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public override void ReadFromBuffer(NetIncomingMessage buffer) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {

8
Content.Shared/StationEvents/MsgStationEvents.cs
View File

@@ -10,13 +10,7 @@ namespace Content.Shared.StationEvents
{ {
public class MsgStationEvents : NetMessage public class MsgStationEvents : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgStationEvents);
public MsgStationEvents(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public string[] Events = Array.Empty<string>(); public string[] Events = Array.Empty<string>();

4
Content.Shared/Stunnable/SharedStunnableComponent.cs
View File

@@ -48,13 +48,9 @@ namespace Content.Shared.Stunnable
[DataField("slowdownCap")] [DataField("slowdownCap")]
protected float _slowdownCap = 20f; protected float _slowdownCap = 20f;
private float _helpKnockdownRemove = 1f;
[DataField("helpInterval")] [DataField("helpInterval")]
private float _helpInterval = 1f; private float _helpInterval = 1f;
[DataField("stunAlertId")] private string _stunAlertId = "stun";
private bool _canHelp = true; private bool _canHelp = true;
protected CancellationTokenSource StatusRemoveCancellation = new(); protected CancellationTokenSource StatusRemoveCancellation = new();

9
Content.Shared/Voting/MsgVoteCanCall.cs
View File

@@ -9,14 +9,7 @@ namespace Content.Shared.Voting
/// </summary> /// </summary>
public sealed class MsgVoteCanCall : NetMessage public sealed class MsgVoteCanCall : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgVoteCanCall);
public MsgVoteCanCall(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public bool CanCall; public bool CanCall;

9
Content.Shared/Voting/MsgVoteData.cs
View File

@@ -7,14 +7,7 @@ namespace Content.Shared.Voting
{ {
public sealed class MsgVoteData : NetMessage public sealed class MsgVoteData : NetMessage
{ {
#region REQUIRED public override MsgGroups MsgGroup => MsgGroups.Command;
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgVoteData);
public MsgVoteData(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public int VoteId; public int VoteId;
public bool VoteActive; public bool VoteActive;