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

adjust for new penumbra

Browse Source
This commit is contained in:
Stanley Dimant
2022-07-09 13:05:11 +02:00
parent 1125077be3
commit 66c957093c
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -185,7 +185,7 @@ public class CharacterDataFactory
} }
AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->Decal->FileName()).ToString(), cache, 0, "Decal", false); 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(); st.Stop();
Logger.Verbose("Building Character Data took " + st.Elapsed); Logger.Verbose("Building Character Data took " + st.Elapsed);
@@ -199,7 +199,7 @@ public class CharacterDataFactory
if (!doNotReverseResolve) if (!doNotReverseResolve)
{ {
fileReplacement.GamePaths = fileReplacement.GamePaths =
_ipcManager.PenumbraReverseResolvePath(path, _dalamudUtil.PlayerName).ToList(); _ipcManager.PenumbraReverseResolvePlayer(path).ToList();
fileReplacement.SetResolvedPath(path); fileReplacement.SetResolvedPath(path);
} }
else else

10
MareSynchronos/Managers/IpcManager.cs
View File

@@ -29,7 +29,7 @@ namespace MareSynchronos.Managers
private readonly ICallGateSubscriber<string, int> _penumbraRemoveTemporaryCollection; private readonly ICallGateSubscriber<string, int> _penumbraRemoveTemporaryCollection;
private readonly ICallGateSubscriber<string>? _penumbraResolveModDir; private readonly ICallGateSubscriber<string>? _penumbraResolveModDir;
private readonly ICallGateSubscriber<string, string, string>? _penumbraResolvePath; private readonly ICallGateSubscriber<string, string, string>? _penumbraResolvePath;
private readonly ICallGateSubscriber<string, string, string[]>? _penumbraReverseResolvePath; private readonly ICallGateSubscriber<string, string[]>? _reverseResolvePlayer;
private readonly ICallGateSubscriber<string, string, Dictionary<string, string>, string, int, int> private readonly ICallGateSubscriber<string, string, Dictionary<string, string>, string, int, int>
_penumbraSetTemporaryMod; _penumbraSetTemporaryMod;
public IpcManager(DalamudPluginInterface pi) public IpcManager(DalamudPluginInterface pi)
@@ -41,7 +41,7 @@ namespace MareSynchronos.Managers
_penumbraResolvePath = pi.GetIpcSubscriber<string, string, string>("Penumbra.ResolveCharacterPath"); _penumbraResolvePath = pi.GetIpcSubscriber<string, string, string>("Penumbra.ResolveCharacterPath");
_penumbraResolveModDir = pi.GetIpcSubscriber<string>("Penumbra.GetModDirectory"); _penumbraResolveModDir = pi.GetIpcSubscriber<string>("Penumbra.GetModDirectory");
_penumbraRedraw = pi.GetIpcSubscriber<string, int, object>("Penumbra.RedrawObjectByName"); _penumbraRedraw = pi.GetIpcSubscriber<string, int, object>("Penumbra.RedrawObjectByName");
_penumbraReverseResolvePath = pi.GetIpcSubscriber<string, string, string[]>("Penumbra.ReverseResolvePath"); _reverseResolvePlayer = pi.GetIpcSubscriber<string, string[]>("Penumbra.ReverseResolvePlayer");
_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 =
@@ -95,7 +95,7 @@ namespace MareSynchronos.Managers
{ {
try try
{ {
return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=8 }; return _penumbraApiVersion.InvokeFunc() is { Item1: 4, Item2: >=9 };
} }
catch catch
{ {
@@ -186,10 +186,10 @@ namespace MareSynchronos.Managers
return resolvedPath; return resolvedPath;
} }
public string[] PenumbraReverseResolvePath(string path, string characterName) public string[] PenumbraReverseResolvePlayer(string path)
{ {
if (!CheckPenumbraApi()) return new[] { path }; if (!CheckPenumbraApi()) return new[] { path };
var resolvedPaths = _penumbraReverseResolvePath!.InvokeFunc(path, characterName); var resolvedPaths = _reverseResolvePlayer!.InvokeFunc(path);
if (resolvedPaths.Length == 0) if (resolvedPaths.Length == 0)
{ {
resolvedPaths = new[] { path }; resolvedPaths = new[] { path };

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.1.3.0</Version> <Version>0.1.4.0</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

3
MareSynchronos/UI/CompactUI.cs
View File

@@ -174,9 +174,8 @@ namespace MareSynchronos.UI
} }
bool textIsUid = true; bool textIsUid = true;
var playerText = entry.OtherUID;
_showUidForEntry.TryGetValue(entry.OtherUID, out bool showUidInsteadOfName); _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()) if (playerText.IsNullOrEmpty())
{ {