juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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.Server/Administration/Managers/AdminManager.cs
View File

@@ -171,9 +171,9 @@ namespace Content.Server.Administration.Managers
public void Initialize()
{
_netMgr.RegisterNetMessage<MsgUpdateAdminStatus>(MsgUpdateAdminStatus.NAME);
_netMgr.RegisterNetMessage<AdminMenuPlayerListRequest>(AdminMenuPlayerListRequest.NAME, HandlePlayerListRequest);
_netMgr.RegisterNetMessage<AdminMenuPlayerListMessage>(AdminMenuPlayerListMessage.NAME);
_netMgr.RegisterNetMessage<MsgUpdateAdminStatus>();
_netMgr.RegisterNetMessage<AdminMenuPlayerListRequest>(HandlePlayerListRequest);
_netMgr.RegisterNetMessage<AdminMenuPlayerListMessage>();
// Cache permissions for loaded console commands with the requisite attributes.
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()
{
_netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME);
_netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(ChatMaxMsgLengthMessage.NAME, OnMaxLengthRequest);
_netManager.RegisterNetMessage<MsgChatMessage>();
_netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(OnMaxLengthRequest);
// Tell all the connected players the chat's character limit
var msg = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>();

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

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

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

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

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

@@ -38,13 +38,10 @@ namespace Content.Server.Preferences.Managers
public void Init()
{
_netManager.RegisterNetMessage<MsgPreferencesAndSettings>(nameof(MsgPreferencesAndSettings));
_netManager.RegisterNetMessage<MsgSelectCharacter>(nameof(MsgSelectCharacter),
HandleSelectCharacterMessage);
_netManager.RegisterNetMessage<MsgUpdateCharacter>(nameof(MsgUpdateCharacter),
HandleUpdateCharacterMessage);
_netManager.RegisterNetMessage<MsgDeleteCharacter>(nameof(MsgDeleteCharacter),
HandleDeleteCharacterMessage);
_netManager.RegisterNetMessage<MsgPreferencesAndSettings>();
_netManager.RegisterNetMessage<MsgSelectCharacter>(HandleSelectCharacterMessage);
_netManager.RegisterNetMessage<MsgUpdateCharacter>(HandleUpdateCharacterMessage);
_netManager.RegisterNetMessage<MsgDeleteCharacter>(HandleDeleteCharacterMessage);
}
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()
{
_netManager.RegisterNetMessage<MsgSandboxStatus>(nameof(MsgSandboxStatus));
_netManager.RegisterNetMessage<MsgSandboxRespawn>(nameof(MsgSandboxRespawn), SandboxRespawnReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAccess>(nameof(MsgSandboxGiveAccess), SandboxGiveAccessReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAghost>(nameof(MsgSandboxGiveAghost), SandboxGiveAghostReceived);
_netManager.RegisterNetMessage<MsgSandboxSuicide>(nameof(MsgSandboxSuicide), SandboxSuicideReceived);
_netManager.RegisterNetMessage<MsgSandboxStatus>();
_netManager.RegisterNetMessage<MsgSandboxRespawn>(SandboxRespawnReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAccess>(SandboxGiveAccessReceived);
_netManager.RegisterNetMessage<MsgSandboxGiveAghost>(SandboxGiveAghostReceived);
_netManager.RegisterNetMessage<MsgSandboxSuicide>(SandboxSuicideReceived);
_playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
_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.
_configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true);
_netManager.RegisterNetMessage<MsgRequestStationEvents>(nameof(MsgRequestStationEvents), RxRequest);
_netManager.RegisterNetMessage<MsgStationEvents>(nameof(MsgStationEvents));
_netManager.RegisterNetMessage<MsgRequestStationEvents>(RxRequest);
_netManager.RegisterNetMessage<MsgStationEvents>();
}
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()
{
_netManager.RegisterNetMessage<MsgVoteData>(MsgVoteData.NAME);
_netManager.RegisterNetMessage<MsgVoteCanCall>(MsgVoteCanCall.NAME);
_netManager.RegisterNetMessage<MsgVoteData>();
_netManager.RegisterNetMessage<MsgVoteCanCall>();
_playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
_adminMgr.OnPermsChanged += AdminPermsChanged;