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/Extensions.cs b/Pilz.Dalamud/Extensions.cs
index 08008a4..94e5113 100644
--- a/Pilz.Dalamud/Extensions.cs
+++ b/Pilz.Dalamud/Extensions.cs
@@ -24,7 +24,7 @@ namespace Pilz.Dalamud
/// Removes a Payload from a given list.
/// Using List.Remove() does not use the reference to compare for some reason. Tis is a workaround.
///
- ///
+ ///
///
public static void Remove(this List payloads, Payload payload)
{
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
///
public NameplateHooks()
{
- SignatureHelper.Initialise(this);
+ PluginServices.GameInteropProvider.InitializeFromAttributes(this);
}
~NameplateHooks()
diff --git a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
index 3accdbb..bd935b2 100644
--- a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
+++ b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
@@ -50,6 +50,7 @@ namespace Pilz.Dalamud.Nameplates.Tools
/// Gets a change of the position of the element of your choice where you can add your payloads.
///
/// The position of your choice.
+ /// The position of your choice.
///
public StringChange GetChange(NameplateElements element, StringPosition position)
{
diff --git a/Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizer.cs b/Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizer.cs
index 6d0c6fa..2ae64c3 100644
--- a/Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizer.cs
+++ b/Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizer.cs
@@ -28,7 +28,7 @@ namespace Pilz.Dalamud.Nameplates.Tools
/// taking into account whether or not the player is in a duty.
///
/// The incoming icon id that is being overwritten by the plugin.
- /// The icon id that should be used.
+ ///
/// Whether a priority icon was found.
public bool IsPriorityIcon(int iconId, ActivityContext activityContext)
{
diff --git a/Pilz.Dalamud/Pilz.Dalamud.csproj b/Pilz.Dalamud/Pilz.Dalamud.csproj
index 8b99e1b..53a2d61 100644
--- a/Pilz.Dalamud/Pilz.Dalamud.csproj
+++ b/Pilz.Dalamud/Pilz.Dalamud.csproj
@@ -27,6 +27,14 @@
0.4.0
True
+
+
+ 1701;1702;1591
+
+
+
+ 1701;1702;1591
+
@@ -60,7 +68,7 @@
-
+
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)
{