From c0a8727a19b48adde4941fbb643fa5c99d13cf50 Mon Sep 17 00:00:00 2001 From: Mira Date: Fri, 2 Aug 2024 19:02:51 +0200 Subject: [PATCH] clean up CharacterInfoService.cs --- HimbeertoniRaidTool/Services/CharacterInfoService.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/HimbeertoniRaidTool/Services/CharacterInfoService.cs b/HimbeertoniRaidTool/Services/CharacterInfoService.cs index b716c4a5..33e11555 100644 --- a/HimbeertoniRaidTool/Services/CharacterInfoService.cs +++ b/HimbeertoniRaidTool/Services/CharacterInfoService.cs @@ -2,7 +2,6 @@ using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Party; using Dalamud.Plugin.Services; -using FFXIVClientStructs.FFXIV.Client.System.Framework; using FFXIVClientStructs.FFXIV.Client.UI.Info; using Lumina.Excel.GeneratedSheets; @@ -12,9 +11,7 @@ internal unsafe class CharacterInfoService { private readonly IObjectTable _gameObjects; private readonly IPartyList _partyList; - private readonly InfoModule* _infoModule; - private InfoProxyPartyMember* PartyInfo => - (InfoProxyPartyMember*)_infoModule->GetInfoProxyById(InfoProxyId.PartyMember); + private static InfoProxyPartyMember* PartyInfo => InfoProxyPartyMember.Instance(); private readonly Dictionary _cache = new(); private readonly HashSet _notFound = new(); private DateTime _lastPrune; @@ -25,11 +22,8 @@ internal CharacterInfoService(IObjectTable gameObjects, IPartyList partyList) _gameObjects = gameObjects; _partyList = partyList; _lastPrune = DateTime.Now; - _infoModule = Framework.Instance()->UIModule->GetInfoModule(); } - public long GetLocalPlayerContentId() => (long)_infoModule->LocalContentId; - public ulong GetContentId(IPlayerCharacter? character) { if (character == null)