diff --git a/MareSynchronos/ClubPenguinSync.json b/MareSynchronos/ClubPenguinSync.json new file mode 100644 index 0000000..85145e8 --- /dev/null +++ b/MareSynchronos/ClubPenguinSync.json @@ -0,0 +1,14 @@ +{ + "Author": "tb", + "Name": "Club Penguin Sync", + "Punchline": "Social modding for everyone!", + "Description": "This plugin will synchronize your Penumbra mods and current Glamourer state with other paired clients automatically.", + "InternalName": "ClubPenguinSync", + "ApplicableVersion": "any", + "Tags": [ + "customization" + ], + "IconUrl": "https://raw.githubusercontent.com/loporrit/MareClient/way4/MareSynchronos/images/icon.png", + "RepoUrl": "https://github.com/Rawrington/nope", + "CanUnloadAsync": true +} diff --git a/MareSynchronos/Interop/Ipc/IpcCallerPetNames.cs b/MareSynchronos/Interop/Ipc/IpcCallerPetNames.cs index a662178..309556e 100644 --- a/MareSynchronos/Interop/Ipc/IpcCallerPetNames.cs +++ b/MareSynchronos/Interop/Ipc/IpcCallerPetNames.cs @@ -30,12 +30,12 @@ public sealed class IpcCallerPetNames : IIpcCaller _dalamudUtil = dalamudUtil; _mareMediator = mareMediator; - _petnamesReady = pi.GetIpcSubscriber("PetRenamer.Ready"); - _petnamesDisposing = pi.GetIpcSubscriber("PetRenamer.Disposing"); + _petnamesReady = pi.GetIpcSubscriber("PetRenamer.OnReady"); + _petnamesDisposing = pi.GetIpcSubscriber("PetRenamer.OnDisposing"); _apiVersion = pi.GetIpcSubscriber<(uint, uint)>("PetRenamer.ApiVersion"); - _enabled = pi.GetIpcSubscriber("PetRenamer.Enabled"); + _enabled = pi.GetIpcSubscriber("PetRenamer.IsEnabled"); - _playerDataChanged = pi.GetIpcSubscriber("PetRenamer.PlayerDataChanged"); + _playerDataChanged = pi.GetIpcSubscriber("PetRenamer.OnPlayerDataChanged"); _getPlayerData = pi.GetIpcSubscriber("PetRenamer.GetPlayerData"); _setPlayerData = pi.GetIpcSubscriber("PetRenamer.SetPlayerData"); _clearPlayerData = pi.GetIpcSubscriber("PetRenamer.ClearPlayerData"); @@ -56,7 +56,7 @@ public sealed class IpcCallerPetNames : IIpcCaller APIAvailable = _enabled?.InvokeFunc() ?? false; if (APIAvailable) { - APIAvailable = _apiVersion?.InvokeFunc() is { Item1: 3, Item2: >= 1 }; + APIAvailable = _apiVersion?.InvokeFunc() is { Item1: 4, Item2: >= 0 }; } } catch diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 01fdec0..4125213 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -2,7 +2,7 @@ ClubPenguinSync - 1.7.0.2 + 1.7.0.5 https://github.com/Rawrington/ClubPenguinSync/ @@ -12,6 +12,10 @@ + + + + diff --git a/MareSynchronos/Services/RemoteConfigurationService.cs b/MareSynchronos/Services/RemoteConfigurationService.cs index c389b63..9416a76 100644 --- a/MareSynchronos/Services/RemoteConfigurationService.cs +++ b/MareSynchronos/Services/RemoteConfigurationService.cs @@ -172,12 +172,6 @@ public sealed class RemoteConfigurationService byte[] pub = Convert.FromBase64String(pubKey); return Ed25519.Verify(sig, msg, pub); } - - private static byte[] SignForMe(string message, ulong ts, byte[] privKey) - { - byte[] msg = [.. BitConverter.GetBytes(ts), .. Encoding.UTF8.GetBytes(message)]; - return Ed25519.Sign(msg, privKey); - } private void LoadConfig(JsonObject jsonDoc) {