diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs index 6a0cea8..59e3f01 100644 --- a/MareSynchronos/Factories/CharacterDataFactory.cs +++ b/MareSynchronos/Factories/CharacterDataFactory.cs @@ -185,7 +185,7 @@ public class CharacterDataFactory } AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->Decal->FileName()).ToString(), cache, 0, "Decal", false); - AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->LegacyBodyDecal->FileName()).ToString(), cache, 0, "Legacy Decal", false); + AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->LegacyBodyDecal->FileName()).ToString(), cache, 0, "Legacy Decal", false);yes st.Stop(); Logger.Verbose("Building Character Data took " + st.Elapsed); @@ -199,7 +199,7 @@ public class CharacterDataFactory if (!doNotReverseResolve) { fileReplacement.GamePaths = - _ipcManager.PenumbraReverseResolvePath(path, _dalamudUtil.PlayerName).ToList(); + _ipcManager.PenumbraReverseResolvePlayer(path).ToList(); fileReplacement.SetResolvedPath(path); } else diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs index ce6ea32..c73b38f 100644 --- a/MareSynchronos/Managers/IpcManager.cs +++ b/MareSynchronos/Managers/IpcManager.cs @@ -29,7 +29,7 @@ namespace MareSynchronos.Managers private readonly ICallGateSubscriber _penumbraRemoveTemporaryCollection; private readonly ICallGateSubscriber? _penumbraResolveModDir; private readonly ICallGateSubscriber? _penumbraResolvePath; - private readonly ICallGateSubscriber? _penumbraReverseResolvePath; + private readonly ICallGateSubscriber? _reverseResolvePlayer; private readonly ICallGateSubscriber, string, int, int> _penumbraSetTemporaryMod; public IpcManager(DalamudPluginInterface pi) @@ -41,7 +41,7 @@ namespace MareSynchronos.Managers _penumbraResolvePath = pi.GetIpcSubscriber("Penumbra.ResolveCharacterPath"); _penumbraResolveModDir = pi.GetIpcSubscriber("Penumbra.GetModDirectory"); _penumbraRedraw = pi.GetIpcSubscriber("Penumbra.RedrawObjectByName"); - _penumbraReverseResolvePath = pi.GetIpcSubscriber("Penumbra.ReverseResolvePath"); + _reverseResolvePlayer = pi.GetIpcSubscriber("Penumbra.ReverseResolvePlayer"); _penumbraApiVersion = pi.GetIpcSubscriber<(int, int)>("Penumbra.ApiVersions"); _penumbraObjectIsRedrawn = pi.GetIpcSubscriber("Penumbra.GameObjectRedrawn"); _penumbraGetMetaManipulations = @@ -95,7 +95,7 @@ namespace MareSynchronos.Managers { try { - return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=8 }; + return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=9 }; } catch { @@ -186,10 +186,10 @@ namespace MareSynchronos.Managers return resolvedPath; } - public string[] PenumbraReverseResolvePath(string path, string characterName) + public string[] PenumbraReverseResolvePlayer(string path) { if (!CheckPenumbraApi()) return new[] { path }; - var resolvedPaths = _penumbraReverseResolvePath!.InvokeFunc(path, characterName); + var resolvedPaths = _reverseResolvePlayer!.InvokeFunc(path); if (resolvedPaths.Length == 0) { resolvedPaths = new[] { path }; diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 569fcb4..7040839 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -3,7 +3,7 @@ - 0.1.3.0 + 0.1.4.0 https://github.com/Penumbra-Sync/client diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index 93ddad4..4e24f70 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -174,9 +174,8 @@ namespace MareSynchronos.UI } bool textIsUid = true; - var playerText = entry.OtherUID; _showUidForEntry.TryGetValue(entry.OtherUID, out bool showUidInsteadOfName); - if (!showUidInsteadOfName && _configuration.GetCurrentServerUidComments().TryGetValue(entry.OtherUID, out playerText)) + if (!showUidInsteadOfName && _configuration.GetCurrentServerUidComments().TryGetValue(entry.OtherUID, out var playerText)) { if (playerText.IsNullOrEmpty()) {