From 777741569ec46177f4029982934ecc5ddd44f806 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:50:07 -0700 Subject: [PATCH] Merged classes --- MiraAPI/Events/MiraEventHandle.cs | 21 +++++++++++---- MiraAPI/Events/MiraEventManager.cs | 43 +++++++++++++++--------------- MiraAPI/Events/MiraEventWrapper.cs | 27 ------------------- 3 files changed, 37 insertions(+), 54 deletions(-) delete mode 100644 MiraAPI/Events/MiraEventWrapper.cs diff --git a/MiraAPI/Events/MiraEventHandle.cs b/MiraAPI/Events/MiraEventHandle.cs index 008b9c9b..86a2782f 100644 --- a/MiraAPI/Events/MiraEventHandle.cs +++ b/MiraAPI/Events/MiraEventHandle.cs @@ -3,19 +3,30 @@ namespace MiraAPI.Events; /// -/// Event handle to use when unregistering a . +/// Wrapper for handlers. +/// Also used when unregistering a . /// public class MiraEventHandle { /// /// Gets the type of event. /// - public Type EventType => EventWrapper.DefinedType; + public Type EventType { get; } - internal MiraEventWrapper EventWrapper { get; } + /// + /// Gets the priority of the handler. Lower values are called first. + /// + internal int Priority { get; } - internal MiraEventHandle(MiraEventWrapper eventWrapper) + /// + /// Gets the event handler delegate. + /// + internal Delegate EventHandler { get; } + + internal MiraEventHandle(Delegate eventHandler, int priority, Type type) { - EventWrapper = eventWrapper; + EventHandler = eventHandler; + Priority = priority; + EventType = type; } } diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 84e8fdda..83b50aa6 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -12,9 +12,9 @@ namespace MiraAPI.Events; /// public static class MiraEventManager { - private static readonly Dictionary> EventWrappersToLoad = []; + private static readonly Dictionary> EventHandlersToLoad = []; - private static readonly Dictionary> EventWrappers = []; + private static readonly Dictionary> EventHandlers = []; /// /// Gets the list of all registered types. @@ -48,12 +48,12 @@ 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 (!EventWrappers.TryGetValue(type.GetTrackedType(), out var handlers)) + if (!EventHandlers.TryGetValue(type.GetTrackedType(), out var handlers)) { return false; } - var callableHandlers = handlers.Where(x => x.DefinedType.IsAssignableTo(type)).ToList(); + var callableHandlers = handlers.Where(x => x.EventType.IsAssignableTo(type)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -186,9 +186,9 @@ public static class MiraEventManager /// A to use when unregistering the event. private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority) { - var eventWrapper = new MiraEventWrapper(@delegate, priority, type); - EventHandlerAdded(type, eventWrapper); - return new MiraEventHandle(eventWrapper); + var eventHandler = new MiraEventHandle(@delegate, priority, type); + EventHandlerAdded(type, eventHandler); + return eventHandler; } private static Type GetTrackedType(this Type type) @@ -201,12 +201,12 @@ public static class MiraEventManager return type; } - private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) + private static void EventHandlerAdded(Type type, MiraEventHandle eventHandler) { if (!loadFinilized) { - EventWrappersToLoad.TryAdd(type, []); - EventWrappersToLoad[type].Add(eventWrapper); + EventHandlersToLoad.TryAdd(type, []); + EventHandlersToLoad[type].Add(eventHandler); return; } @@ -217,16 +217,16 @@ public static class MiraEventManager foreach (Type eventType in trackedEvents) { - var handlers = EventWrappers[eventType]; + var handlers = EventHandlers[eventType]; - var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); + var index = handlers.BinarySearch(eventHandler, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); if (index < 0) { index = ~index; } - handlers.Insert(index, eventWrapper); + handlers.Insert(index, eventHandler); } } @@ -237,15 +237,14 @@ public static class MiraEventManager /// if the event was unregistered successfully, otherwise. public static bool UnregisterEventHandler(MiraEventHandle eventHandle) { - MiraEventWrapper wrapper = eventHandle.EventWrapper; if (!loadFinilized) { - if (!EventWrappersToLoad.TryGetValue(wrapper.DefinedType, out var handlersToLoad)) + if (!EventHandlersToLoad.TryGetValue(eventHandle.EventType, out var handlersToLoad)) { return false; } - if (!handlersToLoad.Remove(eventHandle.EventWrapper)) + if (!handlersToLoad.Remove(eventHandle)) { return false; } @@ -253,7 +252,7 @@ public static class MiraEventManager return true; } - if (!TrackedEventTypes.TryGetValue(wrapper.DefinedType.GetTrackedType(), out var eventTypes)) + if (!TrackedEventTypes.TryGetValue(eventHandle.EventType.GetTrackedType(), out var eventTypes)) { return false; } @@ -261,12 +260,12 @@ public static class MiraEventManager var removed = false; foreach (var type in eventTypes) { - if (!EventWrappers.TryGetValue(type, out var handlers)) + if (!EventHandlers.TryGetValue(type, out var handlers)) { continue; } - removed |= handlers.Remove(wrapper); + removed |= handlers.Remove(eventHandle); } return removed; @@ -279,10 +278,10 @@ public static class MiraEventManager foreach (var eventType in EventTypes) { - EventWrappers.Add(eventType, []); + EventHandlers.Add(eventType, []); } - foreach (var (concreteType, eventHandlers) in EventWrappersToLoad) + foreach (var (concreteType, eventHandlers) in EventHandlersToLoad) { foreach (var eventHandler in eventHandlers) { @@ -292,6 +291,6 @@ public static class MiraEventManager eventHandlers.Clear(); } - EventWrappersToLoad.Clear(); + EventHandlersToLoad.Clear(); } } diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs deleted file mode 100644 index 09cce83a..00000000 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace MiraAPI.Events; - -/// -/// Wrapper for handlers. -/// -/// The action for the event handler. -/// The priority of the handler. -/// The constructed event type. -internal class MiraEventWrapper(Delegate eventHandler, int priority, Type type) -{ - /// - /// Gets the event handler delegate. - /// - public Delegate EventHandler { get; } = eventHandler; - - /// - /// Gets the priority of the handler. Lower values are called first. - /// - public int Priority { get; } = priority; - - /// - /// Gets the type used to construct the . - /// - public Type DefinedType { get; } = type; -}