From 514ae1f1411d1ace52769b6a6db819f9372475ed Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Sat, 3 Sep 2022 15:05:19 +0200
Subject: [PATCH] adjust api

---
 MareAPI                               |  2 +-
 MareSynchronos/Managers/IpcManager.cs | 10 +++++-----
 Penumbra                              |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MareAPI b/MareAPI
index 374cc31..645dd0b 160000
--- a/MareAPI
+++ b/MareAPI
@@ -1 +1 @@
-Subproject commit 374cc31babec9ac37aa21104d7fc02e41cd0d38e
+Subproject commit 645dd0b18f815cb7ccd81f37e84ded9cf650c3f3
diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs
index 855a3e3..9a40397 100644
--- a/MareSynchronos/Managers/IpcManager.cs
+++ b/MareSynchronos/Managers/IpcManager.cs
@@ -32,7 +32,7 @@ namespace MareSynchronos.Managers
         private readonly ICallGateSubscriber<string, string[]>? _reverseResolvePlayer;
         private readonly ICallGateSubscriber<string, string, Dictionary<string, string>, string, int, int>
             _penumbraSetTemporaryMod;
-        private readonly ICallGateSubscriber<IntPtr, string, string, string> _penumbraResourceLoaded;
+        private readonly ICallGateSubscriber<IntPtr, string, string, object?> _penumbraGameObjectResourcePathResolved;
         private readonly DalamudUtil _dalamudUtil;
 
         public IpcManager(DalamudPluginInterface pi, DalamudUtil dalamudUtil)
@@ -57,9 +57,9 @@ namespace MareSynchronos.Managers
             _glamourerApplyOnlyCustomization = pi.GetIpcSubscriber<string, GameObject?, object>("Glamourer.ApplyOnlyCustomizationToCharacter");
             _glamourerApplyOnlyEquipment = pi.GetIpcSubscriber<string, GameObject?, object>("Glamourer.ApplyOnlyEquipmentToCharacter");
             _glamourerRevertCustomization = pi.GetIpcSubscriber<GameObject?, object>("Glamourer.RevertCharacter");
-            _penumbraResourceLoaded = pi.GetIpcSubscriber<IntPtr, string, string, string>("Penumbra.ResourceLoaded");
+            _penumbraGameObjectResourcePathResolved = pi.GetIpcSubscriber<IntPtr, string, string, object?>("Penumbra.GameObjectResourcePathResolved");
 
-            _penumbraResourceLoaded.Subscribe(ResourceLoaded);
+            _penumbraGameObjectResourcePathResolved.Subscribe(ResourceLoaded);
             _penumbraObjectIsRedrawn.Subscribe(RedrawEvent);
             _penumbraInit.Subscribe(PenumbraInit);
             _penumbraDispose.Subscribe(PenumbraDispose);
@@ -113,7 +113,7 @@ namespace MareSynchronos.Managers
         {
             try
             {
-                return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >= 11 };
+                return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >= 13 };
             }
             catch
             {
@@ -128,7 +128,7 @@ namespace MareSynchronos.Managers
             _penumbraDispose.Unsubscribe(PenumbraDispose);
             _penumbraInit.Unsubscribe(PenumbraInit);
             _penumbraObjectIsRedrawn.Unsubscribe(RedrawEvent);
-            _penumbraResourceLoaded.Unsubscribe(ResourceLoaded);
+            _penumbraGameObjectResourcePathResolved.Unsubscribe(ResourceLoaded);
         }
 
         public void GlamourerApplyAll(string? customization, IntPtr obj)
diff --git a/Penumbra b/Penumbra
index cfc441b..e66ca7c 160000
--- a/Penumbra
+++ b/Penumbra
@@ -1 +1 @@
-Subproject commit cfc441b9b1acaaf1bf2da758bd875cfb5229ab60
+Subproject commit e66ca7c5805bf23a82b51649e7f5f75baabe4bc7