From 24e09bbf5ac8be13bf95244b09f355bfc7323a34 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Wed, 5 Jan 2022 15:09:50 -0500
Subject: [PATCH] fix: update for 6.0

---
 NominaOcculta/GameFunctions.cs     | 5 +++--
 NominaOcculta/NominaOcculta.csproj | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/NominaOcculta/GameFunctions.cs b/NominaOcculta/GameFunctions.cs
index 6fad9bc..d9a7067 100755
--- a/NominaOcculta/GameFunctions.cs
+++ b/NominaOcculta/GameFunctions.cs
@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
 
 namespace NominaOcculta {
     internal class GameFunctions : IDisposable {
@@ -9,7 +10,7 @@ namespace NominaOcculta {
             internal const string GenerateName = "E8 ?? ?? ?? ?? 48 8D 8B ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 85 C0 74 1B 48 8D 8B ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8B 8B ?? ?? ?? ?? 48 8B D0 E8 ?? ?? ?? ?? 48 8B CB 48 8B 7C 24";
             internal const string Utf8StringCtor = "E8 ?? ?? ?? ?? 44 2B F7";
             internal const string Utf8StringDtor = "80 79 21 00 75 12";
-            internal const string AtkTextNodeSetText = "E8 ?? ?? ?? ?? 49 8B FC";
+            internal const string AtkTextNodeSetText = "E8 ?? ?? ?? ?? 8D 4E 32";
             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";
         }
 
@@ -100,7 +101,7 @@ namespace NominaOcculta {
         }
 
         public unsafe void LoadSheet(string name) {
-            var ui = this.Plugin.Common.Functions.GetUiModule();
+            var ui = (IntPtr) Framework.Instance()->GetUiModule();
             var getExcelModulePtr = *(*(IntPtr**) ui + 5);
             var getExcelModule = Marshal.GetDelegateForFunctionPointer<GetExcelModuleDelegate>(getExcelModulePtr);
             var excelModule = getExcelModule(ui);
diff --git a/NominaOcculta/NominaOcculta.csproj b/NominaOcculta/NominaOcculta.csproj
index df49248..4f1e3ef 100755
--- a/NominaOcculta/NominaOcculta.csproj
+++ b/NominaOcculta/NominaOcculta.csproj
@@ -23,6 +23,10 @@
             <HintPath>$(Dalamud)\Dalamud.dll</HintPath>
             <Private>false</Private>
         </Reference>
+        <Reference Include="FFXIVClientStructs">
+            <HintPath>$(Dalamud)\FFXIVClientStructs.dll</HintPath>
+            <Private>false</Private>
+        </Reference>
         <Reference Include="ImGui.NET">
             <HintPath>$(Dalamud)\ImGui.NET.dll</HintPath>
             <Private>false</Private>
@@ -39,8 +43,8 @@
 
     <ItemGroup>
         <PackageReference Include="DalamudLinter" Version="1.0.3"/>
-        <PackageReference Include="DalamudPackager" Version="2.1.4"/>
-        <PackageReference Include="XivCommon" Version="3.1.0"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.5"/>
+        <PackageReference Include="XivCommon" Version="4.0.0-alpha.2"/>
     </ItemGroup>
 
 </Project>