Pilz.NET/Pilz.Dalamud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

API 9 #1

Merged
pilzinsel64 merged 2 commits from api9 into master 2023-10-03 07:43:10 +00:00
Conversation 1 Commits 2 Files Changed 7 +9 -6
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f9ab3462eb - Show all commits

2
Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
View File

@@ -35,7 +35,7 @@ namespace Pilz.Dalamud.ActivityContexts
PluginServices.ClientState.TerritoryChanged -= ClientState_TerritoryChanged; PluginServices.ClientState.TerritoryChanged -= ClientState_TerritoryChanged;
} }
private void ClientState_TerritoryChanged(object? sender, ushort e) private void ClientState_TerritoryChanged(ushort obj)
{ {
CheckCurrentTerritory(); CheckCurrentTerritory();
} }

3
Pilz.Dalamud/Nameplates/NameplateHooks.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Pilz.Dalamud.Nameplates.Model; using Pilz.Dalamud.Nameplates.Model;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
using System.Xml.Linq; using System.Xml.Linq;
using Dalamud.Plugin.Services;
namespace Pilz.Dalamud.Nameplates namespace Pilz.Dalamud.Nameplates
{ {
@@ -52,7 +53,7 @@ namespace Pilz.Dalamud.Nameplates
/// </summary> /// </summary>
public NameplateHooks() public NameplateHooks()
{ {
SignatureHelper.Initialise(this); PluginServices.GameInteropProvider.InitializeFromAttributes(this);
} }
~NameplateHooks() ~NameplateHooks()

10
Pilz.Dalamud/PluginServices.cs
View File

@@ -4,6 +4,7 @@ using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.Gui; using Dalamud.Game.Gui;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -14,11 +15,12 @@ namespace Pilz.Dalamud
{ {
public class PluginServices public class PluginServices
{ {
[PluginService] public static GameGui GameGui { get; set; } = null;
[PluginService] public static DalamudPluginInterface PluginInterface { get; set; } = null; [PluginService] public static DalamudPluginInterface PluginInterface { get; set; } = null;
[PluginService] public static ClientState ClientState { get; set; } = null; [PluginService] public static IGameGui GameGui { get; set; } = null;
[PluginService] public static DataManager DataManager { get; set; } = null; [PluginService] public static IClientState ClientState { get; set; } = null;
[PluginService] public static ObjectTable ObjectTable { 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) public static void Initialize(DalamudPluginInterface dalamudPluginInterface)
{ {