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

Re-enable / update Customize+

Browse Source
This commit is contained in:
Loporrit
2024-07-29 22:14:10 +00:00
parent 2344af7fc5
commit 5bea4cf7e9
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MareSynchronos/Interop/IpcManager.cs
View File

@@ -21,11 +21,11 @@ namespace MareSynchronos.Interop;
public sealed class IpcManager : DisposableMediatorSubscriberBase public sealed class IpcManager : DisposableMediatorSubscriberBase
{ {
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 IDalamudPluginInterface _pi; private readonly IDalamudPluginInterface _pi;
private readonly DalamudUtilService _dalamudUtil; private readonly DalamudUtilService _dalamudUtil;
@@ -163,11 +163,11 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
_heelsOffsetUpdate.Subscribe(HeelsOffsetChange); _heelsOffsetUpdate.Subscribe(HeelsOffsetChange);
_customizePlusApiVersion = pi.GetIpcSubscriber<(int, int)>("CustomizePlus.General.GetApiVersion"); _customizePlusApiVersion = pi.GetIpcSubscriber<(int, int)>("CustomizePlus.General.GetApiVersion");
_customizePlusGetActiveProfile = pi.GetIpcSubscriber<ICharacter, (int, Guid?)>("CustomizePlus.Profile.GetActiveProfileIdOnCharacter"); _customizePlusGetActiveProfile = pi.GetIpcSubscriber<ushort, (int, Guid?)>("CustomizePlus.Profile.GetActiveProfileIdOnCharacter");
_customizePlusGetProfileById = pi.GetIpcSubscriber<Guid, (int, string?)>("CustomizePlus.Profile.GetByUniqueId"); _customizePlusGetProfileById = pi.GetIpcSubscriber<Guid, (int, string?)>("CustomizePlus.Profile.GetByUniqueId");
_customizePlusRevertCharacter = pi.GetIpcSubscriber<ICharacter, int>("CustomizePlus.Profile.DeleteTemporaryProfileOnCharacter"); _customizePlusRevertCharacter = pi.GetIpcSubscriber<ushort, int>("CustomizePlus.Profile.DeleteTemporaryProfileOnCharacter");
_customizePlusSetBodyScaleToCharacter = pi.GetIpcSubscriber<ICharacter, string, (int, Guid?)>("CustomizePlus.Profile.SetTemporaryProfileOnCharacter"); _customizePlusSetBodyScaleToCharacter = pi.GetIpcSubscriber<ushort, string, (int, Guid?)>("CustomizePlus.Profile.SetTemporaryProfileOnCharacter");
_customizePlusOnScaleUpdate = pi.GetIpcSubscriber<ICharacter, Guid, object>("CustomizePlus.Profile.OnUpdate"); _customizePlusOnScaleUpdate = pi.GetIpcSubscriber<ushort, Guid, object>("CustomizePlus.Profile.OnUpdate");
_customizePlusDeleteByUniqueId = pi.GetIpcSubscriber<Guid, int>("CustomizePlus.Profile.DeleteTemporaryProfileByUniqueId"); _customizePlusDeleteByUniqueId = pi.GetIpcSubscriber<Guid, int>("CustomizePlus.Profile.DeleteTemporaryProfileByUniqueId");
_customizePlusOnScaleUpdate.Subscribe(OnCustomizePlusScaleChange); _customizePlusOnScaleUpdate.Subscribe(OnCustomizePlusScaleChange);
@@ -234,7 +234,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
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);
} }
@@ -260,12 +260,12 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
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;
} }
} }
@@ -282,7 +282,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
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;
@@ -718,11 +718,10 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
private bool CheckCustomizePlusApiInternal() private bool CheckCustomizePlusApiInternal()
{ {
return false;
try try
{ {
var version = _customizePlusApiVersion.InvokeFunc(); var version = _customizePlusApiVersion.InvokeFunc();
if (version.Item1 == 4 && version.Item2 >= 0) return true; if (version.Item1 == 5 && version.Item2 >= 0) return true;
return false; return false;
} }
catch catch
@@ -849,9 +848,10 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
Mediator.Publish(new HeelsOffsetMessage()); Mediator.Publish(new HeelsOffsetMessage());
} }
private void OnCustomizePlusScaleChange(ICharacter c, Guid g) private void OnCustomizePlusScaleChange(ushort c, Guid g)
{ {
Mediator.Publish(new CustomizePlusMessage(c.Name.ToString() ?? string.Empty)); var obj = _dalamudUtil.GetCharacterFromObjectTableByIndex(c);
Mediator.Publish(new CustomizePlusMessage(obj?.Name.ToString() ?? string.Empty));
} }
private void OnHonorificDisposing() private void OnHonorificDisposing()

2
MareSynchronos/UI/UISharedService.cs
View File

@@ -784,7 +784,6 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
AttachToolTip($"SimpleHeels is " + (_heelsExists ? "available and up to date." : "unavailable or not up to date.")); AttachToolTip($"SimpleHeels is " + (_heelsExists ? "available and up to date." : "unavailable or not up to date."));
ImGui.Spacing(); ImGui.Spacing();
#if false
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted("Customize+"); ImGui.TextUnformatted("Customize+");
ImGui.SameLine(); ImGui.SameLine();
@@ -792,7 +791,6 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
ImGui.SameLine(); ImGui.SameLine();
AttachToolTip($"Customize+ is " + (_customizePlusExists ? "available and up to date." : "unavailable or not up to date.")); AttachToolTip($"Customize+ is " + (_customizePlusExists ? "available and up to date." : "unavailable or not up to date."));
ImGui.Spacing(); ImGui.Spacing();
#endif
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted("Honorific"); ImGui.TextUnformatted("Honorific");