From 5502dbc2872dbd7ab14b2d17c5f448d14a123fe5 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Thu, 12 Nov 2026 01:50:01 -0500 Subject: [PATCH] restore old behaviour + minor improvements inherited invocations should be opt-in, since most mods likely already accounted for the shortcomings of the original system. so the default should be false instead of true also deprecates the MiraEventWrapper class to maintain ABI compatibility while ensuring people migrate to using MiraEventHandle instead --- MiraAPI/Events/MiraEventManager.cs | 40 +++++++++++-------- MiraAPI/Events/MiraEventWrapper.cs | 1 + MiraAPI/Events/RegisterEventAttribute.cs | 4 +- ....cs => RegisterEventContainerAttribute.cs} | 0 4 files changed, 26 insertions(+), 19 deletions(-) rename MiraAPI/Events/{RegisterEventsAttribute.cs => RegisterEventContainerAttribute.cs} (100%) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 219b00d1..a3cd0e7f 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -13,9 +13,9 @@ namespace MiraAPI.Events; /// public static class MiraEventManager { - private static readonly Dictionary> EventHandlersToLoad = []; - private static readonly Dictionary> EventHandlers = []; + private static readonly Dictionary> EventHandlersToLoad = []; + private static readonly Comparer EventComparer = Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority)); /// /// Gets the list of all registered types. @@ -49,17 +49,26 @@ public static class MiraEventManager /// If there was an event handler invoked for this event, return . Otherwise, return . public static bool InvokeEvent(this MiraEvent eventInstance, Type type) { - if (!EventHandlers.TryGetValue(type.GetTrackedType(), out var handlers)) + var trackedType = type.GetTrackedType(); + var callableHandlers = new List(); + + if (EventHandlers.TryGetValue(trackedType, out var handlers)) { - return false; + callableHandlers.AddRange(handlers.Where(x => x.IsTriggeredBy(type))); + } + + if (!loadFinalized && EventHandlersToLoad.TryGetValue(trackedType, out var pendingHandlers)) + { + callableHandlers.AddRange(pendingHandlers.Where(x => x.IsTriggeredBy(type))); } - var callableHandlers = handlers.Where(x => x.IsTriggeredBy(type)).ToList(); if (callableHandlers.Count == 0) { return false; } + callableHandlers.Sort(EventComparer); + foreach (var handler in callableHandlers) { try @@ -139,7 +148,7 @@ public static class MiraEventManager /// public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority) { - return RegisterEventHandler(type, methodInfo, priority, true); + return RegisterEventHandler(type, methodInfo, priority, false); } /// @@ -151,7 +160,7 @@ public static class MiraEventManager /// public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo) { - return RegisterEventHandler(type, methodInfo, 0, true); + return RegisterEventHandler(type, methodInfo, 0, false); } /// @@ -169,7 +178,7 @@ public static class MiraEventManager /// public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority) { - return RegisterEventHandler(methodInfo, priority, true); + return RegisterEventHandler(methodInfo, priority, false); } /// @@ -181,7 +190,7 @@ public static class MiraEventManager /// public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo) { - return RegisterEventHandler(methodInfo, 0, true); + return RegisterEventHandler(methodInfo, 0, false); } /// @@ -202,7 +211,7 @@ public static class MiraEventManager public static MiraEventHandle RegisterEventHandler(Action handler, int priority) where T : MiraEvent { - return RegisterEventHandler(handler, priority, true); + return RegisterEventHandler(handler, priority, false); } /// @@ -216,7 +225,7 @@ public static class MiraEventManager public static MiraEventHandle RegisterEventHandler(Action handler) where T : MiraEvent { - return RegisterEventHandler(handler, 0, true); + return RegisterEventHandler(handler, 0, false); } /// @@ -261,8 +270,7 @@ public static class MiraEventManager foreach (Type eventType in trackedEvents) { var handlers = EventHandlers[eventType]; - - var index = handlers.BinarySearch(eventHandler, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); + var index = handlers.BinarySearch(eventHandler, EventComparer); if (index < 0) { @@ -303,12 +311,10 @@ public static class MiraEventManager var removed = false; foreach (var type in eventTypes) { - if (!EventHandlers.TryGetValue(type, out var handlers)) + if (EventHandlers.TryGetValue(type, out var handlers)) { - continue; + removed |= handlers.Remove(eventHandle); } - - removed |= handlers.Remove(eventHandle); } return removed; diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 469a98d3..8b0300c3 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -7,6 +7,7 @@ namespace MiraAPI.Events; /// /// The action for the event handler. /// The priority of the handler. +[Obsolete("Use MiraEventHandle instead. This will be removed in a future version.")] public class MiraEventWrapper(Delegate eventHandler, int priority) { /// diff --git a/MiraAPI/Events/RegisterEventAttribute.cs b/MiraAPI/Events/RegisterEventAttribute.cs index d674b54d..29737a0c 100644 --- a/MiraAPI/Events/RegisterEventAttribute.cs +++ b/MiraAPI/Events/RegisterEventAttribute.cs @@ -23,7 +23,7 @@ public class RegisterEventAttribute(int priority, bool invokeOnSubtype) : Attrib /// public RegisterEventAttribute(int priority) - : this(priority, true) + : this(priority, false) { } @@ -35,7 +35,7 @@ public class RegisterEventAttribute(int priority, bool invokeOnSubtype) : Attrib /// public RegisterEventAttribute() - : this(0, true) + : this(0, false) { } } diff --git a/MiraAPI/Events/RegisterEventsAttribute.cs b/MiraAPI/Events/RegisterEventContainerAttribute.cs similarity index 100% rename from MiraAPI/Events/RegisterEventsAttribute.cs rename to MiraAPI/Events/RegisterEventContainerAttribute.cs