Special case matching handler type without proxy

Author: Banane9

MonkeyLoader/Events/EventManager.Handlers.cs

@@ -88,29 +88,45 @@ internal bool UnregisterEventHandler<TEvent>(Mod mod, IEventHandler<TEvent> even
         private bool RegisterAsyncEventHandler<TBaseEvent, TEvent>(Mod mod, IAsyncEventHandler<TEvent> asyncEventHandler)
             where TBaseEvent : AsyncEvent
             where TEvent : TBaseEvent
-            => _eventDispatchers.GetOrCreateValue(CreateAsyncDispatcher<TBaseEvent>).AddHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(asyncEventHandler));
+            => _eventDispatchers.GetOrCreateValue(CreateAsyncDispatcher<TBaseEvent>)
+                .AddHandler(mod, typeof(TBaseEvent) == typeof(TEvent)
+                    ? (IAsyncEventHandler<TBaseEvent>)asyncEventHandler
+                    : EventHandlerProxy.For<TBaseEvent, TEvent>(asyncEventHandler));
 
         private bool RegisterCancelableAsyncEventHandler<TBaseEvent, TEvent>(Mod mod, ICancelableAsyncEventHandler<TEvent> cancelableAsyncEventHandler)
             where TBaseEvent : CancelableAsyncEvent
             where TEvent : TBaseEvent
-            => _eventDispatchers.GetOrCreateValue(CreateCancelableAsyncDispatcher<TBaseEvent>).AddHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableAsyncEventHandler));
+            => _eventDispatchers.GetOrCreateValue(CreateCancelableAsyncDispatcher<TBaseEvent>)
+                .AddHandler(mod, typeof(TBaseEvent) == typeof(TEvent)
+                    ? (ICancelableAsyncEventHandler<TBaseEvent>)cancelableAsyncEventHandler
+                    : EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableAsyncEventHandler));
 
         private bool RegisterCancelableSyncEventHandler<TBaseEvent, TEvent>(Mod mod, ICancelableEventHandler<TEvent> cancelableEventHandler)
             where TBaseEvent : CancelableSyncEvent
             where TEvent : TBaseEvent
-            => _eventDispatchers.GetOrCreateValue(CreateCancelableDispatcher<TBaseEvent>).AddHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableEventHandler));
+            => _eventDispatchers.GetOrCreateValue(CreateCancelableDispatcher<TBaseEvent>)
+                .AddHandler(mod, typeof(TBaseEvent) == typeof(TEvent)
+                    ? (ICancelableEventHandler<TBaseEvent>)cancelableEventHandler
+                    : EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableEventHandler));
 
         private bool RegisterSyncEventHandler<TBaseEvent, TEvent>(Mod mod, IEventHandler<TEvent> eventHandler)
             where TBaseEvent : SyncEvent
             where TEvent : TBaseEvent
-            => _eventDispatchers.GetOrCreateValue(CreateDispatcher<TBaseEvent>).AddHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(eventHandler));
+            => _eventDispatchers.GetOrCreateValue(CreateDispatcher<TBaseEvent>)
+                .AddHandler(mod, typeof(TBaseEvent) == typeof(TEvent)
+                    ? (IEventHandler<TBaseEvent>)eventHandler
+                    : EventHandlerProxy.For<TBaseEvent, TEvent>(eventHandler));
 
         private bool UnregisterAsyncEventHandler<TBaseEvent, TEvent>(Mod mod, IAsyncEventHandler<TEvent> asyncEventHandler)
             where TBaseEvent : AsyncEvent
             where TEvent : TBaseEvent
         {
+            var handler = typeof(TBaseEvent) == typeof(TEvent)
+                ? (IAsyncEventHandler<TBaseEvent>)asyncEventHandler
+                : EventHandlerProxy.For<TBaseEvent, TEvent>(asyncEventHandler);
+
             if (_eventDispatchers.TryGetValue<AsyncEventDispatcher<TEvent>>(out var asyncEventDispatcher))
-                return asyncEventDispatcher!.RemoveHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(asyncEventHandler));
+                return asyncEventDispatcher!.RemoveHandler(mod, handler);
 
             return false;
         }
@@ -119,8 +135,12 @@ private bool UnregisterCancelableAsyncEventHandler<TBaseEvent, TEvent>(Mod mod,
             where TBaseEvent : CancelableAsyncEvent
             where TEvent : TBaseEvent
         {
+            var handler = typeof(TBaseEvent) == typeof(TEvent)
+                ? (ICancelableAsyncEventHandler<TBaseEvent>)cancelableAsyncEventHandler
+                : EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableAsyncEventHandler);
+
             if (_eventDispatchers.TryGetValue<CancelableAsyncEventDispatcher<TEvent>>(out var cancelableAsyncEventDispatcher))
-                return cancelableAsyncEventDispatcher!.RemoveHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableAsyncEventHandler));
+                return cancelableAsyncEventDispatcher!.RemoveHandler(mod, handler);
 
             return false;
         }
@@ -129,8 +149,12 @@ private bool UnregisterCancelableSyncEventHandler<TBaseEvent, TEvent>(Mod mod, I
             where TBaseEvent : CancelableSyncEvent
             where TEvent : TBaseEvent
         {
+            var handler = typeof(TBaseEvent) == typeof(TEvent)
+                ? (ICancelableEventHandler<TBaseEvent>)cancelableEventHandler
+                : EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableEventHandler);
+
             if (_eventDispatchers.TryGetValue<CancelableEventDispatcher<TEvent>>(out var cancelableEventDispatcher))
-                return cancelableEventDispatcher!.RemoveHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(cancelableEventHandler));
+                return cancelableEventDispatcher!.RemoveHandler(mod, handler);
 
             return false;
         }
@@ -139,8 +163,12 @@ private bool UnregisterSyncEventHandler<TBaseEvent, TEvent>(Mod mod, IEventHandl
             where TBaseEvent : SyncEvent
             where TEvent : TBaseEvent
         {
+            var handler = typeof(TBaseEvent) == typeof(TEvent)
+                ? (IEventHandler<TBaseEvent>)eventHandler
+                : EventHandlerProxy.For<TBaseEvent, TEvent>(eventHandler);
+
             if (_eventDispatchers.TryGetValue<EventDispatcher<TEvent>>(out var eventDispatcher))
-                return eventDispatcher!.RemoveHandler(mod, EventHandlerProxy.For<TBaseEvent, TEvent>(eventHandler));
+                return eventDispatcher!.RemoveHandler(mod, handler);
 
             return false;
         }

MonkeyLoader/MonkeyLoader.csproj

@@ -11,7 +11,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>MonkeyLoader</Title>
     <Authors>Banane9</Authors>
-    <Version>0.26.0-beta</Version>
+    <Version>0.26.1-beta</Version>
     <Description>A convenience and extendability focused mod loader using NuGet packages.</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>