From 61351c958b9afb529bf42eb05d0fcf41c3b622d4 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 19:36:11 -0700 Subject: [PATCH 01/45] Combined invoke calls into single method --- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 70a218be..f3b430dc 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -40,14 +40,7 @@ public static class VanillaButtonPatches ventTarget = role.Cast().currentTarget; } - var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget); - MiraEventManager.InvokeEvent(genericEvent); - if (genericEvent.IsCancelled) - { - MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance)); - } - - return !genericEvent.IsCancelled; + return InvokeEvents(__instance, playerTarget, ventTarget); } [HarmonyPrefix] @@ -66,7 +59,12 @@ public static class VanillaButtonPatches playerTarget = role.Cast().currentTarget; } - var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget); + return InvokeEvents(__instance, playerTarget); + } + + private static bool InvokeEvents(AbilityButton __instance, PlayerControl? playerTarget, Vent? ventTarget = null) + { + var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget); MiraEventManager.InvokeEvent(genericEvent); if (genericEvent.IsCancelled) { From 64a8539bc38855c4f754a79785d4b01b94dafaa4 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 19:52:45 -0700 Subject: [PATCH 02/45] Simplified to single ClickHandler call --- MiraAPI/Hud/CustomActionButton.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/MiraAPI/Hud/CustomActionButton.cs b/MiraAPI/Hud/CustomActionButton.cs index ce91ad57..079b33df 100644 --- a/MiraAPI/Hud/CustomActionButton.cs +++ b/MiraAPI/Hud/CustomActionButton.cs @@ -179,14 +179,8 @@ public abstract class CustomActionButton MiraEventManager.InvokeEvent(cancelEvent, cancelEventType); } - if (specificInvoked) - { - if (!@event.IsCancelled) ClickHandler(); - } - else - { - if (!genericEvent.IsCancelled) ClickHandler(); - } + MiraCancelableEvent eventCheck = specificInvoked ? @event : genericEvent; + if (!eventCheck.IsCancelled) ClickHandler(); })); if (Keybind == null) return; From 31546ad0122486fdc483b80094b159ddddfb154e Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 20:22:59 -0700 Subject: [PATCH 03/45] Actually invoked generic vanilla button events --- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index f3b430dc..3606d627 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -1,4 +1,5 @@ -using AmongUs.GameOptions; +using System; +using AmongUs.GameOptions; using HarmonyLib; using MiraAPI.Events; using MiraAPI.Events.Vanilla.Gameplay; @@ -71,6 +72,17 @@ public static class VanillaButtonPatches MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance)); } - return !genericEvent.IsCancelled; + var eventType = typeof(VanillaButtonClickEvent<>).MakeGenericType(__instance.GetType()); + var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, __instance)!; + var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType); + if (@event.IsCancelled) + { + var cancelEventType = typeof(VanillaButtonCancelledEvent<>).MakeGenericType(__instance.GetType()); + var cancelEvent = (MiraCancelableEvent)Activator.CreateInstance(cancelEventType, __instance)!; + MiraEventManager.InvokeEvent(cancelEvent, cancelEventType); + } + + MiraCancelableEvent eventCheck = specificInvoked ? @event : genericEvent; + return !eventCheck.IsCancelled; } } From 9bb865bdf14da5649c0e3f1d5c4fe86a75d4b845 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 20:31:35 -0700 Subject: [PATCH 04/45] Used InvokeEvent as extension method --- MiraAPI/Hud/CustomActionButton.cs | 6 +++--- MiraAPI/MiraApiSettings.cs | 4 ++-- MiraAPI/Networking/CustomMurderRpc.cs | 8 ++++---- MiraAPI/Patches/AmongUsClientSyncPatch.cs | 4 ++-- MiraAPI/Patches/Events/CanUsePatches.cs | 2 +- MiraAPI/Patches/Events/EndGamePatches.cs | 4 ++-- MiraAPI/Patches/Events/HnsFinishTaskPatch.cs | 2 +- .../Patches/Events/KillAnimationMurderEventPatch.cs | 2 +- MiraAPI/Patches/Events/MapBehaviourPatches.cs | 2 +- MiraAPI/Patches/Events/ReportBodyEventPatch.cs | 2 +- MiraAPI/Patches/Events/SabotageEventPatches.cs | 4 ++-- MiraAPI/Patches/Events/UsePatches.cs | 2 +- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 6 +++--- MiraAPI/Patches/Events/VentEventPatches.cs | 4 ++-- MiraAPI/Patches/IntroCutscenePatches.cs | 6 +++--- MiraAPI/Patches/PlayerControlPatches.cs | 6 +++--- MiraAPI/Patches/Roles/EjectionPatches.cs | 6 +++--- MiraAPI/Patches/Roles/RoleManagerPatches.cs | 2 +- MiraAPI/Patches/VentCanUsePatch.cs | 2 +- MiraAPI/Patches/Voting/DummyBehaviourPatch.cs | 2 +- MiraAPI/Patches/Voting/MeetingHudPatches.cs | 12 ++++++------ MiraAPI/Voting/VotingUtils.cs | 4 ++-- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/MiraAPI/Hud/CustomActionButton.cs b/MiraAPI/Hud/CustomActionButton.cs index 079b33df..c197a746 100644 --- a/MiraAPI/Hud/CustomActionButton.cs +++ b/MiraAPI/Hud/CustomActionButton.cs @@ -165,18 +165,18 @@ public abstract class CustomActionButton { // Invoke the generic button click event. var genericEvent = new MiraButtonClickEvent(this); - MiraEventManager.InvokeEvent(genericEvent); + genericEvent.InvokeEvent(); if (genericEvent.IsCancelled) MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this)); // Invoke the button click event for specific button. var eventType = CustomButtonManager.ButtonEventTypes[GetType()]; var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!; - var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType); + var specificInvoked = @event.InvokeEvent(eventType); if (@event.IsCancelled) { var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()]; var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!; - MiraEventManager.InvokeEvent(cancelEvent, cancelEventType); + cancelEvent.InvokeEvent(cancelEventType); } MiraCancelableEvent eventCheck = specificInvoked ? @event : genericEvent; diff --git a/MiraAPI/MiraApiSettings.cs b/MiraAPI/MiraApiSettings.cs index 1afca88e..eae79361 100644 --- a/MiraAPI/MiraApiSettings.cs +++ b/MiraAPI/MiraApiSettings.cs @@ -95,10 +95,10 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config) return; var genericEvent = new UiButtonResetEvent(); - MiraEventManager.InvokeEvent(genericEvent); + genericEvent.InvokeEvent(); var genericEvent2 = new UiButtonPostResetEvent(topUi, extraTopUi); - MiraEventManager.InvokeEvent(genericEvent2); + genericEvent2.InvokeEvent(); MiraHudHelper.UiGrid.ArrangeChilds(); MiraHudHelper.ExtraUiGrid.ArrangeChilds(); } diff --git a/MiraAPI/Networking/CustomMurderRpc.cs b/MiraAPI/Networking/CustomMurderRpc.cs index 8a5a701a..2099cb3c 100644 --- a/MiraAPI/Networking/CustomMurderRpc.cs +++ b/MiraAPI/Networking/CustomMurderRpc.cs @@ -85,7 +85,7 @@ public static class CustomMurderRpc var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError; var beforeMurderEvent = new BeforeMurderEvent(source, target, inMeeting); - MiraEventManager.InvokeEvent(beforeMurderEvent); + beforeMurderEvent.InvokeEvent(); var defenseFlag = beforeMurderEvent.IgnoreDefense; var indirectFlag = beforeMurderEvent.IsIndirectAttack; var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null; @@ -227,7 +227,7 @@ public static class CustomMurderRpc var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError; var beforeMurderEvent = new BeforeMurderEvent(source, target, isIndirect, ignoreDefense, inMeeting); - MiraEventManager.InvokeEvent(beforeMurderEvent); + beforeMurderEvent.InvokeEvent(); var defenseFlag = beforeMurderEvent.IgnoreDefense; var indirectFlag = beforeMurderEvent.IsIndirectAttack; var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null; @@ -357,7 +357,7 @@ public static class CustomMurderRpc var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError; var beforeMurderEvent = new BeforeMurderEvent(source, target, framed, isIndirect, ignoreDefense, inMeeting); - MiraEventManager.InvokeEvent(beforeMurderEvent); + beforeMurderEvent.InvokeEvent(); var defenseFlag = beforeMurderEvent.IgnoreDefense; var indirectFlag = beforeMurderEvent.IsIndirectAttack; var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null; @@ -821,7 +821,7 @@ public static class CustomMurderRpc } var afterMurderEvent = framed != null ? new AfterMurderEvent(source, target, framed, deadBody, isIndirect, ignoreDefense) : new AfterMurderEvent(source, target, deadBody, isIndirect, ignoreDefense); - MiraEventManager.InvokeEvent(afterMurderEvent); + afterMurderEvent.InvokeEvent(); if (!isParticipant) { diff --git a/MiraAPI/Patches/AmongUsClientSyncPatch.cs b/MiraAPI/Patches/AmongUsClientSyncPatch.cs index 926004d6..057ddbbd 100644 --- a/MiraAPI/Patches/AmongUsClientSyncPatch.cs +++ b/MiraAPI/Patches/AmongUsClientSyncPatch.cs @@ -19,7 +19,7 @@ internal static class AmongUsClientSyncPatch public static void CreatePlayerPatch(ClientData clientData) { var joinEvent = new PlayerJoinEvent(clientData); - MiraEventManager.InvokeEvent(joinEvent); + joinEvent.InvokeEvent(); if (!AmongUsClient.Instance.AmHost) { @@ -41,6 +41,6 @@ internal static class AmongUsClientSyncPatch public static void PlayerLeftPatch(ClientData data, DisconnectReasons reason) { var leftEvent = new PlayerLeaveEvent(data, reason); - MiraEventManager.InvokeEvent(leftEvent); + leftEvent.InvokeEvent(); } } diff --git a/MiraAPI/Patches/Events/CanUsePatches.cs b/MiraAPI/Patches/Events/CanUsePatches.cs index f99d2b90..a8aa67fd 100644 --- a/MiraAPI/Patches/Events/CanUsePatches.cs +++ b/MiraAPI/Patches/Events/CanUsePatches.cs @@ -35,7 +35,7 @@ public static class CanUsePatches var usable = __instance.TryCast(); if (usable == null) return true; var @event = new PlayerCanUseEvent(usable); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } diff --git a/MiraAPI/Patches/Events/EndGamePatches.cs b/MiraAPI/Patches/Events/EndGamePatches.cs index aa475397..d158d3fd 100644 --- a/MiraAPI/Patches/Events/EndGamePatches.cs +++ b/MiraAPI/Patches/Events/EndGamePatches.cs @@ -13,7 +13,7 @@ internal static class EndGamePatches public static bool Prefix(GameOverReason endReason) { var @event = new BeforeGameEndEvent(endReason); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } @@ -42,7 +42,7 @@ internal static class EndGamePatches } var @event = new GameEndEvent(__instance); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); } } } diff --git a/MiraAPI/Patches/Events/HnsFinishTaskPatch.cs b/MiraAPI/Patches/Events/HnsFinishTaskPatch.cs index 41b193f5..0d837e54 100644 --- a/MiraAPI/Patches/Events/HnsFinishTaskPatch.cs +++ b/MiraAPI/Patches/Events/HnsFinishTaskPatch.cs @@ -12,6 +12,6 @@ public static class HnsFinishTaskPatch public static void FinishTaskPostfix(HideAndSeekManager __instance, PlayerTask task) { var completeTaskEvent = new CompleteHnsTaskEvent(__instance, task.Owner, task); - MiraEventManager.InvokeEvent(completeTaskEvent); + completeTaskEvent.InvokeEvent(); } } diff --git a/MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs b/MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs index d102664c..3c2808e7 100644 --- a/MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs +++ b/MiraAPI/Patches/Events/KillAnimationMurderEventPatch.cs @@ -30,6 +30,6 @@ public static class KillAnimationMurderEventPatch var target = wrapper.GetParameter("target"); var afterMurderEvent = new AfterMurderEvent(source, target, Helpers.GetBodyById(target.PlayerId)); - MiraEventManager.InvokeEvent(afterMurderEvent); + afterMurderEvent.InvokeEvent(); } } diff --git a/MiraAPI/Patches/Events/MapBehaviourPatches.cs b/MiraAPI/Patches/Events/MapBehaviourPatches.cs index 246b6e59..abca6561 100644 --- a/MiraAPI/Patches/Events/MapBehaviourPatches.cs +++ b/MiraAPI/Patches/Events/MapBehaviourPatches.cs @@ -15,7 +15,7 @@ public static class MapBehaviourPatches public static bool MapShowSabotagePatch(MapBehaviour __instance) { var @event = new PlayerOpenSabotageEvent(__instance); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } } diff --git a/MiraAPI/Patches/Events/ReportBodyEventPatch.cs b/MiraAPI/Patches/Events/ReportBodyEventPatch.cs index 3eb1c291..781d5cc3 100644 --- a/MiraAPI/Patches/Events/ReportBodyEventPatch.cs +++ b/MiraAPI/Patches/Events/ReportBodyEventPatch.cs @@ -15,7 +15,7 @@ public static class ReportBodyEventPatch var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null; var @event = new ReportBodyEvent(source, target, body); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } diff --git a/MiraAPI/Patches/Events/SabotageEventPatches.cs b/MiraAPI/Patches/Events/SabotageEventPatches.cs index 0717d6f8..2aaaa571 100644 --- a/MiraAPI/Patches/Events/SabotageEventPatches.cs +++ b/MiraAPI/Patches/Events/SabotageEventPatches.cs @@ -15,7 +15,7 @@ public static class SabotageEventPatches public static bool ShipStatusUpdateSystemPrefix(SystemTypes systemType, byte amount) { var @event = new UpdateSystemEvent(systemType, PlayerControl.LocalPlayer, amount); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } @@ -24,7 +24,7 @@ public static class SabotageEventPatches public static bool ShipStatusCloseDoorsOfTypePrefix(SystemTypes type) { var @event = new CloseDoorsEvent(type); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } } diff --git a/MiraAPI/Patches/Events/UsePatches.cs b/MiraAPI/Patches/Events/UsePatches.cs index 4d783f39..679ac46e 100644 --- a/MiraAPI/Patches/Events/UsePatches.cs +++ b/MiraAPI/Patches/Events/UsePatches.cs @@ -29,7 +29,7 @@ public static class UsePatches public static bool UsePatch(MonoBehaviour __instance) { var @event = new PlayerUseEvent(__instance.Cast()); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return !@event.IsCancelled; } diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 3606d627..2eb06543 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -66,7 +66,7 @@ public static class VanillaButtonPatches private static bool InvokeEvents(AbilityButton __instance, PlayerControl? playerTarget, Vent? ventTarget = null) { var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget); - MiraEventManager.InvokeEvent(genericEvent); + genericEvent.InvokeEvent(); if (genericEvent.IsCancelled) { MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance)); @@ -74,12 +74,12 @@ public static class VanillaButtonPatches var eventType = typeof(VanillaButtonClickEvent<>).MakeGenericType(__instance.GetType()); var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, __instance)!; - var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType); + var specificInvoked = @event.InvokeEvent(eventType); if (@event.IsCancelled) { var cancelEventType = typeof(VanillaButtonCancelledEvent<>).MakeGenericType(__instance.GetType()); var cancelEvent = (MiraCancelableEvent)Activator.CreateInstance(cancelEventType, __instance)!; - MiraEventManager.InvokeEvent(cancelEvent, cancelEventType); + cancelEvent.InvokeEvent(cancelEventType); } MiraCancelableEvent eventCheck = specificInvoked ? @event : genericEvent; diff --git a/MiraAPI/Patches/Events/VentEventPatches.cs b/MiraAPI/Patches/Events/VentEventPatches.cs index 737d221f..c1852015 100644 --- a/MiraAPI/Patches/Events/VentEventPatches.cs +++ b/MiraAPI/Patches/Events/VentEventPatches.cs @@ -29,7 +29,7 @@ public static class VentEventPatches var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == ventId); var @event = new EnterVentEvent(pc, vent); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (pc.AmOwner) { @@ -47,7 +47,7 @@ public static class VentEventPatches var vent = ShipStatus.Instance.AllVents.First(v => v.Id == ventId); var @event = new ExitVentEvent(pc, vent); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (pc.AmOwner) { diff --git a/MiraAPI/Patches/IntroCutscenePatches.cs b/MiraAPI/Patches/IntroCutscenePatches.cs index 8abbefbe..47f4de8b 100644 --- a/MiraAPI/Patches/IntroCutscenePatches.cs +++ b/MiraAPI/Patches/IntroCutscenePatches.cs @@ -31,7 +31,7 @@ public static class IntroCutscenePatches public static void IntroBeginPatch(IntroCutscene __instance) { var @event = new IntroBeginEvent(__instance); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (CustomGameModeManager.ActiveMode != null) { @@ -61,7 +61,7 @@ public static class IntroCutscenePatches Info("IntroCutscene ShowRole reached"); var @event = new IntroRoleRevealEvent(introCutscene); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); } } @@ -138,7 +138,7 @@ public static class IntroCutscenePatches MiraEventManager.InvokeEvent(new IntroEndEvent(introCutscene)); var @event = new BeforeRoundStartEvent(true); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (@event.IsCancelled) return; MiraEventManager.InvokeEvent(new RoundStartEvent(true)); diff --git a/MiraAPI/Patches/PlayerControlPatches.cs b/MiraAPI/Patches/PlayerControlPatches.cs index 791334d8..a357d5eb 100644 --- a/MiraAPI/Patches/PlayerControlPatches.cs +++ b/MiraAPI/Patches/PlayerControlPatches.cs @@ -41,7 +41,7 @@ internal static class PlayerControlPatches public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason) { var deathEvent = new PlayerDeathEvent(__instance, reason, Helpers.GetBodyById(__instance.PlayerId)); - MiraEventManager.InvokeEvent(deathEvent); + deathEvent.InvokeEvent(); var modifiersComponent = __instance.GetComponent(); @@ -59,7 +59,7 @@ internal static class PlayerControlPatches if (playerTask != null) { var completeTaskEvent = new CompleteTaskEvent(__instance, playerTask); - MiraEventManager.InvokeEvent(completeTaskEvent); + completeTaskEvent.InvokeEvent(); } } @@ -102,7 +102,7 @@ internal static class PlayerControlPatches } var beforeMurderEvent = new BeforeMurderEvent(__instance, target); - MiraEventManager.InvokeEvent(beforeMurderEvent); + beforeMurderEvent.InvokeEvent(); if (beforeMurderEvent.IsCancelled) { diff --git a/MiraAPI/Patches/Roles/EjectionPatches.cs b/MiraAPI/Patches/Roles/EjectionPatches.cs index d37b550f..5aec4fb9 100644 --- a/MiraAPI/Patches/Roles/EjectionPatches.cs +++ b/MiraAPI/Patches/Roles/EjectionPatches.cs @@ -17,7 +17,7 @@ internal static class EjectionPatches public static void BeginPostfix(ExileController __instance) { var @event = new EjectionEvent(__instance); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (!__instance.initData.networkedPlayer || !__instance.initData.networkedPlayer.Role || __instance.initData.networkedPlayer.Role is not ICustomRole role) @@ -39,12 +39,12 @@ internal static class EjectionPatches public static void Postfix() { var @event = new BeforeRoundStartEvent(false); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (@event.IsCancelled) return; var @event2 = new RoundStartEvent(false); - MiraEventManager.InvokeEvent(@event2); + @event2.InvokeEvent(); } } } diff --git a/MiraAPI/Patches/Roles/RoleManagerPatches.cs b/MiraAPI/Patches/Roles/RoleManagerPatches.cs index 82e937fc..9062f4d3 100644 --- a/MiraAPI/Patches/Roles/RoleManagerPatches.cs +++ b/MiraAPI/Patches/Roles/RoleManagerPatches.cs @@ -61,7 +61,7 @@ public static class RoleManagerPatches } var @event = new SetRoleEvent(targetPlayer, roleType); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return false; } diff --git a/MiraAPI/Patches/VentCanUsePatch.cs b/MiraAPI/Patches/VentCanUsePatch.cs index cc4e9e5a..3b94441a 100644 --- a/MiraAPI/Patches/VentCanUsePatch.cs +++ b/MiraAPI/Patches/VentCanUsePatch.cs @@ -17,7 +17,7 @@ internal static class VentCanUsePatch public static void Postfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse) { var @event = new PlayerCanUseEvent(__instance.Cast()); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (@event.IsCancelled) { diff --git a/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs b/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs index a893d516..1d392b64 100644 --- a/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs +++ b/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs @@ -43,7 +43,7 @@ internal static class DummyBehaviourPatches yield return new WaitForSeconds(dummy.voteTime.Next()); var dummyVoteEvent = new DummyVoteEvent(dummy); - MiraEventManager.InvokeEvent(dummyVoteEvent); + dummyVoteEvent.InvokeEvent(); if (dummyVoteEvent.IsCancelled) { diff --git a/MiraAPI/Patches/Voting/MeetingHudPatches.cs b/MiraAPI/Patches/Voting/MeetingHudPatches.cs index 1239ac7c..3f3f6c82 100644 --- a/MiraAPI/Patches/Voting/MeetingHudPatches.cs +++ b/MiraAPI/Patches/Voting/MeetingHudPatches.cs @@ -24,7 +24,7 @@ internal static class MeetingHudPatches public static bool VotePatch(PlayerVoteArea __instance) { var beforeVoteEvent = new BeforeVoteEvent(__instance, PlayerControl.LocalPlayer); - MiraEventManager.InvokeEvent(beforeVoteEvent); + beforeVoteEvent.InvokeEvent(); if (beforeVoteEvent.IsCancelled) { @@ -32,7 +32,7 @@ internal static class MeetingHudPatches } var afterVoteEvent = new AfterVoteEvent(__instance, PlayerControl.LocalPlayer); - MiraEventManager.InvokeEvent(afterVoteEvent); + afterVoteEvent.InvokeEvent(); return true; } @@ -99,7 +99,7 @@ internal static class MeetingHudPatches } var @event = new StartMeetingEvent(__instance); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); } [HarmonyPostfix] @@ -177,7 +177,7 @@ internal static class MeetingHudPatches var hasVotedFor = voteData.VotedFor((byte)suspectStateIdx); var @event = new MeetingSelectEvent(voteData, suspectStateIdx, hasVotes && !hasVotedFor); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); return @event.AllowSelect; } @@ -229,7 +229,7 @@ internal static class MeetingHudPatches var shouldEnd = !Helpers.GetAlivePlayers().Exists(plr => plr.GetVoteData().VotesRemaining > 0); var checkEndEvent = new CheckForEndVotingEvent(shouldEnd); - MiraEventManager.InvokeEvent(checkEndEvent); + checkEndEvent.InvokeEvent(); shouldEnd = checkEndEvent.ForceEndVoting || checkEndEvent is { IsCancelled: false, IsVotingComplete: true }; if (!shouldEnd) @@ -241,7 +241,7 @@ internal static class MeetingHudPatches var exiled = VotingUtils.GetExiled(votes, out var isTie); var @event = new ProcessVotesEvent(votes, exiled); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (@event.VotesModified) { diff --git a/MiraAPI/Voting/VotingUtils.cs b/MiraAPI/Voting/VotingUtils.cs index ad9e32ce..c16ee51c 100644 --- a/MiraAPI/Voting/VotingUtils.cs +++ b/MiraAPI/Voting/VotingUtils.cs @@ -47,7 +47,7 @@ public static class VotingUtils private static void HandleVote(PlayerVoteData voteData, byte suspectIdx, bool byJudge, out bool cancelVote) { var @event = new HandleVoteEvent(voteData, suspectIdx, byJudge); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); cancelVote = @event.PreventVote; @@ -290,7 +290,7 @@ public static class VotingUtils public static void HandlePopulateResults(List votes) { var @event = new PopulateResultsEvent(votes); - MiraEventManager.InvokeEvent(@event); + @event.InvokeEvent(); if (@event.IsCancelled) { From 355d6e63f01b58a69eb971524e35bbbb0c00541e Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 20:35:42 -0700 Subject: [PATCH 05/45] Fixed wrong cast type --- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 2eb06543..3b882da7 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -78,7 +78,7 @@ public static class VanillaButtonPatches if (@event.IsCancelled) { var cancelEventType = typeof(VanillaButtonCancelledEvent<>).MakeGenericType(__instance.GetType()); - var cancelEvent = (MiraCancelableEvent)Activator.CreateInstance(cancelEventType, __instance)!; + var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, __instance)!; cancelEvent.InvokeEvent(cancelEventType); } From 6b3dfb978d096cdaf965b4a64edfbcaf841fee51 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 20:44:59 -0700 Subject: [PATCH 06/45] Used as extension method --- MiraAPI/Hud/CustomActionButton.cs | 2 +- MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs | 2 +- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 2 +- MiraAPI/Patches/IntroCutscenePatches.cs | 4 ++-- MiraAPI/Patches/Voting/MeetingHudPatches.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MiraAPI/Hud/CustomActionButton.cs b/MiraAPI/Hud/CustomActionButton.cs index c197a746..7763aac0 100644 --- a/MiraAPI/Hud/CustomActionButton.cs +++ b/MiraAPI/Hud/CustomActionButton.cs @@ -166,7 +166,7 @@ public abstract class CustomActionButton // Invoke the generic button click event. var genericEvent = new MiraButtonClickEvent(this); genericEvent.InvokeEvent(); - if (genericEvent.IsCancelled) MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this)); + if (genericEvent.IsCancelled) new MiraButtonCancelledEvent(this).InvokeEvent(); // Invoke the button click event for specific button. var eventType = CustomButtonManager.ButtonEventTypes[GetType()]; diff --git a/MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs b/MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs index 8427679d..a05bb936 100644 --- a/MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs +++ b/MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs @@ -19,6 +19,6 @@ public static class FreeplayRoundStartPatch { if (__result) return; MeetingButtonManager.OnGameStart(); - MiraEventManager.InvokeEvent(new RoundStartEvent(true)); + new RoundStartEvent(true).InvokeEvent(); } } diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 3b882da7..070c6c7e 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -69,7 +69,7 @@ public static class VanillaButtonPatches genericEvent.InvokeEvent(); if (genericEvent.IsCancelled) { - MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance)); + new VanillaButtonCancelledEvent(__instance).InvokeEvent(); } var eventType = typeof(VanillaButtonClickEvent<>).MakeGenericType(__instance.GetType()); diff --git a/MiraAPI/Patches/IntroCutscenePatches.cs b/MiraAPI/Patches/IntroCutscenePatches.cs index 47f4de8b..dfd668c8 100644 --- a/MiraAPI/Patches/IntroCutscenePatches.cs +++ b/MiraAPI/Patches/IntroCutscenePatches.cs @@ -135,13 +135,13 @@ public static class IntroCutscenePatches Info("IntroCutscene ended"); MeetingButtonManager.OnGameStart(); - MiraEventManager.InvokeEvent(new IntroEndEvent(introCutscene)); + new IntroEndEvent(introCutscene).InvokeEvent(); var @event = new BeforeRoundStartEvent(true); @event.InvokeEvent(); if (@event.IsCancelled) return; - MiraEventManager.InvokeEvent(new RoundStartEvent(true)); + new RoundStartEvent(true).InvokeEvent(); } } } diff --git a/MiraAPI/Patches/Voting/MeetingHudPatches.cs b/MiraAPI/Patches/Voting/MeetingHudPatches.cs index 3f3f6c82..af3c4b1a 100644 --- a/MiraAPI/Patches/Voting/MeetingHudPatches.cs +++ b/MiraAPI/Patches/Voting/MeetingHudPatches.cs @@ -106,7 +106,7 @@ internal static class MeetingHudPatches [HarmonyPatch(nameof(MeetingHud.OnDestroy))] public static void OnDestroyPatch(MeetingHud __instance) { - MiraEventManager.InvokeEvent(new EndMeetingEvent(__instance)); + new EndMeetingEvent(__instance).InvokeEvent(); } [HarmonyPostfix] @@ -123,7 +123,7 @@ internal static class MeetingHudPatches } } - MiraEventManager.InvokeEvent(new VotingCompleteEvent(__instance)); + new VotingCompleteEvent(__instance).InvokeEvent(); } // this is necessary because the actual ForceSkipAll method is inlined. From cb340ce115703a4d19722849dfab2014d7b71385 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Mon, 2 Nov 2026 21:47:53 -0700 Subject: [PATCH 07/45] Wrapped instance in array to make sure corrent CreateInstance is called --- MiraAPI/Patches/Events/VanillaButtonPatches.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Patches/Events/VanillaButtonPatches.cs b/MiraAPI/Patches/Events/VanillaButtonPatches.cs index 070c6c7e..92946439 100644 --- a/MiraAPI/Patches/Events/VanillaButtonPatches.cs +++ b/MiraAPI/Patches/Events/VanillaButtonPatches.cs @@ -73,12 +73,12 @@ public static class VanillaButtonPatches } var eventType = typeof(VanillaButtonClickEvent<>).MakeGenericType(__instance.GetType()); - var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, __instance)!; + var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, [__instance])!; var specificInvoked = @event.InvokeEvent(eventType); if (@event.IsCancelled) { var cancelEventType = typeof(VanillaButtonCancelledEvent<>).MakeGenericType(__instance.GetType()); - var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, __instance)!; + var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, [__instance])!; cancelEvent.InvokeEvent(cancelEventType); } From d622caaf708b5dcafcfa6947049854d9838db259 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 13:18:19 -0700 Subject: [PATCH 08/45] Removed redundant Instance property --- MiraAPI/MiraApiPlugin.cs | 4 +--- MiraAPI/PluginLoading/MiraPluginManager.cs | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MiraAPI/MiraApiPlugin.cs b/MiraAPI/MiraApiPlugin.cs index 5def08da..dc926b2e 100644 --- a/MiraAPI/MiraApiPlugin.cs +++ b/MiraAPI/MiraApiPlugin.cs @@ -61,7 +61,6 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin /// public static bool IsDevBuild => Version.Contains("ci", StringComparison.OrdinalIgnoreCase) || Version.Contains("dev", StringComparison.OrdinalIgnoreCase); - private static MiraPluginManager? PluginManager { get; set; } internal Harmony Harmony { get; } = new(Id); internal static ConfigEntry WikiSortingGroup { get; private set; } @@ -99,8 +98,7 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow); - PluginManager = new MiraPluginManager(); - PluginManager.Initialize(this, this); + MiraPluginManager.Instance.Initialize(this, this); MiraLocaleManager.Register("mira.api", typeof(MiraApiPlugin).Assembly); LocalizationManager.Register(new MiraLocalizationProvider()); diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 3214b099..ab411e99 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -33,6 +33,10 @@ namespace MiraAPI.PluginLoading; /// public sealed class MiraPluginManager { + private MiraPluginManager() + { + } + private readonly Dictionary _registeredPlugins = []; internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = []; @@ -40,13 +44,12 @@ public sealed class MiraPluginManager internal MiraPluginInfo[] PluginsWithOptionsOrGameModes { get; private set; } = []; internal Dictionary> QueuedRoleRegistrations { get; } = []; - internal static MiraPluginManager Instance { get; private set; } = new(); + internal static MiraPluginManager Instance { get; } = new(); internal static ConfigFile MiraApiConfig { get; private set; } = null!; internal static MiraPluginInfo MiraApiPluginInfo { get; private set; } = null!; internal void Initialize(BasePlugin miraApiPlugin, IMiraPlugin apiPlugin) { - Instance = this; CustomGameModeManager.RegisterDefaultMode(); CustomGameModeManager.GetAndSetGameMode(); From af38fade3d2ad746ca04d1229e1b78b40ceb1724 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 13:23:59 -0700 Subject: [PATCH 09/45] Renamed to event handler --- MiraAPI/PluginLoading/MiraPluginManager.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index ab411e99..f2c39f84 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -123,7 +123,7 @@ public sealed class MiraPluginManager if ((isMira && type.IsAbstract) || type.GetCustomAttribute() != null) continue; - RegisterEvents(type); + RegisterEventHandlers(type); if (RegisterModifier(type, info)) continue; @@ -160,7 +160,7 @@ public sealed class MiraPluginManager } } - private static void RegisterEvents(Type type) + private static void RegisterEventHandlers(Type type) { foreach (var method in AccessTools.GetDeclaredMethods(type)) { @@ -171,14 +171,14 @@ public sealed class MiraPluginManager if (!method.IsStatic) { - Error($"Event method {method.Name} in {type.Name} must be static."); + Error($"Event handler method {method.Name} in {type.Name} must be static."); continue; } var parameters = method.GetParameters(); if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent))) { - Error($"Invalid event registration method {method.Name} in {type.Name}"); + Error($"Invalid event handler registration: method {method.Name} in {type.Name}"); continue; } From 82b3200f9b51e80b2f5b23a568fb41f411c16364 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 13:36:39 -0700 Subject: [PATCH 10/45] Fixed xmldoc type reference --- MiraAPI/PluginLoading/MiraPluginInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiraAPI/PluginLoading/MiraPluginInfo.cs b/MiraAPI/PluginLoading/MiraPluginInfo.cs index ca7812cd..da121e7a 100644 --- a/MiraAPI/PluginLoading/MiraPluginInfo.cs +++ b/MiraAPI/PluginLoading/MiraPluginInfo.cs @@ -81,7 +81,7 @@ public class MiraPluginInfo public IReadOnlyCollection MeetingButtons { get; private set; } = null!; /// - /// Gets a of this 's s. + /// Gets a of this 's s. /// public IReadOnlyCollection Presets { get; internal set; } = null!; From 8410d61ac58487312d1dd94eeed6355bee3311f3 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 14:37:16 -0700 Subject: [PATCH 11/45] Registered MiraEvent types on plugins to track subclasses for inheritance calls --- MiraAPI/Events/MiraEventManager.cs | 61 ++++++++++++++++++++++ MiraAPI/PluginLoading/MiraPluginInfo.cs | 11 +++- MiraAPI/PluginLoading/MiraPluginManager.cs | 17 ++++++ 3 files changed, 88 insertions(+), 1 deletion(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index a8b34f16..82ad7978 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Reflection; +using MiraAPI.PluginLoading; namespace MiraAPI.Events; @@ -11,6 +13,17 @@ public static class MiraEventManager { private static readonly Dictionary> EventWrappers = []; + /// + /// Gets the list of all registered types. + /// + public static IReadOnlyList EventTypes { get; internal set; } = []; + + internal static List InternalEventTypes { get; } = []; + + private static readonly Dictionary> TrackedEventTypes = []; + + private static readonly HashSet StoredEventTypes = []; + /// /// Invoke a . /// @@ -72,6 +85,54 @@ public static class MiraEventManager return true; } + internal static bool RegisterEventType(Type eventType, MiraPluginInfo info) + { + if (!typeof(MiraEvent).IsAssignableFrom(eventType)) + { + return false; + } + + info.InternalEventTypes.Add(eventType); + InternalEventTypes.Add(eventType); + + if (!eventType.IsAbstract) + { + if (!TrackedEventTypes.TryGetValue(eventType, out var trackedEvents)) + { + trackedEvents = []; + TrackedEventTypes.Add(eventType, trackedEvents); + } + + trackedEvents.Add(eventType); + } + + foreach (var superType in StoredEventTypes.Where(x => x.IsAssignableFrom(eventType))) + { + if (!eventType.IsAbstract) + { + TrackedEventTypes[eventType].Add(superType); + } + } + + foreach (var subType in StoredEventTypes.Where(x => x.IsAssignableTo(eventType))) + { + if (!subType.IsAbstract) + { + if (!TrackedEventTypes.TryGetValue(subType, out var trackedSubEvents)) + { + trackedSubEvents = []; + TrackedEventTypes.Add(subType, trackedSubEvents); + } + + trackedSubEvents.Add(eventType); + } + } + + StoredEventTypes.Add(eventType); + + return true; + } + /// /// Register a handler. /// diff --git a/MiraAPI/PluginLoading/MiraPluginInfo.cs b/MiraAPI/PluginLoading/MiraPluginInfo.cs index da121e7a..b0d7e434 100644 --- a/MiraAPI/PluginLoading/MiraPluginInfo.cs +++ b/MiraAPI/PluginLoading/MiraPluginInfo.cs @@ -1,7 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using BepInEx; using BepInEx.Configuration; +using MiraAPI.Events; using MiraAPI.GameModes; using MiraAPI.GameOptions; using MiraAPI.Hud; @@ -85,6 +87,11 @@ public class MiraPluginInfo /// public IReadOnlyCollection Presets { get; internal set; } = null!; + /// + /// Gets a of this 's types. + /// + public IReadOnlyCollection EventTypes { get; internal set; } = null!; + /// /// Gets a read only dictionary of Game Mode IDs and the AbstractGameMode object they are associated with. /// @@ -104,6 +111,7 @@ public class MiraPluginInfo Buttons = [.. InternalButtons]; MeetingButtons = [.. InternalMeetingButtons]; TargetedMeetingButtons = [.. InternalTargetedMeetingButtons]; + EventTypes = [.. InternalEventTypes]; } internal List InternalPresets { get; } = []; @@ -113,6 +121,7 @@ public class MiraPluginInfo internal List InternalOptionGroups { get; } = []; internal List InternalMeetingButtons { get; } = []; internal List InternalTargetedMeetingButtons { get; } = []; + internal List InternalEventTypes { get; } = []; internal Dictionary GameModes { get; } = []; internal Dictionary InternalRoles { get; } = []; diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index f2c39f84..4c1c125a 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -89,6 +89,7 @@ public sealed class MiraPluginManager PluginsWithOptionsOrGameModes = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)]; ModifierManager.Modifiers = new ReadOnlyCollection(ModifierManager.InternalModifiers); + MiraEventManager.EventTypes = new ReadOnlyCollection(MiraEventManager.InternalEventTypes); }; } @@ -125,6 +126,9 @@ public sealed class MiraPluginManager RegisterEventHandlers(type); + if (RegisterEventType(type, info)) + continue; + if (RegisterModifier(type, info)) continue; @@ -187,6 +191,19 @@ public sealed class MiraPluginManager } } + private static bool RegisterEventType(Type type, MiraPluginInfo info) + { + try + { + return MiraEventManager.RegisterEventType(type, info); + } + catch (Exception e) + { + Error($"Failed to register event type {type.Name}: {e}"); + return false; + } + } + /// /// Get a mira plugin by its GUID. /// From 8619fe86753c5dd99cc5a4cd20164e966a818b24 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 15:36:15 -0700 Subject: [PATCH 12/45] Allowed correct generic tracking --- MiraAPI/Events/MiraEventManager.cs | 32 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 82ad7978..1198a0ef 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -106,15 +106,9 @@ public static class MiraEventManager trackedEvents.Add(eventType); } - foreach (var superType in StoredEventTypes.Where(x => x.IsAssignableFrom(eventType))) - { - if (!eventType.IsAbstract) - { - TrackedEventTypes[eventType].Add(superType); - } - } + TrackedEventTypes[eventType].AddRange(StoredEventTypes.Where(x => IsSubclassOf(eventType, x))); - foreach (var subType in StoredEventTypes.Where(x => x.IsAssignableTo(eventType))) + foreach (var subType in StoredEventTypes.Where(x => IsSubclassOf(x, eventType))) { if (!subType.IsAbstract) { @@ -133,6 +127,28 @@ public static class MiraEventManager return true; } + private static bool IsSubclassOf(Type? type, Type super) + { + if (type == null || type == typeof(MiraEvent)) + { + return false; + } + + if (type == super) + { + return true; + } + + if (super.IsGenericTypeDefinition && + type.IsGenericType && + type.GetGenericTypeDefinition() == super) + { + return true; + } + + return IsSubclassOf(type.BaseType, super); + } + /// /// Register a handler. /// From 1e0b0bb7e578dd7371e59b1e86b88f8884de770c Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 15:42:17 -0700 Subject: [PATCH 13/45] Combined with helper method --- MiraAPI/Events/MiraEventManager.cs | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 1198a0ef..efc5e359 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -95,31 +95,13 @@ public static class MiraEventManager info.InternalEventTypes.Add(eventType); InternalEventTypes.Add(eventType); - if (!eventType.IsAbstract) - { - if (!TrackedEventTypes.TryGetValue(eventType, out var trackedEvents)) - { - trackedEvents = []; - TrackedEventTypes.Add(eventType, trackedEvents); - } - - trackedEvents.Add(eventType); - } + AddTypeToTracked(eventType); TrackedEventTypes[eventType].AddRange(StoredEventTypes.Where(x => IsSubclassOf(eventType, x))); foreach (var subType in StoredEventTypes.Where(x => IsSubclassOf(x, eventType))) { - if (!subType.IsAbstract) - { - if (!TrackedEventTypes.TryGetValue(subType, out var trackedSubEvents)) - { - trackedSubEvents = []; - TrackedEventTypes.Add(subType, trackedSubEvents); - } - - trackedSubEvents.Add(eventType); - } + AddTypeToTracked(subType, eventType); } StoredEventTypes.Add(eventType); @@ -127,6 +109,23 @@ public static class MiraEventManager return true; } + private static void AddTypeToTracked(Type eventType, Type trackedAs = null!) + { + if (eventType.IsAbstract) + { + return; + } + + if (!TrackedEventTypes.TryGetValue(eventType, out var trackedEvents)) + { + trackedEvents = []; + TrackedEventTypes.Add(eventType, trackedEvents); + } + + trackedAs ??= eventType; + trackedEvents.Add(trackedAs); + } + private static bool IsSubclassOf(Type? type, Type super) { if (type == null || type == typeof(MiraEvent)) From 36ef09b73455834b0471e9b0e9e10b6d3269c72d Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 15:51:03 -0700 Subject: [PATCH 14/45] Changed to hash set --- MiraAPI/Events/MiraEventManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index efc5e359..fe2edc39 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -20,7 +20,7 @@ public static class MiraEventManager internal static List InternalEventTypes { get; } = []; - private static readonly Dictionary> TrackedEventTypes = []; + private static readonly Dictionary> TrackedEventTypes = []; private static readonly HashSet StoredEventTypes = []; @@ -97,7 +97,7 @@ public static class MiraEventManager AddTypeToTracked(eventType); - TrackedEventTypes[eventType].AddRange(StoredEventTypes.Where(x => IsSubclassOf(eventType, x))); + TrackedEventTypes[eventType].UnionWith(StoredEventTypes.Where(x => IsSubclassOf(eventType, x))); foreach (var subType in StoredEventTypes.Where(x => IsSubclassOf(x, eventType))) { From a5a4a6eafd257e327237317c869c5fd2ef2877be Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 16:10:24 -0700 Subject: [PATCH 15/45] Deduplicated with helper method --- MiraAPI/Events/MiraEventManager.cs | 35 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index fe2edc39..55e66f01 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -162,21 +162,8 @@ public static class MiraEventManager throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}"); } - EventWrappers.TryAdd(type, []); - var handlers = EventWrappers[type]; - var @delegate = Delegate.CreateDelegate(typeof(Action<>).MakeGenericType(type), methodInfo); - var eventWrapper = new MiraEventWrapper(@delegate, priority); - - var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); - - if (index < 0) - { - index = ~index; - } - - handlers.Insert(index, eventWrapper); - return new MiraEventHandle(type, eventWrapper); + return RegisterEventHandler(type, @delegate, priority); } /// @@ -189,10 +176,22 @@ public static class MiraEventManager public static MiraEventHandle RegisterEventHandler(Action handler, int priority = 0) where T : MiraEvent { - EventWrappers.TryAdd(typeof(T), []); + return RegisterEventHandler(typeof(T), handler, priority); + } - var handlers = EventWrappers[typeof(T)]; - var eventWrapper = new MiraEventWrapper(handler, priority); + /// + /// Register a handler. + /// + /// The type of event. + /// The method/handler for the event. + /// The priority of the event handler. Lower values are called first. + /// A to use when unregistering the event. + private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority) + { + EventWrappers.TryAdd(type, []); + var handlers = EventWrappers[type]; + + var eventWrapper = new MiraEventWrapper(@delegate, priority); var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); @@ -202,7 +201,7 @@ public static class MiraEventManager } handlers.Insert(index, eventWrapper); - return new MiraEventHandle(typeof(T), eventWrapper); + return new MiraEventHandle(type, eventWrapper); } /// From 67c039aebacec713871506346883f19509c3e0c3 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 16:33:00 -0700 Subject: [PATCH 16/45] Used already existing internal list to track stored event types --- MiraAPI/Events/MiraEventManager.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 55e66f01..58e7bbb9 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -22,8 +22,6 @@ public static class MiraEventManager private static readonly Dictionary> TrackedEventTypes = []; - private static readonly HashSet StoredEventTypes = []; - /// /// Invoke a . /// @@ -92,19 +90,17 @@ public static class MiraEventManager return false; } - info.InternalEventTypes.Add(eventType); - InternalEventTypes.Add(eventType); - AddTypeToTracked(eventType); - TrackedEventTypes[eventType].UnionWith(StoredEventTypes.Where(x => IsSubclassOf(eventType, x))); + TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => IsSubclassOf(eventType, x))); - foreach (var subType in StoredEventTypes.Where(x => IsSubclassOf(x, eventType))) + foreach (var subType in InternalEventTypes.Where(x => IsSubclassOf(x, eventType))) { AddTypeToTracked(subType, eventType); } - StoredEventTypes.Add(eventType); + info.InternalEventTypes.Add(eventType); + InternalEventTypes.Add(eventType); return true; } From 4f80a35e2d5ca33ab4d280db6fe22eeaba9d3860 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 17:08:15 -0700 Subject: [PATCH 17/45] Separated methods for later sync --- MiraAPI/Events/MiraEventManager.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 58e7bbb9..70ad3cc2 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -183,12 +183,17 @@ public static class MiraEventManager /// The priority of the event handler. Lower values are called first. /// A to use when unregistering the event. private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority) + { + var eventWrapper = new MiraEventWrapper(@delegate, priority); + EventHandlerAdded(type, eventWrapper); + return new MiraEventHandle(type, eventWrapper); + } + + private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) { EventWrappers.TryAdd(type, []); var handlers = EventWrappers[type]; - var eventWrapper = new MiraEventWrapper(@delegate, priority); - var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); if (index < 0) @@ -197,7 +202,6 @@ public static class MiraEventManager } handlers.Insert(index, eventWrapper); - return new MiraEventHandle(type, eventWrapper); } /// From 8460f1cdaf65aa1312806436114a1f1fe0629422 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 17:32:13 -0700 Subject: [PATCH 18/45] Handled adding event handlers pre/post load to allow tracker to account for all events --- MiraAPI/Events/MiraEventManager.cs | 79 +++++++++++++++++----- MiraAPI/PluginLoading/MiraPluginManager.cs | 2 +- 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 70ad3cc2..f068e5cf 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using MiraAPI.PluginLoading; @@ -11,6 +12,8 @@ namespace MiraAPI.Events; /// public static class MiraEventManager { + private static readonly Dictionary> EventWrappersToLoad = []; + private static readonly Dictionary> EventWrappers = []; /// @@ -22,6 +25,8 @@ public static class MiraEventManager private static readonly Dictionary> TrackedEventTypes = []; + private static bool loadFinilized = false; + /// /// Invoke a . /// @@ -191,17 +196,32 @@ public static class MiraEventManager private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) { - EventWrappers.TryAdd(type, []); - var handlers = EventWrappers[type]; - - var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); - - if (index < 0) + if (!loadFinilized) { - index = ~index; + EventWrappersToLoad.TryAdd(type, []); + EventWrappersToLoad[type].Add(eventWrapper); + return; } - handlers.Insert(index, eventWrapper); + if (!TrackedEventTypes.TryGetValue(type, out var trackedEvents)) + { + return; + } + + foreach (Type eventType in trackedEvents) + { + EventWrappers.TryAdd(eventType, []); + var handlers = EventWrappers[eventType]; + + var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); + + if (index < 0) + { + index = ~index; + } + + handlers.Insert(index, eventWrapper); + } } /// @@ -211,21 +231,48 @@ public static class MiraEventManager /// if the event was unregistered successfully, otherwise. public static bool UnregisterEventHandler(MiraEventHandle eventHandle) { - if (!EventWrappers.TryGetValue(eventHandle.EventType, out var handlers)) + if (!loadFinilized) + { + if (!EventWrappersToLoad.TryGetValue(eventHandle.EventType, out var handlersToLoad)) + { + return false; + } + + if (!handlersToLoad.Remove(eventHandle.EventWrapper)) + { + return false; + } + + return true; + } + + if (!TrackedEventTypes.TryGetValue(eventHandle.EventType, out var eventTypes)) { return false; } - if (!handlers.Remove(eventHandle.EventWrapper)) + var removed = false; + foreach (var type in eventTypes) { - return false; + if (!EventWrappers.TryGetValue(type, out var handlers)) + { + continue; + } + + removed |= handlers.Remove(eventHandle.EventWrapper); } - if (handlers.Count == 0) - { - EventWrappers.Remove(eventHandle.EventType); - } + return removed; + } - return true; + internal static void OnLoadFinilize() + { + loadFinilized = true; + EventTypes = new ReadOnlyCollection(InternalEventTypes); + + foreach (var eventType in EventTypes) + { + EventWrappers.TryAdd(eventType, []); + } } } diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 4c1c125a..c027c2cb 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -89,7 +89,7 @@ public sealed class MiraPluginManager PluginsWithOptionsOrGameModes = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)]; ModifierManager.Modifiers = new ReadOnlyCollection(ModifierManager.InternalModifiers); - MiraEventManager.EventTypes = new ReadOnlyCollection(MiraEventManager.InternalEventTypes); + MiraEventManager.OnLoadFinilize(); }; } From 3fef36e5cdce18c4b93554efd37b535218e12706 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 17:59:10 -0700 Subject: [PATCH 19/45] Added helper method to allow getting events from generics --- MiraAPI/Events/MiraEventManager.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index f068e5cf..7618f477 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using MiraAPI.PluginLoading; @@ -194,6 +195,15 @@ public static class MiraEventManager return new MiraEventHandle(type, eventWrapper); } + private static bool TryGetTrackedEventType(Type type, [NotNullWhen(true)] out HashSet? trackedEventTypes) + { + Type typeToCheck = type.IsGenericType + ? type.GetGenericTypeDefinition() + : type; + + return TrackedEventTypes.TryGetValue(typeToCheck, out trackedEventTypes); + } + private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) { if (!loadFinilized) @@ -203,7 +213,7 @@ public static class MiraEventManager return; } - if (!TrackedEventTypes.TryGetValue(type, out var trackedEvents)) + if (!TryGetTrackedEventType(type, out var trackedEvents)) { return; } @@ -246,7 +256,7 @@ public static class MiraEventManager return true; } - if (!TrackedEventTypes.TryGetValue(eventHandle.EventType, out var eventTypes)) + if (!TryGetTrackedEventType(eventHandle.EventType, out var eventTypes)) { return false; } @@ -272,7 +282,7 @@ public static class MiraEventManager foreach (var eventType in EventTypes) { - EventWrappers.TryAdd(eventType, []); + EventWrappers.Add(eventType, []); } } } From bc6debb4c042cb7cc8700579f3ca4b0fcd0fcb83 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 18:08:15 -0700 Subject: [PATCH 20/45] Made MiraEventWrapper constructor internal --- MiraAPI/Events/MiraEventWrapper.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 2a2c410a..9568d295 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -5,17 +5,26 @@ namespace MiraAPI.Events; /// /// Wrapper for handlers. /// -/// The action for the event handler. -/// The priority of the handler. -public class MiraEventWrapper(Delegate eventHandler, int priority) +public class MiraEventWrapper { /// /// Gets the event handler delegate. /// - public Delegate EventHandler { get; } = eventHandler; + public Delegate EventHandler { get; } /// /// Gets the priority of the handler. Lower values are called first. /// - public int Priority { get; } = priority; + public int Priority { get; } + + /// + /// Initializes a new instance of the class. + /// + /// The action for the event handler. + /// The priority of the handler. + internal MiraEventWrapper(Delegate eventHandler, int priority) + { + EventHandler = eventHandler; + Priority = priority; + } } From e66252b6ae90be550b731e804b3d3a2b6c6d19af Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 18:32:52 -0700 Subject: [PATCH 21/45] Made Load finilize EventWrappers correctly --- MiraAPI/Events/MiraEventManager.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 7618f477..4492d972 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -284,5 +284,18 @@ public static class MiraEventManager { EventWrappers.Add(eventType, []); } + + foreach (var (concreteType, eventHandlers) in EventWrappersToLoad) + { + if (!TryGetTrackedEventType(concreteType, out var trackedEventTypes)) + { + continue; + } + + foreach (var eventType in trackedEventTypes) + { + EventWrappers[eventType].AddRange(eventHandlers); + } + } } } From e204f70364f6a814a31d47e0172939caf9921777 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 18:42:32 -0700 Subject: [PATCH 22/45] Used helper methods --- MiraAPI/Events/MiraEventManager.cs | 42 ++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 4492d972..d08108b6 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -28,6 +28,23 @@ public static class MiraEventManager private static bool loadFinilized = false; + private static bool TryGetEventHandlers(Type type, [NotNullWhen(true)] out List? eventHandlers) + { + eventHandlers = null; + if (!EventWrappers.TryGetValue(type.GetTrackedType(), out var handlers)) + { + return false; + } + + if (handlers.Count == 0) + { + return false; + } + + eventHandlers = handlers; + return true; + } + /// /// Invoke a . /// @@ -37,9 +54,7 @@ public static class MiraEventManager public static bool InvokeEvent(this T eventInstance) where T : MiraEvent { - EventWrappers.TryGetValue(typeof(T), out var handlers); - - if (handlers == null || handlers.Count == 0) + if (!TryGetEventHandlers(typeof(T), out var handlers)) { return false; } @@ -67,9 +82,7 @@ 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) { - EventWrappers.TryGetValue(type, out var handlers); - - if (handlers == null || handlers.Count == 0) + if (!TryGetEventHandlers(type, out var handlers)) { return false; } @@ -195,13 +208,14 @@ public static class MiraEventManager return new MiraEventHandle(type, eventWrapper); } - private static bool TryGetTrackedEventType(Type type, [NotNullWhen(true)] out HashSet? trackedEventTypes) + private static Type GetTrackedType(this Type type) { - Type typeToCheck = type.IsGenericType - ? type.GetGenericTypeDefinition() - : type; + if (type.IsGenericType) + { + return type.GetGenericTypeDefinition(); + } - return TrackedEventTypes.TryGetValue(typeToCheck, out trackedEventTypes); + return type; } private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) @@ -213,7 +227,7 @@ public static class MiraEventManager return; } - if (!TryGetTrackedEventType(type, out var trackedEvents)) + if (!TrackedEventTypes.TryGetValue(type.GetTrackedType(), out var trackedEvents)) { return; } @@ -256,7 +270,7 @@ public static class MiraEventManager return true; } - if (!TryGetTrackedEventType(eventHandle.EventType, out var eventTypes)) + if (!TrackedEventTypes.TryGetValue(eventHandle.EventType.GetTrackedType(), out var eventTypes)) { return false; } @@ -287,7 +301,7 @@ public static class MiraEventManager foreach (var (concreteType, eventHandlers) in EventWrappersToLoad) { - if (!TryGetTrackedEventType(concreteType, out var trackedEventTypes)) + if (!TrackedEventTypes.TryGetValue(concreteType.GetTrackedType(), out var trackedEventTypes)) { continue; } From d83bcde8a924fdddfcc95def9bfae3d335ed7ce3 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 18:51:54 -0700 Subject: [PATCH 23/45] Added concrete type to wrapper to filter Event handlers when invoked --- MiraAPI/Events/MiraEventManager.cs | 7 ++++--- MiraAPI/Events/MiraEventWrapper.cs | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index d08108b6..10cbdfa2 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -36,12 +36,13 @@ public static class MiraEventManager return false; } - if (handlers.Count == 0) + var callableHandlers = handlers.Where(x => x.ConstructedType.IsAssignableTo(type)).ToList(); + if (callableHandlers.Count == 0) { return false; } - eventHandlers = handlers; + eventHandlers = callableHandlers; return true; } @@ -203,7 +204,7 @@ 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); + var eventWrapper = new MiraEventWrapper(@delegate, priority, type); EventHandlerAdded(type, eventWrapper); return new MiraEventHandle(type, eventWrapper); } diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 9568d295..58d7a0ba 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -17,14 +17,18 @@ public class MiraEventWrapper /// public int Priority { get; } + internal Type ConstructedType { get; } + /// /// Initializes a new instance of the class. /// /// The action for the event handler. /// The priority of the handler. - internal MiraEventWrapper(Delegate eventHandler, int priority) + /// The constructed event type. + internal MiraEventWrapper(Delegate eventHandler, int priority, Type type) { EventHandler = eventHandler; Priority = priority; + ConstructedType = type; } } From 7755274863d04135953ca68b4fd9841c8b64733b Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 19:04:20 -0700 Subject: [PATCH 24/45] Renamed property and used IsSubclassOf to allow generics --- MiraAPI/Events/MiraEventManager.cs | 2 +- MiraAPI/Events/MiraEventWrapper.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 10cbdfa2..eb056fee 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -36,7 +36,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => x.ConstructedType.IsAssignableTo(type)).ToList(); + var callableHandlers = handlers.Where(x => IsSubclassOf(type, x.DefinedType)).ToList(); if (callableHandlers.Count == 0) { return false; diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 58d7a0ba..67fe96d6 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -17,7 +17,7 @@ public class MiraEventWrapper /// public int Priority { get; } - internal Type ConstructedType { get; } + internal Type DefinedType { get; } /// /// Initializes a new instance of the class. @@ -29,6 +29,6 @@ public class MiraEventWrapper { EventHandler = eventHandler; Priority = priority; - ConstructedType = type; + DefinedType = type; } } From 76a02618d8894be256a9616a32cb331446593f0f Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 19:13:05 -0700 Subject: [PATCH 25/45] Added to summary about generic registered events being non-concrete generic type definitions --- MiraAPI/Events/MiraEventManager.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index eb056fee..c93dd8ce 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -19,6 +19,7 @@ public static class MiraEventManager /// /// Gets the list of all registered types. + /// Generic event types are registered as their generic type definitions. /// public static IReadOnlyList EventTypes { get; internal set; } = []; From 484a78c21593762cba5cd100bedb9a1ca655fc7d Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 10:44:20 -0700 Subject: [PATCH 26/45] Renamed method and made extension --- MiraAPI/Events/MiraEventManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index c93dd8ce..4cd72a46 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -37,7 +37,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => IsSubclassOf(type, x.DefinedType)).ToList(); + var callableHandlers = handlers.Where(x => type.IsSubclassOfWithGeneric(x.DefinedType)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -113,9 +113,9 @@ public static class MiraEventManager AddTypeToTracked(eventType); - TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => IsSubclassOf(eventType, x))); + TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => eventType.IsSubclassOfWithGeneric(x))); - foreach (var subType in InternalEventTypes.Where(x => IsSubclassOf(x, eventType))) + foreach (var subType in InternalEventTypes.Where(x => x.IsSubclassOfWithGeneric(eventType))) { AddTypeToTracked(subType, eventType); } @@ -143,7 +143,7 @@ public static class MiraEventManager trackedEvents.Add(trackedAs); } - private static bool IsSubclassOf(Type? type, Type super) + private static bool IsSubclassOfWithGeneric(this Type? type, Type super) { if (type == null || type == typeof(MiraEvent)) { @@ -162,7 +162,7 @@ public static class MiraEventManager return true; } - return IsSubclassOf(type.BaseType, super); + return type.BaseType.IsSubclassOfWithGeneric(super); } /// From 5f4943f92a52eab9deb655806106924401272ab9 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 10:45:37 -0700 Subject: [PATCH 27/45] Used IsSubclassOf instead --- MiraAPI/Events/MiraEventManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 4cd72a46..5cbe73fe 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -106,7 +106,7 @@ public static class MiraEventManager internal static bool RegisterEventType(Type eventType, MiraPluginInfo info) { - if (!typeof(MiraEvent).IsAssignableFrom(eventType)) + if (!eventType.IsSubclassOf(typeof(MiraEvent))) { return false; } From 8a48296d459f5ee0b20731282b1436a9ebba8873 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 11:27:06 -0700 Subject: [PATCH 28/45] Moved type to just EventWrapper with EventHandle providing a property access --- MiraAPI/Events/MiraEventHandle.cs | 5 ++--- MiraAPI/Events/MiraEventManager.cs | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MiraAPI/Events/MiraEventHandle.cs b/MiraAPI/Events/MiraEventHandle.cs index 451e6a2a..008b9c9b 100644 --- a/MiraAPI/Events/MiraEventHandle.cs +++ b/MiraAPI/Events/MiraEventHandle.cs @@ -10,13 +10,12 @@ public class MiraEventHandle /// /// Gets the type of event. /// - public Type EventType { get; } + public Type EventType => EventWrapper.DefinedType; internal MiraEventWrapper EventWrapper { get; } - internal MiraEventHandle(Type type, MiraEventWrapper eventWrapper) + internal MiraEventHandle(MiraEventWrapper eventWrapper) { - EventType = type; EventWrapper = eventWrapper; } } diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 5cbe73fe..0bd8fe5b 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -207,7 +207,7 @@ public static class MiraEventManager { var eventWrapper = new MiraEventWrapper(@delegate, priority, type); EventHandlerAdded(type, eventWrapper); - return new MiraEventHandle(type, eventWrapper); + return new MiraEventHandle(eventWrapper); } private static Type GetTrackedType(this Type type) @@ -257,9 +257,10 @@ 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(eventHandle.EventType, out var handlersToLoad)) + if (!EventWrappersToLoad.TryGetValue(wrapper.DefinedType, out var handlersToLoad)) { return false; } @@ -272,7 +273,7 @@ public static class MiraEventManager return true; } - if (!TrackedEventTypes.TryGetValue(eventHandle.EventType.GetTrackedType(), out var eventTypes)) + if (!TrackedEventTypes.TryGetValue(wrapper.DefinedType.GetTrackedType(), out var eventTypes)) { return false; } @@ -285,7 +286,7 @@ public static class MiraEventManager continue; } - removed |= handlers.Remove(eventHandle.EventWrapper); + removed |= handlers.Remove(wrapper); } return removed; From 1eaf633f886aa625058819df84c304d6b82435bf Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 11:32:30 -0700 Subject: [PATCH 29/45] Correctly used EventHandlerAdded --- MiraAPI/Events/MiraEventManager.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 0bd8fe5b..1a24003c 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -236,7 +236,6 @@ public static class MiraEventManager foreach (Type eventType in trackedEvents) { - EventWrappers.TryAdd(eventType, []); var handlers = EventWrappers[eventType]; var index = handlers.BinarySearch(eventWrapper, Comparer.Create((a, b) => a.Priority.CompareTo(b.Priority))); @@ -304,14 +303,9 @@ public static class MiraEventManager foreach (var (concreteType, eventHandlers) in EventWrappersToLoad) { - if (!TrackedEventTypes.TryGetValue(concreteType.GetTrackedType(), out var trackedEventTypes)) + foreach (var eventHandler in eventHandlers) { - continue; - } - - foreach (var eventType in trackedEventTypes) - { - EventWrappers[eventType].AddRange(eventHandlers); + EventHandlerAdded(concreteType, eventHandler); } } } From e6994f4e995b9e3a12481ec27337390b9aa6e14d Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 11:35:11 -0700 Subject: [PATCH 30/45] Cleared ToLoad dictionary of lists --- MiraAPI/Events/MiraEventManager.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 1a24003c..ec12a059 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -307,6 +307,10 @@ public static class MiraEventManager { EventHandlerAdded(concreteType, eventHandler); } + + eventHandlers.Clear(); } + + EventWrappersToLoad.Clear(); } } From bbd8e1deefb2e6d38355c0cb5f876083629bb331 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 12:11:29 -0700 Subject: [PATCH 31/45] Inverted tracking direction to subtypes for correct EventWrappers contravariance --- MiraAPI/Events/MiraEventManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index ec12a059..8d93cad2 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -37,7 +37,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => type.IsSubclassOfWithGeneric(x.DefinedType)).ToList(); + var callableHandlers = handlers.Where(x => x.DefinedType.IsSubclassOf(type)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -113,11 +113,11 @@ public static class MiraEventManager AddTypeToTracked(eventType); - TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => eventType.IsSubclassOfWithGeneric(x))); - - foreach (var subType in InternalEventTypes.Where(x => x.IsSubclassOfWithGeneric(eventType))) + // subtypes are added to their supertypes, regardless of which were added first + TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => x.IsSubclassOfWithGeneric(eventType))); + foreach (var supertype in InternalEventTypes.Where(x => eventType.IsSubclassOfWithGeneric(x))) { - AddTypeToTracked(subType, eventType); + AddTypeToTracked(supertype, eventType); } info.InternalEventTypes.Add(eventType); From 88b2166d09dc8c7f3c5fd44bf4253217e6fad2c1 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 12:36:22 -0700 Subject: [PATCH 32/45] Used IsAssignableTo instead --- MiraAPI/Events/MiraEventManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 8d93cad2..42a5d949 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -37,7 +37,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => x.DefinedType.IsSubclassOf(type)).ToList(); + var callableHandlers = handlers.Where(x => x.DefinedType.IsAssignableTo(type)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -174,7 +174,7 @@ public static class MiraEventManager /// A to use when unregistering the event. public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0) { - if (!type.IsSubclassOf(typeof(MiraEvent))) + if (!type.IsAssignableTo(typeof(MiraEvent))) { throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}"); } From e9a317c164c21349fbe29bc705570b65051869a8 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 12:42:51 -0700 Subject: [PATCH 33/45] Invoke all events with DynamicInvoke due to contravariance --- MiraAPI/Events/MiraEventManager.cs | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 42a5d949..efac340a 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -56,24 +56,7 @@ public static class MiraEventManager public static bool InvokeEvent(this T eventInstance) where T : MiraEvent { - if (!TryGetEventHandlers(typeof(T), out var handlers)) - { - return false; - } - - foreach (var handler in handlers) - { - try - { - ((Action)handler.EventHandler).Invoke(eventInstance); - } - catch (Exception ex) - { - Error($"Error invoking event handler for {typeof(T).Name}: {ex}"); - } - } - - return true; + return InvokeEvent(eventInstance, typeof(T)); } /// From 1132e86f8f9e96ba396eda5cb8295d061109b3b9 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 12:44:19 -0700 Subject: [PATCH 34/45] Removed now only-once-used method --- MiraAPI/Events/MiraEventManager.cs | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index efac340a..4d733940 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using MiraAPI.PluginLoading; @@ -29,24 +28,6 @@ public static class MiraEventManager private static bool loadFinilized = false; - private static bool TryGetEventHandlers(Type type, [NotNullWhen(true)] out List? eventHandlers) - { - eventHandlers = null; - if (!EventWrappers.TryGetValue(type.GetTrackedType(), out var handlers)) - { - return false; - } - - var callableHandlers = handlers.Where(x => x.DefinedType.IsAssignableTo(type)).ToList(); - if (callableHandlers.Count == 0) - { - return false; - } - - eventHandlers = callableHandlers; - return true; - } - /// /// Invoke a . /// @@ -67,12 +48,18 @@ 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 (!TryGetEventHandlers(type, out var handlers)) + if (!EventWrappers.TryGetValue(type.GetTrackedType(), out var handlers)) { return false; } - foreach (var handler in handlers) + var callableHandlers = handlers.Where(x => x.DefinedType.IsAssignableTo(type)).ToList(); + if (callableHandlers.Count == 0) + { + return false; + } + + foreach (var handler in callableHandlers) { try { From 5b0fee007907accd2577ca91f09edd14b2dddedb Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 14:23:17 -0700 Subject: [PATCH 35/45] Removed parameter that should be calculated to prevent desyncs or type errors --- MiraAPI/Events/MiraEventManager.cs | 4 ++-- MiraAPI/PluginLoading/MiraPluginManager.cs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 4d733940..adfb2627 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -138,12 +138,12 @@ public static class MiraEventManager /// /// Register a handler. /// - /// The type of event. /// The of the event handler. /// The priority of the event handler. Lower values are called first. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0) + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0) { + Type type = methodInfo.GetParameters()[0].ParameterType; if (!type.IsAssignableTo(typeof(MiraEvent))) { throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}"); diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 33ef0c1e..670990ea 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -197,8 +197,7 @@ public sealed class MiraPluginManager continue; } - var paramType = parameters[0].ParameterType; - MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority); + MiraEventManager.RegisterEventHandler(method, eventAttribute.Priority); } } From 6fce7b20b34a80aff7d5320f0413ab09a8f5dc09 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:07:04 -0700 Subject: [PATCH 36/45] Reverted method signature change --- MiraAPI/Events/MiraEventManager.cs | 4 ++-- MiraAPI/PluginLoading/MiraPluginManager.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index adfb2627..4d733940 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -138,12 +138,12 @@ public static class MiraEventManager /// /// Register a handler. /// + /// The type of event. /// The of the event handler. /// The priority of the event handler. Lower values are called first. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0) + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0) { - Type type = methodInfo.GetParameters()[0].ParameterType; if (!type.IsAssignableTo(typeof(MiraEvent))) { throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}"); diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 83a784e6..b4815048 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -197,7 +197,8 @@ public sealed class MiraPluginManager continue; } - MiraEventManager.RegisterEventHandler(method, eventAttribute.Priority); + var paramType = parameters[0].ParameterType; + MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority); } } From 6a257935993c074dd380a40b95fe161e42082c78 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:18:16 -0700 Subject: [PATCH 37/45] Used as extension method --- MiraAPI/Events/MiraEventManager.cs | 2 +- MiraAPI/Patches/Voting/MeetingHudPatches.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 4d733940..e7976177 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -37,7 +37,7 @@ public static class MiraEventManager public static bool InvokeEvent(this T eventInstance) where T : MiraEvent { - return InvokeEvent(eventInstance, typeof(T)); + return eventInstance.InvokeEvent(typeof(T)); } /// diff --git a/MiraAPI/Patches/Voting/MeetingHudPatches.cs b/MiraAPI/Patches/Voting/MeetingHudPatches.cs index 23480a48..71d2c518 100644 --- a/MiraAPI/Patches/Voting/MeetingHudPatches.cs +++ b/MiraAPI/Patches/Voting/MeetingHudPatches.cs @@ -107,7 +107,7 @@ internal static class MeetingHudPatches public static void OnDestroyPatch(MeetingHud __instance) { MeetingVoteAreaVisibility.RestoreAll(); - MiraEventManager.InvokeEvent(new EndMeetingEvent(__instance)); + new EndMeetingEvent(__instance).InvokeEvent(); } [HarmonyPostfix] From b94c1315c428daee31a9b6f53aa33f5e642c4aa1 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:28:05 -0700 Subject: [PATCH 38/45] Added signature as overload --- MiraAPI/Events/MiraEventManager.cs | 11 +++++++++++ MiraAPI/PluginLoading/MiraPluginManager.cs | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index e7976177..84e8fdda 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -153,6 +153,17 @@ public static class MiraEventManager return RegisterEventHandler(type, @delegate, priority); } + /// + /// Register a handler. + /// + /// The of the event handler. + /// The priority of the event handler. Lower values are called first. + /// A to use when unregistering the event. + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0) + { + return RegisterEventHandler(methodInfo.GetParameters()[0].ParameterType, methodInfo, priority); + } + /// /// Register a handler. /// diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index b4815048..83a784e6 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -197,8 +197,7 @@ public sealed class MiraPluginManager continue; } - var paramType = parameters[0].ParameterType; - MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority); + MiraEventManager.RegisterEventHandler(method, eventAttribute.Priority); } } From 177734e3ebe2aa5a9b71eeb6ee287a831f13e28f Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:37:29 -0700 Subject: [PATCH 39/45] Made class internal as no public-facing side of the API exposes it --- MiraAPI/Events/MiraEventWrapper.cs | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 67fe96d6..09cce83a 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -5,30 +5,23 @@ namespace MiraAPI.Events; /// /// Wrapper for handlers. /// -public class MiraEventWrapper +/// 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; } + public Delegate EventHandler { get; } = eventHandler; /// /// Gets the priority of the handler. Lower values are called first. /// - public int Priority { get; } - - internal Type DefinedType { get; } + public int Priority { get; } = priority; /// - /// Initializes a new instance of the class. + /// Gets the type used to construct the . /// - /// The action for the event handler. - /// The priority of the handler. - /// The constructed event type. - internal MiraEventWrapper(Delegate eventHandler, int priority, Type type) - { - EventHandler = eventHandler; - Priority = priority; - DefinedType = type; - } + public Type DefinedType { get; } = type; } 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 40/45] 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; -} From 06b7099ba5e82690e7bc0c5dada83edd700cd1e4 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:04:04 -0700 Subject: [PATCH 41/45] Added InvokeOnSubype to RegisterEventAttribute --- MiraAPI/Events/MiraEventHandle.cs | 19 ++++++++++++++++++- MiraAPI/Events/MiraEventManager.cs | 22 +++++++++++++--------- MiraAPI/Events/RegisterEventAttribute.cs | 9 ++++++++- MiraAPI/PluginLoading/MiraPluginManager.cs | 2 +- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/MiraAPI/Events/MiraEventHandle.cs b/MiraAPI/Events/MiraEventHandle.cs index 86a2782f..9c820621 100644 --- a/MiraAPI/Events/MiraEventHandle.cs +++ b/MiraAPI/Events/MiraEventHandle.cs @@ -23,10 +23,27 @@ public class MiraEventHandle /// internal Delegate EventHandler { get; } - internal MiraEventHandle(Delegate eventHandler, int priority, Type type) + /// + /// Gets a value indicating whether the event handler should also be + /// tirggered by subclasses of . + /// + internal bool InvokeOnSubtype { get; } + + internal MiraEventHandle(Delegate eventHandler, int priority, Type type, bool invokeOnSubtype) { EventHandler = eventHandler; Priority = priority; EventType = type; + InvokeOnSubtype = invokeOnSubtype; + } + + internal bool IsTriggeredBy(Type type) + { + if (InvokeOnSubtype) + { + return EventType.IsAssignableTo(type); + } + + return EventType == type; } } diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 83b50aa6..e5d296e1 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -53,7 +53,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => x.EventType.IsAssignableTo(type)).ToList(); + var callableHandlers = handlers.Where(x => x.IsTriggeredBy(type)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -141,8 +141,9 @@ public static class MiraEventManager /// The type of event. /// The of the event handler. /// The priority of the event handler. Lower values are called first. + /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0) + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0, bool invokeOnSubtype = true) { if (!type.IsAssignableTo(typeof(MiraEvent))) { @@ -150,7 +151,7 @@ public static class MiraEventManager } var @delegate = Delegate.CreateDelegate(typeof(Action<>).MakeGenericType(type), methodInfo); - return RegisterEventHandler(type, @delegate, priority); + return RegisterEventHandler(type, @delegate, priority, invokeOnSubtype); } /// @@ -158,10 +159,11 @@ public static class MiraEventManager /// /// The of the event handler. /// The priority of the event handler. Lower values are called first. + /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0) + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0, bool invokeOnSubtype = true) { - return RegisterEventHandler(methodInfo.GetParameters()[0].ParameterType, methodInfo, priority); + return RegisterEventHandler(methodInfo.GetParameters()[0].ParameterType, methodInfo, priority, invokeOnSubtype); } /// @@ -169,12 +171,13 @@ public static class MiraEventManager /// /// The callback method/handler for the event. /// The priority of the event handler. Lower values are called first. + /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// Type of event. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(Action handler, int priority = 0) + public static MiraEventHandle RegisterEventHandler(Action handler, int priority = 0, bool invokeOnSubtype = true) where T : MiraEvent { - return RegisterEventHandler(typeof(T), handler, priority); + return RegisterEventHandler(typeof(T), handler, priority, invokeOnSubtype); } /// @@ -183,10 +186,11 @@ public static class MiraEventManager /// The type of event. /// The method/handler for the event. /// The priority of the event handler. Lower values are called first. + /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// A to use when unregistering the event. - private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority) + private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority, bool invokeOnSubtype) { - var eventHandler = new MiraEventHandle(@delegate, priority, type); + var eventHandler = new MiraEventHandle(@delegate, priority, type, invokeOnSubtype); EventHandlerAdded(type, eventHandler); return eventHandler; } diff --git a/MiraAPI/Events/RegisterEventAttribute.cs b/MiraAPI/Events/RegisterEventAttribute.cs index 062f30ec..c3a6b736 100644 --- a/MiraAPI/Events/RegisterEventAttribute.cs +++ b/MiraAPI/Events/RegisterEventAttribute.cs @@ -6,11 +6,18 @@ namespace MiraAPI.Events; /// Register a handler. /// /// The priority of the event. Lower values are called first. +/// Whether the event handler should also be triggered by subclasses of the type of the handler. [AttributeUsage(AttributeTargets.Method)] -public class RegisterEventAttribute(int priority = 0) : Attribute +public class RegisterEventAttribute(int priority = 0, bool invokeOnSubtype = true) : Attribute { /// /// Gets the priority of the event. Lower values are called first. /// public int Priority { get; } = priority; + + /// + /// Gets a value indicating whether the event handler should also be + /// triggered by subclasses of the type of the handler. + /// + public bool InvokeOnSubtype { get; } = invokeOnSubtype; } diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 83a784e6..2fb5a5b8 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -197,7 +197,7 @@ public sealed class MiraPluginManager continue; } - MiraEventManager.RegisterEventHandler(method, eventAttribute.Priority); + MiraEventManager.RegisterEventHandler(method, eventAttribute.Priority, eventAttribute.InvokeOnSubtype); } } From eca00dbfcd49a300cba3c6bfe95e9fe0eeac0c25 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:54:10 -0700 Subject: [PATCH 42/45] Moved method to extensions --- MiraAPI/Events/MiraEventManager.cs | 23 +---------------------- MiraAPI/Utilities/Extensions.cs | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index e5d296e1..b5bbfad9 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using MiraAPI.PluginLoading; +using MiraAPI.Utilities; namespace MiraAPI.Events; @@ -113,28 +114,6 @@ public static class MiraEventManager trackedEvents.Add(trackedAs); } - private static bool IsSubclassOfWithGeneric(this Type? type, Type super) - { - if (type == null || type == typeof(MiraEvent)) - { - return false; - } - - if (type == super) - { - return true; - } - - if (super.IsGenericTypeDefinition && - type.IsGenericType && - type.GetGenericTypeDefinition() == super) - { - return true; - } - - return type.BaseType.IsSubclassOfWithGeneric(super); - } - /// /// Register a handler. /// diff --git a/MiraAPI/Utilities/Extensions.cs b/MiraAPI/Utilities/Extensions.cs index d3a0fbae..29f8b623 100644 --- a/MiraAPI/Utilities/Extensions.cs +++ b/MiraAPI/Utilities/Extensions.cs @@ -601,6 +601,35 @@ public static class Extensions return type is { IsClass: true, IsAbstract: true, IsSealed: true }; } + /// + /// Checks if is a subclass of , including + /// account for generics, or given generic type definitions. + /// + /// The type to check. + /// The type to compare against. + /// if is a sublass of , otherwise. + public static bool IsSubclassOfWithGeneric(this Type? type, Type super) + { + if (type == null || type == typeof(object)) + { + return false; + } + + if (type == super) + { + return true; + } + + if (super.IsGenericTypeDefinition && + type.IsGenericType && + type.GetGenericTypeDefinition() == super) + { + return true; + } + + return type.BaseType.IsSubclassOfWithGeneric(super); + } + /// /// Gets a darkened version of a . /// From 14cd9eedf407e1e98c2da0e4338c79b515677cf4 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:58:28 -0700 Subject: [PATCH 43/45] Added overloads, backwards compatibility stand tall --- MiraAPI/Events/MiraEventManager.cs | 63 ++++++++++++++++++++++-- MiraAPI/Events/RegisterEventAttribute.cs | 20 +++++++- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index b5bbfad9..b8c78141 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -122,7 +122,7 @@ public static class MiraEventManager /// The priority of the event handler. Lower values are called first. /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0, bool invokeOnSubtype = true) + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority, bool invokeOnSubtype) { if (!type.IsAssignableTo(typeof(MiraEvent))) { @@ -133,6 +133,24 @@ public static class MiraEventManager return RegisterEventHandler(type, @delegate, priority, invokeOnSubtype); } + /// + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority) + { + return RegisterEventHandler(type, methodInfo, priority, true); + } + + /// + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, bool invokeOnSubtype) + { + return RegisterEventHandler(type, methodInfo, 0, invokeOnSubtype); + } + + /// + public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo) + { + return RegisterEventHandler(type, methodInfo, 0, true); + } + /// /// Register a handler. /// @@ -140,11 +158,29 @@ public static class MiraEventManager /// The priority of the event handler. Lower values are called first. /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority = 0, bool invokeOnSubtype = true) + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority, bool invokeOnSubtype) { return RegisterEventHandler(methodInfo.GetParameters()[0].ParameterType, methodInfo, priority, invokeOnSubtype); } + /// + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, int priority) + { + return RegisterEventHandler(methodInfo, priority, true); + } + + /// + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo, bool invokeOnSubtype) + { + return RegisterEventHandler(methodInfo, 0, invokeOnSubtype); + } + + /// + public static MiraEventHandle RegisterEventHandler(MethodInfo methodInfo) + { + return RegisterEventHandler(methodInfo, 0, true); + } + /// /// Register a handler. /// @@ -153,12 +189,33 @@ public static class MiraEventManager /// Whether the event handler should also be triggered by subclasses of the type of the handler. /// Type of event. /// A to use when unregistering the event. - public static MiraEventHandle RegisterEventHandler(Action handler, int priority = 0, bool invokeOnSubtype = true) + public static MiraEventHandle RegisterEventHandler(Action handler, int priority, bool invokeOnSubtype) where T : MiraEvent { return RegisterEventHandler(typeof(T), handler, priority, invokeOnSubtype); } + /// + public static MiraEventHandle RegisterEventHandler(Action handler, int priority) + where T : MiraEvent + { + return RegisterEventHandler(handler, priority, true); + } + + /// + public static MiraEventHandle RegisterEventHandler(Action handler, bool invokeOnSubtype) + where T : MiraEvent + { + return RegisterEventHandler(handler, 0, invokeOnSubtype); + } + + /// + public static MiraEventHandle RegisterEventHandler(Action handler) + where T : MiraEvent + { + return RegisterEventHandler(handler, 0, true); + } + /// /// Register a handler. /// diff --git a/MiraAPI/Events/RegisterEventAttribute.cs b/MiraAPI/Events/RegisterEventAttribute.cs index c3a6b736..00684595 100644 --- a/MiraAPI/Events/RegisterEventAttribute.cs +++ b/MiraAPI/Events/RegisterEventAttribute.cs @@ -8,7 +8,7 @@ namespace MiraAPI.Events; /// The priority of the event. Lower values are called first. /// Whether the event handler should also be triggered by subclasses of the type of the handler. [AttributeUsage(AttributeTargets.Method)] -public class RegisterEventAttribute(int priority = 0, bool invokeOnSubtype = true) : Attribute +public class RegisterEventAttribute(int priority, bool invokeOnSubtype) : Attribute { /// /// Gets the priority of the event. Lower values are called first. @@ -20,4 +20,22 @@ public class RegisterEventAttribute(int priority = 0, bool invokeOnSubtype = tru /// triggered by subclasses of the type of the handler. /// public bool InvokeOnSubtype { get; } = invokeOnSubtype; + + /// + public RegisterEventAttribute(int priority) + : this(priority, true) + { + } + + /// + public RegisterEventAttribute(bool invokeOnSubtype) + : this(0, invokeOnSubtype) + { + } + + /// + public RegisterEventAttribute() + : this(0, true) + { + } } From 881ad4de7025383f20be8110fc18bd0a720e31d4 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Wed, 11 Nov 2026 01:40:49 -0500 Subject: [PATCH 44/45] fix typos and key not found --- MiraAPI/Events/MiraEventHandle.cs | 8 ++++---- MiraAPI/Events/MiraEventManager.cs | 12 ++++++------ MiraAPI/PluginLoading/MiraPluginManager.cs | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MiraAPI/Events/MiraEventHandle.cs b/MiraAPI/Events/MiraEventHandle.cs index 9c820621..19482f41 100644 --- a/MiraAPI/Events/MiraEventHandle.cs +++ b/MiraAPI/Events/MiraEventHandle.cs @@ -16,18 +16,18 @@ public class MiraEventHandle /// /// Gets the priority of the handler. Lower values are called first. /// - internal int Priority { get; } + public int Priority { get; } /// /// Gets the event handler delegate. /// - internal Delegate EventHandler { get; } + public Delegate EventHandler { get; } /// /// Gets a value indicating whether the event handler should also be - /// tirggered by subclasses of . + /// triggered by subclasses of . /// - internal bool InvokeOnSubtype { get; } + public bool InvokeOnSubtype { get; } internal MiraEventHandle(Delegate eventHandler, int priority, Type type, bool invokeOnSubtype) { diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 4b25ca78..60bb38dd 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -27,7 +27,7 @@ public static class MiraEventManager private static readonly Dictionary> TrackedEventTypes = []; - private static bool loadFinilized = false; + private static bool loadFinalized = false; /// /// Invoke a . @@ -77,7 +77,7 @@ public static class MiraEventManager internal static bool RegisterEventType(Type eventType, MiraPluginInfo info) { - if (!eventType.IsSubclassOf(typeof(MiraEvent))) + if (eventType.IsAbstract || !eventType.IsSubclassOf(typeof(MiraEvent))) { return false; } @@ -243,7 +243,7 @@ public static class MiraEventManager private static void EventHandlerAdded(Type type, MiraEventHandle eventHandler) { - if (!loadFinilized) + if (!loadFinalized) { EventHandlersToLoad.TryAdd(type, []); EventHandlersToLoad[type].Add(eventHandler); @@ -277,7 +277,7 @@ public static class MiraEventManager /// if the event was unregistered successfully, otherwise. public static bool UnregisterEventHandler(MiraEventHandle eventHandle) { - if (!loadFinilized) + if (!loadFinalized) { if (!EventHandlersToLoad.TryGetValue(eventHandle.EventType, out var handlersToLoad)) { @@ -311,9 +311,9 @@ public static class MiraEventManager return removed; } - internal static void OnLoadFinilize() + internal static void OnLoadFinalize() { - loadFinilized = true; + loadFinalized = true; EventTypes = new ReadOnlyCollection(InternalEventTypes); foreach (var eventType in EventTypes) diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 58d4f7bb..4f83cb80 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -104,7 +104,7 @@ public sealed class MiraPluginManager PluginsWithOptionsOrGameModes = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)]; ModifierManager.Modifiers = new ReadOnlyCollection(ModifierManager.InternalModifiers); - MiraEventManager.OnLoadFinilize(); + MiraEventManager.OnLoadFinalize(); }; } @@ -143,7 +143,7 @@ public sealed class MiraPluginManager { if (plugin.ForceRegisterEvents) { - Warning("For optimisation reasons, MiraAPI no longer automatically searches every type for events. Please use RegisterEventsAttribute moving forward."); + Warning("For optimisation reasons, MiraAPI no longer automatically searches every type for events. Please use RegisterEventContainerAttribute moving forward."); } foreach (var type in assembly.GetTypes()) From 87dd7b5441481b73072762fadea893b1fa1deb1b Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 11 Nov 2026 15:40:12 -0700 Subject: [PATCH 45/45] Returned MiraEventWrapper --- MiraAPI/Events/MiraEventWrapper.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 MiraAPI/Events/MiraEventWrapper.cs diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs new file mode 100644 index 00000000..469a98d3 --- /dev/null +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -0,0 +1,21 @@ +using System; + +namespace MiraAPI.Events; + +/// +/// Wrapper for handlers. +/// +/// The action for the event handler. +/// The priority of the handler. +public class MiraEventWrapper(Delegate eventHandler, int priority) +{ + /// + /// Gets the event handler delegate. + /// + public Delegate EventHandler => eventHandler; + + /// + /// Gets the priority of the handler. Lower values are called first. + /// + public int Priority => priority; +}