Amend Me

Engine.Core/UniverseObject.cs

@@ -6,14 +6,15 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Name: {Name}, Initialized: {Initialized}")]
 public class UniverseObject : BaseEntity, IUniverseObject
 {
-    public Event<IUniverseObject, IUniverse> OnEnteredUniverse { get; private set; } = new();
-    public Event<IUniverseObject, IUniverse> OnExitedUniverse { get; private set; } = new();
-    public Event<IUniverseObject, IUniverseObject?, IUniverseObject?> OnParentChanged { get; private set; } = new();
-    public Event<IUniverseObject, IUniverseObject> OnChildrenAdded { get; private set; } = new();
-    public Event<IUniverseObject, IUniverseObject> OnChildrenRemoved { get; private set; } = new();
-    public Event<IActive, bool> OnActiveChanged { get; private set; } = new();
-    public Event<INameable, string> OnNameChanged { get; private set; } = new();
-    public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; private set; } = new();
+    public Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments> OnEnteredUniverse { get; init; } = new();
+    public Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments> OnExitedUniverse { get; init; } = new();
+    public Event<IUniverseObject, IUniverseObject.ParentChangedArguments> OnParentChanged { get; init; } = new();
+    public Event<IUniverseObject, IUniverseObject.ChildrenAddedArguments> OnChildrenAdded { get; init; } = new();
+    public Event<IUniverseObject, IUniverseObject.ChildrenRemovedArguments> OnChildrenRemoved { get; init; } = new();
+
+    public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; init; } = new();
+    public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; init; } = new();
+    public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; init; } = new();
 
     private string _name = nameof(UniverseObject);
     private IUniverse _universe = null!;
@@ -37,7 +38,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
             string previousName = _name;
             _name = value;
-            OnNameChanged?.Invoke(this, previousName);
+            OnNameChanged?.Invoke(this, new(previousName));
         }
     }
 
@@ -50,7 +51,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _universe = universe;
         UpdateActive();
         OnEnteringUniverse(universe);
-        OnEnteredUniverse?.Invoke(this, universe);
+        OnEnteredUniverse?.Invoke(this, new(universe));
         return true;
     }
 
@@ -62,7 +63,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         OnExitingUniverse(universe);
         _universe = null!;
-        OnExitedUniverse?.Invoke(this, universe);
+        OnExitedUniverse?.Invoke(this, new(universe));
         return true;
     }
 
@@ -93,7 +94,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         }
 
         UpdateActive();
-        OnParentChanged?.Invoke(this, previousParent, parent);
+        OnParentChanged?.Invoke(this, new(previousParent, parent));
     }
 
     public void AddChild(IUniverseObject parent)
@@ -103,7 +104,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         _children.Add(parent);
         parent.SetParent(this);
-        OnChildrenAdded?.Invoke(this, parent);
+        OnChildrenAdded?.Invoke(this, new(parent));
     }
 
     public void RemoveChild(IUniverseObject child)
@@ -112,7 +113,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
             return;
 
         child.SetParent(null);
-        OnChildrenRemoved?.Invoke(this, child);
+        OnChildrenRemoved?.Invoke(this, new(child));
     }
 
     protected virtual void OnAssign(IBehaviourController behaviourController) { }
@@ -134,8 +135,8 @@ public class UniverseObject : BaseEntity, IUniverseObject
         stateEnable.OnEnabledChanged.AddListener(OnStateEnabledChanged);
     }
 
-    private void OnParentActiveChanged(IActive sender, bool previousState) => UpdateActive();
-    private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive();
+    private void OnParentActiveChanged(IActive sender, IActive.ActiveChangedArguments arguments) => UpdateActive();
+    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments arguments) => UpdateActive();
 
     private void UpdateActive()
     {
@@ -143,7 +144,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
 
         if (previousActive != IsActive)
-            OnActiveChanged?.Invoke(this, previousActive);
+            OnActiveChanged?.Invoke(this, new(previousActive));
     }
 
     protected override void UnassignInternal()