Merge branch 'main' of https://github.com/LeonBlade/HeelsPlugin

LeonBlade · Sep 10, 2022 · e31dec0 · e31dec0
2 parents 664a861 + d010ebc
commit e31dec0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/HeelsPlugin/IpcManager.cs b/HeelsPlugin/IpcManager.cs
@@ -7,7 +7,7 @@ namespace HeelsPlugin
 {
   public class IpcManager : IDisposable
   {
-    private static readonly string API_VERSION = "1.0.0";
+    private static readonly string API_VERSION = "1.0.1";
 
     public static readonly string ApiVersionIdentifier = "HeelsPlugin.ApiVersion";
     public static readonly string GetOffsetIdentifier = "HeelsPlugin.GetOffset";
@@ -18,23 +18,23 @@ public class IpcManager : IDisposable
     private ICallGateProvider<string>? ApiVersion;
     private ICallGateProvider<float>? GetOffset;
     private ICallGateProvider<float, object?>? OffsetUpdate;
-    private ICallGateSubscriber<GameObject, float, object?>? RegisterPlayer;
-    private ICallGateSubscriber<GameObject, object?>? UnregisterPlayer;
+    private ICallGateProvider<GameObject, float, object?>? RegisterPlayer;
+    private ICallGateProvider<GameObject, object?>? UnregisterPlayer;
 
     public IpcManager(DalamudPluginInterface pluginInterface, PluginMemory memory)
     {
       ApiVersion = pluginInterface.GetIpcProvider<string>(ApiVersionIdentifier);
       GetOffset = pluginInterface.GetIpcProvider<float>(IpcManager.GetOffsetIdentifier);
       OffsetUpdate = pluginInterface.GetIpcProvider<float, object?>(IpcManager.OffsetChangedIdentifier);
-      RegisterPlayer = pluginInterface.GetIpcSubscriber<GameObject, float, object?>(IpcManager.RegisterPlayerIdentifier);
-      UnregisterPlayer = pluginInterface.GetIpcSubscriber<GameObject, object?>(IpcManager.UnregisterPlayerIdentifier);
+      RegisterPlayer = pluginInterface.GetIpcProvider<GameObject, float, object?>(IpcManager.RegisterPlayerIdentifier);
+      UnregisterPlayer = pluginInterface.GetIpcProvider<GameObject, object?>(IpcManager.UnregisterPlayerIdentifier);
 
-      RegisterPlayer.Subscribe((gameObject, offset) =>
+      RegisterPlayer.RegisterAction((gameObject, offset) =>
       {
         memory.PlayerOffsets[gameObject] = offset;
       });
 
-      UnregisterPlayer.Subscribe((gameObject) =>
+      UnregisterPlayer.RegisterAction((gameObject) =>
       {
         memory.PlayerOffsets.Remove(gameObject);
       });
@@ -52,6 +52,8 @@ public void Dispose()
     {
       ApiVersion?.UnregisterFunc();
       GetOffset?.UnregisterFunc();
+      RegisterPlayer?.UnregisterAction();
+      UnregisterPlayer?.UnregisterAction();
     }
   }
 }