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

minion/pet/companion/mount rework

Browse Source
This commit is contained in:
Stanley Dimant
2022-07-22 02:11:35 +02:00
parent 75885473ad
commit 9d9aac6bb3
14 changed files with 403 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -8,9 +8,9 @@ using Dalamud.Logging;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using MareSynchronos.API;
using MareSynchronos.FileCacheDB;
using MareSynchronos.Interop;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using MareSynchronos.WebAPI.Utils;
using Penumbra.GameData.ByteString;
using Penumbra.GameData.Structs;
@@ -42,24 +42,23 @@ public class CachedPlayer
}
private bool _isDisposed = false;
private CancellationTokenSource? _downloadCancellationTokenSource;
private Dictionary<ObjectKind, CancellationTokenSource?> _downloadCancellationTokenSources = new();
private string _lastGlamourerData = string.Empty;
private string _originalGlamourerData = string.Empty;
public PlayerCharacter? PlayerCharacter { get; set; }
public Dalamud.Game.ClientState.Objects.Types.Character? PlayerCharacter { get; set; }
public string? PlayerName { get; private set; }
public string PlayerNameHash { get; }
private string _lastAppliedEquipmentHash = string.Empty;
public bool RequestedPenumbraRedraw { get; set; }
public bool WasVisible { get; private set; }
private readonly Dictionary<string, CharacterCacheDto> _cache = new();
private readonly Dictionary<ObjectKind, CharacterCacheDto> _cache = new();
private CharacterEquipment? _currentCharacterEquipment;
@@ -69,46 +68,32 @@ public class CachedPlayer
Logger.Debug("Checking for files to download for player " + PlayerName);
Logger.Debug("Hash for data is " + characterData.Hash);
if (!_cache.ContainsKey(characterData.Hash))
if (!_cache.ContainsKey(characterData.ObjectKind))
{
_cache.Add(characterData.ObjectKind, new());
_downloadCancellationTokenSources.Add(characterData.ObjectKind, null);
}
_cache.TryGetValue(characterData.ObjectKind, out var cachedDto);
if ((cachedDto?.Hash ?? string.Empty) != characterData.Hash)
{
Logger.Debug("Received total " + characterData.FileReplacements.Count + " file replacement data");
_cache[characterData.Hash] = characterData;
_cache[characterData.ObjectKind] = characterData;
}
else
{
Logger.Debug("Had valid local cache for " + PlayerName);
}
_lastAppliedEquipmentHash = characterData.Hash;
DownloadAndApplyCharacter();
DownloadAndApplyCharacter(characterData.ObjectKind);
}
private void ApiControllerOnCharacterReceived(object? sender, CharacterReceivedEventArgs e)
private void DownloadAndApplyCharacter(ObjectKind objectKind)
{
if (string.IsNullOrEmpty(PlayerName) || e.CharacterNameHash != PlayerNameHash) return;
Logger.Debug("Received data for " + this);
Logger.Debug("Checking for files to download for player " + PlayerName);
Logger.Debug("Hash for data is " + e.CharacterData.Hash);
if (!_cache.ContainsKey(e.CharacterData.Hash))
{
Logger.Debug("Received total " + e.CharacterData.FileReplacements.Count + " file replacement data");
_cache[e.CharacterData.Hash] = e.CharacterData;
}
else
{
Logger.Debug("Had valid local cache for " + PlayerName);
}
_lastAppliedEquipmentHash = e.CharacterData.Hash;
DownloadAndApplyCharacter();
}
private void DownloadAndApplyCharacter()
{
_downloadCancellationTokenSource?.Cancel();
_downloadCancellationTokenSource = new CancellationTokenSource();
var downloadToken = _downloadCancellationTokenSource.Token;
_downloadCancellationTokenSources[objectKind]?.Cancel();
_downloadCancellationTokenSources[objectKind] = new CancellationTokenSource();
var downloadToken = _downloadCancellationTokenSources[objectKind]!.Token;
var downloadId = _apiController.GetDownloadId();
Task.Run(async () =>
{
@@ -116,7 +101,7 @@ public class CachedPlayer
Dictionary<string, string> moddedPaths;
int attempts = 0;
while ((toDownloadReplacements = TryCalculateModdedDictionary(_cache[_lastAppliedEquipmentHash], out moddedPaths)).Count > 0 && attempts++ <= 10)
while ((toDownloadReplacements = TryCalculateModdedDictionary(out moddedPaths)).Count > 0 && attempts++ <= 10)
{
Logger.Debug("Downloading missing files for player " + PlayerName);
await _apiController.DownloadFiles(downloadId, toDownloadReplacements, downloadToken);
@@ -126,7 +111,7 @@ public class CachedPlayer
return;
}
if ((TryCalculateModdedDictionary(_cache[_lastAppliedEquipmentHash], out moddedPaths)).All(c => _apiController.ForbiddenTransfers.Any(f => f.Hash == c.Hash)))
if ((TryCalculateModdedDictionary(out moddedPaths)).All(c => _apiController.ForbiddenTransfers.Any(f => f.Hash == c.Hash)))
{
break;
}
@@ -142,7 +127,7 @@ public class CachedPlayer
}
}
ApplyCharacterData(_cache[_lastAppliedEquipmentHash], moddedPaths);
ApplyCharacterData(objectKind, moddedPaths);
}, downloadToken).ContinueWith(task =>
{
if (!task.IsCanceled) return;
@@ -152,22 +137,21 @@ public class CachedPlayer
});
}
private List<FileReplacementDto> TryCalculateModdedDictionary(CharacterCacheDto cache,
out Dictionary<string, string> moddedDictionary)
private List<FileReplacementDto> TryCalculateModdedDictionary(out Dictionary<string, string> moddedDictionary)
{
List<FileReplacementDto> missingFiles = new();
moddedDictionary = new Dictionary<string, string>();
try
{
using var db = new FileCacheContext();
foreach (var item in cache.FileReplacements)
foreach (var item in _cache.SelectMany(c => c.Value.FileReplacements).ToList())
{
foreach (var gamePath in item.GamePaths)
{
var fileCache = db.FileCaches.FirstOrDefault(f => f.Hash == item.Hash);
if (fileCache != null)
{
moddedDictionary.Add(gamePath, fileCache.Filepath);
moddedDictionary[gamePath] = fileCache.Filepath;
}
else
{
@@ -184,24 +168,57 @@ public class CachedPlayer
return missingFiles;
}
private unsafe void ApplyCharacterData(CharacterCacheDto cache, Dictionary<string, string> moddedPaths)
private unsafe void ApplyCharacterData(ObjectKind objectKind, Dictionary<string, string> moddedPaths)
{
if (PlayerCharacter is null) return;
var cache = _cache[objectKind];
_ipcManager.PenumbraRemoveTemporaryCollection(PlayerName!);
var tempCollection = _ipcManager.PenumbraCreateTemporaryCollection(PlayerName!);
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerCharacter!.Address);
RequestedPenumbraRedraw = true;
Logger.Debug(
$"Request Redraw for {PlayerName}");
_ipcManager.PenumbraSetTemporaryMods(tempCollection, moddedPaths, cache.ManipulationData);
_ipcManager.GlamourerApplyAll(cache.GlamourerData, PlayerCharacter!);
var minion = ((Character*)PlayerCharacter.Address)->CompanionObject;
if (minion != null)
_ipcManager.PenumbraSetTemporaryMods(tempCollection, moddedPaths, _cache.First().Value.ManipulationData);
if (objectKind == ObjectKind.Player)
{
var compName = new Utf8String(minion->Character.GameObject.GetName()).ToString();
if (compName != null)
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerCharacter!.Address);
RequestedPenumbraRedraw = true;
Logger.Debug(
$"Request Redraw for {PlayerName}");
_ipcManager.GlamourerApplyAll(cache.GlamourerData, PlayerCharacter!);
}
else if (objectKind == ObjectKind.Minion)
{
var minion = ((Character*)PlayerCharacter.Address)->CompanionObject;
if (minion != null)
{
_ipcManager.PenumbraRedraw(compName);
Logger.Debug($"Request Redraw for Minion");
_ipcManager.GlamourerApplyAll(cache.GlamourerData, obj: (IntPtr)minion);
}
}
else if (objectKind == ObjectKind.Pet)
{
var pet = _dalamudUtil.GetPet(PlayerCharacter.Address);
if (pet != IntPtr.Zero)
{
Logger.Debug("Request Redraw for Pet");
_ipcManager.GlamourerApplyAll(cache.GlamourerData, pet);
}
}
else if (objectKind == ObjectKind.Companion)
{
var companion = _dalamudUtil.GetCompanion(PlayerCharacter.Address);
if (companion != IntPtr.Zero)
{
Logger.Debug("Request Redraw for Companion");
_ipcManager.GlamourerApplyAll(cache.GlamourerData, companion);
}
}
else if (objectKind == ObjectKind.Mount)
{
var mount = ((CharaExt*)PlayerCharacter.Address)->Mount;
if (mount != null)
{
Logger.Debug($"Request Redraw for Mount");
_ipcManager.PenumbraRedraw((IntPtr)mount);
}
}
}
@@ -217,10 +234,11 @@ public class CachedPlayer
Logger.Verbose("Restoring state for " + PlayerName);
_dalamudUtil.FrameworkUpdate -= DalamudUtilOnFrameworkUpdate;
_ipcManager.PenumbraRedrawEvent -= IpcManagerOnPenumbraRedrawEvent;
_apiController.CharacterReceived -= ApiControllerOnCharacterReceived;
_downloadCancellationTokenSource?.Cancel();
_downloadCancellationTokenSource?.Dispose();
_downloadCancellationTokenSource = null;
foreach (var token in _downloadCancellationTokenSources)
{
token.Value?.Cancel();
token.Value?.Dispose();
}
_ipcManager.PenumbraRemoveTemporaryCollection(PlayerName);
if (PlayerCharacter != null && PlayerCharacter.IsValid())
{
@@ -283,9 +301,9 @@ public class CachedPlayer
private Task? _penumbraRedrawEventTask;
private void IpcManagerOnPenumbraRedrawEvent(object? sender, EventArgs e)
private void IpcManagerOnPenumbraRedrawEvent(IntPtr address, int idx)
{
var player = _dalamudUtil.GetPlayerCharacterFromObjectTableByIndex((int)sender!);
var player = _dalamudUtil.GetCharacterFromObjectTableByIndex(idx);
if (player == null || player.Name.ToString() != PlayerName) return;
if (!_penumbraRedrawEventTask?.IsCompleted ?? false) return;
@@ -294,10 +312,11 @@ public class CachedPlayer
PlayerCharacter = player;
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerCharacter.Address);
if (RequestedPenumbraRedraw == false && !string.IsNullOrEmpty(_lastAppliedEquipmentHash))
if (RequestedPenumbraRedraw == false)
{
Logger.Warn("Unauthorized character change detected");
DownloadAndApplyCharacter();
// todo for everything I guess
DownloadAndApplyCharacter(ObjectKind.Player);
}
else
{