t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add compatibility to penumbra 0.5.3.7 / GetPlayerMetaManipulations

Browse Source
This commit is contained in:
Stanley Dimant
2022-07-10 20:28:27 +02:00
parent d338b4b93c
commit 98c1802d63
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -152,7 +152,7 @@ public class CharacterDataFactory
var cache = new CharacterData var cache = new CharacterData
{ {
GlamourerString = _ipcManager.GlamourerGetCharacterCustomization(_dalamudUtil.PlayerCharacter), GlamourerString = _ipcManager.GlamourerGetCharacterCustomization(_dalamudUtil.PlayerCharacter),
ManipulationString = _ipcManager.PenumbraGetMetaManipulations(_dalamudUtil.PlayerName) ManipulationString = _ipcManager.PenumbraGetMetaManipulations()
}; };
var human = (Human*)((Character*)_dalamudUtil.PlayerPointer)->GameObject.GetDrawObject(); var human = (Human*)((Character*)_dalamudUtil.PlayerPointer)->GameObject.GetDrawObject();

10
MareSynchronos/Managers/IpcManager.cs
View File

@@ -21,7 +21,7 @@ namespace MareSynchronos.Managers
private readonly ICallGateSubscriber<string, GameObject?, object>? _glamourerApplyOnlyCustomization; private readonly ICallGateSubscriber<string, GameObject?, object>? _glamourerApplyOnlyCustomization;
private readonly ICallGateSubscriber<(int, int)> _penumbraApiVersion; private readonly ICallGateSubscriber<(int, int)> _penumbraApiVersion;
private readonly ICallGateSubscriber<string, string, bool, (int, string)> _penumbraCreateTemporaryCollection; private readonly ICallGateSubscriber<string, string, bool, (int, string)> _penumbraCreateTemporaryCollection;
private readonly ICallGateSubscriber<string, string> _penumbraGetMetaManipulations; private readonly ICallGateSubscriber<string> _penumbraGetMetaManipulations;
private readonly ICallGateSubscriber<object> _penumbraInit; private readonly ICallGateSubscriber<object> _penumbraInit;
private readonly ICallGateSubscriber<object> _penumbraDispose; private readonly ICallGateSubscriber<object> _penumbraDispose;
private readonly ICallGateSubscriber<IntPtr, int, object?> _penumbraObjectIsRedrawn; private readonly ICallGateSubscriber<IntPtr, int, object?> _penumbraObjectIsRedrawn;
@@ -45,7 +45,7 @@ namespace MareSynchronos.Managers
_penumbraApiVersion = pi.GetIpcSubscriber<(int, int)>("Penumbra.ApiVersions"); _penumbraApiVersion = pi.GetIpcSubscriber<(int, int)>("Penumbra.ApiVersions");
_penumbraObjectIsRedrawn = pi.GetIpcSubscriber<IntPtr, int, object?>("Penumbra.GameObjectRedrawn"); _penumbraObjectIsRedrawn = pi.GetIpcSubscriber<IntPtr, int, object?>("Penumbra.GameObjectRedrawn");
_penumbraGetMetaManipulations = _penumbraGetMetaManipulations =
pi.GetIpcSubscriber<string, string>("Penumbra.GetMetaManipulations"); pi.GetIpcSubscriber<string>("Penumbra.GetPlayerMetaManipulations");
_glamourerApiVersion = pi.GetIpcSubscriber<int>("Glamourer.ApiVersion"); _glamourerApiVersion = pi.GetIpcSubscriber<int>("Glamourer.ApiVersion");
_glamourerGetAllCustomization = pi.GetIpcSubscriber<GameObject?, string>("Glamourer.GetAllCustomizationFromCharacter"); _glamourerGetAllCustomization = pi.GetIpcSubscriber<GameObject?, string>("Glamourer.GetAllCustomizationFromCharacter");
@@ -95,7 +95,7 @@ namespace MareSynchronos.Managers
{ {
try try
{ {
return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=10 }; return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=11 };
} }
catch catch
{ {
@@ -153,10 +153,10 @@ namespace MareSynchronos.Managers
return ret.Item2; return ret.Item2;
} }
public string PenumbraGetMetaManipulations(string characterName) public string PenumbraGetMetaManipulations()
{ {
if (!CheckPenumbraApi()) return string.Empty; if (!CheckPenumbraApi()) return string.Empty;
return _penumbraGetMetaManipulations.InvokeFunc(characterName); return _penumbraGetMetaManipulations.InvokeFunc();
} }
public string? PenumbraModDirectory() public string? PenumbraModDirectory()