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

fix an issue where animations get removed/added through mod changes don't reload the config

Browse Source
This commit is contained in:
Stanley Dimant
2025-02-10 00:52:03 +01:00
parent aec2a2d1cb
commit a8c2ac3158
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MareSynchronos/FileCache/TransientResourceManager.cs
View File

@@ -93,6 +93,8 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
PlayerConfig.RemovePath(replacement); PlayerConfig.RemovePath(replacement);
} }
// force reload semi transient resources
_semiTransientResources = null;
_configurationService.Save(); _configurationService.Save();
} }
} }
@@ -197,7 +199,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
{ {
foreach (var file in semiset.Where(p => list.Contains(p, StringComparer.OrdinalIgnoreCase))) foreach (var file in semiset.Where(p => list.Contains(p, StringComparer.OrdinalIgnoreCase)))
{ {
Logger.LogTrace("Removing From Transient: {file}", file); Logger.LogTrace("Removing From SemiTransient: {file}", file);
PlayerConfig.RemovePath(file); PlayerConfig.RemovePath(file);
} }
@@ -295,7 +297,10 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
// ignore files that are the same // ignore files that are the same
var replacedGamePath = gamePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase); var replacedGamePath = gamePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase);
if (string.Equals(filePath, replacedGamePath, StringComparison.OrdinalIgnoreCase)) return; if (string.Equals(filePath, replacedGamePath, StringComparison.OrdinalIgnoreCase))
{
return;
}
// ignore files to not handle // ignore files to not handle
var handledTypes = IsTransientRecording ? _fileTypesToHandleRecording : _fileTypesToHandle; var handledTypes = IsTransientRecording ? _fileTypesToHandleRecording : _fileTypesToHandle;
@@ -333,18 +338,22 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
|| SemiTransientResources.SelectMany(k => k.Value).Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase))) || SemiTransientResources.SelectMany(k => k.Value).Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase)))
{ {
if (!IsTransientRecording) if (!IsTransientRecording)
Logger.LogTrace("Not adding {replacedPath} : {filePath}", replacedGamePath, filePath); Logger.LogTrace("Not adding {replacedPath} : {filePath}, Reason: Transient: {contains}, SemiTransient: {contains2}", replacedGamePath, filePath,
value.Contains(replacedGamePath), SemiTransientResources.SelectMany(k => k.Value).Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase)));
alreadyTransient = true; alreadyTransient = true;
} }
else else
{ {
if (!IsTransientRecording) if (!IsTransientRecording)
{ {
value.Add(replacedGamePath); bool isAdded = value.Add(replacedGamePath);
if (isAdded)
{
Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", replacedGamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath); Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", replacedGamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath);
SendTransients(gameObjectAddress); SendTransients(gameObjectAddress);
} }
} }
}
if (owner != null && IsTransientRecording) if (owner != null && IsTransientRecording)
{ {