chore: bump version to 8.0.0

XivCommon/Functions/BattleTalk.cs

@@ -2,9 +2,11 @@
 using System.Runtime.InteropServices;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 /// <summary>
 /// The class containing BattleTalk functionality
 /// </summary>
@@ -31,7 +33,7 @@ namespace XivCommon.Functions {
     private AddBattleTalkDelegate? AddBattleTalk { get; }
     private Hook<AddBattleTalkDelegate>? AddBattleTalkHook { get; }
 
-        internal unsafe BattleTalk(bool hook) {
+    internal unsafe BattleTalk(IGameInteropProvider interop, bool hook) {
         this.HookEnabled = hook;
 
         var addBattleTalkPtr = (IntPtr) Framework.Instance()->GetUiModule()->VTable->ShowBattleTalk;
@@ -39,7 +41,7 @@ namespace XivCommon.Functions {
             this.AddBattleTalk = Marshal.GetDelegateForFunctionPointer<AddBattleTalkDelegate>(addBattleTalkPtr);
 
             if (this.HookEnabled) {
-                    this.AddBattleTalkHook = Hook<AddBattleTalkDelegate>.FromAddress(addBattleTalkPtr, this.AddBattleTalkDetour);
+                this.AddBattleTalkHook = interop.HookFromAddress<AddBattleTalkDelegate>(addBattleTalkPtr, this.AddBattleTalkDetour);
                 this.AddBattleTalkHook.Enable();
             }
         }
@@ -58,7 +60,7 @@ namespace XivCommon.Functions {
         try {
             return this.AddBattleTalkDetourInner(uiModule, senderPtr, messagePtr, duration, style);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in BattleTalk detour");
+            Logger.Log.Error(ex, "Exception in BattleTalk detour");
         }
 
         Return:
@@ -81,7 +83,7 @@ namespace XivCommon.Functions {
         try {
             this.OnBattleTalk?.Invoke(ref sender, ref message, ref options, ref handled);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in BattleTalk event");
+            Logger.Log.Error(ex, "Exception in BattleTalk event");
         }
 
         if (handled) {
@@ -179,4 +181,3 @@ namespace XivCommon.Functions {
     /// </summary>
     Blue = 9,
 }
-}

XivCommon/Functions/Chat.cs

@@ -7,7 +7,8 @@ using FFXIVClientStructs.FFXIV.Client.System.Memory;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 /// <summary>
 /// A class containing chat functionality
 /// </summary>
@@ -23,7 +24,7 @@ namespace XivCommon.Functions {
 
     private readonly unsafe delegate* unmanaged<Utf8String*, int, IntPtr, void> _sanitiseString = null!;
 
-        internal Chat(SigScanner scanner) {
+    internal Chat(ISigScanner scanner) {
         if (scanner.TryScanText(Signatures.SendChat, out var processChatBoxPtr, "chat sending")) {
             this.ProcessChatBox = Marshal.GetDelegateForFunctionPointer<ProcessChatBoxDelegate>(processChatBoxPtr);
         }
@@ -154,4 +155,3 @@ namespace XivCommon.Functions {
         }
     }
 }
-}

XivCommon/Functions/ChatBubbles.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
 using Dalamud.Game;
-using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
+
+namespace XivCommon.Functions;
 
-namespace XivCommon.Functions {
 /// <summary>
 /// Class containing chat bubble events and functions
 /// </summary>
@@ -16,7 +17,7 @@ namespace XivCommon.Functions {
         internal const string ChatBubbleUpdate = "48 85 D2 0F 84 ?? ?? ?? ?? 48 89 5C 24 ?? 57 48 83 EC 20 8B 41 0C";
     }
 
-        private ObjectTable ObjectTable { get; }
+    private IObjectTable ObjectTable { get; }
 
     private delegate void OpenChatBubbleDelegate(IntPtr manager, IntPtr @object, IntPtr text, byte a4);
 
@@ -56,7 +57,7 @@ namespace XivCommon.Functions {
     /// </summary>
     public event OnUpdateChatBubbleDelegate? OnUpdateBubble;
 
-        internal ChatBubbles(ObjectTable objectTable, SigScanner scanner, bool hookEnabled) {
+    internal ChatBubbles(IObjectTable objectTable, ISigScanner scanner, IGameInteropProvider interop, bool hookEnabled) {
         this.ObjectTable = objectTable;
 
         if (!hookEnabled) {
@@ -64,12 +65,12 @@ namespace XivCommon.Functions {
         }
 
         if (scanner.TryScanText(Signatures.ChatBubbleOpen, out var openPtr, "chat bubbles open")) {
-                this.OpenChatBubbleHook = Hook<OpenChatBubbleDelegate>.FromAddress(openPtr, this.OpenChatBubbleDetour);
+            this.OpenChatBubbleHook = interop.HookFromAddress<OpenChatBubbleDelegate>(openPtr, this.OpenChatBubbleDetour);
             this.OpenChatBubbleHook.Enable();
         }
 
         if (scanner.TryScanText(Signatures.ChatBubbleUpdate, out var updatePtr, "chat bubbles update")) {
-                this.UpdateChatBubbleHook = Hook<UpdateChatBubbleDelegate>.FromAddress(updatePtr + 9, this.UpdateChatBubbleDetour);
+            this.UpdateChatBubbleHook = interop.HookFromAddress<UpdateChatBubbleDelegate>(updatePtr + 9, this.UpdateChatBubbleDetour);
             this.UpdateChatBubbleHook.Enable();
         }
     }
@@ -84,7 +85,7 @@ namespace XivCommon.Functions {
         try {
             this.OpenChatBubbleDetourInner(manager, @object, text, a4);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in chat bubble detour");
+            Logger.Log.Error(ex, "Exception in chat bubble detour");
             this.OpenChatBubbleHook!.Original(manager, @object, text, a4);
         }
     }
@@ -100,7 +101,7 @@ namespace XivCommon.Functions {
         try {
             this.OnChatBubble?.Invoke(ref @object, ref text);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in chat bubble event");
+            Logger.Log.Error(ex, "Exception in chat bubble event");
         }
 
         var newText = text.Encode().Terminate();
@@ -116,7 +117,7 @@ namespace XivCommon.Functions {
         try {
             this.UpdateChatBubbleDetourInner(bubblePtr, @object);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in update chat bubble detour");
+            Logger.Log.Error(ex, "Exception in update chat bubble detour");
             this.UpdateChatBubbleHook!.Original(bubblePtr, @object);
         }
     }
@@ -131,7 +132,7 @@ namespace XivCommon.Functions {
         try {
             this.OnUpdateBubble?.Invoke(ref @object);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in chat bubble update event");
+            Logger.Log.Error(ex, "Exception in chat bubble update event");
         }
 
         this.UpdateChatBubbleHook!.Original(bubblePtr, @object.Address);
@@ -165,4 +166,3 @@ namespace XivCommon.Functions {
     Init = 2,
     Off = 3,
 }
-}

XivCommon/Functions/DutyFinder.cs

@@ -5,7 +5,8 @@ using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using Lumina.Excel.GeneratedSheets;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 /// <summary>
 /// Duty Finder functions
 /// </summary>
@@ -22,7 +23,7 @@ namespace XivCommon.Functions {
     private readonly OpenDutyDelegate? _openDuty;
     private readonly OpenRouletteDelegate? _openRoulette;
 
-        internal DutyFinder(SigScanner scanner) {
+    internal DutyFinder(ISigScanner scanner) {
         if (scanner.TryScanText(Signatures.OpenRegularDuty, out var openDutyPtr, "Duty Finder (open duty)")) {
             this._openDuty = Marshal.GetDelegateForFunctionPointer<OpenDutyDelegate>(openDutyPtr);
         }
@@ -78,4 +79,3 @@ namespace XivCommon.Functions {
         this._openRoulette(agent, roulette, 0);
     }
 }
-}

XivCommon/Functions/Examine.cs

@@ -4,7 +4,8 @@ using Dalamud.Game;
 using Dalamud.Game.ClientState.Objects.Types;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 /// <summary>
 /// Class containing examine functions
 /// </summary>
@@ -17,7 +18,7 @@ namespace XivCommon.Functions {
 
     private RequestCharInfoDelegate? RequestCharacterInfo { get; }
 
-        internal Examine(SigScanner scanner) {
+    internal Examine(ISigScanner scanner) {
         // got this by checking what accesses rciData below
         if (scanner.TryScanText(Signatures.RequestCharacterInfo, out var rciPtr, "Examine")) {
             this.RequestCharacterInfo = Marshal.GetDelegateForFunctionPointer<RequestCharInfoDelegate>(rciPtr);
@@ -64,4 +65,3 @@ namespace XivCommon.Functions {
         this.RequestCharacterInfo(rciData);
     }
 }
-}

XivCommon/Functions/FriendList/FriendList.cs

@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 
-namespace XivCommon.Functions.FriendList {
+namespace XivCommon.Functions.FriendList;
+
 /// <summary>
 /// The class containing friend list functionality
 /// </summary>
@@ -59,4 +60,3 @@ namespace XivCommon.Functions.FriendList {
     internal FriendList() {
     }
 }
-}

XivCommon/Functions/FriendList/FriendListEntry.cs

@@ -3,7 +3,8 @@ using System.Runtime.InteropServices;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
 
-namespace XivCommon.Functions.FriendList {
+namespace XivCommon.Functions.FriendList;
+
 /// <summary>
 /// An entry in a player's friend list.
 /// </summary>
@@ -69,4 +70,3 @@ namespace XivCommon.Functions.FriendList {
         }
     }
 }
-}

XivCommon/Functions/Housing/Housing.cs

@@ -1,7 +1,8 @@
 using System;
 using Dalamud.Game;
 
-namespace XivCommon.Functions.Housing {
+namespace XivCommon.Functions.Housing;
+
 /// <summary>
 /// The class containing housing functionality
 /// </summary>
@@ -47,10 +48,9 @@ namespace XivCommon.Functions.Housing {
         }
     }
 
-        internal Housing(SigScanner scanner) {
+    internal Housing(ISigScanner scanner) {
         if (scanner.TryGetStaticAddressFromSig(Signatures.HousingPointer, out var ptr)) {
             this.HousingPointer = ptr;
         }
     }
 }
-}

XivCommon/Functions/Housing/HousingLocation.cs

@@ -1,4 +1,5 @@
-namespace XivCommon.Functions.Housing {
+namespace XivCommon.Functions.Housing; 
+
 /// <summary>
 /// Information about a player's current location in a housing ward.
 /// </summary>
@@ -56,4 +57,3 @@
         }
     }
 }
-}

XivCommon/Functions/Housing/RawHousingLocation.cs

@@ -1,6 +1,7 @@
 using System.Runtime.InteropServices;
 
-namespace XivCommon.Functions.Housing {
+namespace XivCommon.Functions.Housing; 
+
 /// <summary>
 /// Information about the player's current location in a housing ward as
 /// kept by the game's internal structures.
@@ -38,4 +39,3 @@ namespace XivCommon.Functions.Housing {
     /// </summary>
     public readonly byte InsideIndicator; // aa -> ab
 }
-}

XivCommon/Functions/Journal.cs

@@ -5,7 +5,8 @@ using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using Lumina.Excel.GeneratedSheets;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 /// <summary>
 /// Journal functions
 /// </summary>
@@ -22,7 +23,7 @@ namespace XivCommon.Functions {
     private readonly OpenQuestDelegate? _openQuest;
     private readonly IsQuestCompletedDelegate? _isQuestCompleted;
 
-        internal Journal(SigScanner scanner) {
+    internal Journal(ISigScanner scanner) {
         if (scanner.TryScanText(Signatures.OpenQuest, out var openQuestPtr, "Journal (open quest)")) {
             this._openQuest = Marshal.GetDelegateForFunctionPointer<OpenQuestDelegate>(openQuestPtr);
         }
@@ -80,4 +81,3 @@ namespace XivCommon.Functions {
         return this._isQuestCompleted((ushort) (questId & 0xFFFF)) != 0;
     }
 }
-}

XivCommon/Functions/NamePlates/NamePlateUpdateEventArgs.cs

@@ -1,7 +1,8 @@
 using System;
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace XivCommon.Functions.NamePlates {
+namespace XivCommon.Functions.NamePlates; 
+
 /// <summary>
 /// Arguments for the name plate update event
 /// </summary>
@@ -75,4 +76,3 @@ namespace XivCommon.Functions.NamePlates {
         this.ObjectId = objectId;
     }
 }
-}

XivCommon/Functions/NamePlates/NamePlates.cs

@@ -3,11 +3,13 @@ using System.Runtime.InteropServices;
 using Dalamud.Game;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Graphics;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon.Functions.NamePlates {
+namespace XivCommon.Functions.NamePlates;
+
 /// <summary>
 /// The class containing name plate functionality
 /// </summary>
@@ -46,7 +48,7 @@ namespace XivCommon.Functions.NamePlates {
     /// </summary>
     public bool ForceRedraw { get; set; }
 
-        internal NamePlates(GameFunctions functions, SigScanner scanner, bool hookEnabled) {
+    internal NamePlates(GameFunctions functions, ISigScanner scanner, IGameInteropProvider interop, bool hookEnabled) {
         this.Functions = functions;
 
         if (!hookEnabled) {
@@ -55,7 +57,7 @@ namespace XivCommon.Functions.NamePlates {
 
         if (scanner.TryScanText(Signatures.NamePlateUpdate, out var updatePtr)) {
             unsafe {
-                    this._namePlateUpdateHook = Hook<NamePlateUpdateDelegate>.FromAddress(updatePtr, this.NamePlateUpdateDetour);
+                this._namePlateUpdateHook = interop.HookFromAddress<NamePlateUpdateDelegate>(updatePtr, this.NamePlateUpdateDetour);
             }
 
             this._namePlateUpdateHook.Enable();
@@ -83,7 +85,7 @@ namespace XivCommon.Functions.NamePlates {
         try {
             this.NamePlateUpdateDetourInner(numberData, stringData);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in NamePlateUpdateDetour");
+            Logger.Log.Error(ex, "Exception in NamePlateUpdateDetour");
         }
 
         return this._namePlateUpdateHook!.Original(addon, numberData, stringData);
@@ -162,7 +164,7 @@ namespace XivCommon.Functions.NamePlates {
             try {
                 this.OnUpdate?.Invoke(args);
             } catch (Exception ex) {
-                    Logger.LogError(ex, "Exception in name plate update event");
+                Logger.Log.Error(ex, "Exception in name plate update event");
             }
 
             void Replace(byte[] bytes, int i, bool free = true) {
@@ -224,4 +226,3 @@ namespace XivCommon.Functions.NamePlates {
         }
     }
 }
-}

XivCommon/Functions/NamePlates/Structs.cs

@@ -1,7 +1,8 @@
 using System.Runtime.InteropServices;
 using FFXIVClientStructs.FFXIV.Client.Graphics;
 
-namespace XivCommon.Functions.NamePlates {
+namespace XivCommon.Functions.NamePlates; 
+
 [StructLayout(LayoutKind.Explicit, Size = 0x28)]
 internal unsafe struct NumberArrayData {
     [FieldOffset(0x0)]
@@ -173,4 +174,3 @@ namespace XivCommon.Functions.NamePlates {
         };
     }
 }
-}

XivCommon/Functions/PartyFinder.cs

@@ -2,18 +2,19 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Dalamud.Game;
-using Dalamud.Game.Gui.PartyFinder;
 using Dalamud.Game.Gui.PartyFinder.Types;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
+
+namespace XivCommon.Functions;
 
-namespace XivCommon.Functions {
 /// <summary>
 /// A class containing Party Finder functionality
 /// </summary>
 public class PartyFinder : IDisposable {
     private static class Signatures {
         internal const string RequestListings = "48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 40 0F 10 81";
-            internal const string JoinCrossParty = "E8 ?? ?? ?? ?? 0F B7 47 28";
+        internal const string JoinCrossParty = "E8 ?? ?? ?? ?? 41 0F B7 07 49 8B CC";
     }
 
     private delegate byte RequestPartyFinderListingsDelegate(IntPtr agent, byte categoryIdx);
@@ -39,7 +40,7 @@ namespace XivCommon.Functions {
     /// </summary>
     public event JoinPfEventDelegate? JoinParty;
 
-        private PartyFinderGui PartyFinderGui { get; }
+    private IPartyFinderGui PartyFinderGui { get; }
     private bool JoinsEnabled { get; }
     private bool ListingsEnabled { get; }
     private IntPtr PartyFinderAgent { get; set; } = IntPtr.Zero;
@@ -59,7 +60,7 @@ namespace XivCommon.Functions {
     /// </summary>
     public IReadOnlyDictionary<uint, PartyFinderListing> CurrentListings => this.Listings;
 
-        internal PartyFinder(SigScanner scanner, PartyFinderGui partyFinderGui, Hooks hooks) {
+    internal PartyFinder(ISigScanner scanner, IPartyFinderGui partyFinderGui, IGameInteropProvider interop, Hooks hooks) {
         this.PartyFinderGui = partyFinderGui;
 
         this.ListingsEnabled = hooks.HasFlag(Hooks.PartyFinderListings);
@@ -73,13 +74,13 @@ namespace XivCommon.Functions {
             this.RequestPartyFinderListings = Marshal.GetDelegateForFunctionPointer<RequestPartyFinderListingsDelegate>(requestPfPtr);
 
             if (this.ListingsEnabled) {
-                    this.RequestPfListingsHook = Hook<RequestPartyFinderListingsDelegate>.FromAddress(requestPfPtr, this.OnRequestPartyFinderListings);
+                this.RequestPfListingsHook = interop.HookFromAddress<RequestPartyFinderListingsDelegate>(requestPfPtr, this.OnRequestPartyFinderListings);
                 this.RequestPfListingsHook.Enable();
             }
         }
 
         if (this.JoinsEnabled && scanner.TryScanText(Signatures.JoinCrossParty, out var joinPtr, "Party Finder joins")) {
-                this.JoinPfHook = Hook<JoinPfDelegate>.FromAddress(joinPtr, this.JoinPfDetour);
+            this.JoinPfHook = interop.HookFromAddress<JoinPfDelegate>(joinPtr, this.JoinPfDetour);
             this.JoinPfHook.Enable();
         }
     }
@@ -122,7 +123,7 @@ namespace XivCommon.Functions {
                 this.JoinParty?.Invoke(listing);
             }
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in PF join detour");
+            Logger.Log.Error(ex, "Exception in PF join detour");
         }
 
         return ret;
@@ -178,4 +179,3 @@ namespace XivCommon.Functions {
 
     Unknown4 = 4,
 }
-}

XivCommon/Functions/Talk.cs

@@ -3,8 +3,10 @@ using System.Runtime.InteropServices;
 using Dalamud.Game;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
+
+namespace XivCommon.Functions;
 
-namespace XivCommon.Functions {
 /// <summary>
 /// Class containing Talk events
 /// </summary>
@@ -42,7 +44,7 @@ namespace XivCommon.Functions {
     /// </summary>
     public event TalkEventDelegate? OnTalk;
 
-        internal Talk(SigScanner scanner, bool hooksEnabled) {
+    internal Talk(ISigScanner scanner, IGameInteropProvider interop, bool hooksEnabled) {
         if (scanner.TryScanText(Signatures.SetAtkValue, out var setAtkPtr, "Talk - set atk value")) {
             this.SetAtkValueString = Marshal.GetDelegateForFunctionPointer<SetAtkValueStringDelegate>(setAtkPtr);
         } else {
@@ -54,7 +56,7 @@ namespace XivCommon.Functions {
         }
 
         if (scanner.TryScanText(Signatures.ShowMessageBox, out var showMessageBoxPtr, "Talk")) {
-                this.AddonTalkV45Hook = Hook<AddonTalkV45Delegate>.FromAddress(showMessageBoxPtr, this.AddonTalkV45Detour);
+            this.AddonTalkV45Hook = interop.HookFromAddress<AddonTalkV45Delegate>(showMessageBoxPtr, this.AddonTalkV45Detour);
             this.AddonTalkV45Hook.Enable();
         }
     }
@@ -72,7 +74,7 @@ namespace XivCommon.Functions {
         try {
             this.AddonTalkV45DetourInner(data);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in Talk detour");
+            Logger.Log.Error(ex, "Exception in Talk detour");
         }
 
         Return:
@@ -90,7 +92,7 @@ namespace XivCommon.Functions {
         try {
             this.OnTalk?.Invoke(ref name, ref text, ref style);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in Talk event");
+            Logger.Log.Error(ex, "Exception in Talk event");
         }
 
         var newName = name.Encode().Terminate();
@@ -156,4 +158,3 @@ namespace XivCommon.Functions {
     /// </summary>
     PurpleSystem = 9,
 }
-}

XivCommon/Functions/Tooltips/ActionTooltip.cs

@@ -1,6 +1,7 @@
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace XivCommon.Functions.Tooltips {
+namespace XivCommon.Functions.Tooltips; 
+
 /// <summary>
 /// The class allowing for action tooltip manipulation
 /// </summary>
@@ -25,4 +26,3 @@ namespace XivCommon.Functions.Tooltips {
         set => **(this.NumberArrayData + 4) = (int) value;
     }
 }
-}

XivCommon/Functions/Tooltips/ActionTooltipEnums.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace XivCommon.Functions.Tooltips {
+namespace XivCommon.Functions.Tooltips; 
+
 /// <summary>
 /// An enum containing the strings used in action tooltips.
 /// </summary>
@@ -41,4 +42,3 @@ namespace XivCommon.Functions.Tooltips {
     Unknown8 = 1 << 8,
     #pragma warning restore 1591
 }
-}

XivCommon/Functions/Tooltips/BaseTooltip.cs

@@ -1,7 +1,8 @@
 using System;
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace XivCommon.Functions.Tooltips {
+namespace XivCommon.Functions.Tooltips; 
+
 /// <summary>
 /// The base class for tooltips
 /// </summary>
@@ -47,4 +48,3 @@ namespace XivCommon.Functions.Tooltips {
         }
     }
 }
-}

XivCommon/Functions/Tooltips/ItemTooltip.cs

@@ -1,6 +1,7 @@
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace XivCommon.Functions.Tooltips {
+namespace XivCommon.Functions.Tooltips; 
+
 /// <summary>
 /// The class allowing for item tooltip manipulation
 /// </summary>
@@ -25,4 +26,3 @@ namespace XivCommon.Functions.Tooltips {
         set => *(*(this.NumberArrayData + 4) + 4) = (int) value;
     }
 }
-}

XivCommon/Functions/Tooltips/ItemTooltipEnums.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace XivCommon.Functions.Tooltips {
+namespace XivCommon.Functions.Tooltips; 
+
 /// <summary>
 /// An enum containing the strings used in item tooltips.
 /// </summary>
@@ -91,4 +92,3 @@ namespace XivCommon.Functions.Tooltips {
     Unknown19 = 1 << 19,
     #pragma warning restore 1591
 }
-}

XivCommon/Functions/Tooltips/Tooltips.cs

@@ -3,8 +3,10 @@ using System.Runtime.InteropServices;
 using Dalamud.Game;
 using Dalamud.Game.Gui;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
+
+namespace XivCommon.Functions.Tooltips;
 
-namespace XivCommon.Functions.Tooltips {
 /// <summary>
 /// The class containing tooltip functionality
 /// </summary>
@@ -59,11 +61,11 @@ namespace XivCommon.Functions.Tooltips {
     /// </summary>
     public event ActionTooltipEventDelegate? OnActionTooltip;
 
-        private GameGui GameGui { get; }
+    private IGameGui GameGui { get; }
     private ItemTooltip? ItemTooltip { get; set; }
     private ActionTooltip? ActionTooltip { get; set; }
 
-        internal Tooltips(SigScanner scanner, GameGui gui, bool enabled) {
+    internal Tooltips(ISigScanner scanner, IGameGui gui, IGameInteropProvider interop, bool enabled) {
         this.GameGui = gui;
 
         if (scanner.TryScanText(Signatures.SadSetString, out var setStringPtr, "Tooltips - StringArrayData::SetString")) {
@@ -78,7 +80,7 @@ namespace XivCommon.Functions.Tooltips {
 
         if (scanner.TryScanText(Signatures.AgentItemDetailUpdateTooltip, out var updateItemPtr, "Tooltips - Items")) {
             unsafe {
-                    this.ItemUpdateTooltipHook = Hook<ItemUpdateTooltipDelegate>.FromAddress(updateItemPtr, this.ItemUpdateTooltipDetour);
+                this.ItemUpdateTooltipHook = interop.HookFromAddress<ItemUpdateTooltipDelegate>(updateItemPtr, this.ItemUpdateTooltipDetour);
             }
 
             this.ItemUpdateTooltipHook.Enable();
@@ -86,7 +88,7 @@ namespace XivCommon.Functions.Tooltips {
 
         if (scanner.TryScanText(Signatures.AgentActionDetailUpdateTooltip, out var updateActionPtr, "Tooltips - Actions")) {
             unsafe {
-                    this.ActionGenerateTooltipHook = Hook<ActionUpdateTooltipDelegate>.FromAddress(updateActionPtr, this.ActionUpdateTooltipDetour);
+                this.ActionGenerateTooltipHook = interop.HookFromAddress<ActionUpdateTooltipDelegate>(updateActionPtr, this.ActionUpdateTooltipDetour);
             }
 
             this.ActionGenerateTooltipHook.Enable();
@@ -106,7 +108,7 @@ namespace XivCommon.Functions.Tooltips {
             try {
                 this.ItemUpdateTooltipDetourInner(numberArrayData, stringArrayData);
             } catch (Exception ex) {
-                    Logger.LogError(ex, "Exception in item tooltip detour");
+                Logger.Log.Error(ex, "Exception in item tooltip detour");
             }
         }
 
@@ -119,7 +121,7 @@ namespace XivCommon.Functions.Tooltips {
         try {
             this.OnItemTooltip?.Invoke(this.ItemTooltip, this.GameGui.HoveredItem);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in OnItemTooltip event");
+            Logger.Log.Error(ex, "Exception in OnItemTooltip event");
         }
     }
 
@@ -134,7 +136,7 @@ namespace XivCommon.Functions.Tooltips {
         try {
             this.ActionUpdateTooltipDetourInner(numberArrayData, stringArrayData);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in action tooltip detour");
+            Logger.Log.Error(ex, "Exception in action tooltip detour");
         }
     }
 
@@ -144,8 +146,7 @@ namespace XivCommon.Functions.Tooltips {
         try {
             this.OnActionTooltip?.Invoke(this.ActionTooltip, this.GameGui.HoveredAction);
         } catch (Exception ex) {
-                Logger.LogError(ex, "Exception in OnActionTooltip event");
-            }
+            Logger.Log.Error(ex, "Exception in OnActionTooltip event");
         }
     }
 }

XivCommon/Functions/UiAlloc.cs

@@ -2,7 +2,8 @@
 using System.Runtime.InteropServices;
 using Dalamud.Game;
 
-namespace XivCommon.Functions {
+namespace XivCommon.Functions;
+
 internal class UiAlloc {
     private static class Signatures {
         internal const string GameAlloc = "E8 ?? ?? ?? ?? 49 83 CC FF 4C 8B F0";
@@ -22,7 +23,7 @@ namespace XivCommon.Functions {
 
     private readonly GetGameAllocatorDelegate? _getGameAllocator;
 
-        internal UiAlloc(SigScanner scanner) {
+    internal UiAlloc(ISigScanner scanner) {
         if (scanner.TryScanText(Signatures.GameAlloc, out var gameAllocPtr, "UiAlloc (GameAlloc)")) {
             this._gameAlloc = Marshal.GetDelegateForFunctionPointer<GameAllocDelegate>(gameAllocPtr);
         } else {
@@ -56,4 +57,3 @@ namespace XivCommon.Functions {
         this._gameFree(ptr);
     }
 }
-}

XivCommon/GameFunctions.cs

@@ -1,8 +1,6 @@
 using System;
 using Dalamud.Game;
-using Dalamud.Game.ClientState.Objects;
-using Dalamud.Game.Gui;
-using Dalamud.Game.Gui.PartyFinder;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using XivCommon.Functions;
@@ -12,14 +10,15 @@ using XivCommon.Functions.NamePlates;
 using XivCommon.Functions.Tooltips;
 using Framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework;
 
-namespace XivCommon {
+namespace XivCommon;
+
 /// <summary>
 /// A class containing game functions
 /// </summary>
 public class GameFunctions : IDisposable {
-        private GameGui GameGui { get; }
+    private IGameGui GameGui { get; }
 
-        private Dalamud.Game.Framework Framework { get; }
+    private IFramework Framework { get; }
 
     internal UiAlloc UiAlloc { get; }
 
@@ -84,22 +83,25 @@ namespace XivCommon {
     public Housing Housing { get; }
 
     internal GameFunctions(Hooks hooks) {
-            this.Framework = Util.GetService<Dalamud.Game.Framework>();
-            this.GameGui = Util.GetService<GameGui>();
+        Logger.Log = Util.GetService<IPluginLog>();
 
-            var objectTable = Util.GetService<ObjectTable>();
-            var partyFinderGui = Util.GetService<PartyFinderGui>();
-            var scanner = Util.GetService<SigScanner>();
+        this.Framework = Util.GetService<IFramework>();
+        this.GameGui = Util.GetService<IGameGui>();
+
+        var interop = Util.GetService<IGameInteropProvider>();
+        var objectTable = Util.GetService<IObjectTable>();
+        var partyFinderGui = Util.GetService<IPartyFinderGui>();
+        var scanner = Util.GetService<ISigScanner>();
 
         this.UiAlloc = new UiAlloc(scanner);
         this.Chat = new Chat(scanner);
-            this.PartyFinder = new PartyFinder(scanner, partyFinderGui, hooks);
-            this.BattleTalk = new BattleTalk(hooks.HasFlag(Hooks.BattleTalk));
+        this.PartyFinder = new PartyFinder(scanner, partyFinderGui, interop, hooks);
+        this.BattleTalk = new BattleTalk(interop, hooks.HasFlag(Hooks.BattleTalk));
         this.Examine = new Examine(scanner);
-            this.Talk = new Talk(scanner, hooks.HasFlag(Hooks.Talk));
-            this.ChatBubbles = new ChatBubbles(objectTable, scanner, hooks.HasFlag(Hooks.ChatBubbles));
-            this.Tooltips = new Tooltips(scanner, this.GameGui, hooks.HasFlag(Hooks.Tooltips));
-            this.NamePlates = new NamePlates(this, scanner, hooks.HasFlag(Hooks.NamePlates));
+        this.Talk = new Talk(scanner, interop, hooks.HasFlag(Hooks.Talk));
+        this.ChatBubbles = new ChatBubbles(objectTable, scanner, interop, hooks.HasFlag(Hooks.ChatBubbles));
+        this.Tooltips = new Tooltips(scanner, this.GameGui, interop, hooks.HasFlag(Hooks.Tooltips));
+        this.NamePlates = new NamePlates(this, scanner, interop, hooks.HasFlag(Hooks.NamePlates));
         this.DutyFinder = new DutyFinder(scanner);
         this.Journal = new Journal(scanner);
         this.FriendList = new FriendList();
@@ -122,7 +124,7 @@ namespace XivCommon {
     /// <returns>pointer to struct</returns>
     [Obsolete("Use Framework.Instance()")]
     public unsafe Framework* GetFramework() {
-            return (Framework*) this.Framework.Address.BaseAddress;
+        return FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance();
     }
 
     /// <summary>
@@ -173,4 +175,3 @@ namespace XivCommon {
         return (IntPtr) AtkStage.GetSingleton();
     }
 }
-}

XivCommon/Hooks.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace XivCommon {
+namespace XivCommon; 
+
 /// <summary>
 /// Flags for which hooks to use
 /// </summary>
@@ -71,4 +72,3 @@ namespace XivCommon {
 internal static class HooksExt {
     internal const Hooks DefaultHooks = Hooks.None;
 }
-}

XivCommon/Logger.cs

@@ -1,26 +1,7 @@
-using System;
-using Dalamud.Logging;
+using Dalamud.Plugin.Services;
+
+namespace XivCommon;
 
-namespace XivCommon {
 internal static class Logger {
-        private static string Format(string msg) {
-            return $"[XIVCommon] {msg}";
-        }
-
-        internal static void Log(string msg) {
-            PluginLog.Log(Format(msg));
-        }
-
-        internal static void LogWarning(string msg) {
-            PluginLog.LogWarning(Format(msg));
-        }
-
-        internal static void LogError(string msg) {
-            PluginLog.LogError(Format(msg));
-        }
-
-        internal static void LogError(Exception ex, string msg) {
-            PluginLog.LogError(ex, Format(msg));
-        }
-    }
+    internal static IPluginLog Log { get; set; } = null!;
 }

XivCommon/SigScannerExt.cs

@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using Dalamud.Game;
 
-namespace XivCommon {
+namespace XivCommon;
+
 internal static class SigScannerExt {
     /// <summary>
     /// Scan for a signature in memory.
@@ -12,7 +13,7 @@ namespace XivCommon {
     /// <param name="result">pointer where signature was found or <see cref="IntPtr.Zero"/> if not found</param>
     /// <param name="name">name of this signature - if specified, a warning will be printed if the signature could not be found</param>
     /// <returns>true if signature was found</returns>
-        internal static bool TryScanText(this SigScanner scanner, string sig, out IntPtr result, string? name = null) {
+    internal static bool TryScanText(this ISigScanner scanner, string sig, out IntPtr result, string? name = null) {
         result = IntPtr.Zero;
         try {
             result = scanner.ScanText(sig);
@@ -26,4 +27,3 @@ namespace XivCommon {
         }
     }
 }
-}

XivCommon/Util.cs

@@ -4,7 +4,8 @@ using System.Reflection;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin;
 
-namespace XivCommon {
+namespace XivCommon; 
+
 internal static class Util {
     internal static byte[] Terminate(this byte[] array) {
         var terminated = new byte[array.Length + 1];
@@ -36,7 +37,7 @@ namespace XivCommon {
     }
 
     internal static void PrintMissingSig(string name) {
-            Logger.LogWarning($"Could not find signature for {name}. This functionality will be disabled.");
+        Logger.Log.Warning($"Could not find signature for {name}. This functionality will be disabled.");
     }
 
     internal static T GetService<T>() {
@@ -60,4 +61,3 @@ namespace XivCommon {
         return start;
     }
 }
-}

XivCommon/XivCommon.csproj

@@ -5,7 +5,7 @@
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Nullable>enable</Nullable>
-        <Version>7.0.2</Version>
+        <Version>8.0.0</Version>
         <DebugType>full</DebugType>
     </PropertyGroup>
 
@@ -14,7 +14,7 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Title>XivCommon</Title>
         <Authors>ascclemens</Authors>
-        <RepositoryUrl>https://git.annaclemens.io/ascclemens/XivCommon</RepositoryUrl>
+        <RepositoryUrl>https://git.anna.lgbt/anna/XivCommon</RepositoryUrl>
         <Description>A set of common functions, hooks, and events not included in Dalamud.</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>

XivCommon/XivCommonBase.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace XivCommon {
+namespace XivCommon; 
+
 /// <summary>
 /// A base class for accessing XivCommon functionality.
 /// </summary>
@@ -28,4 +29,3 @@ namespace XivCommon {
         this.Functions.Dispose();
     }
 }
-}