From f2bdaf1b490204de39f668707b3f6d319f5e0eb9 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Fri, 22 Nov 2024 00:35:17 +0100
Subject: [PATCH] Circumvent  rsf not existing.

---
 Penumbra.GameData                             |  2 +-
 Penumbra/Interop/Hooks/HookSettings.cs        |  1 +
 .../Hooks/ResourceLoading/TexMdlService.cs    | 27 ++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Penumbra.GameData b/Penumbra.GameData
index c855c17c..07d18f7f 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit c855c17cffd7d270c3f013e01767cd052c24c462
+Subproject commit 07d18f7f7218811956e6663592e53c4145f2d862
diff --git a/Penumbra/Interop/Hooks/HookSettings.cs b/Penumbra/Interop/Hooks/HookSettings.cs
index a1dd374f..3deeb107 100644
--- a/Penumbra/Interop/Hooks/HookSettings.cs
+++ b/Penumbra/Interop/Hooks/HookSettings.cs
@@ -96,6 +96,7 @@ public struct ResourceLoadingHooks
         public bool CheckFileState;
         public bool TexResourceHandleOnLoad;
         public bool LoadMdlFileExtern;
+        public bool SoundOnLoad;
     }
 
     public struct ResourceHooks
diff --git a/Penumbra/Interop/Hooks/ResourceLoading/TexMdlService.cs b/Penumbra/Interop/Hooks/ResourceLoading/TexMdlService.cs
index 9c17e0cf..b43f1ed5 100644
--- a/Penumbra/Interop/Hooks/ResourceLoading/TexMdlService.cs
+++ b/Penumbra/Interop/Hooks/ResourceLoading/TexMdlService.cs
@@ -7,6 +7,7 @@
 using Penumbra.Interop.Structs;
 using Penumbra.String.Classes;
 using ResourceHandle = FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle;
+using TextureResourceHandle = Penumbra.Interop.Structs.TextureResourceHandle;
 
 namespace Penumbra.Interop.Hooks.ResourceLoading;
 
@@ -52,7 +53,8 @@ public TexMdlScdService(IGameInteropProvider interop)
             _loadMdlFileExternHook.Enable();
         if (!HookOverrides.Instance.ResourceLoading.TexResourceHandleOnLoad)
             _textureOnLoadHook.Enable();
-        _soundOnLoadHook.Enable();
+        if (!HookOverrides.Instance.ResourceLoading.SoundOnLoad)
+            _soundOnLoadHook.Enable();
     }
 
     /// <summary> Add CRC64 if the given file is a model or texture file and has an associated path. </summary>
@@ -80,6 +82,7 @@ public void Dispose()
     /// i.e. CRC32 of filename in the lower bytes, CRC32 of parent path in the upper bytes.
     /// </summary>
     private readonly Dictionary<ulong, ResourceType> _customFileCrc = [];
+
     public IReadOnlyDictionary<ulong, ResourceType> CustomCache
         => _customFileCrc;
 
@@ -98,15 +101,31 @@ public IReadOnlyDictionary<ulong, ResourceType> CustomCache
 
     private delegate byte SoundOnLoadDelegate(ResourceHandle* handle, SeFileDescriptor* descriptor, byte unk);
 
-    [Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 30 8B 79 ?? 48 8B DA 8B D7")]
+    [Signature(Sigs.LoadScdFileLocal)]
     private readonly delegate* unmanaged<ResourceHandle*, SeFileDescriptor*, byte, byte> _loadScdFileLocal = null!;
 
-    [Signature("40 56 57 41 54 48 81 EC 90 00 00 00 80 3A 0B 45 0F B6 E0 48 8B F2", DetourName = nameof(OnScdLoadDetour))]
+    [Signature(Sigs.SoundOnLoad, DetourName = nameof(OnScdLoadDetour))]
     private readonly Hook<SoundOnLoadDelegate> _soundOnLoadHook = null!;
 
+    [Signature(Sigs.RsfServiceAddress, ScanType = ScanType.StaticAddress)]
+    private readonly nint* _rsfService = null;
+
     private byte OnScdLoadDetour(ResourceHandle* handle, SeFileDescriptor* descriptor, byte unk)
     {
-        var ret = _soundOnLoadHook.Original(handle, descriptor, unk);
+        byte ret;
+        if (*_rsfService == nint.Zero)
+        {
+            Penumbra.Log.Debug(
+                $"Resource load of {handle->FileName} before FFXIV RSF-service was instantiated, workaround by setting pointer.");
+            *_rsfService = 1;
+            ret          = _soundOnLoadHook.Original(handle, descriptor, unk);
+            *_rsfService = nint.Zero;
+        }
+        else
+        {
+            ret = _soundOnLoadHook.Original(handle, descriptor, unk);
+        }
+
         if (!_scdReturnData.Value)
             return ret;