diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs index 926e237..be0794b 100644 --- a/MareSynchronos/Factories/CharacterDataFactory.cs +++ b/MareSynchronos/Factories/CharacterDataFactory.cs @@ -152,7 +152,7 @@ public class CharacterDataFactory var cache = new CharacterData { GlamourerString = _ipcManager.GlamourerGetCharacterCustomization(_dalamudUtil.PlayerCharacter), - ManipulationString = _ipcManager.PenumbraGetMetaManipulations(_dalamudUtil.PlayerName) + ManipulationString = _ipcManager.PenumbraGetMetaManipulations() }; var human = (Human*)((Character*)_dalamudUtil.PlayerPointer)->GameObject.GetDrawObject(); diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs index 475c32c..e096233 100644 --- a/MareSynchronos/Managers/IpcManager.cs +++ b/MareSynchronos/Managers/IpcManager.cs @@ -21,7 +21,7 @@ namespace MareSynchronos.Managers private readonly ICallGateSubscriber? _glamourerApplyOnlyCustomization; private readonly ICallGateSubscriber<(int, int)> _penumbraApiVersion; private readonly ICallGateSubscriber _penumbraCreateTemporaryCollection; - private readonly ICallGateSubscriber _penumbraGetMetaManipulations; + private readonly ICallGateSubscriber _penumbraGetMetaManipulations; private readonly ICallGateSubscriber _penumbraInit; private readonly ICallGateSubscriber _penumbraDispose; private readonly ICallGateSubscriber _penumbraObjectIsRedrawn; @@ -45,7 +45,7 @@ namespace MareSynchronos.Managers _penumbraApiVersion = pi.GetIpcSubscriber<(int, int)>("Penumbra.ApiVersions"); _penumbraObjectIsRedrawn = pi.GetIpcSubscriber("Penumbra.GameObjectRedrawn"); _penumbraGetMetaManipulations = - pi.GetIpcSubscriber("Penumbra.GetMetaManipulations"); + pi.GetIpcSubscriber("Penumbra.GetPlayerMetaManipulations"); _glamourerApiVersion = pi.GetIpcSubscriber("Glamourer.ApiVersion"); _glamourerGetAllCustomization = pi.GetIpcSubscriber("Glamourer.GetAllCustomizationFromCharacter"); @@ -95,7 +95,7 @@ namespace MareSynchronos.Managers { try { - return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=10 }; + return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=11 }; } catch { @@ -153,10 +153,10 @@ namespace MareSynchronos.Managers return ret.Item2; } - public string PenumbraGetMetaManipulations(string characterName) + public string PenumbraGetMetaManipulations() { if (!CheckPenumbraApi()) return string.Empty; - return _penumbraGetMetaManipulations.InvokeFunc(characterName); + return _penumbraGetMetaManipulations.InvokeFunc(); } public string? PenumbraModDirectory()