From d12766295907995b382aaffb3fb3b0dc77eec707 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Sun, 24 Sep 2023 16:41:15 +0200
Subject: [PATCH] some adjustments for API9

---
 .../ActivityContexts/ActivityContextManager.cs         |  2 +-
 Pilz.Dalamud/Nameplates/NameplateHooks.cs              |  3 ++-
 Pilz.Dalamud/PluginServices.cs                         | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
index 5ba94f3..af0b902 100644
--- a/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
+++ b/Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
@@ -35,7 +35,7 @@ namespace Pilz.Dalamud.ActivityContexts
             PluginServices.ClientState.TerritoryChanged -= ClientState_TerritoryChanged;
         }
 
-        private void ClientState_TerritoryChanged(object? sender, ushort e)
+        private void ClientState_TerritoryChanged(ushort obj)
         {
             CheckCurrentTerritory();
         }
diff --git a/Pilz.Dalamud/Nameplates/NameplateHooks.cs b/Pilz.Dalamud/Nameplates/NameplateHooks.cs
index 1c8d207..867e3bf 100644
--- a/Pilz.Dalamud/Nameplates/NameplateHooks.cs
+++ b/Pilz.Dalamud/Nameplates/NameplateHooks.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Pilz.Dalamud.Nameplates.Model;
 using Lumina.Excel.GeneratedSheets;
 using System.Xml.Linq;
+using Dalamud.Plugin.Services;
 
 namespace Pilz.Dalamud.Nameplates
 {
@@ -52,7 +53,7 @@ namespace Pilz.Dalamud.Nameplates
         /// </summary>
         public NameplateHooks()
         {
-            SignatureHelper.Initialise(this);
+            PluginServices.GameInteropProvider.InitializeFromAttributes(this);
         }
 
         ~NameplateHooks()
diff --git a/Pilz.Dalamud/PluginServices.cs b/Pilz.Dalamud/PluginServices.cs
index 37302ed..a50d24e 100644
--- a/Pilz.Dalamud/PluginServices.cs
+++ b/Pilz.Dalamud/PluginServices.cs
@@ -4,6 +4,7 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.Gui;
 using Dalamud.IoC;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,11 +15,12 @@ namespace Pilz.Dalamud
 {
     public class PluginServices
     {
-        [PluginService] public static GameGui GameGui { get; set; } = null;
         [PluginService] public static DalamudPluginInterface PluginInterface { get; set; } = null;
-        [PluginService] public static ClientState ClientState { get; set; } = null;
-        [PluginService] public static DataManager DataManager { get; set; } = null;
-        [PluginService] public static ObjectTable ObjectTable { get; set; } = null;
+        [PluginService] public static IGameGui GameGui { get; set; } = null;
+        [PluginService] public static IClientState ClientState { get; set; } = null;
+        [PluginService] public static IDataManager DataManager { get; set; } = null;
+        [PluginService] public static IObjectTable ObjectTable { get; set; } = null;
+        [PluginService] public static IGameInteropProvider GameInteropProvider { get; set; } = null;
 
         public static void Initialize(DalamudPluginInterface dalamudPluginInterface)
         {