diff --git a/Dalamud/Plugin/ICallGateProvider.cs b/Dalamud/Plugin/ICallGateProvider.cs
index 08387b298..881bd045c 100644
--- a/Dalamud/Plugin/ICallGateProvider.cs
+++ b/Dalamud/Plugin/ICallGateProvider.cs
@@ -36,7 +36,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, TRet> func);
@@ -49,7 +49,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, TRet> func);
@@ -62,7 +62,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, T4, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3, T4> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, T4, TRet> func);
@@ -75,7 +75,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, T4, T5, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3, T4, T5> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, T4, T5, TRet> func);
@@ -88,7 +88,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, TRet> func);
@@ -101,7 +101,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, TRet> func);
@@ -114,7 +114,7 @@ namespace Dalamud.Plugin
     public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
         public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, T8, TRet> func);
diff --git a/Dalamud/Plugin/ICallGateSubscriber.cs b/Dalamud/Plugin/ICallGateSubscriber.cs
index f2d9ea5a4..779497275 100644
--- a/Dalamud/Plugin/ICallGateSubscriber.cs
+++ b/Dalamud/Plugin/ICallGateSubscriber.cs
@@ -42,10 +42,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2);
@@ -58,10 +58,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3);
@@ -74,10 +74,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, T4, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3, T4> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3, T4> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
@@ -90,10 +90,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3, T4, T5> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
@@ -106,10 +106,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
@@ -122,10 +122,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
@@ -138,10 +138,10 @@ namespace Dalamud.Plugin
     public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
         public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
diff --git a/Dalamud/Plugin/Internal/CallGatePubSub.cs b/Dalamud/Plugin/Internal/CallGatePubSub.cs
index 76ba0b885..c9ee1e45e 100644
--- a/Dalamud/Plugin/Internal/CallGatePubSub.cs
+++ b/Dalamud/Plugin/Internal/CallGatePubSub.cs
@@ -72,7 +72,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, TRet>, ICallGateSubscriber<T1, T2, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -84,11 +84,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -104,7 +104,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, TRet>, ICallGateSubscriber<T1, T2, T3, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -116,11 +116,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -136,7 +136,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, T4, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, TRet>, ICallGateSubscriber<T1, T2, T3, T4, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3, T4> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -148,11 +148,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3, arg4);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3, T4> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3, T4> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -168,7 +168,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, T4, T5, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3, T4, T5> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -180,11 +180,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3, arg4, arg5);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3, T4, T5> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -200,7 +200,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -212,11 +212,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -232,7 +232,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -244,11 +244,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
@@ -264,7 +264,7 @@ namespace Dalamud.Plugin.Internal
     internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
     {
         /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
+        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
             => base.RegisterAction(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
@@ -276,11 +276,11 @@ namespace Dalamud.Plugin.Internal
             => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 
         /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
+        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
             => base.Subscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
+        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
             => base.Unsubscribe(action);
 
         /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>