ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-16 05:34:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not replace paths when mods are not enabled.

Browse source
This commit is contained in:
Ottermandias 2024-07-28 01:08:58 +02:00
parent 3ffe6151ff
commit f143601aa0
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Penumbra/Interop/Hooks/ResourceLoading/ResourceLoader.cs
View file

@ -17,15 +17,17 @@ public unsafe class ResourceLoader : IDisposable, IService
private readonly FileReadService _fileReadService; private readonly FileReadService _fileReadService;
private readonly TexMdlService _texMdlService; private readonly TexMdlService _texMdlService;
private readonly PapHandler _papHandler; private readonly PapHandler _papHandler;
private readonly Configuration _config;
private ResolveData _resolvedData = ResolveData.Invalid; private ResolveData _resolvedData = ResolveData.Invalid;
public event Action<Utf8GamePath, FullPath?, ResolveData>? PapRequested; public event Action<Utf8GamePath, FullPath?, ResolveData>? PapRequested;
public ResourceLoader(ResourceService resources, FileReadService fileReadService, TexMdlService texMdlService) public ResourceLoader(ResourceService resources, FileReadService fileReadService, TexMdlService texMdlService, Configuration config)
{ {
_resources = resources; _resources = resources;
_fileReadService = fileReadService; _fileReadService = fileReadService;
_texMdlService = texMdlService; _texMdlService = texMdlService;
_config = config;
ResetResolvePath(); ResetResolvePath();
_resources.ResourceRequested += ResourceHandler; _resources.ResourceRequested += ResourceHandler;
@ -39,7 +41,7 @@ public unsafe class ResourceLoader : IDisposable, IService
private int PapResourceHandler(void* self, byte* path, int length) private int PapResourceHandler(void* self, byte* path, int length)
{ {
if (!Utf8GamePath.FromPointer(path, out var gamePath)) if (!_config.EnableMods || !Utf8GamePath.FromPointer(path, out var gamePath))
return length; return length;
var (resolvedPath, data) = _incMode.Value var (resolvedPath, data) = _incMode.Value
@ -119,7 +121,7 @@ public unsafe class ResourceLoader : IDisposable, IService
private void ResourceHandler(ref ResourceCategory category, ref ResourceType type, ref int hash, ref Utf8GamePath path, private void ResourceHandler(ref ResourceCategory category, ref ResourceType type, ref int hash, ref Utf8GamePath path,
Utf8GamePath original, GetResourceParameters* parameters, ref bool sync, ref ResourceHandle* returnValue) Utf8GamePath original, GetResourceParameters* parameters, ref bool sync, ref ResourceHandle* returnValue)
{ {
if (returnValue != null) if (!_config.EnableMods || returnValue != null)
return; return;
CompareHash(ComputeHash(path.Path, parameters), hash, path); CompareHash(ComputeHash(path.Path, parameters), hash, path);