MonoBehaviour events can be added with a priority

Eddio0141 · Sep 1, 2023 · d18afba · d18afba
1 parent f986104
commit d18afba
Show file tree

Hide file tree

Showing 6 changed files with 287 additions and 42 deletions.
diff --git a/UniTAS/Patcher.Tests/KernelUtils.cs b/UniTAS/Patcher.Tests/KernelUtils.cs
@@ -14,7 +14,6 @@
 using UniTAS.Patcher.Interfaces.GUI;
 using UniTAS.Patcher.Interfaces.Movie;
 using UniTAS.Patcher.Models.Customization;
-using UniTAS.Patcher.Models.DependencyInjection;
 using UniTAS.Patcher.Models.GlobalHotkeyListener;
 using UniTAS.Patcher.Models.GUI;
 using UniTAS.Patcher.Models.UnitySafeWrappers.SceneManagement;
@@ -119,7 +118,7 @@ public void ResetStaticFields()
         }
     }
 
-    [Singleton(RegisterPriority.FirstUpdateSkipOnRestart, IncludeDifferentAssembly = true)]
+    [Singleton(IncludeDifferentAssembly = true)]
     public class TestPriority : IOnPreUpdatesActual
     {
         public void PreUpdateActual()

diff --git a/UniTAS/Patcher/Implementations/MonoBehEventInvoker.cs b/UniTAS/Patcher/Implementations/MonoBehEventInvoker.cs
@@ -3,6 +3,7 @@
 using UniTAS.Patcher.Interfaces.DependencyInjection;
 using UniTAS.Patcher.Interfaces.Events.MonoBehaviourEvents.DontRunIfPaused;
 using UniTAS.Patcher.Interfaces.Events.MonoBehaviourEvents.RunEvenPaused;
+using UniTAS.Patcher.Models.EventSubscribers;
 using UniTAS.Patcher.Services;
 using UniTAS.Patcher.Services.EventSubscribers;
 using UniTAS.Patcher.Utils;
@@ -203,9 +204,47 @@ public event InputSystemEvents.InputUpdateCall OnInputUpdateActual
         remove => InputSystemEvents.OnInputUpdateActual -= value;
     }
 
+    public event InputSystemEvents.InputUpdateCall OnInputUpdateUnconditional
+    {
+        add => InputSystemEvents.OnInputUpdateUnconditional += value;
+        remove => InputSystemEvents.OnInputUpdateUnconditional -= value;
+    }
+
     public event Action OnPreUpdatesActual
     {
         add => MonoBehaviourEvents.OnPreUpdateActual += value;
         remove => MonoBehaviourEvents.OnPreUpdateActual -= value;
     }
+
+    public event Action OnPreUpdatesUnconditional
+    {
+        add => MonoBehaviourEvents.OnPreUpdateUnconditional += value;
+        remove => MonoBehaviourEvents.OnPreUpdateUnconditional -= value;
+    }
+
+    public void AddPriorityCallback(CallbackUpdate callbackUpdate, Action callback, CallbackPriority priority)
+    {
+        var callbackList = callbackUpdate switch
+        {
+            CallbackUpdate.AwakeActual => MonoBehaviourEvents.AwakesActual,
+            CallbackUpdate.AwakeUnconditional => MonoBehaviourEvents.AwakesUnconditional,
+            CallbackUpdate.StartActual => MonoBehaviourEvents.StartsActual,
+            CallbackUpdate.StartUnconditional => MonoBehaviourEvents.StartsUnconditional,
+            CallbackUpdate.EnableActual => MonoBehaviourEvents.EnablesActual,
+            CallbackUpdate.EnableUnconditional => MonoBehaviourEvents.EnablesUnconditional,
+            CallbackUpdate.PreUpdateActual => MonoBehaviourEvents.PreUpdatesActual,
+            CallbackUpdate.PreUpdateUnconditional => MonoBehaviourEvents.PreUpdatesUnconditional,
+            CallbackUpdate.UpdateActual => MonoBehaviourEvents.UpdatesActual,
+            CallbackUpdate.UpdateUnconditional => MonoBehaviourEvents.UpdatesUnconditional,
+            CallbackUpdate.FixedUpdateActual => MonoBehaviourEvents.FixedUpdatesActual,
+            CallbackUpdate.FixedUpdateUnconditional => MonoBehaviourEvents.FixedUpdatesUnconditional,
+            CallbackUpdate.GUIActual => MonoBehaviourEvents.GUIsActual,
+            CallbackUpdate.GUIUnconditional => MonoBehaviourEvents.GUIsUnconditional,
+            CallbackUpdate.LastUpdateActual => MonoBehaviourEvents.LastUpdatesActual,
+            CallbackUpdate.LastUpdateUnconditional => MonoBehaviourEvents.LastUpdatesUnconditional,
+            _ => throw new ArgumentOutOfRangeException(nameof(callbackUpdate), callbackUpdate, null)
+        };
+
+        callbackList.Add(callback, (int)priority);
+    }
 }
diff --git a/UniTAS/Patcher/Models/EventSubscribers/CallbackPriority.cs b/UniTAS/Patcher/Models/EventSubscribers/CallbackPriority.cs
@@ -0,0 +1,8 @@
+namespace UniTAS.Patcher.Models.EventSubscribers;
+
+public enum CallbackPriority
+{
+    // the higher you place it, the lower the value, the earlier it gets invoked
+    FirstUpdateSkipOnRestart,
+    Default
+}
diff --git a/UniTAS/Patcher/Models/EventSubscribers/CallbackUpdate.cs b/UniTAS/Patcher/Models/EventSubscribers/CallbackUpdate.cs
@@ -0,0 +1,21 @@
+namespace UniTAS.Patcher.Models.EventSubscribers;
+
+public enum CallbackUpdate
+{
+    AwakeUnconditional,
+    AwakeActual,
+    StartUnconditional,
+    StartActual,
+    EnableUnconditional,
+    EnableActual,
+    PreUpdateUnconditional,
+    PreUpdateActual,
+    UpdateUnconditional,
+    UpdateActual,
+    FixedUpdateUnconditional,
+    FixedUpdateActual,
+    GUIUnconditional,
+    GUIActual,
+    LastUpdateUnconditional,
+    LastUpdateActual
+}
diff --git a/UniTAS/Patcher/Services/EventSubscribers/IMonoBehaviourEvents.cs b/UniTAS/Patcher/Services/EventSubscribers/IMonoBehaviourEvents.cs
@@ -1,4 +1,5 @@
 using System;
+using UniTAS.Patcher.Models.EventSubscribers;
 using UniTAS.Patcher.Utils;
 
 namespace UniTAS.Patcher.Services.EventSubscribers;
@@ -19,5 +20,9 @@ public interface IUpdateEvents
     event Action OnLastUpdateUnconditional;
     event Action OnLastUpdateActual;
     event Action OnPreUpdatesActual;
+    event Action OnPreUpdatesUnconditional;
     event InputSystemEvents.InputUpdateCall OnInputUpdateActual;
+    event InputSystemEvents.InputUpdateCall OnInputUpdateUnconditional;
+
+    void AddPriorityCallback(CallbackUpdate callbackUpdate, Action callback, CallbackPriority priority);
 }