From 0870f01df666324bb499b9627f57875a2697dbbe Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Sun, 5 Apr 2020 17:12:34 -0500
Subject: [PATCH] Changed when OnPluginsStateChanged is invoked, and added a
 new OnAnyPluginsStateChanged to take over where it had been

---
 IPA.Loader/Loader/PluginManager.cs            | 27 ++++++++++++++++---
 .../Async/UnityMainThreadTaskScheduler.cs     |  8 ++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/IPA.Loader/Loader/PluginManager.cs b/IPA.Loader/Loader/PluginManager.cs
index b42275c4..06df93d5 100644
--- a/IPA.Loader/Loader/PluginManager.cs
+++ b/IPA.Loader/Loader/PluginManager.cs
@@ -208,9 +208,13 @@ namespace IPA.Loader
 
                     var disabled = new Dictionary<PluginExecutor, Task>();
                     result = TaskEx.WhenAll(disableStructure.Select(d => Disable(d, disabled)));
-                    OnPluginsStateChanged?.Invoke(result);
                 }
 
+                OnAnyPluginsStateChanged?.Invoke(result, toEnable, toDisable);
+                // if there are any that are capable of enabling/disabling at runtime, run event handler
+                if (toEnable.Concat(toDisable).Any(m => m.RuntimeOptions == RuntimeOptions.DynamicInit))
+                    OnPluginsStateChanged?.Invoke(result);
+
                 //DisabledConfig.Instance.Changed();
                 // changed is handled by transaction
                 return result;
@@ -250,23 +254,38 @@ namespace IPA.Loader
         /// <param name="plugin">the plugin that was disabled</param>
         /// <param name="needsRestart">whether it needs a restart to take effect</param>
         public delegate void PluginDisableDelegate(PluginMetadata plugin, bool needsRestart);
+        /// <summary>
+        /// A delegate representing a state change event for any plugin.
+        /// </summary>
+        /// <param name="changeTask">the <see cref="Task"/> representing the change</param>
+        /// <param name="enabled">the plugins that were enabled in the change</param>
+        /// <param name="disabled">the plugins that were disabled in the change</param>
+        public delegate void OnAnyPluginsStateChangedDelegate(Task changeTask, IEnumerable<PluginMetadata> enabled, IEnumerable<PluginMetadata> disabled);
 
         /// <summary>
-        /// Called whenever a plugin is enabled.
+        /// Called whenever a plugin is enabled, before the plugin in question is enabled.
         /// </summary>
         public static event PluginEnableDelegate PluginEnabled;
         /// <summary>
-        /// Called whenever a plugin is disabled.
+        /// Called whenever a plugin is disabled, before the plugin in question is enabled.
         /// </summary>
         public static event PluginDisableDelegate PluginDisabled;
         /// <summary>
-        /// Called whenever any plugins have their state changed with the <see cref="Task"/> representing that state change.
+        /// Called whenever any plugins have their state changed at runtime with the <see cref="Task"/> representing that state change.
         /// </summary>
         /// <remarks>
         /// Note that this is called on the Unity main thread, and cannot therefore block, as the <see cref="Task"/>
         /// provided represents operations that also run on the Unity main thread.
         /// </remarks>
         public static event Action<Task> OnPluginsStateChanged;
+        /// <summary>
+        /// Called whenever any plugins, regardless of whether or not their change occurs during runtime, have their state changed.
+        /// </summary>
+        /// <remarks>
+        /// Note that this is called on the Unity main thread, and cannot therefore block, as the <see cref="Task"/>
+        /// provided represents operations that also run on the Unity main thread.
+        /// </remarks>
+        public static event OnAnyPluginsStateChangedDelegate OnAnyPluginsStateChanged;
 
         /// <summary>
         /// Gets a list of all enabled BSIPA plugins. Use <see cref="EnabledPlugins"/> instead of this.
diff --git a/IPA.Loader/Utilities/Async/UnityMainThreadTaskScheduler.cs b/IPA.Loader/Utilities/Async/UnityMainThreadTaskScheduler.cs
index 3bbc84fc..eb53fc92 100644
--- a/IPA.Loader/Utilities/Async/UnityMainThreadTaskScheduler.cs
+++ b/IPA.Loader/Utilities/Async/UnityMainThreadTaskScheduler.cs
@@ -180,7 +180,7 @@ namespace IPA.Utilities.Async
         }
 
         /// <summary>
-        /// Queues a given <see cref="Task"/> to this scheduler. The <see cref="Task"/> <i>must></i> be
+        /// Queues a given <see cref="Task"/> to this scheduler. The <see cref="Task"/> <i>must</i> be
         /// scheduled for this <see cref="TaskScheduler"/> by the runtime.
         /// </summary>
         /// <param name="task">the <see cref="Task"/> to queue</param>
@@ -195,12 +195,8 @@ namespace IPA.Utilities.Async
         }
 
         /// <summary>
-        /// Rejects any attempts to execute a task inline.
+        /// Runs the task inline if the current thread is the Unity main thread.
         /// </summary>
-        /// <remarks>
-        /// This task scheduler <i>always</i> runs its tasks on the thread that it manages, therefore it doesn't
-        /// make sense to run it inline.
-        /// </remarks>
         /// <param name="task">the task to attempt to execute</param>
         /// <param name="taskWasPreviouslyQueued">whether the task was previously queued to this scheduler</param>
         /// <returns><see langword="false"/></returns>