Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

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

@@ -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<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
{
#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)
{

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

@@ -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<string>();

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

@@ -10,13 +10,7 @@ namespace Content.Shared.Chat
/// </summary>
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;
/// <summary>
/// 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]
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;
/// <summary>
/// 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>
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;

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

@@ -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!;

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

@@ -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!;

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

@@ -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;

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

@@ -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;
}

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

@@ -9,14 +9,7 @@ namespace Content.Shared.Preferences
/// </summary>
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;

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

@@ -12,14 +12,7 @@ namespace Content.Shared.Preferences
/// </summary>
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!;

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

@@ -9,14 +9,7 @@ namespace Content.Shared.Preferences
/// </summary>
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;

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

@@ -12,14 +12,7 @@ namespace Content.Shared.Preferences
/// </summary>
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!;

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

@@ -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)
{
}

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

@@ -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)
{

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

@@ -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<string>();

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

@@ -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();

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

@@ -9,14 +9,7 @@ namespace Content.Shared.Voting
/// </summary>
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;

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

@@ -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;