refactor: network entity packets
This commit is contained in:
@@ -44,7 +44,7 @@ public abstract class LiteNetLibCommunicatorBase : UniverseObject, INetworkCommu
|
||||
return;
|
||||
|
||||
foreach (Delegate @delegate in delegates)
|
||||
@delegate.InvokeSafe(packet);
|
||||
@delegate.InvokeSafe(packet, peer.Id.ToString());
|
||||
}
|
||||
|
||||
private void NetworkReceiveEvent(NetPeer peer, NetPacketReader reader, byte channel, DeliveryMethod deliveryMethod)
|
||||
@@ -57,7 +57,7 @@ public abstract class LiteNetLibCommunicatorBase : UniverseObject, INetworkCommu
|
||||
{
|
||||
// Find network packets implementing INetworkPacket
|
||||
IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
|
||||
.Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface);
|
||||
.Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
|
||||
|
||||
MethodInfo subscribeReusableMethod = typeof(NetPacketProcessor)
|
||||
.GetMethods()
|
||||
@@ -66,17 +66,33 @@ public abstract class LiteNetLibCommunicatorBase : UniverseObject, INetworkCommu
|
||||
m.GetParameters()[0].ParameterType.GetGenericTypeDefinition() == typeof(Action<,>)
|
||||
)!;
|
||||
|
||||
MethodInfo registerNestedTypeMethod = typeof(NetPacketProcessor)
|
||||
.GetMethods()
|
||||
.FirstOrDefault(m => m.Name == nameof(NetPacketProcessor.RegisterNestedType) &&
|
||||
m.GetParameters().Length == 0
|
||||
)!;
|
||||
|
||||
MethodInfo onPacketArrivedMethod = typeof(LiteNetLibCommunicatorBase)
|
||||
.GetMethod(nameof(OnPacketArrived), BindingFlags.NonPublic | BindingFlags.Instance)!;
|
||||
|
||||
// Register all network packets by calling the method bellow where T is our found network packet type
|
||||
// Register all network packets by calling the methods bellow where T is our found network packet type
|
||||
// NetPacketProcessor.SubscribeReusable<T, NetPeer>(Action<T, NetPeer> onReceive)
|
||||
foreach (var packetType in packetTypes)
|
||||
// NetPacketProcessor.RegisterNestedType<T>()
|
||||
foreach (Type packetType in packetTypes)
|
||||
{
|
||||
var genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
|
||||
if (!packetType.IsClass)
|
||||
{
|
||||
Console.WriteLine($"Registering Nested: {packetType.FullName}");
|
||||
MethodInfo genericRegisterNestedTypeMethod = registerNestedTypeMethod.MakeGenericMethod(packetType);
|
||||
genericRegisterNestedTypeMethod.Invoke(netPacketProcessor, []);
|
||||
continue;
|
||||
}
|
||||
|
||||
var delegateType = typeof(Action<,>).MakeGenericType(packetType, typeof(NetPeer));
|
||||
var delegateHandler = Delegate.CreateDelegate(delegateType, this, genericOnPacketArrivedMethod);
|
||||
Console.WriteLine($"Registering Reusable: {packetType.FullName}");
|
||||
MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
|
||||
|
||||
Type delegateType = typeof(Action<,>).MakeGenericType(packetType, typeof(NetPeer));
|
||||
Delegate delegateHandler = Delegate.CreateDelegate(delegateType, this, genericOnPacketArrivedMethod);
|
||||
|
||||
var genericSubscribeReusableMethod = subscribeReusableMethod.MakeGenericMethod(packetType, typeof(NetPeer));
|
||||
genericSubscribeReusableMethod.Invoke(netPacketProcessor, [delegateHandler]);
|
||||
@@ -112,22 +128,28 @@ public abstract class LiteNetLibCommunicatorBase : UniverseObject, INetworkCommu
|
||||
netPacketProcessor.RegisterNestedType(Vector3DNetPacker.Write, Vector3DNetPacker.Read);
|
||||
}
|
||||
|
||||
public void SubscribeToPackets<T>(Action<T> callback)
|
||||
public INetworkCommunicator SubscribeToPackets<T>(Action<T, string> callback)
|
||||
{
|
||||
if (!listeners.TryGetValue(typeof(T), out List<Delegate>? delegates))
|
||||
Type type = typeof(T);
|
||||
Console.WriteLine($"Subscribing to: {type.FullName} on {GetType().Name}");
|
||||
if (!listeners.TryGetValue(type, out List<Delegate>? delegates))
|
||||
{
|
||||
delegates = [];
|
||||
listeners.Add(typeof(T), delegates);
|
||||
listeners.Add(type, delegates);
|
||||
}
|
||||
|
||||
delegates.Add(callback);
|
||||
return this;
|
||||
}
|
||||
|
||||
public void UnsubscribeFromPackets<T>(Action<T> callback)
|
||||
public INetworkCommunicator UnsubscribeFromPackets<T>(Action<T, string> callback)
|
||||
{
|
||||
if (!listeners.TryGetValue(typeof(T), out List<Delegate>? delegates))
|
||||
return;
|
||||
Type type = typeof(T);
|
||||
Console.WriteLine($"Unsubscribing from: {type.FullName} on {GetType().Name}");
|
||||
if (!listeners.TryGetValue(type, out List<Delegate>? delegates))
|
||||
return this;
|
||||
|
||||
delegates.Remove(callback);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user