chore: debumped .NET Core version to 8

Engine.Core/Abstract/IBehaviourCollector.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace Syntriax.Engine.Core;
 
 /// <summary>
@@ -5,7 +7,7 @@ namespace Syntriax.Engine.Core;
 /// Provides mechanisms for tracking additions and removals, and notifies subscribers when such events occur on the assigned <see cref="IUniverse"/>.
 /// </summary>
 /// <typeparam name="T">The type of objects tracked by the collector.</typeparam>
-public interface IBehaviourCollector<T> : IHasUniverse where T : class
+public interface IBehaviourCollector<T> : IHasUniverse, IEnumerable<T> where T : class
 {
     /// <summary>
     /// Event triggered when an object of type <typeparamref name="T"/> is added to the collector.
@@ -17,16 +19,6 @@ public interface IBehaviourCollector<T> : IHasUniverse where T : class
     /// </summary>
     event RemovedEventHandler? OnRemoved;
 
-    /// <summary>
-    /// Amount of <typeparamref name="T"/> collected.
-    /// </summary>
-    int Count { get; }
-
-    /// <summary>
-    /// Get a <typeparamref name="T"/> collected by it's index.
-    /// </summary>
-    T this[System.Index index] { get; }
-
     /// <summary>
     /// Delegate for handling the <see cref="OnCollected"/> event.
     /// </summary>

Engine.Core/Abstract/IBehaviourController.cs

@@ -3,10 +3,25 @@ using System.Collections.Generic;
 namespace Syntriax.Engine.Core;
 
 /// <summary>
-/// Represents a controller for managing <see cref="IBehaviour"/>s. Connected to an <see cref="IUniverseObject"/>.
+/// Represents a controller for managing <see cref="IBehaviour"/>s and notify them accordingly about the engine's updates. Connected to an <see cref="IUniverseObject"/>.
 /// </summary>
 public interface IBehaviourController : IEntity, IHasUniverseObject, IEnumerable<IBehaviour>
 {
+    /// <summary>
+    /// Event triggered before the update of <see cref="IBehaviour"/>s.
+    /// </summary>
+    event PreUpdateEventHandler? OnPreUpdate;
+
+    /// <summary>
+    /// Event triggered during the update of <see cref="IBehaviour"/>s.
+    /// </summary>
+    event UpdateEventHandler? OnUpdate;
+
+    /// <summary>
+    /// Event triggered before the drawing phase.
+    /// </summary>
+    event PreDrawEventHandler? OnPreDraw;
+
     /// <summary>
     /// Event triggered when a <see cref="IBehaviour"/> is added to the <see cref="IBehaviourController"/>.
     /// </summary>
@@ -68,6 +83,20 @@ public interface IBehaviourController : IEntity, IHasUniverseObject, IEnumerable
     /// <param name="behaviour">The <see cref="IBehaviour"/> to remove.</param>
     void RemoveBehaviour<T>(T behaviour) where T : class, IBehaviour;
 
+    /// <summary>
+    /// Updates all <see cref="IBehaviour"/>s in the <see cref="IBehaviourController"/>.
+    /// </summary>
+    void Update();
+
+    /// <summary>
+    /// Performs pre-draw operations.
+    /// </summary>
+    void UpdatePreDraw();
+
+    delegate void PreUpdateEventHandler(IBehaviourController sender);
+    delegate void UpdateEventHandler(IBehaviourController sender);
+    delegate void PreDrawEventHandler(IBehaviourController sender);
     delegate void BehaviourAddedEventHandler(IBehaviourController sender, IBehaviour behaviourAdded);
     delegate void BehaviourRemovedEventHandler(IBehaviourController sender, IBehaviour behaviourRemoved);
+
 }

Engine.Core/Abstract/IUniverse.cs

@@ -18,24 +18,9 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
     event UpdateEventHandler? OnUpdate;
 
     /// <summary>
-    /// Event triggered after <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>.
+    /// Event triggered when <see cref="PreDraw"/> is called on the <see cref="IUniverse"/>.
     /// </summary>
-    event UpdateEventHandler? OnPostUpdate;
+    event PreDrawEventHandler? OnPreDraw;
-
-    /// <summary>
-    /// Event triggered when <see cref="Draw"/> is about to be called called on the <see cref="IUniverse"/>.
-    /// </summary>
-    event DrawEventHandler? OnPreDraw;
-
-    /// <summary>
-    /// Event triggered when <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
-    /// </summary>
-    event DrawEventHandler? OnDraw;
-
-    /// <summary>
-    /// Event triggered after <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
-    /// </summary>
-    event DrawEventHandler? OnPostDraw;
 
     /// <summary>
     /// Event triggered when a <see cref="IUniverseObject"/> is registered to the <see cref="IUniverse"/>.
@@ -99,14 +84,14 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
     void Update(UniverseTime universeTime);
 
     /// <summary>
-    /// Performs operations that should be done to the draw.
+    /// Performs operations that should be done before the draw calls.
     /// </summary>
-    void Draw();
+    void PreDraw();
 
     delegate void TimeScaleChangedEventHandler(IUniverse sender, float previousTimeScale);
 
     delegate void UpdateEventHandler(IUniverse sender, UniverseTime engineTime);
-    delegate void DrawEventHandler(IUniverse sender);
+    delegate void PreDrawEventHandler(IUniverse sender);
 
     delegate void UniverseObjectRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectRegistered);
     delegate void UniverseObjectUnRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectUnregistered);

Engine.Core/ActiveBehaviourCollector.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -15,8 +16,11 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
     protected readonly List<T> activeBehaviours = new(32);
     protected readonly Dictionary<IActive, T> monitoringActiveToBehaviour = new(32);
 
+    public IReadOnlyList<T> Behaviours => activeBehaviours;
     public IUniverse Universe { get; private set; } = null!;
 
+    public T this[Index index] => activeBehaviours[index];
+
     public ActiveBehaviourCollector() { }
     public ActiveBehaviourCollector(IUniverse universe) => Assign(universe);
 
@@ -57,12 +61,12 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         {
             activeBehaviours.Add(behaviour);
             OnBehaviourAdd(behaviour);
-            OnCollected?.Invoke(this, behaviour);
+            OnCollected?.InvokeSafe(this, behaviour);
         }
         else if (activeBehaviours.Remove(behaviour))
         {
             OnBehaviourRemove(behaviour);
-            OnRemoved?.Invoke(this, behaviour);
+            OnRemoved?.InvokeSafe(this, behaviour);
         }
     }
 
@@ -79,7 +83,7 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         if (activeBehaviours.Remove(tBehaviour))
         {
             OnBehaviourRemove(tBehaviour);
-            OnRemoved?.Invoke(this, tBehaviour);
+            OnRemoved?.InvokeSafe(this, tBehaviour);
         }
     }
 
@@ -95,7 +99,7 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         universe.OnUniverseObjectUnRegistered += OnUniverseObjectUnregistered;
 
         Universe = universe;
-        OnUniverseAssigned?.Invoke(this);
+        OnUniverseAssigned?.InvokeSafe(this);
 
         return true;
     }
@@ -112,10 +116,10 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered;
 
         Universe = null!;
-        OnUnassigned?.Invoke(this);
+        OnUnassigned?.InvokeSafe(this);
         return true;
     }
 
-    public int Count => activeBehaviours.Count;
+    public IEnumerator<T> GetEnumerator() => activeBehaviours.GetEnumerator();
-    public T this[System.Index index] => activeBehaviours[index];
+    IEnumerator IEnumerable.GetEnumerator() => activeBehaviours.GetEnumerator();
 }

Engine.Core/BaseEntity.cs

@@ -33,7 +33,7 @@ public abstract class BaseEntity : IEntity
             string previousId = _id;
 
             _id = value;
-            OnIdChanged?.Invoke(this, previousId);
+            OnIdChanged?.InvokeSafe(this, previousId);
         }
     }
 
@@ -47,9 +47,9 @@ public abstract class BaseEntity : IEntity
 
             _initialized = value;
             if (value)
-                OnInitialized?.Invoke(this);
+                OnInitialized?.InvokeSafe(this);
             else
-                OnFinalized?.Invoke(this);
+                OnFinalized?.InvokeSafe(this);
         }
     }
 
@@ -62,7 +62,7 @@ public abstract class BaseEntity : IEntity
         _stateEnable = stateEnable;
         _stateEnable.Assign(this);
         OnAssign(stateEnable);
-        OnStateEnableAssigned?.Invoke(this);
+        OnStateEnableAssigned?.InvokeSafe(this);
         return true;
     }
 
@@ -76,7 +76,7 @@ public abstract class BaseEntity : IEntity
 
         _stateEnable = null!;
         _stateEnable.Unassign();
-        OnUnassigned?.Invoke(this);
+        OnUnassigned?.InvokeSafe(this);
         return true;
     }
 

Engine.Core/Behaviour.cs

@@ -1,9 +1,9 @@
 namespace Syntriax.Engine.Core;
 
-public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
+public abstract class Behaviour : BehaviourBase
-    IPreUpdate, IUpdate, IPostUpdate,
-    IPreDraw, IDraw, IPostDraw
 {
+    private bool isInitializedThisFrame = false;
+
     protected IUniverse Universe => BehaviourController.UniverseObject.Universe;
     protected IUniverseObject UniverseObject => BehaviourController.UniverseObject;
 
@@ -20,6 +20,11 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
     protected virtual void OnInitialize() { }
     protected virtual void OnInitialize(IInitializable _)
     {
+        isInitializedThisFrame = true;
+
+        BehaviourController.OnPreUpdate += PreUpdate;
+        BehaviourController.OnPreDraw += PreDraw;
+        BehaviourController.OnUpdate += Update;
         BehaviourController.UniverseObject.OnEnteredUniverse += EnteredUniverse;
         BehaviourController.UniverseObject.OnExitedUniverse += ExitedUniverse;
 
@@ -32,6 +37,9 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
     protected virtual void OnFinalize() { }
     protected virtual void OnFinalize(IInitializable _)
     {
+        BehaviourController.OnPreUpdate -= PreUpdate;
+        BehaviourController.OnPreDraw -= PreDraw;
+        BehaviourController.OnUpdate -= Update;
         BehaviourController.UniverseObject.OnEnteredUniverse -= EnteredUniverse;
         BehaviourController.UniverseObject.OnExitedUniverse -= ExitedUniverse;
 
@@ -41,16 +49,9 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
             ExitedUniverse(UniverseObject, Universe);
     }
 
-    protected virtual void OnFirstActiveFrame() { }
-    void IFirstFrameUpdate.FirstActiveFrame()
-    {
-        Debug.Assert.AssertInitialized(this);
-        OnFirstActiveFrame();
-    }
-
     protected virtual void OnPreUpdatePreActiveCheck() { }
     protected virtual void OnPreUpdate() { }
-    void IPreUpdate.PreUpdate()
+    protected virtual void PreUpdate(IBehaviourController _)
     {
         Debug.Assert.AssertInitialized(this);
 
@@ -59,12 +60,22 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
         if (!IsActive)
             return;
 
+        if (isInitializedThisFrame)
+            FirstActiveFrame();
+
         OnPreUpdate();
     }
 
+    protected virtual void OnFirstActiveFrame() { }
+    protected virtual void FirstActiveFrame()
+    {
+        OnFirstActiveFrame();
+        isInitializedThisFrame = false;
+    }
+
     protected virtual void OnUpdatePreActiveCheck() { }
     protected virtual void OnUpdate() { }
-    void IUpdate.Update()
+    protected virtual void Update(IBehaviourController _)
     {
         Debug.Assert.AssertInitialized(this);
 
@@ -76,23 +87,9 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
         OnUpdate();
     }
 
-    protected virtual void OnPostUpdatePreActiveCheck() { }
-    protected virtual void OnPostUpdate() { }
-    void IPostUpdate.PostUpdate()
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnPostUpdatePreActiveCheck();
-
-        if (!StateEnable.Enabled)
-            return;
-
-        OnPostUpdate();
-    }
-
     protected virtual void OnPreDrawPreActiveCheck() { }
     protected virtual void OnPreDraw() { }
-    void IPreDraw.PreDraw()
+    protected virtual void PreDraw(IBehaviourController _)
     {
         Debug.Assert.AssertInitialized(this);
 
@@ -104,34 +101,6 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
         OnPreDraw();
     }
 
-    protected virtual void OnDrawPreActiveCheck() { }
-    protected virtual void OnDraw() { }
-    void IDraw.Draw()
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnDrawPreActiveCheck();
-
-        if (!StateEnable.Enabled)
-            return;
-
-        OnDraw();
-    }
-
-    protected virtual void OnPostDrawPreActiveCheck() { }
-    protected virtual void OnPostDraw() { }
-    void IPostDraw.PostDraw()
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnPostDrawPreActiveCheck();
-
-        if (!StateEnable.Enabled)
-            return;
-
-        OnPostDraw();
-    }
-
     protected virtual void OnEnteredUniverse(IUniverse universe) { }
     protected virtual void EnteredUniverse(IUniverseObject sender, IUniverse universe) => OnEnteredUniverse(universe);
 

Engine.Core/Behaviour2D.cs

@@ -17,6 +17,10 @@ public abstract class Behaviour2D : Behaviour, IBehaviour2D
     }
 
     protected sealed override void OnUnassign(IAssignable assignable) => base.OnUnassign(assignable);
+    protected sealed override void PreUpdate(IBehaviourController behaviourController) => base.PreUpdate(behaviourController);
+    protected sealed override void FirstActiveFrame() => base.FirstActiveFrame();
+    protected sealed override void Update(IBehaviourController behaviourController) => base.Update(behaviourController);
+    protected sealed override void PreDraw(IBehaviourController behaviourController) => base.PreDraw(behaviourController);
     protected sealed override void EnteredUniverse(IUniverseObject sender, IUniverse universe) => base.EnteredUniverse(sender, universe);
     protected sealed override void ExitedUniverse(IUniverseObject sender, IUniverse universe) => base.ExitedUniverse(sender, universe);
 }

Engine.Core/BehaviourBase.cs

@@ -21,7 +21,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
             int previousPriority = _priority;
             _priority = value;
-            OnPriorityChanged?.Invoke(this, previousPriority);
+            OnPriorityChanged?.InvokeSafe(this, previousPriority);
         }
     }
 
@@ -39,7 +39,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
         behaviourController.OnUniverseObjectAssigned += OnUniverseObjectAssigned;
         if (behaviourController.UniverseObject is not null)
             OnUniverseObjectAssigned(behaviourController);
-        OnBehaviourControllerAssigned?.Invoke(this);
+        OnBehaviourControllerAssigned?.InvokeSafe(this);
         return true;
     }
 
@@ -79,6 +79,6 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
         _isActive = StateEnable.Enabled && _behaviourController.UniverseObject.IsActive;
 
         if (previousActive != IsActive)
-            OnActiveChanged?.Invoke(this, previousActive);
+            OnActiveChanged?.InvokeSafe(this, previousActive);
     }
 }

Engine.Core/BehaviourCollector.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -13,8 +14,11 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 
     protected readonly List<T> behaviours = new(32);
 
+    public IReadOnlyList<T> Behaviours => behaviours;
     public IUniverse Universe { get; private set; } = null!;
 
+    public T this[Index index] => behaviours[index];
+
     public BehaviourCollector() { }
     public BehaviourCollector(IUniverse universe) => Assign(universe);
 
@@ -44,7 +48,7 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 
         behaviours.Add(tBehaviour);
         OnBehaviourAdd(behaviour);
-        OnCollected?.Invoke(this, tBehaviour);
+        OnCollected?.InvokeSafe(this, tBehaviour);
     }
 
     protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
@@ -57,7 +61,7 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
             return;
 
         OnBehaviourRemove(behaviour);
-        OnRemoved?.Invoke(this, tBehaviour);
+        OnRemoved?.InvokeSafe(this, tBehaviour);
     }
 
     protected virtual void OnAssign(IUniverse universe) { }
@@ -74,7 +78,7 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 
         Universe = universe;
         OnAssign(universe);
-        OnUniverseAssigned?.Invoke(this);
+        OnUniverseAssigned?.InvokeSafe(this);
 
         return true;
     }
@@ -91,10 +95,10 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
         Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered;
 
         Universe = null!;
-        OnUnassigned?.Invoke(this);
+        OnUnassigned?.InvokeSafe(this);
         return true;
     }
 
-    public int Count => behaviours.Count;
+    public IEnumerator<T> GetEnumerator() => behaviours.GetEnumerator();
-    public T this[System.Index index] => behaviours[index];
+    IEnumerator IEnumerable.GetEnumerator() => behaviours.GetEnumerator();
 }

Engine.Core/BehaviourController.cs

@@ -8,6 +8,10 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Behaviour Count: {behaviours.Count}")]
 public class BehaviourController : BaseEntity, IBehaviourController
 {
+    public event IBehaviourController.PreUpdateEventHandler? OnPreUpdate = null;
+    public event IBehaviourController.UpdateEventHandler? OnUpdate = null;
+    public event IBehaviourController.PreDrawEventHandler? OnPreDraw = null;
+
     public event IBehaviourController.BehaviourAddedEventHandler? OnBehaviourAdded = null;
     public event IBehaviourController.BehaviourRemovedEventHandler? OnBehaviourRemoved = null;
     public event IHasUniverseObject.UniverseObjectAssignedEventHandler? OnUniverseObjectAssigned = null;
@@ -27,15 +31,12 @@ public class BehaviourController : BaseEntity, IBehaviourController
         if (IsInitialized)
             behaviour.Initialize();
         behaviour.OnPriorityChanged += OnPriorityChange;
-        OnBehaviourAdded?.Invoke(this, behaviour);
+        OnBehaviourAdded?.InvokeSafe(this, behaviour);
         return behaviour;
     }
 
     public T AddBehaviour<T>(params object?[]? args) where T : class, IBehaviour
-    {
+        => AddBehaviour(Factory.BehaviourFactory.Instantiate<T>(_universeObject, args));
-        T behaviour = Factory.BehaviourFactory.Instantiate<T>(args);
-        return AddBehaviour(behaviour);
-    }
 
     public T? GetBehaviour<T>()
     {
@@ -95,7 +96,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
         behaviour.OnPriorityChanged -= OnPriorityChange;
         behaviour.Finalize();
         behaviours.Remove(behaviour);
-        OnBehaviourRemoved?.Invoke(this, behaviour);
+        OnBehaviourRemoved?.InvokeSafe(this, behaviour);
     }
 
     protected virtual void OnAssign(IUniverseObject universeObject) { }
@@ -106,7 +107,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
 
         _universeObject = universeObject;
         OnAssign(universeObject);
-        OnUniverseObjectAssigned?.Invoke(this);
+        OnUniverseObjectAssigned?.InvokeSafe(this);
         return true;
     }
 
@@ -124,6 +125,27 @@ public class BehaviourController : BaseEntity, IBehaviourController
             behaviour.Finalize();
     }
 
+    public void Update()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled)
+            return;
+
+        OnPreUpdate?.InvokeSafe(this);
+        OnUpdate?.InvokeSafe(this);
+    }
+
+    public void UpdatePreDraw()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled)
+            return;
+
+        OnPreDraw?.InvokeSafe(this);
+    }
+
     public BehaviourController() { }
     public BehaviourController(IUniverseObject universeObject) => Assign(universeObject);
 

Engine.Core/Engine.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>false</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Syntriax.Engine.Core</RootNamespace>

Engine.Core/Exceptions/BehaviourNotFoundException.cs

@@ -1,3 +1,9 @@
+using System;
+
 namespace Syntriax.Engine.Core.Exceptions;
 
-public class BehaviourNotFoundException(string? message) : NotFoundException(message);
+public class BehaviourNotFoundException(string? message) : Exception(message)
+{
+    public static NotAssignedException FromType<TBehaviour>()
+        => new($"{typeof(TBehaviour).FullName} was not found");
+}

Engine.Core/Exceptions/NotFoundException.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Syntriax.Engine.Core.Exceptions;
-
-public class NotFoundException(string? message) : Exception(message)
-{
-    public static NotAssignedException FromType<T>()
-        => new($"{typeof(T).FullName} was not found");
-}

Engine.Core/Exceptions/UniverseObjectNotFoundException.cs

@@ -1,3 +1,9 @@
+using System;
+
 namespace Syntriax.Engine.Core.Exceptions;
 
-public class UniverseObjectNotFoundException(string? message) : NotFoundException(message);
+public class UniverseObjectNotFoundException(string? message) : Exception(message)
+{
+    public static NotAssignedException FromType<TUniverseObject>()
+        => new($"{typeof(TUniverseObject).FullName} was not found");
+}

Engine.Core/Extensions/BehaviourControllerExtensions.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 using Syntriax.Engine.Core.Exceptions;
@@ -39,19 +38,6 @@ public static class BehaviourControllerExtensions
     public static T GetOrAddBehaviour<T>(this IBehaviourController behaviourController, params object?[]? args) where T : class, IBehaviour
         => behaviourController.GetBehaviour<T>() ?? behaviourController.AddBehaviour<T>(args);
 
-    /// <summary>
-    /// Gets an existing <see cref="IBehaviour"/> of the specified type, or adds and returns the fallback type if it doesn't exist.
-    /// </summary>
-    /// <typeparam name="TOriginal">The type of <see cref="IBehaviour"/> to get.</typeparam>
-    /// <typeparam name="TFallback">The type of <see cref="IBehaviour"/> to add. It must be assignable from <typeparamref name="TOriginal"/></typeparam>
-    /// <param name="behaviourController">The <see cref="IBehaviourController"/> to search in.</param>
-    /// <param name="args">Optional arguments to pass to the constructor of the <see cref="IBehaviour"/> if a new one is added.</param>
-    /// <returns>The existing or newly added <see cref="IBehaviour"/> of the specified type.</returns>
-    public static TOriginal GetOrAddBehaviour<TOriginal, TFallback>(this IBehaviourController behaviourController, params object?[]? args)
-            where TOriginal : class
-            where TFallback : class, IBehaviour, TOriginal
-        => behaviourController.GetBehaviour<TOriginal>() ?? behaviourController.AddBehaviour<TFallback>(args);
-
     /// <summary>
     /// Tries to get a <see cref="IBehaviour"/> of the specified type in it's <see cref="IUniverseObject"/>'s parents recursively.
     /// </summary>
@@ -95,27 +81,6 @@ public static class BehaviourControllerExtensions
     public static T GetRequiredBehaviourInParent<T>(this IBehaviourController behaviourController) where T : class
         => behaviourController.GetBehaviourInParent<T>() ?? throw new BehaviourNotFoundException($"{behaviourController.UniverseObject.Name}'s {nameof(IBehaviourController)} does not contain any {typeof(T).FullName} on any parent");
 
-    /// <summary>
-    /// Gets all <see cref="IBehaviour"/>s of the specified type in it's <see cref="IUniverseObject"/>'s parents recursively and stores them in the provided list.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
-    /// <param name="behavioursInParent">The list to store the <see cref="IBehaviour"/>s.</param>
-    public static void GetBehavioursInParent<T>(this IBehaviourController behaviourController, IList<T> behavioursInParent) where T : class
-    {
-        IBehaviourController? controller = behaviourController;
-        List<T> cache = [];
-        behavioursInParent.Clear();
-
-        while (controller is not null)
-        {
-            controller.GetBehaviours(cache);
-            foreach (T behaviour in cache)
-                behavioursInParent.Add(behaviour);
-
-            controller = controller.UniverseObject.Parent?.BehaviourController;
-        }
-    }
-
     /// <summary>
     /// Tries to get a <see cref="IBehaviour"/> of the specified type in it's <see cref="IUniverseObject"/>'s children recursively.
     /// </summary>
@@ -155,28 +120,4 @@ public static class BehaviourControllerExtensions
     /// <returns>The <see cref="IBehaviour"/> of the specified type if found; otherwise, throws <see cref="BehaviourNotFoundException"/>.</returns>
     public static T GetRequiredBehaviourInChildren<T>(this IBehaviourController behaviourController) where T : class
         => behaviourController.GetBehaviourInChildren<T>() ?? throw new BehaviourNotFoundException($"{behaviourController.UniverseObject.Name}'s {nameof(IBehaviourController)} does not contain any {typeof(T).FullName} on any children ");
-
-    /// <summary>
-    /// Gets all <see cref="IBehaviour"/>s of the specified type in it's <see cref="IUniverseObject"/>'s children recursively and stores them in the provided list.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
-    /// <param name="behavioursInChildren">The list to store the <see cref="IBehaviour"/>s.</param>
-    public static void GetBehavioursInChildren<T>(this IBehaviourController behaviourController, IList<T> behavioursInChildren) where T : class
-    {
-        List<T> cache = [];
-        behavioursInChildren.Clear();
-
-        TraverseChildrenForBehaviour(behaviourController.UniverseObject, behavioursInChildren, cache);
-    }
-
-    private static void TraverseChildrenForBehaviour<T>(IUniverseObject universeObject, IList<T> behaviours, IList<T> cache) where T : class
-    {
-        universeObject.BehaviourController.GetBehaviours(cache);
-
-        foreach (T behaviour in cache)
-            behaviours.Add(behaviour);
-
-        foreach (IUniverseObject child in universeObject)
-            TraverseChildrenForBehaviour(child, behaviours, cache);
-    }
 }

Engine.Core/Extensions/BehaviourExtensions.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Syntriax.Engine.Core;
+
+public static class BehaviourExtensions
+{
+    public static T? FindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
+    {
+        foreach (IUniverseObject universeObject in universeObjects)
+            if (universeObject.BehaviourController.GetBehaviour<T>() is T behaviour)
+                return behaviour;
+
+        return default;
+    }
+
+    public static bool TryFindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    {
+        behaviour = FindBehaviour<T>(universeObjects);
+        return behaviour is not null;
+    }
+
+    public static void FindBehaviours<T>(this IEnumerable<IUniverseObject> universeObjects, List<T> behaviours) where T : class
+    {
+        behaviours.Clear();
+        List<T> cache = [];
+
+        foreach (IUniverseObject universeObject in universeObjects)
+        {
+            universeObject.BehaviourController.GetBehaviours(cache);
+            behaviours.AddRange(cache);
+        }
+    }
+}

Engine.Core/Extensions/UniverseExtensions.cs

@@ -7,30 +7,9 @@ public static class UniverseExtensions
     public static IUniverseObject InstantiateUniverseObject(this IUniverse universe, params object?[]? args)
         => universe.InstantiateUniverseObject<UniverseObject>(args);
 
-    /// <summary>
-    /// Searches through all <see cref="IUniverseObject"/>s to find the specified instance of the type.
-    /// </summary>
-    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
-    /// <returns>The specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
     public static T GetRequiredUniverseObject<T>(this IUniverse universe) where T : class
         => universe.GetUniverseObject<T>() ?? throw new UniverseObjectNotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} object of type {typeof(T).FullName}");
 
-    /// <summary>
-    /// Searches through all <see cref="IBehaviours"/>s to find the specified instance of the type.
-    /// </summary>
-    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
-    /// <returns>The specified type if found; otherwise, throws <see cref="BehaviourNotFoundException"/>.</returns>
     public static T FindRequiredBehaviour<T>(this IUniverse universe) where T : class
         => universe.FindBehaviour<T>() ?? throw new BehaviourNotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} with {nameof(IBehaviour)} of type {typeof(T).FullName}");
-
-    /// <summary>
-    /// Searches through all <see cref="IUniverseObject"/>s and <see cref="IBehaviours"/>s to find the specified instance of the type.
-    /// </summary>
-    /// <remarks>
-    /// WARNING: This is more expensive compared to <see cref="GetRequiredUniverseObject{T}(IUniverse)"/> or <see cref="FindRequiredBehaviour{T}(IUniverse)"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
-    /// </remarks>
-    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
-    /// <returns>The specified type if found; otherwise, throws <see cref="NotFoundException"/>.</returns>
-    public static T FindRequired<T>(this IUniverse universe) where T : class
-        => universe.Find<T>() ?? throw new NotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} or {nameof(IBehaviour)} of type {typeof(T).FullName}");
 }

Engine.Core/Extensions/UniverseObjectExtensions.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
-using Syntriax.Engine.Core.Exceptions;
-
 namespace Syntriax.Engine.Core;
 
 public static class UniverseObjectExtensions
@@ -16,13 +14,6 @@ public static class UniverseObjectExtensions
         return universeObject;
     }
 
-    #region Universe Object Search
-    /// <summary>
-    /// Gets a <see cref="IUniverseObject"/> of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
-    /// <returns>The first found <see cref="IUniverseObject"/> of the specified type; otherwise, null.</returns>
     public static T? GetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
     {
         foreach (IUniverseObject universeObject in universeObjects)
@@ -32,224 +23,17 @@ public static class UniverseObjectExtensions
         return default;
     }
 
-    /// <summary>
+    public static bool TryGetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    /// Tries to get a <see cref="IUniverseObject"/> of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
-    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the universe objects; otherwise, <see cref="false"/>.</returns>
-    public static bool TryGetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? universeObject) where T : class
     {
-        universeObject = GetUniverseObject<T>(universeObjects);
+        behaviour = GetUniverseObject<T>(universeObjects);
-        return universeObject is not null;
-    }
-
-    /// <summary>
-    /// Searches through the provided <see cref="IUniverseObject"/>s to collect a list of <see cref="IUniverseObject"/>s of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObject">The <see cref="IUniverseObject"/> to search.</param>
-    /// <returns>The found <see cref="IUniverseObject"/>s of the specified types</returns>
-    public static void GetUniverseObjects<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> foundUniverseObjects) where T : class
-    {
-        foundUniverseObjects.Clear();
-
-        foreach (IUniverseObject universeObject in universeObjects)
-            if (universeObject is T @object)
-                foundUniverseObjects.Add(@object);
-    }
-    #endregion
-
-    #region Universe Object Search In Parent
-    /// <summary>
-    /// Tries to get a <see cref="IUniverseObject"/> of the specified type in it's parents recursively.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
-    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the parent universe objects; otherwise, <see cref="false"/>.</returns>
-    public static bool TryGetUniverseObjectInParent<T>(this IUniverseObject universeObject, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    {
-        behaviour = GetUniverseObjectInParent<T>(universeObject);
         return behaviour is not null;
     }
 
-    /// <summary>
+    public static void GetUniverseObjects<T>(this IEnumerable<IUniverseObject> universeObjects, List<T> behaviours) where T : class
-    /// Gets a <see cref="IUniverseObject"/> of the specified type in it's parents recursively.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
-    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, null.</returns>
-    public static T? GetUniverseObjectInParent<T>(this IUniverseObject universeObject) where T : class
-    {
-        if (universeObject.GetUniverseObject<T>() is T localUniverseObject)
-            return localUniverseObject;
-
-        IUniverseObject? parent = universeObject;
-
-        while (parent is not null)
-        {
-            if (parent is T behaviour)
-                return behaviour;
-
-            parent = universeObject.Parent;
-        }
-
-        return default;
-    }
-
-    /// <summary>
-    /// Gets a <see cref="IUniverseObject"/> of the specified type in the parents recursively. Throws an error if not found.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
-    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
-    public static T GetRequiredUniverseObjectInParent<T>(this IUniverseObject universeObject) where T : class
-        => universeObject.GetUniverseObjectInParent<T>() ?? throw new UniverseObjectNotFoundException($"{universeObject.Name}'s {nameof(IUniverseObject)} does not contain any {typeof(T).FullName} on any parent ");
-
-    #endregion
-
-    #region Universe Object Search In Children
-    /// <summary>
-    /// Tries to get a <see cref="IUniverseObject"/> of the specified type in it's children recursively.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
-    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the child universe objects; otherwise, <see cref="false"/>.</returns>
-    public static bool TryGetUniverseObjectInChildren<T>(this IUniverseObject universeObject, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    {
-        behaviour = GetUniverseObjectInChildren<T>(universeObject);
-        return behaviour is not null;
-    }
-
-    /// <summary>
-    /// Gets a <see cref="IUniverseObject"/> of the specified type in it's children recursively.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
-    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, null.</returns>
-    public static T? GetUniverseObjectInChildren<T>(this IUniverseObject universeObject) where T : class
-    {
-        if (universeObject.GetUniverseObject<T>() is T localUniverseObject)
-            return localUniverseObject;
-
-        foreach (IUniverseObject child in universeObject)
-            if (GetUniverseObjectInChildren<T>(child) is T behaviour)
-                return behaviour;
-
-        return default;
-    }
-
-    /// <summary>
-    /// Gets a <see cref="IUniverseObject"/> of the specified type in the children recursively. Throws an error if not found.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
-    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
-    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
-    public static T GetRequiredUniverseObjectInChildren<T>(this IUniverseObject universeObject) where T : class
-        => universeObject.GetUniverseObjectInChildren<T>() ?? throw new UniverseObjectNotFoundException($"{universeObject.Name}'s {nameof(IUniverseObject)} does not contain any {typeof(T).FullName} on any children ");
-    #endregion
-
-    #region Behaviour Search
-    /// <summary>
-    /// Finds a <see cref="IBehaviour"/> of the specified type in the provided <see cref="IUniverseObject"/>s.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
-    /// <returns>The first found <see cref="IBehaviour"/> of the specified type; otherwise, null.</returns>
-    public static T? FindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
-    {
-        foreach (IUniverseObject universeObject in universeObjects)
-            if (universeObject.BehaviourController.GetBehaviour<T>() is T behaviour)
-                return behaviour;
-
-        return default;
-    }
-
-    /// <summary>
-    /// Tries to find a <see cref="IBehaviour"/> of the specified type in the provided <see cref="IUniverseObject"/>s.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
-    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
-    /// <returns><see cref="true"/> if a <see cref="IBehaviour"/> of the specified type was found in the provided <see cref="IUniverseObject"/>s; otherwise, <see cref="false"/>.</returns>
-    public static bool TryFindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    {
-        behaviour = FindBehaviour<T>(universeObjects);
-        return behaviour is not null;
-    }
-
-    /// <summary>
-    /// Searches through the provided <see cref="IUniverseObject"/>s to collect a list of <see cref="IBehaviour"/>s of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to get.</typeparam>
-    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
-    public static void FindBehaviours<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> behaviours) where T : class
     {
         behaviours.Clear();
-        List<T> cache = [];
-
         foreach (IUniverseObject universeObject in universeObjects)
-        {
+            if (universeObject is T @object)
-            universeObject.BehaviourController.GetBehaviours(cache);
+                behaviours.Add(@object);
-            foreach (T behaviour in cache)
-                behaviours.Add(behaviour);
     }
 }
-    #endregion
-
-    #region General Search
-    /// <summary>
-    /// Finds an object of the specified type in the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s.
-    /// </summary>
-    /// <remarks>
-    /// WARNING: This is more expensive compared to <see cref="GetUniverseObject{T}(IEnumerable{IUniverseObject})"/> or <see cref="FindBehaviour{T}(IEnumerable{IUniverseObject})"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
-    /// </remarks>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
-    /// <returns>The first found instance of the specified type; otherwise, null.</returns>
-    public static T? Find<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
-    {
-        if (universeObjects.GetUniverseObject<T>() is T foundUniverseObject)
-            return foundUniverseObject;
-
-        if (universeObjects.FindBehaviour<T>() is T foundBehaviour)
-            return foundBehaviour;
-
-        return null;
-    }
-
-    /// <summary>
-    /// Tries to find an object of the specified type in the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s.
-    /// </summary>
-    /// <remarks>
-    /// WARNING: This is more expensive compared to <see cref="TryGetUniverseObject{T}(IEnumerable{IUniverseObject}, out T?)"/> or <see cref="TryFindBehaviour{T}(IEnumerable{IUniverseObject}, out T?)"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
-    /// </remarks>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
-    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
-    /// <returns><see cref="true"/> if an object of the specified type was found in the provided <see cref="IUniverseObject"/>s; otherwise, <see cref="false"/>.</returns>
-    public static bool TryFind<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    {
-        behaviour = Find<T>(universeObjects);
-        return behaviour is not null;
-    }
-
-    /// <summary>
-    /// Searches through the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s to collect a list of the specified type.
-    /// </summary>
-    /// <remarks>
-    /// WARNING: This is more expensive compared to <see cref="GetUniverseObjects{T}(IEnumerable{IUniverseObject}, IList{T})"/> or <see cref="FindBehaviours{T}(IEnumerable{IUniverseObject}, IList{T})"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
-    /// </remarks>
-    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to get.</typeparam>
-    /// <param name="instances">List of objects found wit the specified type.</param>
-    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
-    public static void Find<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> instances) where T : class
-    {
-        instances.Clear();
-        List<T> cache = [];
-
-        foreach (IUniverseObject universeObject in universeObjects)
-        {
-            universeObject.Find(cache);
-            foreach (T behaviour in cache)
-                instances.Add(behaviour);
-        }
-    }
-    #endregion
-}

Engine.Core/Factory/BehaviourFactory.cs

@@ -4,10 +4,10 @@ namespace Syntriax.Engine.Core.Factory;
 
 public class BehaviourFactory
 {
-    public static T Instantiate<T>(params object?[]? args) where T : class, IBehaviour
+    public static T Instantiate<T>(IUniverseObject universeObject, params object?[]? args) where T : class, IBehaviour
-        => Instantiate<T>(stateEnable: null, args);
+        => Instantiate<T>(universeObject, stateEnable: null, args);
 
-    public static T Instantiate<T>(IStateEnable? stateEnable, params object?[]? args)
+    public static T Instantiate<T>(IUniverseObject universeObject, IStateEnable? stateEnable, params object?[]? args)
         where T : class, IBehaviour
     {
         T behaviour = TypeFactory.Get<T>(args);
@@ -18,6 +18,8 @@ public class BehaviourFactory
 
         if (!behaviour.Assign(stateEnable))
             throw AssignFailedException.From(behaviour, stateEnable);
+        if (!behaviour.Assign(universeObject.BehaviourController))
+            throw AssignFailedException.From(behaviour, universeObject.BehaviourController);
 
         return behaviour;
     }

Engine.Core/Helpers/DelegateExtensions.cs

@@ -4,10 +4,9 @@ namespace Syntriax.Engine.Core;
 
 public static class DelegateExtensions
 {
-    [Obsolete($"{nameof(InvokeSafe)} causes memory allocation, please use Invoke() instead.")]
     public static void InvokeSafe(this Delegate @delegate, params object?[] args)
     {
-        foreach (Delegate invocation in Delegate.EnumerateInvocationList(@delegate))
+        foreach (Delegate invocation in @delegate.GetInvocationList())
             try { invocation.DynamicInvoke(args); }
             catch (Exception exception)
             {

Engine.Core/Helpers/Progression/ProgressionTracker.cs

@@ -19,10 +19,10 @@ public class ProgressionTracker : IProgressionTracker
         Progression = progression.Clamp(Progression, 1f);
         Status = status;
 
-        OnUpdated?.Invoke(this, previousProgression, previousStatus);
+        OnUpdated?.InvokeSafe(this, previousProgression, previousStatus);
 
         if (progression >= 1f)
-            OnEnded?.Invoke(this);
+            OnEnded?.InvokeSafe(this);
     }
 
     void IProgressionTracker.Reset()

Engine.Core/Primitives/Shape2D.cs

@@ -35,7 +35,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
             foreach (Vector2D vertex in value)
                 _vertices.Add(vertex);
 
-            OnShapeUpdated?.Invoke(this);
+            OnShapeUpdated?.InvokeSafe(this);
         }
     }
 
@@ -229,7 +229,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
         for (int i = 0; i < count; i++)
             to._vertices.Add(transform.Transform(from[i]));
 
-        to.OnShapeUpdated?.Invoke(to);
+        to.OnShapeUpdated?.InvokeSafe(to);
     }
 
     /// <summary>

Engine.Core/Serialization/EntityRegistry.cs

@@ -14,7 +14,7 @@ public class EntityRegistry
     public void Add(IEntity entity)
     {
         if (registeredEntities.TryAdd(entity.Id, entity))
-            OnEntityRegistered?.Invoke(this, entity);
+            OnEntityRegistered?.InvokeSafe(this, entity);
     }
 
     public void QueueAssign(string id, Action<IEntity> setMethod)
@@ -26,7 +26,7 @@ public class EntityRegistry
     public void AssignAll()
     {
         foreach ((string id, Action<IEntity>? action) in assignCallbacks)
-            action?.Invoke(registeredEntities[id]);
+            action?.InvokeSafe(registeredEntities[id]);
     }
 
     public void Reset()

Engine.Core/StateEnable.cs

@@ -21,7 +21,7 @@ public class StateEnable : IStateEnable
 
             bool previousState = _enabled;
             _enabled = value;
-            OnEnabledChanged?.Invoke(this, previousState);
+            OnEnabledChanged?.InvokeSafe(this, previousState);
         }
     }
 
@@ -33,7 +33,7 @@ public class StateEnable : IStateEnable
 
         _entity = entity;
         OnAssign(entity);
-        OnEntityAssigned?.Invoke(this);
+        OnEntityAssigned?.InvokeSafe(this);
         return true;
     }
 
@@ -43,7 +43,7 @@ public class StateEnable : IStateEnable
             return false;
 
         _entity = null!;
-        OnUnassigned?.Invoke(this);
+        OnUnassigned?.InvokeSafe(this);
         return true;
     }
 }

Engine.Core/Systems/Abstract/IDraw.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified when the draw phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IDraw : IBehaviour
-{
-    /// <summary>
-    /// Calls draw logic for the <see cref="IBehaviour"/> to be displayed visually.
-    /// </summary>
-    void Draw();
-}

Engine.Core/Systems/Abstract/IFirstFrameUpdate.cs

@@ -1,6 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-public interface IFirstFrameUpdate : IBehaviour
-{
-    void FirstActiveFrame();
-}

Engine.Core/Systems/Abstract/IPostDraw.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified after the draw phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IPostDraw : IBehaviour
-{
-    /// <summary>
-    /// Updates the state of the <see cref="IBehaviour"/> after the main draw phase happens.
-    /// </summary>
-    void PostDraw();
-}

Engine.Core/Systems/Abstract/IPostUpdate.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified after the update phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IPostUpdate : IBehaviour
-{
-    /// <summary>
-    /// Updates the state of the <see cref="IBehaviour"/> after the main update phase happens.
-    /// </summary>
-    void PostUpdate();
-}

Engine.Core/Systems/Abstract/IPreDraw.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified before the draw phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IPreDraw : IBehaviour
-{
-    /// <summary>
-    /// Updates the state of the <see cref="IBehaviour"/> before the main draw phase happens.
-    /// </summary>
-    void PreDraw();
-}

Engine.Core/Systems/Abstract/IPreUpdate.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified before the update phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IPreUpdate : IBehaviour
-{
-    /// <summary>
-    /// Updates the state of the <see cref="IBehaviour"/> before the main update phase happens.
-    /// </summary>
-    void PreUpdate();
-}

Engine.Core/Systems/Abstract/IUpdate.cs

@@ -1,12 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> to be notified when the update phase of the <see cref="IUniverse"/> occurs.
-/// </summary>
-public interface IUpdate : IBehaviour
-{
-    /// <summary>
-    /// Updates the state of the <see cref="IBehaviour"/>.
-    /// </summary>
-    void Update();
-}

Engine.Core/Systems/DrawManager.cs

@@ -1,51 +0,0 @@
-
-namespace Syntriax.Engine.Core;
-
-public class DrawManager : UniverseObject
-{
-    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
-
-    private readonly ActiveBehaviourCollectorSorted<IPreDraw> preDrawEntities = new() { SortBy = SortByPriority() };
-    private readonly ActiveBehaviourCollectorSorted<IDraw> drawEntities = new() { SortBy = SortByPriority() };
-    private readonly ActiveBehaviourCollectorSorted<IPostDraw> postDrawEntities = new() { SortBy = SortByPriority() };
-
-    private void OnPreDraw(IUniverse sender)
-    {
-        for (int i = preDrawEntities.Count - 1; i >= 0; i--)
-            preDrawEntities[i].PreDraw();
-    }
-
-    private void OnDraw(IUniverse sender)
-    {
-        for (int i = drawEntities.Count - 1; i >= 0; i--)
-            drawEntities[i].Draw();
-    }
-
-    private void OnPostDraw(IUniverse sender)
-    {
-        for (int i = postDrawEntities.Count - 1; i >= 0; i--)
-            postDrawEntities[i].PostDraw();
-    }
-
-    protected override void OnEnteringUniverse(IUniverse universe)
-    {
-        preDrawEntities.Assign(universe);
-        drawEntities.Assign(universe);
-        postDrawEntities.Assign(universe);
-
-        universe.OnPreDraw += OnPreDraw;
-        universe.OnDraw += OnDraw;
-        universe.OnPostDraw += OnPostDraw;
-    }
-
-    protected override void OnExitingUniverse(IUniverse universe)
-    {
-        preDrawEntities.Unassign();
-        drawEntities.Unassign();
-        postDrawEntities.Unassign();
-
-        universe.OnPreDraw -= OnPreDraw;
-        universe.OnDraw -= OnDraw;
-        universe.OnPostDraw -= OnPostDraw;
-    }
-}

Engine.Core/Systems/UpdateManager.cs

@@ -1,74 +0,0 @@
-
-using System.Collections.Generic;
-
-namespace Syntriax.Engine.Core;
-
-public class UpdateManager : UniverseObject
-{
-    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
-
-    private readonly ActiveBehaviourCollectorSorted<IFirstFrameUpdate> firstFrameUpdates = new() { SortBy = SortByPriority() };
-    private readonly ActiveBehaviourCollectorSorted<IPreUpdate> preUpdateEntities = new() { SortBy = SortByPriority() };
-    private readonly ActiveBehaviourCollectorSorted<IUpdate> updateEntities = new() { SortBy = SortByPriority() };
-    private readonly ActiveBehaviourCollectorSorted<IPostUpdate> postUpdateEntities = new() { SortBy = SortByPriority() };
-
-    private readonly List<IFirstFrameUpdate> toCallFirstFrameUpdates = new(32);
-
-    protected override void OnEnteringUniverse(IUniverse universe)
-    {
-        firstFrameUpdates.Assign(universe);
-        preUpdateEntities.Assign(universe);
-        updateEntities.Assign(universe);
-        postUpdateEntities.Assign(universe);
-
-        universe.OnPreUpdate += OnPreUpdate;
-        universe.OnUpdate += OnUpdate;
-        universe.OnPostUpdate += OnPostUpdate;
-    }
-
-    protected override void OnExitingUniverse(IUniverse universe)
-    {
-        firstFrameUpdates.Unassign();
-        preUpdateEntities.Unassign();
-        updateEntities.Unassign();
-        postUpdateEntities.Unassign();
-
-        universe.OnPreUpdate -= OnPreUpdate;
-        universe.OnUpdate -= OnUpdate;
-        universe.OnPostUpdate -= OnPostUpdate;
-    }
-
-    private void OnPreUpdate(IUniverse sender, UniverseTime engineTime)
-    {
-        for (int i = toCallFirstFrameUpdates.Count - 1; i >= 0; i--)
-        {
-            toCallFirstFrameUpdates[i].FirstActiveFrame();
-            toCallFirstFrameUpdates.RemoveAt(i);
-        }
-
-        for (int i = preUpdateEntities.Count - 1; i >= 0; i--)
-            preUpdateEntities[i].PreUpdate();
-    }
-
-    private void OnUpdate(IUniverse sender, UniverseTime engineTime)
-    {
-        for (int i = updateEntities.Count - 1; i >= 0; i--)
-            updateEntities[i].Update();
-    }
-
-    private void OnPostUpdate(IUniverse sender, UniverseTime engineTime)
-    {
-        for (int i = postUpdateEntities.Count - 1; i >= 0; i--)
-            postUpdateEntities[i].PostUpdate();
-    }
-
-    private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IFirstFrameUpdate behaviourCollected)
-    {
-        toCallFirstFrameUpdates.Add(behaviourCollected);
-    }
-
-    public UpdateManager()
-    {
-        firstFrameUpdates.OnCollected += OnFirstFrameCollected;
-    }
-}

Engine.Core/Transform2D.cs

@@ -31,7 +31,7 @@ public class Transform2D : Behaviour, ITransform2D
             _position = value;
 
             UpdateLocalPosition();
-            OnPositionChanged?.Invoke(this, previousPosition);
+            OnPositionChanged?.InvokeSafe(this, previousPosition);
         }
     }
 
@@ -47,7 +47,7 @@ public class Transform2D : Behaviour, ITransform2D
             _scale = value;
 
             UpdateLocalScale();
-            OnScaleChanged?.Invoke(this, previousScale);
+            OnScaleChanged?.InvokeSafe(this, previousScale);
         }
     }
 
@@ -63,7 +63,7 @@ public class Transform2D : Behaviour, ITransform2D
             _rotation = value;
 
             UpdateLocalRotation();
-            OnRotationChanged?.Invoke(this, previousRotation);
+            OnRotationChanged?.InvokeSafe(this, previousRotation);
         }
     }
 
@@ -79,7 +79,7 @@ public class Transform2D : Behaviour, ITransform2D
             _localPosition = value;
 
             UpdatePosition();
-            OnPositionChanged?.Invoke(this, previousPosition);
+            OnPositionChanged?.InvokeSafe(this, previousPosition);
         }
     }
 
@@ -97,8 +97,8 @@ public class Transform2D : Behaviour, ITransform2D
 
             UpdateScale();
             UpdatePosition();
-            OnScaleChanged?.Invoke(this, previousScale);
+            OnScaleChanged?.InvokeSafe(this, previousScale);
-            OnPositionChanged?.Invoke(this, previousPosition);
+            OnPositionChanged?.InvokeSafe(this, previousPosition);
         }
     }
 
@@ -114,7 +114,7 @@ public class Transform2D : Behaviour, ITransform2D
             _localRotation = value;
 
             UpdateRotation();
-            OnRotationChanged?.Invoke(this, previousRotation);
+            OnRotationChanged?.InvokeSafe(this, previousRotation);
         }
     }
 
@@ -125,7 +125,7 @@ public class Transform2D : Behaviour, ITransform2D
 
         UpdatePosition();
 
-        OnPositionChanged?.Invoke(this, previousPosition);
+        OnPositionChanged?.InvokeSafe(this, previousPosition);
     }
 
     private void RecalculateScale(ITransform2D _, Vector2D previousScale)
@@ -138,8 +138,8 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateScale();
         UpdatePosition();
 
-        OnScaleChanged?.Invoke(this, previousScale);
+        OnScaleChanged?.InvokeSafe(this, previousScale);
-        OnPositionChanged?.Invoke(this, previousPosition);
+        OnPositionChanged?.InvokeSafe(this, previousPosition);
     }
 
     private void RecalculateRotation(ITransform2D _, float previousRotation)
@@ -152,8 +152,8 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateRotation();
         UpdatePosition();
 
-        OnRotationChanged?.Invoke(this, previousRotation);
+        OnRotationChanged?.InvokeSafe(this, previousRotation);
-        OnPositionChanged?.Invoke(this, previousPosition);
+        OnPositionChanged?.InvokeSafe(this, previousPosition);
     }
 
     private void UpdateLocalPosition()
@@ -247,9 +247,9 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateLocalScale();
         UpdateLocalRotation();
 
-        OnPositionChanged?.Invoke(this, Position);
+        OnPositionChanged?.InvokeSafe(this, Position);
-        OnScaleChanged?.Invoke(this, Scale);
+        OnScaleChanged?.InvokeSafe(this, Scale);
-        OnRotationChanged?.Invoke(this, Rotation);
+        OnRotationChanged?.InvokeSafe(this, Rotation);
     }
 
     private void LookForTransform2D(IBehaviourController sender, IBehaviour behaviourAdded)

Engine.Core/Universe.cs

@@ -9,10 +9,7 @@ public class Universe : BaseEntity, IUniverse
 {
     public event IUniverse.UpdateEventHandler? OnPreUpdate = null;
     public event IUniverse.UpdateEventHandler? OnUpdate = null;
-    public event IUniverse.UpdateEventHandler? OnPostUpdate = null;
+    public event IUniverse.PreDrawEventHandler? OnPreDraw = null;
-    public event IUniverse.DrawEventHandler? OnPreDraw = null;
-    public event IUniverse.DrawEventHandler? OnDraw = null;
-    public event IUniverse.DrawEventHandler? OnPostDraw = null;
 
     public event IUniverse.UniverseObjectRegisteredEventHandler? OnUniverseObjectRegistered = null;
     public event IUniverse.UniverseObjectUnRegisteredEventHandler? OnUniverseObjectUnRegistered = null;
@@ -37,7 +34,7 @@ public class Universe : BaseEntity, IUniverse
 
             float previousTimeScale = _timeScale;
             _timeScale = value;
-            OnTimeScaleChanged?.Invoke(this, previousTimeScale);
+            OnTimeScaleChanged?.InvokeSafe(this, previousTimeScale);
         }
     }
 
@@ -60,7 +57,7 @@ public class Universe : BaseEntity, IUniverse
         if (!universeObject.EnterUniverse(this))
             throw new Exception($"{universeObject.Name} can't enter the universe");
 
-        OnUniverseObjectRegistered?.Invoke(this, universeObject);
+        OnUniverseObjectRegistered?.InvokeSafe(this, universeObject);
     }
 
     public T InstantiateUniverseObject<T>(params object?[]? args) where T : class, IUniverseObject
@@ -95,7 +92,7 @@ public class Universe : BaseEntity, IUniverse
         if (!universeObject.Finalize())
             throw new Exception($"{universeObject.Name} can't be finalized");
 
-        OnUniverseObjectUnRegistered?.Invoke(this, universeObject);
+        OnUniverseObjectUnRegistered?.InvokeSafe(this, universeObject);
     }
 
     protected override void InitializeInternal()
@@ -118,18 +115,22 @@ public class Universe : BaseEntity, IUniverse
         UnscaledTime = engineTime;
         Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale)));
 
-        OnPreUpdate?.Invoke(this, Time);
+        OnPreUpdate?.InvokeSafe(this, Time);
-        OnUpdate?.Invoke(this, Time);
+
-        OnPostUpdate?.Invoke(this, Time);
+        for (int i = 0; i < UniverseObjects.Count; i++)
+            UniverseObjects[i].BehaviourController.Update();
+
+        OnUpdate?.InvokeSafe(this, Time);
     }
 
-    public void Draw()
+    public void PreDraw()
     {
         Debug.Assert.AssertInitialized(this);
 
-        OnPreDraw?.Invoke(this);
+        for (int i = 0; i < UniverseObjects.Count; i++)
-        OnDraw?.Invoke(this);
+            UniverseObjects[i].BehaviourController.UpdatePreDraw();
-        OnPostDraw?.Invoke(this);
+
+        OnPreDraw?.InvokeSafe(this);
     }
 
     private void OnUniverseObjectFinalize(IInitializable initializable)

Engine.Core/UniverseObject.cs

@@ -37,7 +37,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
             string previousName = _name;
             _name = value;
-            OnNameChanged?.Invoke(this, previousName);
+            OnNameChanged?.InvokeSafe(this, previousName);
         }
     }
 
@@ -50,7 +50,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _universe = universe;
         UpdateActive();
         OnEnteringUniverse(universe);
-        OnEnteredUniverse?.Invoke(this, universe);
+        OnEnteredUniverse?.InvokeSafe(this, universe);
         return true;
     }
 
@@ -62,7 +62,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         OnExitingUniverse(universe);
         _universe = null!;
-        OnExitedUniverse?.Invoke(this, universe);
+        OnExitedUniverse?.InvokeSafe(this, universe);
         return true;
     }
 
@@ -93,7 +93,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         }
 
         UpdateActive();
-        OnParentChanged?.Invoke(this, previousParent, parent);
+        OnParentChanged?.InvokeSafe(this, previousParent, parent);
     }
 
     public void AddChild(IUniverseObject parent)
@@ -103,7 +103,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         _children.Add(parent);
         parent.SetParent(this);
-        OnChildrenAdded?.Invoke(this, parent);
+        OnChildrenAdded?.InvokeSafe(this, parent);
     }
 
     public void RemoveChild(IUniverseObject child)
@@ -112,7 +112,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
             return;
 
         child.SetParent(null);
-        OnChildrenRemoved?.Invoke(this, child);
+        OnChildrenRemoved?.InvokeSafe(this, child);
     }
 
     protected virtual void OnAssign(IBehaviourController behaviourController) { }
@@ -123,7 +123,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         _behaviourController = behaviourController;
         OnAssign(behaviourController);
-        OnBehaviourControllerAssigned?.Invoke(this);
+        OnBehaviourControllerAssigned?.InvokeSafe(this);
         return true;
     }
 
@@ -143,7 +143,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
 
         if (previousActive != IsActive)
-            OnActiveChanged?.Invoke(this, previousActive);
+            OnActiveChanged?.InvokeSafe(this, previousActive);
     }
 
     protected override void UnassignInternal()

Engine.Physics2D/Abstract/IPhysicsEngine2D.cs

@@ -26,13 +26,6 @@ public interface IPhysicsEngine2D
     /// <param name="deltaTime">The time step.</param>
     void Step(float deltaTime);
 
-    /// <summary>
-    /// Advances the physics simulation by the specified time on a single <see cref="IRigidBody2D"/>.
-    /// </summary>
-    /// <param name="rigidBody">The <see cref="IRigidBody2D"/> to be progressed individually.</param>
-    /// <param name="deltaTime">The time step.</param>
-    void StepIndividual(IRigidBody2D rigidBody, float deltaTime);
-
     delegate void PhysicsIterationEventHandler(IPhysicsEngine2D sender, float iterationDeltaTime);
     delegate void PhysicsStepEventHandler(IPhysicsEngine2D sender, float stepDeltaTime);
 }

Engine.Physics2D/Abstract/Updates/IPostPhysicsUpdate.cs

@@ -1,15 +0,0 @@
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> that listens to the phase after the physics simulation phase.
-/// </summary>
-public interface IPostPhysicsUpdate : IBehaviour
-{
-    /// <summary>
-    /// Execute logic that should occur after the physics simulation has been updated.
-    /// </summary>
-    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
-    void PostPhysicsUpdate(float delta);
-}

Engine.Physics2D/Abstract/Updates/IPrePhysicsUpdate.cs

@@ -1,15 +0,0 @@
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> that listens to the phase before the physics simulation phase.
-/// </summary>
-public interface IPrePhysicsUpdate : IBehaviour
-{
-    /// <summary>
-    /// Execute logic that should occur before the physics simulation is updated.
-    /// </summary>
-    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
-    void PrePhysicsUpdate(float delta);
-}

Engine.Physics2D/Collider2DBehaviourBase.cs

@@ -69,7 +69,7 @@ public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
         Transform.OnRotationChanged -= SetNeedsRecalculationFromRotation;
     }
 
-    public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation);
+    public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.InvokeSafe(this, collisionDetectionInformation);
-    public void Resolve(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionResolved?.Invoke(this, collisionDetectionInformation);
+    public void Resolve(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionResolved?.InvokeSafe(this, collisionDetectionInformation);
-    public void Trigger(ICollider2D initiator) => OnTriggered?.Invoke(this, initiator);
+    public void Trigger(ICollider2D initiator) => OnTriggered?.InvokeSafe(this, initiator);
 }

Engine.Physics2D/Engine.Physics2D.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Syntriax.Engine.Physics2D</RootNamespace>

Engine.Physics2D/PhysicsEngine2D.cs

@@ -14,12 +14,9 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
     protected readonly ICollisionDetector2D collisionDetector = null!;
     protected readonly ICollisionResolver2D collisionResolver = null!;
 
-    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
-    protected ActiveBehaviourCollectorSorted<IPrePhysicsUpdate> physicsPreUpdateCollector = new() { SortBy = SortByPriority() };
-    protected ActiveBehaviourCollectorSorted<IPhysicsUpdate> physicsUpdateCollector = new() { SortBy = SortByPriority() };
-    protected ActiveBehaviourCollectorSorted<IPostPhysicsUpdate> physicsPostUpdateCollector = new() { SortBy = SortByPriority() };
     protected BehaviourCollector<IRigidBody2D> rigidBodyCollector = new();
     protected BehaviourCollector<ICollider2D> colliderCollector = new();
+    protected BehaviourCollector<IPhysicsUpdate> physicsUpdateCollector = new();
 
     public int IterationPerStep { get => _iterationPerStep; set => _iterationPerStep = value < 1 ? 1 : value; }
     public float IterationPeriod { get => _iterationPeriod; set => _iterationPeriod = value.Max(0.0001f); }
@@ -28,123 +25,52 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
     {
         float intervalDeltaTime = deltaTime / IterationPerStep;
 
-        for (int i = physicsPreUpdateCollector.Count - 1; i >= 0; i--)
-            physicsPreUpdateCollector[i].PrePhysicsUpdate(deltaTime);
-
-        for (int i = physicsUpdateCollector.Count - 1; i >= 0; i--)
-            physicsUpdateCollector[i].PhysicsUpdate(deltaTime);
-
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
             // Can Parallel
-            for (int i = rigidBodyCollector.Count - 1; i >= 0; i--)
+            foreach (IRigidBody2D rigidBody in rigidBodyCollector)
-                StepRigidBody(rigidBodyCollector[i], intervalDeltaTime);
-
-            // Can Parallel
-            for (int i = colliderCollector.Count - 1; i >= 0; i--)
-                colliderCollector[i].Recalculate();
-
-            // Can Parallel
-            for (int x = 0; x < colliderCollector.Count; x++)
-            {
-                ICollider2D? colliderX = colliderCollector[x];
-                if (!colliderX.IsActive)
-                    continue;
-
-                for (int y = x + 1; y < colliderCollector.Count; y++)
-                {
-                    ICollider2D? colliderY = colliderCollector[y];
-
-                    if (!colliderY.IsActive)
-                        continue;
-
-                    ResolveColliders(colliderX, colliderY);
-                }
-            }
-
-            OnPhysicsIteration?.Invoke(this, intervalDeltaTime);
-        }
-
-        for (int i = physicsPostUpdateCollector.Count - 1; i >= 0; i--)
-            physicsPostUpdateCollector[i].PostPhysicsUpdate(deltaTime);
-
-        OnPhysicsStep?.Invoke(this, deltaTime);
-    }
-
-    public void StepIndividual(IRigidBody2D rigidBody, float deltaTime)
-    {
-        float intervalDeltaTime = deltaTime / IterationPerStep;
-
-        System.Collections.Generic.List<ICollider2D> childColliders = [];
-        System.Collections.Generic.List<IPrePhysicsUpdate> physicsPreUpdates = [];
-        System.Collections.Generic.List<IPhysicsUpdate> physicsUpdates = [];
-        System.Collections.Generic.List<IPostPhysicsUpdate> physicsPostUpdates = [];
-
-        rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
-
-        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
-            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
-
-        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
-            physicsUpdate.PhysicsUpdate(deltaTime);
-
-        for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
-        {
                 StepRigidBody(rigidBody, intervalDeltaTime);
 
-            for (int i = childColliders.Count - 1; i >= 0; i--)
+            // Can Parallel
-                childColliders[i].Recalculate();
+            foreach (ICollider2D collider in colliderCollector)
+                collider.Recalculate();
 
-            for (int x = 0; x < childColliders.Count; x++)
+            // Can Parallel
+            for (int x = 0; x < colliderCollector.Behaviours.Count; x++)
             {
-                ICollider2D? colliderX = childColliders[x];
+                ICollider2D? colliderX = colliderCollector.Behaviours[x];
                 if (!colliderX.IsActive)
-                    continue;
+                    return;
 
-                for (int y = 0; y < colliderCollector.Count; y++)
+                for (int y = x + 1; y < colliderCollector.Behaviours.Count; y++)
                 {
-                    ICollider2D? colliderY = colliderCollector[y];
+                    ICollider2D? colliderY = colliderCollector.Behaviours[y];
 
                     if (!colliderY.IsActive)
-                        continue;
-
-                    ResolveColliders(colliderX, colliderY);
-                }
-            }
-        }
-
-        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
-            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
-    }
-
-    private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
-    {
-        if (colliderX.RigidBody2D == colliderY.RigidBody2D)
                         return;
 
+                    if (colliderX.RigidBody2D == colliderY.RigidBody2D)
+                        continue;
+
                     bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
                     if (bothCollidersAreTriggers)
-            return;
+                        continue;
 
                     bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
                     if (bothCollidersAreStatic)
-            return;
+                        continue;
-
-        if (!collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
-            return;
 
+                    if (collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
+                    {
                         if (colliderX.IsTrigger)
                         {
                             colliderX.Trigger(colliderY);
-            return;
+                            continue;
                         }
                         else if (colliderY.IsTrigger)
                         {
                             colliderY.Trigger(colliderX);
-            return;
+                            continue;
                         }
 
                         if (information.Detector == colliderX)
@@ -160,6 +86,17 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
 
                         collisionResolver?.Resolve(information);
                     }
+                }
+            }
+
+            OnPhysicsIteration?.InvokeSafe(this, intervalDeltaTime);
+        }
+
+        foreach (IPhysicsUpdate physicsUpdate in physicsUpdateCollector)
+            physicsUpdate.PhysicsUpdate(deltaTime);
+
+        OnPhysicsStep?.InvokeSafe(this, deltaTime);
+    }
 
     private static void StepRigidBody(IRigidBody2D rigidBody, float intervalDeltaTime)
     {
@@ -172,9 +109,7 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
 
     protected override void OnEnteringUniverse(IUniverse universe)
     {
-        physicsPreUpdateCollector.Assign(universe);
         physicsUpdateCollector.Assign(universe);
-        physicsPostUpdateCollector.Assign(universe);
         colliderCollector.Assign(universe);
         rigidBodyCollector.Assign(universe);
 
@@ -183,9 +118,7 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
 
     protected override void OnExitingUniverse(IUniverse universe)
     {
-        physicsPreUpdateCollector.Unassign();
         physicsUpdateCollector.Unassign();
-        physicsPostUpdateCollector.Unassign();
         colliderCollector.Unassign();
         rigidBodyCollector.Unassign();
 

Engine.Physics2D/PhysicsEngine2DStandalone.cs

@@ -45,108 +45,49 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
             // Can Parallel
-            for (int i = rigidBodies.Count - 1; i >= 0; i--)
+            for (int i = 0; i < rigidBodies.Count; i++)
                 StepRigidBody(rigidBodies[i], intervalDeltaTime);
 
             // Can Parallel
-            for (int i = colliders.Count - 1; i >= 0; i--)
+            foreach (ICollider2D collider in colliders)
-                colliders[i].Recalculate();
+                collider.Recalculate();
 
             // Can Parallel
             for (int x = 0; x < colliders.Count; x++)
             {
                 ICollider2D? colliderX = colliders[x];
                 if (!colliderX.IsActive)
-                    continue;
+                    return;
 
                 for (int y = x + 1; y < colliders.Count; y++)
                 {
                     ICollider2D? colliderY = colliders[y];
+
                     if (!colliderY.IsActive)
                         return;
 
-                    ResolveColliders(colliderX, colliderY);
-                }
-            }
-            OnPhysicsIteration?.Invoke(this, intervalDeltaTime);
-        }
-        OnPhysicsStep?.Invoke(this, deltaTime);
-    }
-
-    public void StepIndividual(IRigidBody2D rigidBody, float deltaTime)
-    {
-        float intervalDeltaTime = deltaTime / IterationPerStep;
-
-        List<ICollider2D> childColliders = [];
-        List<IPrePhysicsUpdate> physicsPreUpdates = [];
-        List<IPhysicsUpdate> physicsUpdates = [];
-        List<IPostPhysicsUpdate> physicsPostUpdates = [];
-
-        rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
-
-        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
-            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
-
-        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
-            physicsUpdate.PhysicsUpdate(deltaTime);
-
-        for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
-        {
-            StepRigidBody(rigidBody, intervalDeltaTime);
-
-            foreach (ICollider2D collider in childColliders)
-                collider.Recalculate();
-
-            for (int x = 0; x < childColliders.Count; x++)
-            {
-                ICollider2D? colliderX = childColliders[x];
-                if (!colliderX.IsActive)
-                    continue;
-
-                for (int y = 0; y < colliders.Count; y++)
-                {
-                    ICollider2D? colliderY = colliders[y];
-
-                    if (!colliderY.IsActive)
-                        continue;
-
-                    ResolveColliders(colliderX, colliderY);
-                }
-            }
-        }
-
-        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
-            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
-    }
-
-    private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
-    {
                     if (colliderX.RigidBody2D == colliderY.RigidBody2D)
-            return;
+                        continue;
 
                     bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
                     if (bothCollidersAreTriggers)
-            return;
+                        continue;
 
                     bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
                     if (bothCollidersAreStatic)
-            return;
+                        continue;
-
-        if (!collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
-            return;
 
+                    if (collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
+                    {
                         if (colliderX.IsTrigger)
                         {
                             colliderX.Trigger(colliderY);
-            return;
+                            continue;
                         }
                         else if (colliderY.IsTrigger)
                         {
                             colliderY.Trigger(colliderX);
-            return;
+                            continue;
                         }
 
                         if (information.Detector == colliderX)
@@ -162,6 +103,12 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
 
                         collisionResolver?.Resolve(information);
                     }
+                }
+            }
+            OnPhysicsIteration?.InvokeSafe(this, intervalDeltaTime);
+        }
+        OnPhysicsStep?.InvokeSafe(this, deltaTime);
+    }
 
     private static void StepRigidBody(IRigidBody2D rigidBody, float intervalDeltaTime)
     {

Engine.Serializers/Engine.Serializers.Yaml/Engine.Serializers.Yaml.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Syntriax.Engine.Serializers.Yaml</RootNamespace>

Engine.Serializers/Engine.Serializers.Yaml/YamlSerializer.cs

@@ -20,7 +20,7 @@ public class YamlSerializer : Core.Serialization.ISerializer
     private readonly EntityRegistry entityRegistry = null!;
     private readonly IProgressionTracker progressionTracker = null!;
 
-    private readonly System.Threading.Lock Lock = new();
+    private readonly object Lock = new();
 
     public YamlSerializer()
     {

Engine.Systems/Engine.Systems.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Syntriax.Engine.Systems</RootNamespace>

Engine.Systems/StateMachine/State.cs

@@ -53,12 +53,12 @@ public class State : BaseEntity, IState
     public void Update()
     {
         if (GetNextState() is IState transitionState)
-            OnStateTransitionReady?.Invoke(this, transitionState);
+            OnStateTransitionReady?.InvokeSafe(this, transitionState);
-        OnStateUpdate?.Invoke(this);
+        OnStateUpdate?.InvokeSafe(this);
     }
 
-    public void TransitionTo(IState from) => OnStateTransitionedTo?.Invoke(this, from);
+    public void TransitionTo(IState from) => OnStateTransitionedTo?.InvokeSafe(this, from);
-    public void TransitionFrom(IState to) => OnStateTransitionedFrom?.Invoke(this, to);
+    public void TransitionFrom(IState to) => OnStateTransitionedFrom?.InvokeSafe(this, to);
 
     public IState? GetNextState()
     {

Engine.Systems/StateMachine/StateBehaviourBase.cs

@@ -30,21 +30,21 @@ public abstract class StateBehaviourBase : Behaviour, IState
     public void Update()
     {
         OnUpdateState();
-        OnStateUpdate?.Invoke(this);
+        OnStateUpdate?.InvokeSafe(this);
     }
 
     protected virtual void OnTransitionedToState(IState from) { }
     public void TransitionTo(IState from)
     {
         OnTransitionedToState(from);
-        OnStateTransitionedTo?.Invoke(this, from);
+        OnStateTransitionedTo?.InvokeSafe(this, from);
     }
 
     protected virtual void OnTransitionedFromState(IState to) { }
     public void TransitionFrom(IState to)
     {
         OnTransitionedFromState(to);
-        OnStateTransitionedFrom?.Invoke(this, to);
+        OnStateTransitionedFrom?.InvokeSafe(this, to);
     }
 
     public abstract IState? GetNextState();

Engine.Systems/StateMachine/StateMachine.cs

@@ -23,7 +23,7 @@ public class StateMachine : Behaviour
             _state = value;
             previousState.TransitionFrom(value);
             value.TransitionTo(_state);
-            OnStateChanged?.Invoke(this, previousState, value);
+            OnStateChanged?.InvokeSafe(this, previousState, value);
 
             value.OnStateTransitionReady += OnStateTransitionReady;
         }

Engine.Systems/Time/StopwatchBehaviour.cs

@@ -35,7 +35,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         shouldBeTicking = false;
 
         State = TimerState.Stopped;
-        OnStopped?.Invoke(this);
+        OnStopped?.InvokeSafe(this);
     }
 
     protected override void OnUpdate()
@@ -46,7 +46,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         double delta = Universe.Time.DeltaSpan.TotalSeconds;
 
         Time += delta;
-        OnDelta?.Invoke(this, delta);
+        OnDelta?.InvokeSafe(this, delta);
     }
 
     protected override void OnEnteredUniverse(IUniverse universe)
@@ -71,13 +71,13 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
     public virtual void Pause()
     {
         State = TimerState.Paused;
-        OnPaused?.Invoke(this);
+        OnPaused?.InvokeSafe(this);
     }
 
     public virtual void Resume()
     {
         State = TimerState.Ticking;
-        OnResumed?.Invoke(this);
+        OnResumed?.InvokeSafe(this);
     }
 
     private void StartStopwatch()
@@ -85,7 +85,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         hasStartedTickingBefore = true;
 
         State = TimerState.Ticking;
-        OnStarted?.Invoke(this);
+        OnStarted?.InvokeSafe(this);
     }
 
     protected override void OnFinalize()

Engine.Systems/Time/TickerBehaviour.cs

@@ -26,7 +26,7 @@ public class TickerBehaviour : StopwatchBehaviour, ITicker
         {
             nextTick += Period;
             TickCounter++;
-            OnTick?.Invoke(this);
+            OnTick?.InvokeSafe(this);
         }
     }
 

Engine.Systems/Time/TimerBehaviour.cs

@@ -50,7 +50,7 @@ public class TimerBehaviour : Behaviour, ITimer
         shouldBeTicking = false;
 
         State = TimerState.Stopped;
-        OnStopped?.Invoke(this);
+        OnStopped?.InvokeSafe(this);
     }
 
     protected override void OnUpdate()
@@ -61,7 +61,7 @@ public class TimerBehaviour : Behaviour, ITimer
         double delta = Universe.Time.DeltaSpan.TotalSeconds;
 
         Remaining -= delta;
-        OnDelta?.Invoke(this, delta);
+        OnDelta?.InvokeSafe(this, delta);
 
         if (Remaining <= .0f)
             Stop();
@@ -89,13 +89,13 @@ public class TimerBehaviour : Behaviour, ITimer
     public virtual void Pause()
     {
         State = TimerState.Paused;
-        OnPaused?.Invoke(this);
+        OnPaused?.InvokeSafe(this);
     }
 
     public virtual void Resume()
     {
         State = TimerState.Ticking;
-        OnResumed?.Invoke(this);
+        OnResumed?.InvokeSafe(this);
     }
 
     private void StartTimer()
@@ -103,7 +103,7 @@ public class TimerBehaviour : Behaviour, ITimer
         hasStartedTickingBefore = true;
 
         State = TimerState.Ticking;
-        OnStarted?.Invoke(this);
+        OnStarted?.InvokeSafe(this);
     }
 
     protected override void OnFinalize()

Engine.Systems/Tween/EngineExtensions/TweenAABBExtensions.cs

@@ -6,5 +6,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenAABBExtensions
 {
     public static ITween TweenAABB(this AABB initialAABB, ITweenManager tweenManager, float duration, AABB targetAABB, Action<AABB> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(new AABB(initialAABB.LowerBoundary.Lerp(targetAABB.LowerBoundary, t), initialAABB.UpperBoundary.Lerp(targetAABB.UpperBoundary, t))));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(new AABB(initialAABB.LowerBoundary.Lerp(targetAABB.LowerBoundary, t), initialAABB.UpperBoundary.Lerp(targetAABB.UpperBoundary, t))));
 }

Engine.Systems/Tween/EngineExtensions/TweenCircleExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenCircleExtensions
 {
     public static ITween TweenCircle(this Circle initialCircle, ITweenManager tweenManager, float duration, Circle targetCircle, System.Action<Circle> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.Invoke(
+            t => setMethod?.InvokeSafe(
                 new Circle(
                     initialCircle.Center.Lerp(targetCircle.Center, t),
                     initialCircle.Diameter.Lerp(targetCircle.Diameter, t)

Engine.Systems/Tween/EngineExtensions/TweenColorExtensions.cs

@@ -5,11 +5,11 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenColorExtensions
 {
     public static ITween TweenColor(this ColorRGB initialColorRGB, ITweenManager tweenManager, float duration, ColorRGB targetColorRGB, System.Action<ColorRGB> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorRGB.Lerp(targetColorRGB, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorRGB.Lerp(targetColorRGB, t)));
 
     public static ITween TweenColor(this ColorRGBA initialColorRGBA, ITweenManager tweenManager, float duration, ColorRGBA targetColorRGBA, System.Action<ColorRGBA> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorRGBA.Lerp(targetColorRGBA, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorRGBA.Lerp(targetColorRGBA, t)));
 
     public static ITween TweenColor(this ColorHSV initialColorHSV, ITweenManager tweenManager, float duration, ColorHSV targetColorHSV, System.Action<ColorHSV> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorHSV.Lerp(targetColorHSV, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorHSV.Lerp(targetColorHSV, t)));
 }

Engine.Systems/Tween/EngineExtensions/TweenLine2DEquationExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenLine2DEquationExtensions
 {
     public static ITween TweenLine2DEquation(this Line2DEquation initialLine2DEquation, ITweenManager tweenManager, float duration, Line2DEquation targetLine2DEquation, System.Action<Line2DEquation> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.Invoke(
+            t => setMethod?.InvokeSafe(
                 new Line2DEquation(
                     initialLine2DEquation.Slope.Lerp(targetLine2DEquation.Slope, t),
                     initialLine2DEquation.OffsetY.Lerp(targetLine2DEquation.OffsetY, t)

Engine.Systems/Tween/EngineExtensions/TweenLine2DExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenLine2DExtensions
 {
     public static ITween TweenLine2D(this Line2D initialLine2D, ITweenManager tweenManager, float duration, Line2D targetLine2D, System.Action<Line2D> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.Invoke(
+            t => setMethod?.InvokeSafe(
                 new Line2D(
                     initialLine2D.From.Lerp(targetLine2D.From, t),
                     initialLine2D.To.Lerp(targetLine2D.To, t)

Engine.Systems/Tween/EngineExtensions/TweenProjection1DExtensions.cs

@@ -7,7 +7,7 @@ public static class TweenProjection1DExtensions
 {
     public static ITween TweenProjection1D(this Projection1D initialProjection1D, ITweenManager tweenManager, float duration, Projection1D targetProjection1D, Action<Projection1D> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.Invoke(
+            t => setMethod?.InvokeSafe(
                 new Projection1D(
                     initialProjection1D.Min.Lerp(targetProjection1D.Min, t),
                     initialProjection1D.Max.Lerp(targetProjection1D.Max, t)

Engine.Systems/Tween/EngineExtensions/TweenQuaternionExtensions.cs

@@ -6,5 +6,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenQuaternionExtensions
 {
     public static ITween TweenQuaternion(this Quaternion initialQuaternion, ITweenManager tweenManager, float duration, Quaternion targetQuaternion, Action<Quaternion> setMethod)
-       => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialQuaternion.SLerp(targetQuaternion, t)));
+       => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialQuaternion.SLerp(targetQuaternion, t)));
 }

Engine.Systems/Tween/EngineExtensions/TweenTransform2DExtensions.cs

@@ -39,69 +39,4 @@ public static class TweenTransform2DExtensions
         float initialLocalRotation = transform2D.LocalRotation;
         return tweenManager.StartTween(duration, t => transform2D.LocalRotation = initialLocalRotation.Lerp(targetLocalRotation, t));
     }
-    public static ITween TweenPositionAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additivePosition)
-    {
-        Vector2D progressedPosition = Vector2D.Zero;
-        return tweenManager.StartTween(duration, t =>
-        {
-            Vector2D displacement = Vector2D.Zero.Lerp(additivePosition, t) - progressedPosition;
-            transform2D.Position += displacement;
-            progressedPosition += displacement;
-        });
-    }
-
-    public static ITween TweenScaleAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveScale)
-    {
-        Vector2D progressedScale = Vector2D.Zero;
-        return tweenManager.StartTween(duration, t =>
-        {
-            Vector2D displacement = Vector2D.Zero.Lerp(additiveScale, t) - progressedScale;
-            transform2D.Scale += displacement;
-            progressedScale += displacement;
-        });
-    }
-
-    public static ITween TweenRotationAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, float additiveRotation)
-    {
-        float progressedRotation = 0f;
-        return tweenManager.StartTween(duration, t =>
-        {
-            float displacement = 0f.Lerp(additiveRotation, t) - progressedRotation;
-            transform2D.Rotation += displacement;
-            progressedRotation += displacement;
-        });
-    }
-
-    public static ITween TweenLocalPositionAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveLocalPosition)
-    {
-        Vector2D progressedLocalPosition = Vector2D.Zero;
-        return tweenManager.StartTween(duration, t =>
-        {
-            Vector2D displacement = Vector2D.Zero.Lerp(additiveLocalPosition, t) - progressedLocalPosition;
-            transform2D.LocalPosition += displacement;
-            progressedLocalPosition += displacement;
-        });
-    }
-
-    public static ITween TweenLocalScaleAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveLocalScale)
-    {
-        Vector2D progressedLocalScale = Vector2D.Zero;
-        return tweenManager.StartTween(duration, t =>
-        {
-            Vector2D displacement = Vector2D.Zero.Lerp(additiveLocalScale, t) - progressedLocalScale;
-            transform2D.LocalScale += displacement;
-            progressedLocalScale += displacement;
-        });
-    }
-
-    public static ITween TweenLocalRotationAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, float additiveLocalRotation)
-    {
-        float progressedLocalRotation = 0f;
-        return tweenManager.StartTween(duration, t =>
-        {
-            float displacement = 0f.Lerp(additiveLocalRotation, t) - progressedLocalRotation;
-            transform2D.LocalRotation += displacement;
-            progressedLocalRotation += displacement;
-        });
-    }
 }

Engine.Systems/Tween/EngineExtensions/TweenTriangleExtensions.cs

@@ -7,7 +7,7 @@ public static class TweenTriangleExtensions
 {
     public static ITween TweenTriangle(this Triangle initialTriangle, ITweenManager tweenManager, float duration, Triangle targetTriangle, Action<Triangle> setMethod)
        => tweenManager.StartTween(duration,
-            t => setMethod?.Invoke(
+            t => setMethod?.InvokeSafe(
                 new Triangle(
                     initialTriangle.A.Lerp(targetTriangle.A, t),
                     initialTriangle.B.Lerp(targetTriangle.B, t),

Engine.Systems/Tween/EngineExtensions/TweenVector2DExtensions.cs

@@ -5,5 +5,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenVector2DExtensions
 {
     public static ITween TweenVector2D(this Vector2D initialVector2D, ITweenManager tweenManager, float duration, Vector2D targetVector2D, System.Action<Vector2D> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialVector2D.Lerp(targetVector2D, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialVector2D.Lerp(targetVector2D, t)));
 }

Engine.Systems/Tween/EngineExtensions/TweenVector3DExtensions.cs

@@ -5,5 +5,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenVector3DExtensions
 {
     public static ITween TweenVector3D(this Vector3D initialVector3D, ITweenManager tweenManager, float duration, Vector3D targetVector3D, System.Action<Vector3D> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialVector3D.Lerp(targetVector3D, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialVector3D.Lerp(targetVector3D, t)));
 }

Engine.Systems/Tween/Tween.cs

@@ -26,14 +26,14 @@ internal class Tween : ITween
             _state = value;
             switch (value)
             {
-                case TweenState.Completed: OnCompleted?.Invoke(this); OnEnded?.Invoke(this); break;
+                case TweenState.Completed: OnCompleted?.InvokeSafe(this); OnEnded?.InvokeSafe(this); break;
-                case TweenState.Cancelled: OnCancelled?.Invoke(this); OnEnded?.Invoke(this); break;
+                case TweenState.Cancelled: OnCancelled?.InvokeSafe(this); OnEnded?.InvokeSafe(this); break;
-                case TweenState.Paused: OnPaused?.Invoke(this); break;
+                case TweenState.Paused: OnPaused?.InvokeSafe(this); break;
                 case TweenState.Playing:
                     if (previousState == TweenState.Idle)
-                        OnStarted?.Invoke(this);
+                        OnStarted?.InvokeSafe(this);
                     else
-                        OnResumed?.Invoke(this);
+                        OnResumed?.InvokeSafe(this);
                     break;
             }
         }
@@ -58,9 +58,9 @@ internal class Tween : ITween
 
             _counter = value.Min(Duration).Max(0f);
             Progress = Counter / Duration;
-            OnUpdated?.Invoke(this);
+            OnUpdated?.InvokeSafe(this);
 
-            OnDeltaUpdated?.Invoke(this, Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress));
+            OnDeltaUpdated?.InvokeSafe(this, Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress));
 
             if (_counter >= Duration)
                 State = TweenState.Completed;

Engine.Systems/Tween/TweenExtensions.cs

@@ -46,56 +46,56 @@ public static class TweenExtensions
     public static ITween OnStart(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnStarted += _ => callback.Invoke();
+        tweenConcrete.OnStarted += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnPause(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnPaused += _ => callback.Invoke();
+        tweenConcrete.OnPaused += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnResume(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnResumed += _ => callback.Invoke();
+        tweenConcrete.OnResumed += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnCancel(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnCancelled += _ => callback.Invoke();
+        tweenConcrete.OnCancelled += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnComplete(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnCompleted += _ => callback.Invoke();
+        tweenConcrete.OnCompleted += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnEnd(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnEnded += _ => callback.Invoke();
+        tweenConcrete.OnEnded += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnUpdate(this ITween tween, Action callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnUpdated += _ => callback.Invoke();
+        tweenConcrete.OnUpdated += _ => callback.InvokeSafe();
         return tween;
     }
 
     public static ITween OnDeltaUpdate(this ITween tween, Action<float> callback)
     {
         Tween tweenConcrete = (Tween)tween;
-        tweenConcrete.OnDeltaUpdated += (_, delta) => callback.Invoke(delta);
+        tweenConcrete.OnDeltaUpdated += (_, delta) => callback.InvokeSafe(delta);
         return tween;
     }
 }

Engine.Systems/Tween/TweenManager.cs

@@ -14,7 +14,7 @@ public class TweenManager : UniverseObject, ITweenManager
     public ITween StartTween(float duration, ITweenManager.TweenSetCallback? setCallback = null)
     {
         Tween tween = new(duration);
-        tween.OnUpdated += tween => setCallback?.Invoke(tween.Value);
+        tween.OnUpdated += tween => setCallback?.InvokeSafe(tween.Value);
         runningCoroutines.Add(tween, coroutineManager.StartCoroutine(RunTween(tween)));
         return tween;
     }

Engine/Engine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Syntriax.Engine</RootNamespace>