From 81099651bc477586900311f9923bff6e75c8b6c5 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Fri, 19 Aug 2022 09:47:36 -0400
Subject: [PATCH] refactor: update for API 7

---
 XivCommon/Functions/BattleTalk.cs            | 2 +-
 XivCommon/Functions/ChatBubbles.cs           | 4 ++--
 XivCommon/Functions/NamePlates/NamePlates.cs | 2 +-
 XivCommon/Functions/PartyFinder.cs           | 4 ++--
 XivCommon/Functions/Talk.cs                  | 2 +-
 XivCommon/Functions/Tooltips/Tooltips.cs     | 4 ++--
 XivCommon/XivCommon.csproj                   | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/XivCommon/Functions/BattleTalk.cs b/XivCommon/Functions/BattleTalk.cs
index ab1b2f4..d470455 100755
--- a/XivCommon/Functions/BattleTalk.cs
+++ b/XivCommon/Functions/BattleTalk.cs
@@ -39,7 +39,7 @@ namespace XivCommon.Functions {
                 this.AddBattleTalk = Marshal.GetDelegateForFunctionPointer<AddBattleTalkDelegate>(addBattleTalkPtr);
 
                 if (this.HookEnabled) {
-                    this.AddBattleTalkHook = new Hook<AddBattleTalkDelegate>(addBattleTalkPtr, this.AddBattleTalkDetour);
+                    this.AddBattleTalkHook = Hook<AddBattleTalkDelegate>.FromAddress(addBattleTalkPtr, this.AddBattleTalkDetour);
                     this.AddBattleTalkHook.Enable();
                 }
             }
diff --git a/XivCommon/Functions/ChatBubbles.cs b/XivCommon/Functions/ChatBubbles.cs
index c216332..f8c2f57 100755
--- a/XivCommon/Functions/ChatBubbles.cs
+++ b/XivCommon/Functions/ChatBubbles.cs
@@ -64,12 +64,12 @@ namespace XivCommon.Functions {
             }
 
             if (scanner.TryScanText(Signatures.ChatBubbleOpen, out var openPtr, "chat bubbles open")) {
-                this.OpenChatBubbleHook = new Hook<OpenChatBubbleDelegate>(openPtr, this.OpenChatBubbleDetour);
+                this.OpenChatBubbleHook = Hook<OpenChatBubbleDelegate>.FromAddress(openPtr, this.OpenChatBubbleDetour);
                 this.OpenChatBubbleHook.Enable();
             }
 
             if (scanner.TryScanText(Signatures.ChatBubbleUpdate, out var updatePtr, "chat bubbles update")) {
-                this.UpdateChatBubbleHook = new Hook<UpdateChatBubbleDelegate>(updatePtr + 9, this.UpdateChatBubbleDetour);
+                this.UpdateChatBubbleHook = Hook<UpdateChatBubbleDelegate>.FromAddress(updatePtr + 9, this.UpdateChatBubbleDetour);
                 this.UpdateChatBubbleHook.Enable();
             }
         }
diff --git a/XivCommon/Functions/NamePlates/NamePlates.cs b/XivCommon/Functions/NamePlates/NamePlates.cs
index 4fda3c7..b8cb043 100755
--- a/XivCommon/Functions/NamePlates/NamePlates.cs
+++ b/XivCommon/Functions/NamePlates/NamePlates.cs
@@ -55,7 +55,7 @@ namespace XivCommon.Functions.NamePlates {
 
             if (scanner.TryScanText(Signatures.NamePlateUpdate, out var updatePtr)) {
                 unsafe {
-                    this._namePlateUpdateHook = new Hook<NamePlateUpdateDelegate>(updatePtr, this.NamePlateUpdateDetour);
+                    this._namePlateUpdateHook = Hook<NamePlateUpdateDelegate>.FromAddress(updatePtr, this.NamePlateUpdateDetour);
                 }
 
                 this._namePlateUpdateHook.Enable();
diff --git a/XivCommon/Functions/PartyFinder.cs b/XivCommon/Functions/PartyFinder.cs
index 10c7774..cae6368 100755
--- a/XivCommon/Functions/PartyFinder.cs
+++ b/XivCommon/Functions/PartyFinder.cs
@@ -73,13 +73,13 @@ namespace XivCommon.Functions {
                 this.RequestPartyFinderListings = Marshal.GetDelegateForFunctionPointer<RequestPartyFinderListingsDelegate>(requestPfPtr);
 
                 if (this.ListingsEnabled) {
-                    this.RequestPfListingsHook = new Hook<RequestPartyFinderListingsDelegate>(requestPfPtr, this.OnRequestPartyFinderListings);
+                    this.RequestPfListingsHook = Hook<RequestPartyFinderListingsDelegate>.FromAddress(requestPfPtr, this.OnRequestPartyFinderListings);
                     this.RequestPfListingsHook.Enable();
                 }
             }
 
             if (this.JoinsEnabled && scanner.TryScanText(Signatures.JoinCrossParty, out var joinPtr, "Party Finder joins")) {
-                this.JoinPfHook = new Hook<JoinPfDelegate>(joinPtr, this.JoinPfDetour);
+                this.JoinPfHook = Hook<JoinPfDelegate>.FromAddress(joinPtr, this.JoinPfDetour);
                 this.JoinPfHook.Enable();
             }
         }
diff --git a/XivCommon/Functions/Talk.cs b/XivCommon/Functions/Talk.cs
index 9307b6a..69f3a4a 100755
--- a/XivCommon/Functions/Talk.cs
+++ b/XivCommon/Functions/Talk.cs
@@ -54,7 +54,7 @@ namespace XivCommon.Functions {
             }
 
             if (scanner.TryScanText(Signatures.ShowMessageBox, out var showMessageBoxPtr, "Talk")) {
-                this.AddonTalkV45Hook = new Hook<AddonTalkV45Delegate>(showMessageBoxPtr, this.AddonTalkV45Detour);
+                this.AddonTalkV45Hook = Hook<AddonTalkV45Delegate>.FromAddress(showMessageBoxPtr, this.AddonTalkV45Detour);
                 this.AddonTalkV45Hook.Enable();
             }
         }
diff --git a/XivCommon/Functions/Tooltips/Tooltips.cs b/XivCommon/Functions/Tooltips/Tooltips.cs
index 8a198a9..5d17b5a 100755
--- a/XivCommon/Functions/Tooltips/Tooltips.cs
+++ b/XivCommon/Functions/Tooltips/Tooltips.cs
@@ -78,7 +78,7 @@ namespace XivCommon.Functions.Tooltips {
 
             if (scanner.TryScanText(Signatures.AgentItemDetailUpdateTooltip, out var updateItemPtr, "Tooltips - Items")) {
                 unsafe {
-                    this.ItemUpdateTooltipHook = new Hook<ItemUpdateTooltipDelegate>(updateItemPtr, this.ItemUpdateTooltipDetour);
+                    this.ItemUpdateTooltipHook = Hook<ItemUpdateTooltipDelegate>.FromAddress(updateItemPtr, this.ItemUpdateTooltipDetour);
                 }
 
                 this.ItemUpdateTooltipHook.Enable();
@@ -86,7 +86,7 @@ namespace XivCommon.Functions.Tooltips {
 
             if (scanner.TryScanText(Signatures.AgentActionDetailUpdateTooltip, out var updateActionPtr, "Tooltips - Actions")) {
                 unsafe {
-                    this.ActionGenerateTooltipHook = new Hook<ActionUpdateTooltipDelegate>(updateActionPtr, this.ActionUpdateTooltipDetour);
+                    this.ActionGenerateTooltipHook = Hook<ActionUpdateTooltipDelegate>.FromAddress(updateActionPtr, this.ActionUpdateTooltipDetour);
                 }
 
                 this.ActionGenerateTooltipHook.Enable();
diff --git a/XivCommon/XivCommon.csproj b/XivCommon/XivCommon.csproj
index 48aa023..cd986a3 100755
--- a/XivCommon/XivCommon.csproj
+++ b/XivCommon/XivCommon.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5-windows</TargetFramework>
+        <TargetFramework>net6-windows</TargetFramework>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Nullable>enable</Nullable>
@@ -14,7 +14,7 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Title>XivCommon</Title>
         <Authors>ascclemens</Authors>
-        <RepositoryUrl>https://git.sr.ht/~jkcclemens/XivCommon</RepositoryUrl>
+        <RepositoryUrl>https://git.annaclemens.io/ascclemens/XivCommon</RepositoryUrl>
         <Description>A set of common functions, hooks, and events not included in Dalamud.</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
@@ -23,8 +23,8 @@
         <Dalamud>$(AppData)\XIVLauncher\addon\Hooks\dev</Dalamud>
     </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-        <Dalamud>$(HOME)/games/final-fantasy-xiv-online/drive_c/users/$(USER)/AppData/Roaming/XIVLauncher/addon/Hooks/dev</Dalamud>
+    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
+        <Dalamud>$(DALAMUD_HOME)</Dalamud>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(IsCI)' == 'true'">