From 9ccbe1064245156d6ff7fa9d8982744da85a2d49 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Tue, 10 Jan 2023 09:42:59 +0100
Subject: [PATCH] Fix signature and CS changes.

---
 Penumbra.GameData/Signatures.cs                 | 2 +-
 Penumbra/Interop/Loader/ResourceLoader.Debug.cs | 1 +
 Penumbra/Interop/Loader/ResourceLoader.cs       | 4 ++--
 Penumbra/UI/ConfigWindow.ResourceTab.cs         | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Penumbra.GameData/Signatures.cs b/Penumbra.GameData/Signatures.cs
index 9f13bdf1..aae686dc 100644
--- a/Penumbra.GameData/Signatures.cs
+++ b/Penumbra.GameData/Signatures.cs
@@ -43,7 +43,7 @@ public static class Sigs
         "E8 ?? ?? ?? ?? 40 F6 C7 01 74 3A 40 F6 C7 04 75 27 48 85 DB 74 2F 48 8B 05 ?? ?? ?? ?? 48 8B D3 48 8B 48 30";
 
     public const string EnableDraw   = "E8 ?? ?? ?? ?? 48 8B 8B ?? ?? ?? ?? 48 85 C9 74 33 45 33 C0";
-    public const string WeaponReload = "E8 ?? ?? ?? ?? 44 8B 9F";
+    public const string WeaponReload = "E8 ?? ?? ?? ?? 33 DB BE";
 
     // PathResolver.Meta
     public const string UpdateModel       = "48 8B ?? 56 48 83 ?? ?? ?? B9";
diff --git a/Penumbra/Interop/Loader/ResourceLoader.Debug.cs b/Penumbra/Interop/Loader/ResourceLoader.Debug.cs
index 6791f5be..a168299e 100644
--- a/Penumbra/Interop/Loader/ResourceLoader.Debug.cs
+++ b/Penumbra/Interop/Loader/ResourceLoader.Debug.cs
@@ -5,6 +5,7 @@ using Dalamud.Hooking;
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.System.Resource;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
+using FFXIVClientStructs.Interop;
 using FFXIVClientStructs.STD;
 using Penumbra.Collections;
 using Penumbra.GameData;
diff --git a/Penumbra/Interop/Loader/ResourceLoader.cs b/Penumbra/Interop/Loader/ResourceLoader.cs
index ac00d62d..9a929eaf 100644
--- a/Penumbra/Interop/Loader/ResourceLoader.cs
+++ b/Penumbra/Interop/Loader/ResourceLoader.cs
@@ -106,10 +106,10 @@ public unsafe partial class ResourceLoader : IDisposable
     {
         SignatureHelper.Initialise( this );
         _decRefHook = Hook< ResourceHandleDecRef >.FromAddress(
-            ( IntPtr )FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle.fpDecRef,
+            ( IntPtr )FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle.MemberFunctionPointers.DecRef,
             ResourceHandleDecRefDetour );
         _incRefHook = Hook< ResourceHandleDestructor >.FromAddress(
-            ( IntPtr )FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle.fpIncRef, ResourceHandleIncRefDetour );
+            ( IntPtr )FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle.MemberFunctionPointers.IncRef, ResourceHandleIncRefDetour );
     }
 
     // Event fired whenever a resource is requested.
diff --git a/Penumbra/UI/ConfigWindow.ResourceTab.cs b/Penumbra/UI/ConfigWindow.ResourceTab.cs
index ad128ee9..ce6bf442 100644
--- a/Penumbra/UI/ConfigWindow.ResourceTab.cs
+++ b/Penumbra/UI/ConfigWindow.ResourceTab.cs
@@ -4,6 +4,7 @@ using System.Numerics;
 using Dalamud.Interface;
 using FFXIVClientStructs.FFXIV.Client.System.Resource;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
+using FFXIVClientStructs.Interop;
 using FFXIVClientStructs.STD;
 using ImGuiNET;
 using OtterGui;