chore: removed unused piece of code

This also makes the events very not ideal for multithreaded applications at the moment.

Engine.Core/Debug/RotatingFileLogger.cs

@@ -55,7 +55,7 @@ public class RotatingFileLogger : ILogger
     private static void RotateLastLogs(string directory, string prefix, int rotateLength)
     {
         IOrderedEnumerable<string> logs = System.IO.Directory.GetFiles(directory, $"{prefix}*.log")
-            .OrderBy(File.GetCreationTime);
+            .OrderByDescending(File.GetCreationTime);
 
         foreach (string file in logs.Skip(rotateLength))
             try

Engine.Core/Helpers/Event.cs

@@ -58,6 +58,9 @@ public class Event
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -74,6 +77,9 @@ public class Event
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -90,6 +96,9 @@ public class Event
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -103,6 +112,8 @@ public class Event
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -117,6 +128,8 @@ public class Event
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -131,23 +144,23 @@ public class Event
     /// </summary>
     public void Invoke()
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
-            try { listeners[i].Callback.Invoke(); }
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
+            try { listeners[currentCallIndex].Callback.Invoke(); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}()";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}()";
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}()";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}()";
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 
@@ -216,6 +229,9 @@ public class Event<TSender> where TSender : class
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -232,6 +248,9 @@ public class Event<TSender> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -248,6 +267,9 @@ public class Event<TSender> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -261,6 +283,8 @@ public class Event<TSender> where TSender : class
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -275,6 +299,8 @@ public class Event<TSender> where TSender : class
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -290,23 +316,23 @@ public class Event<TSender> where TSender : class
     /// <param name="sender">The caller that's triggering this event.</param>
     public void Invoke(TSender sender)
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
-            try { listeners[i].Callback.Invoke(sender); }
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
+            try { listeners[currentCallIndex].Callback.Invoke(sender); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender})";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender})";
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(sender); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender})";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender})";
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 
@@ -382,6 +408,9 @@ public class Event<TSender, TArguments> where TSender : class
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -398,6 +427,9 @@ public class Event<TSender, TArguments> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -414,6 +446,9 @@ public class Event<TSender, TArguments> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -427,6 +462,8 @@ public class Event<TSender, TArguments> where TSender : class
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -441,6 +478,8 @@ public class Event<TSender, TArguments> where TSender : class
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -457,23 +496,23 @@ public class Event<TSender, TArguments> where TSender : class
     /// <param name="args">The arguments provided for this event.</param>
     public void Invoke(TSender sender, TArguments args)
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
-            try { listeners[i].Callback.Invoke(sender, args); }
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
+            try { listeners[currentCallIndex].Callback.Invoke(sender, args); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender}, {args})";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender}, {args})";
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(sender, args); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender, args); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender}, {args})";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender}, {args})";
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 

Engine.Core/Helpers/FastListOrdered.cs

@@ -16,8 +16,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
     private readonly Func<TItem, TIndex> getIndexFunc = null!;
     private readonly IComparer<TIndex> sortBy = null!;
 
-    private int count = 0;
-    public int Count => count;
+    public int Count { get; private set; } = 0;
 
     public bool IsReadOnly { get; set; } = false;
 
@@ -35,10 +34,10 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
     private (TIndex TIndex, int i) GetAt(Index index)
     {
         int actualIndex = index.IsFromEnd
-                ? count - index.Value
+                ? Count - index.Value
                 : index.Value;
 
-        if (actualIndex < 0 || actualIndex >= count)
+        if (actualIndex < 0 || actualIndex >= Count)
             throw new IndexOutOfRangeException();
 
         int leftIndex = actualIndex;
@@ -75,7 +74,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
             items[key] = list = [];
 
         list.Add(item);
-        count++;
+        Count++;
     }
 
     public void Insert(int index, TItem item)
@@ -88,7 +87,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
             items[tIndex] = list = [];
 
         list.Insert(index, item);
-        count++;
+        Count++;
     }
 
     public bool Remove(TItem item)
@@ -103,7 +102,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
         if (!list.Remove(item))
             return false;
 
-        count--;
+        Count--;
         return true;
     }
 
@@ -114,7 +113,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
 
         (TIndex tIndex, int i) = GetAt(index);
         items[tIndex].RemoveAt(i);
-        count--;
+        Count--;
     }
 
     public void Clear()
@@ -125,7 +124,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
         foreach ((TIndex index, FastList<TItem> list) in items)
             list.Clear();
 
-        count = 0;
+        Count = 0;
     }
 
     public bool Contains(TItem item)

Engine.Core/Systems/Yields/WaitForSecondsYield.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Engine.Core;
+
+public class WaitForSecondsYield(float seconds) : ICoroutineYield
+{
+    private readonly DateTime triggerTime = DateTime.UtcNow.AddSeconds(seconds);
+
+    public bool Yield() => DateTime.UtcNow < triggerTime;
+}

Engine.Core/Systems/Yields/WaitUntilYield.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Engine.Core;
+
+public class WaitUntilYield(Func<bool> condition) : ICoroutineYield
+{
+    private readonly Func<bool> condition = condition;
+
+    public bool Yield() => !condition.Invoke();
+}

Engine.Core/Systems/Yields/WaitWhileYield.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace Engine.Core;
 
-public class CoroutineYield(Func<bool> condition) : ICoroutineYield
+public class WaitWhileYield(Func<bool> condition) : ICoroutineYield
 {
     private readonly Func<bool> condition = condition;
 

Engine.Integration/Engine.Integration.LiteNetLib/LiteNetLibCommunicatorBase.cs

@@ -178,6 +178,7 @@ public abstract class LiteNetLibCommunicatorBase : Behaviour, IEnterUniverse, IE
         netPacketProcessor.RegisterNestedType(Vector3DNetPacker.Write, Vector3DNetPacker.Read);
         netPacketProcessor.RegisterNestedType(Vector3DIntNetPacker.Write, Vector3DIntNetPacker.Read);
         netPacketProcessor.RegisterNestedType(Vector4DNetPacker.Write, Vector4DNetPacker.Read);
+        netPacketProcessor.RegisterNestedType(Matrix4x4NetPacker.Write, Matrix4x4NetPacker.Read);
     }
 
     public INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback)

Engine.Integration/Engine.Integration.LiteNetLib/LiteNetLibServer.cs

@@ -6,7 +6,7 @@ using Engine.Core.Debug;
 
 namespace Engine.Systems.Network;
 
-public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer
+public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer, IPostUpdate
 {
     public string Password { get; private set; } = string.Empty;
     public int MaxConnectionCount { get; private set; } = 2;
@@ -104,17 +104,8 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
         }
     }
 
-    private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
-
-    public override void EnterUniverse(IUniverse universe)
+    public void PostUpdate()
     {
-        base.EnterUniverse(universe);
-        universe.OnPostUpdate.AddListener(PollEvents);
-    }
-
-    public override void ExitUniverse(IUniverse universe)
-    {
-        base.ExitUniverse(universe);
-        universe.OnPostUpdate.RemoveListener(PollEvents);
+        Manager.PollEvents();
     }
 }

Engine.Integration/Engine.Integration.LiteNetLib/Packers/Matrix4x4NetPacker.cs

@@ -0,0 +1,61 @@
+using LiteNetLib.Utils;
+
+using Engine.Core;
+
+namespace Engine.Systems.Network.Packers;
+
+internal static class Matrix4x4NetPacker
+{
+    internal static void Write(NetDataWriter writer, Matrix4x4 data)
+    {
+        writer.Put(data.M11);
+        writer.Put(data.M12);
+        writer.Put(data.M13);
+        writer.Put(data.M14);
+
+        writer.Put(data.M21);
+        writer.Put(data.M22);
+        writer.Put(data.M23);
+        writer.Put(data.M24);
+
+        writer.Put(data.M31);
+        writer.Put(data.M32);
+        writer.Put(data.M33);
+        writer.Put(data.M34);
+
+        writer.Put(data.M41);
+        writer.Put(data.M42);
+        writer.Put(data.M43);
+        writer.Put(data.M44);
+    }
+
+    internal static Matrix4x4 Read(NetDataReader reader)
+    {
+        float m11 = reader.GetFloat();
+        float m12 = reader.GetFloat();
+        float m13 = reader.GetFloat();
+        float m14 = reader.GetFloat();
+
+        float m21 = reader.GetFloat();
+        float m22 = reader.GetFloat();
+        float m23 = reader.GetFloat();
+        float m24 = reader.GetFloat();
+
+        float m31 = reader.GetFloat();
+        float m32 = reader.GetFloat();
+        float m33 = reader.GetFloat();
+        float m34 = reader.GetFloat();
+
+        float m41 = reader.GetFloat();
+        float m42 = reader.GetFloat();
+        float m43 = reader.GetFloat();
+        float m44 = reader.GetFloat();
+
+        return new Matrix4x4(
+            m11, m12, m13, m14,
+            m21, m22, m23, m24,
+            m31, m32, m33, m34,
+            m41, m42, m43, m44
+        );
+    }
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/MonoGameCamera2D.cs

@@ -113,10 +113,10 @@ public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, ILastFr
     public void PreDraw()
     {
         ProjectionMatrix = Matrix4x4.CreateOrthographicViewCentered(Viewport.Width, Viewport.Height);
-        ViewMatrix =
-            Matrix4x4.CreateTranslation(new Vector3D(-Transform.Position.X, -Transform.Position.Y, 0f))
-                .ApplyRotationZ(Transform.Rotation * Math.DegreeToRadian)
-                .ApplyScale(Transform.Scale.X.Max(Transform.Scale.Y))
-                .ApplyScale(Zoom);
+        ViewMatrix = Matrix4x4.Identity
+            .ApplyScale(Transform.Scale.X.Max(Transform.Scale.Y))
+            .ApplyScale(Zoom)
+            .ApplyRotationZ(-Transform.Rotation * Math.DegreeToRadian)
+            .ApplyTranslation(new Vector3D(-Transform.Position.X, -Transform.Position.Y, 0f));
     }
 }

Engine.Integration/Engine.Integration.MonoGame/MonoGameTriangleBatch.cs

@@ -19,8 +19,11 @@ public class MonoGameTriangleBatch : Behaviour, ITriangleBatch, IFirstFrameUpdat
     private BasicEffect basicEffect = null!;
     private readonly RasterizerState rasterizerState = new() { CullMode = CullMode.None };
 
+    private ICamera camera = null!;
+
     public void FirstActiveFrame()
     {
+        camera = Universe.FindRequiredBehaviour<ICamera>();
         GraphicsDevice graphicsDevice = Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.GraphicsDevice;
         this.graphicsDevice = graphicsDevice;
         basicEffect = new(graphicsDevice);
@@ -45,10 +48,8 @@ public class MonoGameTriangleBatch : Behaviour, ITriangleBatch, IFirstFrameUpdat
 
     public void Begin(Matrix4x4? view = null, Matrix4x4? projection = null)
     {
-        Viewport viewport = graphicsDevice.Viewport;
-
-        this.view = (view ?? Matrix4x4.Identity).Transposed.ToXnaMatrix();
-        this.projection = (projection ?? Matrix4x4.CreateOrthographicViewCentered(viewport.Width, viewport.Height)).Transposed.ToXnaMatrix();
+        this.view = (view ?? camera.ViewMatrix).Transposed.ToXnaMatrix();
+        this.projection = (projection ?? camera.ProjectionMatrix).Transposed.ToXnaMatrix();
     }
 
     public void End() => Flush();

Engine.Systems/Graphics/TriangleBatcher.cs

@@ -10,14 +10,10 @@ public class TriangleBatcher : Behaviour, IFirstFrameUpdate, ILastFrameUpdate, I
     private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
 
     private readonly BehaviourCollector<ITriangleBatch> triangleBatches = new();
-    private ICamera camera = null!;
-
     private readonly ActiveBehaviourCollectorOrdered<int, IDrawableTriangle> drawableShapes = new(GetPriority(), SortByAscendingPriority());
 
     public void FirstActiveFrame()
     {
-        camera = Universe.FindRequiredBehaviour<ICamera>();
-
         drawableShapes.Assign(Universe);
         triangleBatches.Assign(Universe);
     }
@@ -27,7 +23,7 @@ public class TriangleBatcher : Behaviour, IFirstFrameUpdate, ILastFrameUpdate, I
         for (int i = 0; i < triangleBatches.Count; i++)
         {
             ITriangleBatch triangleBatch = triangleBatches[i];
-            triangleBatch.Begin(camera.ViewMatrix, camera.ProjectionMatrix);
+            triangleBatch.Begin();
             for (int j = 0; j < drawableShapes.Count; j++)
                 drawableShapes[j].Draw(triangleBatch);
             triangleBatch.End();

Engine.Systems/Network/Abstract/IPacketListenerClientEntity.cs

@@ -0,0 +1,6 @@
+namespace Engine.Systems.Network;
+
+public interface IPacketListenerClientEntity<T> : INetworkEntity where T : IEntityNetworkPacket
+{
+    void OnEntityClientPacketArrived(IConnection sender, T packet);
+}

Engine.Systems/Network/Abstract/IPacketListenerServerEntity.cs

@@ -0,0 +1,6 @@
+namespace Engine.Systems.Network;
+
+public interface IPacketListenerServerEntity<T> : INetworkEntity where T : IEntityNetworkPacket
+{
+    void OnEntityServerPacketArrived(IConnection sender, T packet);
+}

Engine.Systems/Network/NetworkManager.cs

@@ -10,25 +10,127 @@ namespace Engine.Systems.Network;
 /// <summary>
 /// Intermediary manager that looks up in it's hierarchy for a <see cref="INetworkCommunicator"/> to route/broadcast it's received packets to their destinations.
 /// </summary>
+/// TODO: I need to peer check this class, I don't exactly remember the state I was in when I was originally writing it and left it uncommented and the current comments are added later on.
+/// It's a fairly complex manager that relies heavily on Reflection and lots of generic method delegation which is making it very hard to read back. 
 public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetworkManager
 {
-    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientPacketArrivalMethods = [];
-    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverPacketArrivalMethods = [];
+    #region Packet Router/Broadcaster to Listener Delegates
 
-    private readonly Dictionary<Type, Dictionary<string, object>> clientPacketRouters = [];
-    private readonly Dictionary<Type, Dictionary<string, object>> serverPacketRouters = [];
+    /// <summary>
+    /// Behaviour Type → Packet Type → List of <see cref="IPacketListenerClient{T}"/> listener methods (broadcast packets, client-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientBroadcastPacketListenerMethods = [];
 
-    private readonly List<(Type packetType, Delegate @delegate)> packetRetrievalDelegates = [];
+    /// <summary>
+    /// Behaviour Type → Packet Type → List of <see cref="IPacketListenerServer{T}"/> listener methods (broadcast packets, server-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverBroadcastPacketListenerMethods = [];
 
+    /// <summary>
+    /// Behaviour Type → Packet Type → List of <see cref="IPacketListenerClientEntity{T}"/> listener methods (entity packets, client-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientEntityPacketListenerMethods = [];
+
+    /// <summary>
+    /// Behaviour Type → Packet Type → List of <see cref="IPacketListenerServerEntity{T}"/> listener methods (entity packets, server-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverEntityPacketListenerMethods = [];
+
+    #endregion 
+
+    #region Packet Router/Broadcaster Events
+
+    /// <summary>
+    /// Packet Type → Behaviour.Id → Broadcaster Event (broadcast, client-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<string, object>> clientPacketBroadcastEvents = [];
+
+    /// <summary>
+    /// Packet Type → Behaviour.Id → Broadcaster Event (broadcast, server-side)
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<string, object>> serverPacketBroadcastEvents = [];
+
+    /// <summary>
+    /// Maps an <see cref="IEntityNetworkPacket"/> type to a set of routing events,
+    /// keyed by <see cref="IIdentifiable.Id"/>, for CLIENT entity listeners.
+    /// The packet is routed to the correct <see cref="INetworkEntity"/> instance
+    /// by matching <see cref="IEntityNetworkPacket.EntityId"/>.
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<string, object>> clientEntityPacketRouterEvents = [];
+
+    /// <summary>
+    /// Maps an <see cref="IEntityNetworkPacket"/> type to a set of routing events,
+    /// keyed by <see cref="IIdentifiable.Id"/>, for SERVER entity listeners.
+    /// The packet is routed to the correct <see cref="INetworkEntity"/> instance
+    /// by matching <see cref="IEntityNetworkPacket.EntityId"/>.
+    /// </summary>
+    private readonly Dictionary<Type, Dictionary<string, object>> serverEntityPacketRouterEvents = [];
+
+    #endregion 
+
+    #region Packet Retrieval Delegates
+
+    /// <summary>
+    /// Stores delegates that connect incoming broadcast packets from <see cref="INetworkCommunicator"/>
+    /// to <see cref="OnPacketReceived{T}(IConnection, T)"/>. 
+    /// These are used to subscribe/unsubscribe from <see cref="INetworkCommunicator"/> events.
+    /// </summary>
+    private readonly List<PacketRetrievalDelegatePair> broadcastPacketRetrievalSubscriptionDelegates = [];
+
+    /// <summary>
+    /// Stores delegates that connect incoming entity packets from <see cref="INetworkCommunicator"/>
+    /// to <see cref="OnPacketReceived{T}(IConnection, T)"/>. 
+    /// These are used to subscribe/unsubscribe from <see cref="INetworkCommunicator"/> events.
+    /// </summary>
+    private readonly List<PacketRetrievalDelegatePair> entityPacketRetrievalSubscriptionDelegates = [];
+
+    /// <summary>
+    /// Stores delegates that connect incoming all packets from <see cref="INetworkCommunicator"/> to 
+    /// <see cref="OnPacketReceived{T}(IConnection, T)"/>. This is a combination of all subscription 
+    /// delegates filtered so there are no duplicates packet entries.
+    /// </summary>
+    private readonly List<PacketRetrievalDelegatePair> uniqueRetrievalSubscriptionDelegates = [];
+
+    #endregion
+
+    #region Method Caches
+
+    /// <summary>
+    /// Packet type → <see cref="ClearRouter{T}(object)"/> method.
+    /// </summary>
     private readonly Dictionary<Type, MethodInfo> clearRoutesMethods = [];
-    private readonly Dictionary<Type, MethodInfo> registerPacketListenersMethods = [];
 
+    /// <summary>
+    /// Packet type → <see cref="RegisterBroadcastPacketListenerEvent{T}(INetworkEntity, Event{IConnection, T}, NetworkType)"/> method.
+    /// </summary>
+    private readonly Dictionary<Type, MethodInfo> registerBroadcastPacketListenersMethods = [];
+
+    /// <summary>
+    /// Packet type → <see cref="RegisterEntityPacketListenerEvent{T}(INetworkEntity, Event{IConnection, T}, NetworkType)"/> method.
+    /// </summary>
+    private readonly Dictionary<Type, MethodInfo> registerEntityPacketListenersMethods = [];
+
+    #endregion 
+
+    #region Network Entity Collector
+
+    /// <summary>
+    /// All active network <see cref="INetworkEntity"/>, keyed by <see cref="IIdentifiable.Id"/>.
+    /// </summary>
     private readonly Dictionary<string, INetworkEntity> _networkEntities = [];
     public IReadOnlyDictionary<string, INetworkEntity> NetworkEntities => _networkEntities;
 
+    /// <summary>
+    /// Collector responsible for detecting <see cref="INetworkEntity"/>s entering/leaving the universe.
+    /// </summary>
     private readonly BehaviourCollector<INetworkEntity> _networkEntityCollector = new();
+
     public IBehaviourCollector<INetworkEntity> NetworkEntityCollector => _networkEntityCollector;
 
+    #endregion
+
+    #region Network Communicator
+
     public INetworkCommunicator NetworkCommunicator
     {
         get;
@@ -40,68 +142,74 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
             INetworkCommunicator? previousCommunicator = field;
             field = value;
 
-            if (previousCommunicator is not null) UnsubscribeCommunicatorMethods(previousCommunicator);
-            if (field is not null) SubscribeCommunicatorMethods(field);
+            // Unsubscribe packet delegates from old communicator
+            if (previousCommunicator is not null)
+                InvokeCommunicatorMethods(nameof(INetworkCommunicator.UnsubscribeFromPackets), previousCommunicator);
+
+            // Subscribe packet delegates to new communicator
+            if (field is not null)
+                InvokeCommunicatorMethods(nameof(INetworkCommunicator.SubscribeToPackets), field);
         }
     } = null!;
 
-    #region Communicator Subscriptions
-    private void SubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
-    {
-        MethodInfo subscribeToPacketsMethod = typeof(INetworkCommunicator)
-            .GetMethod(nameof(INetworkCommunicator.SubscribeToPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
-
-        foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
-        {
-            MethodInfo genericSubscribeMethod = subscribeToPacketsMethod.MakeGenericMethod(packetType);
-            genericSubscribeMethod.Invoke(networkCommunicator, [@delegate]);
-        }
-    }
-
-    private void UnsubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
+    /// <summary>
+    /// Dynamically invokes <see cref="INetworkCommunicator.SubscribeToPackets{T}(Event{IConnection, T}.EventHandler)"/> 
+    /// or <see cref="INetworkCommunicator.UnsubscribeFromPackets{T}(Event{IConnection, T}.EventHandler)"/>
+    /// on the provided <see cref="INetworkCommunicator"/> for all known packet types.
+    /// </summary>
+    private void InvokeCommunicatorMethods(string methodName, INetworkCommunicator networkCommunicator)
     {
         MethodInfo unsubscribeFromPacketsMethod = typeof(INetworkCommunicator)
-            .GetMethod(nameof(INetworkCommunicator.UnsubscribeFromPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
+            .GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
 
-        foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
+        foreach ((Type packetType, Delegate @delegate) in uniqueRetrievalSubscriptionDelegates)
         {
-            MethodInfo genericUnsubscribeMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
-            genericUnsubscribeMethod.Invoke(networkCommunicator, [@delegate]);
+            MethodInfo genericMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
+            genericMethod.Invoke(networkCommunicator, [@delegate]);
         }
     }
+
     #endregion
 
-    #region Packet Routing
+    ////////////////////////////////////////////////////////////////
+
+    #region Packet Routing/Broadcasting
+
+    /// <summary>
+    /// Entry point for ALL incoming packets from the <see cref="NetworkCommunicator"/>.
+    /// </summary>
     private void OnPacketReceived<T>(IConnection sender, T entityDataPacket)
     {
+        BroadcastPacket(sender, entityDataPacket);
+
         if (entityDataPacket is IEntityNetworkPacket entityPacket)
             RoutePacket(sender, entityDataPacket, entityPacket);
-        else
-            BroadcastPacket(sender, entityDataPacket);
     }
 
     private void RoutePacket<T>(IConnection sender, T entityDataPacket, IEntityNetworkPacket entityPacket)
     {
         if (NetworkCommunicator is INetworkCommunicatorClient)
-            RoutePacket(clientPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
+            RoutePacket(clientEntityPacketRouterEvents, entityPacket.EntityId, sender, entityDataPacket);
+
         if (NetworkCommunicator is INetworkCommunicatorServer)
-            RoutePacket(serverPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
+            RoutePacket(serverEntityPacketRouterEvents, entityPacket.EntityId, sender, entityDataPacket);
     }
 
     private void BroadcastPacket<T>(IConnection sender, T entityDataPacket)
     {
         if (NetworkCommunicator is INetworkCommunicatorClient)
-            BroadcastPacket(clientPacketRouters, sender, entityDataPacket);
+            BroadcastPacket(clientPacketBroadcastEvents, sender, entityDataPacket);
+
         if (NetworkCommunicator is INetworkCommunicatorServer)
-            BroadcastPacket(serverPacketRouters, sender, entityDataPacket);
+            BroadcastPacket(serverPacketBroadcastEvents, sender, entityDataPacket);
     }
 
-    private static void BroadcastPacket<T>(
-        Dictionary<Type, Dictionary<string, object>> packetRouters,
+    private void BroadcastPacket<T>(
+        Dictionary<Type, Dictionary<string, object>> packetBroadcasters,
         IConnection sender,
         T entityDataPacket)
     {
-        if (!packetRouters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
+        if (!packetBroadcasters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
             return;
 
         foreach ((string behaviourId, object routerEventReference) in routers)
@@ -111,7 +219,7 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         }
     }
 
-    private static void RoutePacket<T>(
+    private void RoutePacket<T>(
         Dictionary<Type, Dictionary<string, object>> packetRouters,
         string entityId,
         IConnection sender,
@@ -126,65 +234,114 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
         routerEvent.Invoke(sender, entityDataPacket!);
     }
+
     #endregion
 
     #region Packet Routers
+
+    /// <summary>
+    /// Registers routing events for the behaviour based on cached packet listener methods.
+    /// </summary>
     private void RegisterPacketRoutersFor(
         INetworkEntity behaviour,
         Dictionary<Type, Dictionary<string, object>> packetRouters,
-        Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods,
-        NetworkType networkType)
+        Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods,
+        NetworkType networkType,
+        Dictionary<Type, MethodInfo> registerPacketListenerListenersMethods)
     {
-        if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
+        if (!packetListenerMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? listenerMethods))
             return;
 
-        foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
-            foreach (MethodInfo receiveMethod in methods)
+        foreach (Type packetType in listenerMethods.Keys)
+        {
+            if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
             {
-                if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
-                {
-                    routers = [];
-                    packetRouters.Add(packetType, routers);
-                }
-
-                object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType);
-                routers.Add(behaviour.Id, packetListenerEvent);
+                routers = [];
+                packetRouters.Add(packetType, routers);
             }
+
+            object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType, registerPacketListenerListenersMethods);
+
+            routers.Add(behaviour.Id, packetListenerEvent);
+        }
     }
 
-    private object CreateEventAndRegister(Type packetType, INetworkEntity behaviour, NetworkType networkType)
+    /// <summary>
+    /// Creates an Event<IConnection, TPacket> and attaches listener callbacks.
+    /// </summary>
+    private object CreateEventAndRegister(
+        Type packetType,
+        INetworkEntity behaviour,
+        NetworkType networkType,
+        Dictionary<Type, MethodInfo> registerPacketListenersMethods)
     {
         Type genericEventType = typeof(Event<,>).MakeGenericType(typeof(IConnection), packetType);
         object packetListenerEvent = Activator.CreateInstance(genericEventType)!;
 
         if (!registerPacketListenersMethods.TryGetValue(packetType, out MethodInfo? registerPacketListenerMethod))
-            throw new($"{nameof(RegisterPacketListenerEvent)} for {packetType.Name} has not been cached.");
+            throw new($"Packet Listener Events for {packetType.Name} has not been cached.");
 
         registerPacketListenerMethod.Invoke(this, [behaviour, packetListenerEvent, networkType]);
         return packetListenerEvent;
     }
 
-    private static void RegisterPacketListenerEvent<T>(
+    /// <summary>
+    /// Registers broadcast packet listeners on the behaviour.
+    /// </summary>
+    private static void RegisterBroadcastPacketListenerEvent<T>(
         INetworkEntity behaviour,
         Event<IConnection, T> packetListenerEvent,
         NetworkType networkType)
     {
         switch (networkType)
         {
-            case NetworkType.Client: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerClient<T>)behaviour).OnClientPacketArrived(sender, packet)); break;
-            case NetworkType.Server: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerServer<T>)behaviour).OnServerPacketArrived(sender, packet)); break;
+            case NetworkType.Client:
+                packetListenerEvent.AddListener(
+                    (sender, packet) => ((IPacketListenerClient<T>)behaviour).OnClientPacketArrived(sender, packet));
+                break;
+
+            case NetworkType.Server:
+                packetListenerEvent.AddListener(
+                    (sender, packet) => ((IPacketListenerServer<T>)behaviour).OnServerPacketArrived(sender, packet));
+                break;
         }
     }
 
+    /// <summary>
+    /// Registers entity-specific packet listeners on a network behaviour.
+    /// </summary>
+    private static void RegisterEntityPacketListenerEvent<T>(
+        INetworkEntity behaviour,
+        Event<IConnection, T> packetListenerEvent,
+        NetworkType networkType
+    ) where T : IEntityNetworkPacket
+    {
+        switch (networkType)
+        {
+            case NetworkType.Client:
+                packetListenerEvent.AddListener(
+                    (sender, packet) => ((IPacketListenerClientEntity<T>)behaviour).OnEntityClientPacketArrived(sender, packet));
+                break;
+
+            case NetworkType.Server:
+                packetListenerEvent.AddListener(
+                    (sender, packet) => ((IPacketListenerServerEntity<T>)behaviour).OnEntityServerPacketArrived(sender, packet));
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Unregisters all routing events associated with the behaviour.
+    /// </summary>
     private void UnregisterPacketRoutersFor(
         INetworkEntity behaviour,
         Dictionary<Type, Dictionary<string, object>> packetRouters,
-        Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods)
+        Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods)
     {
-        if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
+        if (!packetListenerMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? listenerMethods))
             return;
 
-        foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
+        foreach ((Type packetType, List<MethodInfo> methods) in listenerMethods)
         {
             if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
                 continue;
@@ -199,6 +356,9 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         }
     }
 
+    /// <summary>
+    /// Clears all listeners from a router event.
+    /// </summary>
     private static void ClearRouter<T>(object routerEventReference)
     {
         Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
@@ -208,124 +368,192 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
     #endregion
 
     #region Engine Callbacks
-    private void OnCollected(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
+
+    /// <summary>
+    /// Called when an <see cref="INetworkEntity"/> enters the universe.
+    /// Registers all packet routing for that entity.
+    /// </summary>
+    private void OnCollected(
+        IBehaviourCollector<INetworkEntity> sender,
+        IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
     {
         INetworkEntity collectedBehaviour = args.BehaviourCollected;
 
         if (!_networkEntities.TryAdd(collectedBehaviour.Id, collectedBehaviour))
             throw new($"Unable to add {collectedBehaviour.Id} to {nameof(NetworkManager)}");
 
-        RegisterPacketRoutersFor(collectedBehaviour, clientPacketRouters, clientPacketArrivalMethods, NetworkType.Client);
-        RegisterPacketRoutersFor(collectedBehaviour, serverPacketRouters, serverPacketArrivalMethods, NetworkType.Server);
+        RegisterPacketRoutersFor(collectedBehaviour, clientPacketBroadcastEvents, clientBroadcastPacketListenerMethods, NetworkType.Client, registerBroadcastPacketListenersMethods);
+        RegisterPacketRoutersFor(collectedBehaviour, clientEntityPacketRouterEvents, clientEntityPacketListenerMethods, NetworkType.Client, registerEntityPacketListenersMethods);
+
+        RegisterPacketRoutersFor(collectedBehaviour, serverPacketBroadcastEvents, serverBroadcastPacketListenerMethods, NetworkType.Server, registerBroadcastPacketListenersMethods);
+        RegisterPacketRoutersFor(collectedBehaviour, serverEntityPacketRouterEvents, serverEntityPacketListenerMethods, NetworkType.Server, registerEntityPacketListenersMethods);
     }
 
+    /// <summary>
+    /// Called when an <see cref="INetworkEntity"/> is removed from the universe.
+    /// Cleans up all routing.
+    /// </summary>
     private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourRemovedArguments args)
     {
         INetworkEntity removedBehaviour = args.BehaviourRemoved;
-        if (!_networkEntities.Remove(args.BehaviourRemoved.Id))
+
+        if (!_networkEntities.Remove(removedBehaviour.Id))
             return;
 
-        UnregisterPacketRoutersFor(removedBehaviour, clientPacketRouters, clientPacketArrivalMethods);
-        UnregisterPacketRoutersFor(removedBehaviour, serverPacketRouters, serverPacketArrivalMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, clientPacketBroadcastEvents, clientBroadcastPacketListenerMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, clientEntityPacketRouterEvents, clientEntityPacketListenerMethods);
+
+        UnregisterPacketRoutersFor(removedBehaviour, serverPacketBroadcastEvents, serverBroadcastPacketListenerMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, serverEntityPacketRouterEvents, serverEntityPacketListenerMethods);
     }
 
     public void ExitUniverse(IUniverse universe) => _networkEntityCollector.Unassign();
+
     public void EnterUniverse(IUniverse universe)
     {
         _networkEntityCollector.Assign(universe);
         NetworkCommunicator = BehaviourController.GetRequiredBehaviourInParent<INetworkCommunicator>();
     }
+
     #endregion
 
     #region Initialization
+
     public NetworkManager()
     {
-        CachePacketRetrievalDelegates();
+        CacheRetrievalSubscriptionDelegates();
         CacheRegistrationMethods();
-        CachePacketArrivalMethods();
+        CachePacketListenerMethods();
 
         _networkEntityCollector.OnCollected.AddListener(OnCollected);
         _networkEntityCollector.OnRemoved.AddListener(OnRemoved);
     }
 
-    private void CachePacketRetrievalDelegates()
+    /// <summary>
+    /// Caches all retrieval subscription delegates for packets.
+    /// </summary>
+    private void CacheRetrievalSubscriptionDelegates()
     {
-        IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
-            .Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
+        CachePacketRetrievalDelegates(typeof(INetworkPacket), broadcastPacketRetrievalSubscriptionDelegates);
+        CachePacketRetrievalDelegates(typeof(IEntityNetworkPacket), entityPacketRetrievalSubscriptionDelegates);
 
-        MethodInfo onPacketArrivedMethod = GetType()
-            .GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
+        uniqueRetrievalSubscriptionDelegates.AddRange(broadcastPacketRetrievalSubscriptionDelegates.Concat(entityPacketRetrievalSubscriptionDelegates).DistinctBy(pair => pair.PacketType));
+    }
 
-        foreach (Type packetType in packetTypes)
+    /// <summary>
+    /// Creates delegates for all concrete packet types that forward packets to <see cref="OnPacketReceived{T}(IConnection, T)"/>.
+    /// </summary>
+    private void CachePacketRetrievalDelegates(Type packetType, List<PacketRetrievalDelegatePair> retrievalDelegates)
+    {
+        IEnumerable<Type> packetTypes =
+            AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(a => a.GetTypes())
+                .Where(t =>
+                    packetType.IsAssignableFrom(t) &&
+                    !t.IsInterface &&
+                    !t.IsAbstract &&
+                    !t.IsGenericType
+                );
+
+        MethodInfo onPacketArrivedMethod = GetType().GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
+
+        foreach (Type type in packetTypes)
         {
-            MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
+            MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(type);
+
+            Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), type);
 
-            Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), packetType);
             Delegate genericPacketReceivedDelegate = Delegate.CreateDelegate(genericDelegateType, this, genericOnPacketArrivedMethod);
 
-            packetRetrievalDelegates.Add((packetType, genericPacketReceivedDelegate));
+            retrievalDelegates.Add((type, genericPacketReceivedDelegate));
         }
     }
 
+    /// <summary>
+    /// Caches all registration and cleanup methods for packets.
+    /// </summary>
     private void CacheRegistrationMethods()
     {
-        CacheRegistrationMethods(registerPacketListenersMethods, nameof(RegisterPacketListenerEvent));
-        CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter));
+        CacheRegistrationMethods(registerBroadcastPacketListenersMethods, nameof(RegisterBroadcastPacketListenerEvent), broadcastPacketRetrievalSubscriptionDelegates);
+        CacheRegistrationMethods(registerEntityPacketListenersMethods, nameof(RegisterEntityPacketListenerEvent), entityPacketRetrievalSubscriptionDelegates);
+        CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter), uniqueRetrievalSubscriptionDelegates);
     }
 
-    private void CacheRegistrationMethods(Dictionary<Type, MethodInfo> registrationMethods, string methodName)
+    /// <summary>
+    /// Creates generic method instances for each packet type listener to be registered into the <see cref="NetworkEntity"/>.
+    /// </summary>
+    private void CacheRegistrationMethods(
+        Dictionary<Type, MethodInfo> listenerRegistrationMethods,
+        string methodName,
+        List<PacketRetrievalDelegatePair> packetRetrievalDelegates)
     {
         MethodInfo registerPacketMethod = typeof(NetworkManager).GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Static)!;
+
         foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
         {
             MethodInfo genericMethod = registerPacketMethod.MakeGenericMethod(packetType);
-            registrationMethods.Add(packetType, genericMethod);
+            listenerRegistrationMethods.TryAdd(packetType, genericMethod);
         }
     }
 
-    private void CachePacketArrivalMethods()
+    /// <summary>
+    /// Caches packet listener methods for all packet listener interfaces.
+    /// </summary>
+    private void CachePacketListenerMethods()
     {
-        CachePacketArrivalMethods(clientPacketArrivalMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<INetworkEntity>.OnClientPacketArrived));
-        CachePacketArrivalMethods(serverPacketArrivalMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<INetworkEntity>.OnServerPacketArrived));
+        CachePacketListenerMethods(clientBroadcastPacketListenerMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<>.OnClientPacketArrived));
+        CachePacketListenerMethods(serverBroadcastPacketListenerMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<>.OnServerPacketArrived));
+        CachePacketListenerMethods(clientEntityPacketListenerMethods, typeof(IPacketListenerClientEntity<>), nameof(IPacketListenerClientEntity<>.OnEntityClientPacketArrived));
+        CachePacketListenerMethods(serverEntityPacketListenerMethods, typeof(IPacketListenerServerEntity<>), nameof(IPacketListenerServerEntity<>.OnEntityServerPacketArrived));
     }
 
-    private static void CachePacketArrivalMethods(Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods, Type listenerType, string packetArrivalMethodName)
+    /// <summary>
+    /// Discovers all types implementing a given packet listener interface and caches their methods.
+    /// </summary>
+    private static void CachePacketListenerMethods(
+        Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods,
+        Type listenerType,
+        string packetListenerMethodName)
     {
         foreach (Type listenerClass in GetGenericsWith(listenerType))
         {
-            Dictionary<Type, List<MethodInfo>> packetRouters = [];
-            packetArrivalMethods.Add(listenerClass, packetRouters);
+            Dictionary<Type, List<MethodInfo>> listenerMethodDictionary = [];
+            packetListenerMethods.Add(listenerClass, listenerMethodDictionary);
 
             foreach (Type packetListener in GetGenericInterfacesWith(listenerType, listenerClass))
             {
                 Type packetType = packetListener.GetGenericArguments().First();
 
-                List<MethodInfo> arrivalMethods = packetListener
-                    .GetMethods()
-                    .Where(m => m.Name == packetArrivalMethodName)
-                    .ToList();
+                List<MethodInfo> listenerMethods = [.. packetListener.GetMethods().Where(m => m.Name == packetListenerMethodName)];
 
-                packetRouters.Add(packetType, arrivalMethods);
+                listenerMethodDictionary.Add(packetType, listenerMethods);
             }
         }
     }
 
+    /// <summary>
+    /// Finds all types that implement a generic interface.
+    /// </summary>
     private static IEnumerable<Type> GetGenericsWith(Type type)
         => AppDomain.CurrentDomain
             .GetAssemblies()
             .SelectMany(a =>
                 a.GetTypes().Where(
                     t => t.GetInterfaces().Any(
-                        i => i.IsGenericType && i.GetGenericTypeDefinition() == type
-                    )
-                )
-            );
+                        i => i.IsGenericType && i.GetGenericTypeDefinition() == type)));
 
+    // Gets all generic interfaces of a specific definition on a type
     private static IEnumerable<Type> GetGenericInterfacesWith(Type interfaceType, Type type)
-        => type.GetInterfaces().Where(
-            i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType
-        );
+        => type.GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType);
+
     #endregion
 
+    // Identifies whether packet routing is client-side or server-side
     private enum NetworkType { Client, Server }
+
+    private readonly record struct PacketRetrievalDelegatePair(Type PacketType, Delegate Delegate)
+    {
+        public static implicit operator (Type packetType, Delegate @delegate)(PacketRetrievalDelegatePair value) => (value.PacketType, value.Delegate);
+        public static implicit operator PacketRetrievalDelegatePair((Type packetType, Delegate @delegate) value) => new(value.packetType, value.@delegate);
+    }
 }

Engine.Systems/Tween/Yields/WaitForTweenCompleteCoroutineYield.cs

@@ -2,4 +2,4 @@ using Engine.Core;
 
 namespace Engine.Systems.Tween;
 
-public class WaitForTweenCompleteCoroutineYield(ITween tween) : CoroutineYield(() => tween.State == TweenState.Completed);
+public class WaitForTweenCompleteCoroutineYield(ITween tween) : WaitUntilYield(() => tween.State == TweenState.Completed);

Engine.Systems/Tween/Yields/WaitForTweenDoneCoroutineYield.cs

@@ -2,4 +2,4 @@ using Engine.Core;
 
 namespace Engine.Systems.Tween;
 
-public class WaitWhileTweenActiveCoroutineYield(ITween tween) : CoroutineYield(() => tween.State.CheckFlag(TweenState.Completed | TweenState.Cancelled));
+public class WaitWhileTweenActiveCoroutineYield(ITween tween) : WaitUntilYield(() => tween.State.CheckFlag(TweenState.Completed | TweenState.Cancelled));