From 2424e85b1f2cc09cc302a2be538f468fbfe0f5b5 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Wed, 12 Jan 2022 15:53:49 -0500
Subject: [PATCH] fix: update for 6.0

---
 NominaOcculta/Commands.cs          |  1 +
 NominaOcculta/GameFunctions.cs     | 39 +++++++++++++++++++-----------
 NominaOcculta/NominaOcculta.csproj |  3 ++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/NominaOcculta/Commands.cs b/NominaOcculta/Commands.cs
index 752b947..c05dd28 100755
--- a/NominaOcculta/Commands.cs
+++ b/NominaOcculta/Commands.cs
@@ -44,6 +44,7 @@ namespace NominaOcculta {
                     this.Plugin.ChatGui.PrintError($"Invalid operation \"{first[0]}\", was expecting enable, disable, toggle, or reset.");
                     return;
             }
+
             string? rest = null;
             if (first.Length > 1) {
                 rest = first[1];
diff --git a/NominaOcculta/GameFunctions.cs b/NominaOcculta/GameFunctions.cs
index d9a7067..7e1b367 100755
--- a/NominaOcculta/GameFunctions.cs
+++ b/NominaOcculta/GameFunctions.cs
@@ -3,6 +3,7 @@ using System.Runtime.InteropServices;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
+using Siggingway;
 
 namespace NominaOcculta {
     internal class GameFunctions : IDisposable {
@@ -14,6 +15,8 @@ namespace NominaOcculta {
             internal const string LoadExd = "40 53 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 41 0F B6 D9";
         }
 
+        #region Delegates
+
         private delegate IntPtr GenerateNameDelegate(int race, int clan, int gender, IntPtr first, IntPtr last);
 
         private delegate IntPtr Utf8StringCtorDelegate(IntPtr memory);
@@ -26,14 +29,29 @@ namespace NominaOcculta {
 
         private delegate IntPtr GetExcelModuleDelegate(IntPtr uiModule);
 
-        private Utf8StringCtorDelegate Utf8StringCtor { get; }
-        private Utf8StringDtorDelegate Utf8StringDtor { get; }
-        private GenerateNameDelegate InternalGenerateName { get; }
-        private LoadExdDelegate LoadExd { get; }
+        #endregion
 
-        private Hook<AtkTextNodeSetTextDelegate> AtkTextNodeSetTextHook { get; }
+        #region Functions
+
+        [Signature(Signatures.Utf8StringCtor)]
+        private Utf8StringCtorDelegate Utf8StringCtor { get; init; } = null!;
+
+        [Signature(Signatures.Utf8StringDtor)]
+        private Utf8StringDtorDelegate Utf8StringDtor { get; init; } = null!;
+
+        [Signature(Signatures.GenerateName)]
+        private GenerateNameDelegate InternalGenerateName { get; init; } = null!;
+
+        [Signature(Signatures.LoadExd)]
+        private LoadExdDelegate LoadExd { get; init; } = null!;
+
+        #endregion
+
+        [Signature(Signatures.AtkTextNodeSetText, DetourName = nameof(AtkTextNodeSetTextDetour))]
+        private Hook<AtkTextNodeSetTextDelegate> AtkTextNodeSetTextHook { get; init; } = null!;
 
         internal delegate void AtkTextNodeSetTextEventDelegate(IntPtr node, IntPtr text, ref SeString? overwrite);
+
         internal event AtkTextNodeSetTextEventDelegate? AtkTextNodeSetText;
 
         private Plugin Plugin { get; }
@@ -44,15 +62,8 @@ namespace NominaOcculta {
         internal GameFunctions(Plugin plugin) {
             this.Plugin = plugin;
 
-            this.Utf8StringCtor = Marshal.GetDelegateForFunctionPointer<Utf8StringCtorDelegate>(this.Plugin.SigScanner.ScanText(Signatures.Utf8StringCtor));
-            this.Utf8StringDtor = Marshal.GetDelegateForFunctionPointer<Utf8StringDtorDelegate>(this.Plugin.SigScanner.ScanText(Signatures.Utf8StringDtor));
-            this.InternalGenerateName = Marshal.GetDelegateForFunctionPointer<GenerateNameDelegate>(this.Plugin.SigScanner.ScanText(Signatures.GenerateName));
-            this.LoadExd = Marshal.GetDelegateForFunctionPointer<LoadExdDelegate>(this.Plugin.SigScanner.ScanText(Signatures.LoadExd));
+            Siggingway.Siggingway.Initialise(this.Plugin.SigScanner, this);
 
-            this.AtkTextNodeSetTextHook = new Hook<AtkTextNodeSetTextDelegate>(
-                this.Plugin.SigScanner.ScanText(Signatures.AtkTextNodeSetText),
-                this.OnAtkTextNodeSetText
-            );
             this.AtkTextNodeSetTextHook.Enable();
 
             this.First = Marshal.AllocHGlobal(128);
@@ -70,7 +81,7 @@ namespace NominaOcculta {
             this.AtkTextNodeSetTextHook.Dispose();
         }
 
-        private unsafe void OnAtkTextNodeSetText(IntPtr node, IntPtr text) {
+        private unsafe void AtkTextNodeSetTextDetour(IntPtr node, IntPtr text) {
             SeString? overwrite = null;
             this.AtkTextNodeSetText?.Invoke(node, text, ref overwrite);
 
diff --git a/NominaOcculta/NominaOcculta.csproj b/NominaOcculta/NominaOcculta.csproj
index babb509..e065a20 100755
--- a/NominaOcculta/NominaOcculta.csproj
+++ b/NominaOcculta/NominaOcculta.csproj
@@ -44,7 +44,8 @@
     <ItemGroup>
         <PackageReference Include="DalamudLinter" Version="1.0.3"/>
         <PackageReference Include="DalamudPackager" Version="2.1.5"/>
-        <PackageReference Include="XivCommon" Version="4.0.0-alpha.2"/>
+        <PackageReference Include="Siggingway" Version="1.1.0"/>
+        <PackageReference Include="XivCommon" Version="4.0.0"/>
     </ItemGroup>
 
 </Project>