ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-12 22:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/Penumbra-Sync/client

Browse source
This commit is contained in:
Stanley Dimant 2024-09-13 00:19:47 +02:00
commit e35ed1b529
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MareSynchronos/Interop/Ipc/IpcCallerPetNames.cs
View file

@ -68,6 +68,7 @@ public sealed class IpcCallerPetNames : IIpcCaller
private void OnPetNicknamesReady() private void OnPetNicknamesReady()
{ {
CheckAPI(); CheckAPI();
_mareMediator.Publish(new PetNamesReadyMessage());
} }
private void OnPetNicknamesDispose() private void OnPetNicknamesDispose()

7
MareSynchronos/PlayerData/Handlers/PairHandler.cs
View file

@ -564,6 +564,13 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
await _ipcManager.Honorific.SetTitleAsync(PlayerCharacter, _cachedData.HonorificData).ConfigureAwait(false); await _ipcManager.Honorific.SetTitleAsync(PlayerCharacter, _cachedData.HonorificData).ConfigureAwait(false);
}); });
Mediator.Subscribe<PetNamesReadyMessage>(this, async (_) =>
{
if (string.IsNullOrEmpty(_cachedData?.PetNamesData)) return;
Logger.LogTrace("Reapplying Pet Names data for {this}", this);
await _ipcManager.PetNames.SetPlayerData(PlayerCharacter, _cachedData.PetNamesData).ConfigureAwait(false);
});
_ipcManager.Penumbra.AssignTemporaryCollectionAsync(Logger, _penumbraCollection, _charaHandler.GetGameObject()!.ObjectIndex).GetAwaiter().GetResult(); _ipcManager.Penumbra.AssignTemporaryCollectionAsync(Logger, _penumbraCollection, _charaHandler.GetGameObject()!.ObjectIndex).GetAwaiter().GetResult();
} }

1
MareSynchronos/Services/Mediator/Messages.cs
View file

@ -41,6 +41,7 @@ public record PenumbraResourceLoadMessage(IntPtr GameObject, string GamePath, st
public record CustomizePlusMessage(nint? Address) : 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 PetNamesReadyMessage : MessageBase;
public record PetNamesMessage(string PetNicknamesData) : MessageBase; public record PetNamesMessage(string PetNicknamesData) : MessageBase;
public record HonorificReadyMessage : MessageBase; public record HonorificReadyMessage : MessageBase;
public record PlayerChangedMessage(CharacterData Data) : MessageBase; public record PlayerChangedMessage(CharacterData Data) : MessageBase;