friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

reenable customize+

Browse Source
This commit is contained in:
Stanley Dimant
2024-07-29 23:04:10 +02:00
parent 801afebfc9
commit fd3b1d3e31
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MareSynchronos/Interop/Ipc/IpcCallerCustomize.cs
View File

@@ -12,11 +12,11 @@ namespace MareSynchronos.Interop.Ipc;
public sealed class IpcCallerCustomize : IIpcCaller public sealed class IpcCallerCustomize : IIpcCaller
{ {
private readonly ICallGateSubscriber<(int, int)> _customizePlusApiVersion; private readonly ICallGateSubscriber<(int, int)> _customizePlusApiVersion;
private readonly ICallGateSubscriber<ICharacter, (int, Guid?)> _customizePlusGetActiveProfile; private readonly ICallGateSubscriber<ushort, (int, Guid?)> _customizePlusGetActiveProfile;
private readonly ICallGateSubscriber<Guid, (int, string?)> _customizePlusGetProfileById; private readonly ICallGateSubscriber<Guid, (int, string?)> _customizePlusGetProfileById;
private readonly ICallGateSubscriber<ICharacter, Guid, object> _customizePlusOnScaleUpdate; private readonly ICallGateSubscriber<ushort, Guid, object> _customizePlusOnScaleUpdate;
private readonly ICallGateSubscriber<ICharacter, int> _customizePlusRevertCharacter; private readonly ICallGateSubscriber<ushort, int> _customizePlusRevertCharacter;
private readonly ICallGateSubscriber<ICharacter, string, (int, Guid?)> _customizePlusSetBodyScaleToCharacter; private readonly ICallGateSubscriber<ushort, string, (int, Guid?)> _customizePlusSetBodyScaleToCharacter;
private readonly ICallGateSubscriber<Guid, int> _customizePlusDeleteByUniqueId; private readonly ICallGateSubscriber<Guid, int> _customizePlusDeleteByUniqueId;
private readonly ILogger<IpcCallerCustomize> _logger; private readonly ILogger<IpcCallerCustomize> _logger;
private readonly DalamudUtilService _dalamudUtil; private readonly DalamudUtilService _dalamudUtil;
@@ -26,11 +26,11 @@ public sealed class IpcCallerCustomize : IIpcCaller
DalamudUtilService dalamudUtil, MareMediator mareMediator) DalamudUtilService dalamudUtil, MareMediator mareMediator)
{ {
_customizePlusApiVersion = dalamudPluginInterface.GetIpcSubscriber<(int, int)>("CustomizePlus.General.GetApiVersion"); _customizePlusApiVersion = dalamudPluginInterface.GetIpcSubscriber<(int, int)>("CustomizePlus.General.GetApiVersion");
_customizePlusGetActiveProfile = dalamudPluginInterface.GetIpcSubscriber<ICharacter, (int, Guid?)>("CustomizePlus.Profile.GetActiveProfileIdOnCharacter"); _customizePlusGetActiveProfile = dalamudPluginInterface.GetIpcSubscriber<ushort, (int, Guid?)>("CustomizePlus.Profile.GetActiveProfileIdOnCharacter");
_customizePlusGetProfileById = dalamudPluginInterface.GetIpcSubscriber<Guid, (int, string?)>("CustomizePlus.Profile.GetByUniqueId"); _customizePlusGetProfileById = dalamudPluginInterface.GetIpcSubscriber<Guid, (int, string?)>("CustomizePlus.Profile.GetByUniqueId");
_customizePlusRevertCharacter = dalamudPluginInterface.GetIpcSubscriber<ICharacter, int>("CustomizePlus.Profile.DeleteTemporaryProfileOnCharacter"); _customizePlusRevertCharacter = dalamudPluginInterface.GetIpcSubscriber<ushort, int>("CustomizePlus.Profile.DeleteTemporaryProfileOnCharacter");
_customizePlusSetBodyScaleToCharacter = dalamudPluginInterface.GetIpcSubscriber<ICharacter, string, (int, Guid?)>("CustomizePlus.Profile.SetTemporaryProfileOnCharacter"); _customizePlusSetBodyScaleToCharacter = dalamudPluginInterface.GetIpcSubscriber<ushort, string, (int, Guid?)>("CustomizePlus.Profile.SetTemporaryProfileOnCharacter");
_customizePlusOnScaleUpdate = dalamudPluginInterface.GetIpcSubscriber<ICharacter, Guid, object>("CustomizePlus.Profile.OnUpdate"); _customizePlusOnScaleUpdate = dalamudPluginInterface.GetIpcSubscriber<ushort, Guid, object>("CustomizePlus.Profile.OnUpdate");
_customizePlusDeleteByUniqueId = dalamudPluginInterface.GetIpcSubscriber<Guid, int>("CustomizePlus.Profile.DeleteTemporaryProfileByUniqueId"); _customizePlusDeleteByUniqueId = dalamudPluginInterface.GetIpcSubscriber<Guid, int>("CustomizePlus.Profile.DeleteTemporaryProfileByUniqueId");
_customizePlusOnScaleUpdate.Subscribe(OnCustomizePlusScaleChange); _customizePlusOnScaleUpdate.Subscribe(OnCustomizePlusScaleChange);
@@ -52,7 +52,7 @@ public sealed class IpcCallerCustomize : IIpcCaller
if (gameObj is ICharacter c) if (gameObj is ICharacter c)
{ {
_logger.LogTrace("CustomizePlus reverting for {chara}", c.Address.ToString("X")); _logger.LogTrace("CustomizePlus reverting for {chara}", c.Address.ToString("X"));
_customizePlusRevertCharacter!.InvokeFunc(c); _customizePlusRevertCharacter!.InvokeFunc(c.ObjectIndex);
} }
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }
@@ -69,12 +69,12 @@ public sealed class IpcCallerCustomize : IIpcCaller
_logger.LogTrace("CustomizePlus applying for {chara}", c.Address.ToString("X")); _logger.LogTrace("CustomizePlus applying for {chara}", c.Address.ToString("X"));
if (scale.IsNullOrEmpty()) if (scale.IsNullOrEmpty())
{ {
_customizePlusRevertCharacter!.InvokeFunc(c); _customizePlusRevertCharacter!.InvokeFunc(c.ObjectIndex);
return null; return null;
} }
else else
{ {
var result = _customizePlusSetBodyScaleToCharacter!.InvokeFunc(c, decodedScale); var result = _customizePlusSetBodyScaleToCharacter!.InvokeFunc(c.ObjectIndex, decodedScale);
return result.Item2; return result.Item2;
} }
} }
@@ -101,7 +101,7 @@ public sealed class IpcCallerCustomize : IIpcCaller
var gameObj = _dalamudUtil.CreateGameObject(character); var gameObj = _dalamudUtil.CreateGameObject(character);
if (gameObj is ICharacter c) if (gameObj is ICharacter c)
{ {
var res = _customizePlusGetActiveProfile.InvokeFunc(c); var res = _customizePlusGetActiveProfile.InvokeFunc(c.ObjectIndex);
_logger.LogTrace("CustomizePlus GetActiveProfile returned {err}", res.Item1); _logger.LogTrace("CustomizePlus GetActiveProfile returned {err}", res.Item1);
if (res.Item1 != 0 || res.Item2 == null) return string.Empty; if (res.Item1 != 0 || res.Item2 == null) return string.Empty;
return _customizePlusGetProfileById.InvokeFunc(res.Item2.Value).Item2; return _customizePlusGetProfileById.InvokeFunc(res.Item2.Value).Item2;
@@ -115,13 +115,10 @@ public sealed class IpcCallerCustomize : IIpcCaller
public void CheckAPI() public void CheckAPI()
{ {
// todo: restore this when it's available again
return;
try try
{ {
var version = _customizePlusApiVersion.InvokeFunc(); var version = _customizePlusApiVersion.InvokeFunc();
APIAvailable = (version.Item1 == 4 && version.Item2 >= 0); APIAvailable = (version.Item1 == 5 && version.Item2 >= 0);
} }
catch catch
{ {
@@ -129,9 +126,10 @@ public sealed class IpcCallerCustomize : IIpcCaller
} }
} }
private void OnCustomizePlusScaleChange(ICharacter c, Guid g) private void OnCustomizePlusScaleChange(ushort c, Guid g)
{ {
_mareMediator.Publish(new CustomizePlusMessage(c.Name.ToString() ?? string.Empty)); var obj = _dalamudUtil.GetCharacterFromObjectTableByIndex(c);
_mareMediator.Publish(new CustomizePlusMessage(obj?.Address ?? null));
} }
public void Dispose() public void Dispose()

5
MareSynchronos/PlayerData/Services/CacheCreationService.cs
View File

@@ -79,9 +79,10 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
if (_isZoning) return; if (_isZoning) return;
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
foreach (var item in _playerRelatedObjects foreach (var item in _playerRelatedObjects
.Where(item => string.IsNullOrEmpty(msg.ProfileName) .Where(item => msg.Address == null
|| string.Equals(item.Value.Name, msg.ProfileName, StringComparison.Ordinal)).Select(k => k.Key)) || item.Value.Address == msg.Address).Select(k => k.Key))
{ {
Logger.LogDebug("Received CustomizePlus change, updating {obj}", item); Logger.LogDebug("Received CustomizePlus change, updating {obj}", item);
await AddPlayerCacheToCreate(item).ConfigureAwait(false); await AddPlayerCacheToCreate(item).ConfigureAwait(false);

2
MareSynchronos/Services/Mediator/Messages.cs
View File

@@ -38,7 +38,7 @@ public record PenumbraRedrawMessage(IntPtr Address, int ObjTblIdx, bool WasReque
public record GlamourerChangedMessage(IntPtr Address) : MessageBase; public record GlamourerChangedMessage(IntPtr Address) : MessageBase;
public record HeelsOffsetMessage : MessageBase; public record HeelsOffsetMessage : MessageBase;
public record PenumbraResourceLoadMessage(IntPtr GameObject, string GamePath, string FilePath) : SameThreadMessage; public record PenumbraResourceLoadMessage(IntPtr GameObject, string GamePath, string FilePath) : SameThreadMessage;
public record CustomizePlusMessage(string ProfileName) : MessageBase; public record CustomizePlusMessage(nint? Address) : MessageBase;
public record HonorificMessage(string NewHonorificTitle) : MessageBase; public record HonorificMessage(string NewHonorificTitle) : MessageBase;
public record MoodlesMessage(IntPtr Address) : MessageBase; public record MoodlesMessage(IntPtr Address) : MessageBase;
public record HonorificReadyMessage : MessageBase; public record HonorificReadyMessage : MessageBase;