space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove NetMessage deprecated boilerplate entirely (#1830)

Browse Source 
* Remove NetMessage boilerplate in favor of virtual properties

* forgot some stuff
This commit is contained in:
mirrorcult
2021-07-12 01:28:46 -07:00
committed by GitHub
parent dadd7b4cc3
commit d992e47f30
6 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Robust.Shared/Network/INetManager.cs
View File

@@ -116,23 +116,6 @@ namespace Robust.Shared.Network
/// </summary>
event EventHandler<NetDisconnectedArgs> Disconnect;
#region StringTable
/// <summary>
/// Registers a NetMessage to be sent or received.
/// </summary>
/// <typeparam name="T">Type to register.</typeparam>
/// <param name="name">String ID of the message.</param>
/// <param name="rxCallback">Callback function to process the received message.</param>
/// <param name="accept">
/// The side of the network this message is accepted on.
/// If we are not on the side specified, the receive callback will not be registered even if provided.
/// </param>
[Obsolete("Use the method without a name argument instead")]
void RegisterNetMessage<T>(string name, ProcessMessage<T>? rxCallback = null,
NetMessageAccept accept = NetMessageAccept.Both)
where T : NetMessage;
/// <summary>
/// Registers a NetMessage to be sent or received.
/// </summary>
@@ -156,8 +139,5 @@ namespace Robust.Shared.Network
/// <typeparam name="T">Type of NetMessage to send.</typeparam>
/// <returns>Instance of the NetMessage.</returns>
T CreateNetMessage<T>() where T : NetMessage;
#endregion StringTable
}
}

2
Robust.Shared/Network/Messages/MsgPlayerListReq.cs
View File

@@ -1,7 +1,5 @@
using Lidgren.Network;
#nullable disable
namespace Robust.Shared.Network.Messages
{
public class MsgPlayerListReq : NetMessage

13
Robust.Shared/Network/NetManager.cs
View File

@@ -902,10 +902,11 @@ namespace Robust.Shared.Network
#region NetMessages
/// <inheritdoc />
public void RegisterNetMessage<T>(string name, ProcessMessage<T>? rxCallback = null,
public void RegisterNetMessage<T>(ProcessMessage<T>? rxCallback = null,
NetMessageAccept accept = NetMessageAccept.Both)
where T : NetMessage
where T : NetMessage, new()
{
var name = new T().MsgName;
var id = _strings.AddString(name);
_messages.Add(name, typeof(T));
@@ -928,14 +929,6 @@ namespace Robust.Shared.Network
CacheBlankFunction(typeof(T));
}
/// <inheritdoc />
public void RegisterNetMessage<T>(ProcessMessage<T>? rxCallback = null,
NetMessageAccept accept = NetMessageAccept.Both)
where T : NetMessage, new()
{
RegisterNetMessage(new T().MsgName, rxCallback, accept);
}
/// <inheritdoc />
public T CreateNetMessage<T>()
where T : NetMessage

12
Robust.Shared/Network/NetMessage.cs
View File

@@ -66,18 +66,6 @@ namespace Robust.Shared.Network
/// </summary>
public int MsgSize { get; set; }
/// <summary>
/// Constructs an instance of the NetMessage.
/// </summary>
/// <param name="name">String identifier of the message type.</param>
/// <param name="group">The group this message type belongs to.</param>
[Obsolete("Use NetMessageAttribute and no constructor instead")]
protected NetMessage(string name, MsgGroups group)
{
MsgName = name;
MsgGroup = group;
}
protected NetMessage()
{
MsgName = GetType().Name;

6
Robust.Shared/Serialization/RobustMappedStringSerializer.cs
View File

@@ -214,9 +214,9 @@ namespace Robust.Shared.Serialization
/// <seealso cref="OnClientCompleteHandshake"/>
private void NetworkInitialize()
{
_net.RegisterNetMessage<MsgMapStrServerHandshake>(nameof(MsgMapStrServerHandshake), HandleServerHandshake, NetMessageAccept.Client);
_net.RegisterNetMessage<MsgMapStrClientHandshake>(nameof(MsgMapStrClientHandshake), HandleClientHandshake, NetMessageAccept.Server);
_net.RegisterNetMessage<MsgMapStrStrings>(nameof(MsgMapStrStrings), HandleStringsMessage, NetMessageAccept.Client);
_net.RegisterNetMessage<MsgMapStrServerHandshake>(HandleServerHandshake, NetMessageAccept.Client);
_net.RegisterNetMessage<MsgMapStrClientHandshake>(HandleClientHandshake, NetMessageAccept.Server);
_net.RegisterNetMessage<MsgMapStrStrings>(HandleStringsMessage, NetMessageAccept.Client);
_net.Disconnect += NetOnDisconnect;
}

9
Robust.UnitTesting/RobustIntegrationTest.NetManager.cs
View File

@@ -272,9 +272,9 @@ namespace Robust.UnitTesting
public event EventHandler<NetChannelArgs>? Connected;
public event EventHandler<NetDisconnectedArgs>? Disconnect;
public void RegisterNetMessage<T>(string name, ProcessMessage<T>? rxCallback = null,
NetMessageAccept accept = NetMessageAccept.Both) where T : NetMessage
public void RegisterNetMessage<T>(ProcessMessage<T>? rxCallback = null, NetMessageAccept accept = NetMessageAccept.Both) where T : NetMessage, new()
{
var name = new T().MsgName;
var thisSide = IsServer ? NetMessageAccept.Server : NetMessageAccept.Client;
_registeredMessages.Add(typeof(T));
@@ -282,11 +282,6 @@ namespace Robust.UnitTesting
_callbacks.Add(typeof(T), msg => rxCallback((T) msg));
}
public void RegisterNetMessage<T>(ProcessMessage<T>? rxCallback = null, NetMessageAccept accept = NetMessageAccept.Both) where T : NetMessage, new()
{
RegisterNetMessage(new T().MsgName, rxCallback, accept);
}
public T CreateNetMessage<T>() where T : NetMessage
{
var type = typeof(T);