From b15d22d5339f30da31a57f9fec60408be0060cbe Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 28 Sep 2023 01:57:00 -0400 Subject: [PATCH] refactor: update for api 9 --- BetterPartyFinder/BetterPartyFinder.csproj | 2 +- BetterPartyFinder/BetterPartyFinder.yaml | 4 ++-- BetterPartyFinder/JoinHandler.cs | 2 +- BetterPartyFinder/Plugin.cs | 22 +++++++++------------- BetterPartyFinder/PluginUi.cs | 11 ++++++----- BetterPartyFinder/Util.cs | 6 +++--- BetterPartyFinder/packages.lock.json | 2 +- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/BetterPartyFinder/BetterPartyFinder.csproj b/BetterPartyFinder/BetterPartyFinder.csproj index e8a73e4..5fafbac 100755 --- a/BetterPartyFinder/BetterPartyFinder.csproj +++ b/BetterPartyFinder/BetterPartyFinder.csproj @@ -1,7 +1,7 @@ - net6-windows + net7-windows 1.2.6 latest enable diff --git a/BetterPartyFinder/BetterPartyFinder.yaml b/BetterPartyFinder/BetterPartyFinder.yaml index 8cfef2b..ff66f1e 100755 --- a/BetterPartyFinder/BetterPartyFinder.yaml +++ b/BetterPartyFinder/BetterPartyFinder.yaml @@ -1,4 +1,4 @@ -author: ascclemens +author: Anna name: Better Party Finder punchline: Use advanced Party Finder filter presets. description: |- @@ -12,4 +12,4 @@ description: |- - Remove PFs above maximum item level - Filter on item level range - Filter on multiple jobs and slots (ex. MCH + GNB available) -repo_url: https://git.annaclemens.io/ascclemens/BetterPartyFinder +repo_url: https://git.anna.lgbt/anna/BetterPartyFinder diff --git a/BetterPartyFinder/JoinHandler.cs b/BetterPartyFinder/JoinHandler.cs index 58ad9d9..6ab7302 100755 --- a/BetterPartyFinder/JoinHandler.cs +++ b/BetterPartyFinder/JoinHandler.cs @@ -25,7 +25,7 @@ namespace BetterPartyFinder { SeString msg = "Party description: "; msg.Payloads.AddRange(listing.Description.Payloads); - this.Plugin.ChatGui.PrintChat(new XivChatEntry { + this.Plugin.ChatGui.Print(new XivChatEntry { Name = "Better Party Finder", Type = XivChatType.SystemMessage, Message = msg, diff --git a/BetterPartyFinder/Plugin.cs b/BetterPartyFinder/Plugin.cs index 8adc44e..b3b00a0 100755 --- a/BetterPartyFinder/Plugin.cs +++ b/BetterPartyFinder/Plugin.cs @@ -1,37 +1,33 @@ -using Dalamud.Data; -using Dalamud.Game.ClientState; -using Dalamud.Game.Command; -using Dalamud.Game.Gui; -using Dalamud.Game.Gui.PartyFinder; -using Dalamud.IoC; +using Dalamud.IoC; using Dalamud.Plugin; +using Dalamud.Plugin.Services; using XivCommon; namespace BetterPartyFinder { // ReSharper disable once ClassNeverInstantiated.Global public class Plugin : IDalamudPlugin { - public string Name => "Better Party Finder"; + internal static string Name => "Better Party Finder"; [PluginService] internal DalamudPluginInterface Interface { get; init; } = null!; [PluginService] - internal ChatGui ChatGui { get; init; } = null!; + internal IChatGui ChatGui { get; init; } = null!; [PluginService] - internal ClientState ClientState { get; init; } = null!; + internal IClientState ClientState { get; init; } = null!; [PluginService] - internal CommandManager CommandManager { get; init; } = null!; + internal ICommandManager CommandManager { get; init; } = null!; [PluginService] - internal DataManager DataManager { get; init; } = null!; + internal IDataManager DataManager { get; init; } = null!; [PluginService] - internal GameGui GameGui { get; init; } = null!; + internal IGameGui GameGui { get; init; } = null!; [PluginService] - internal PartyFinderGui PartyFinderGui { get; init; } = null!; + internal IPartyFinderGui PartyFinderGui { get; init; } = null!; internal Configuration Config { get; } private Filter Filter { get; } diff --git a/BetterPartyFinder/PluginUi.cs b/BetterPartyFinder/PluginUi.cs index fe54f47..3ea4250 100755 --- a/BetterPartyFinder/PluginUi.cs +++ b/BetterPartyFinder/PluginUi.cs @@ -2,10 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; -using Dalamud.Data; using Dalamud.Game.Gui.PartyFinder.Types; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Interface; +using Dalamud.Interface.Utility; +using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Component.GUI; using ImGuiNET; using Lumina.Excel.GeneratedSheets; @@ -88,7 +89,7 @@ namespace BetterPartyFinder { private void DrawSettingsWindow() { ImGui.SetNextWindowSize(new Vector2(-1f, -1f), ImGuiCond.FirstUseEver); - if (!this.SettingsVisible || !ImGui.Begin($"{this.Plugin.Name} settings", ref this._settingsVisible)) { + if (!this.SettingsVisible || !ImGui.Begin($"{Plugin.Name} settings", ref this._settingsVisible)) { return; } @@ -141,7 +142,7 @@ namespace BetterPartyFinder { return; } - if (!ImGui.Begin(this.Plugin.Name, ref this._visible, ImGuiWindowFlags.NoDocking)) { + if (!ImGui.Begin(Plugin.Name, ref this._visible, ImGuiWindowFlags.NoDocking)) { if (ImGui.IsWindowCollapsed() && addon != null && addon->IsVisible) { // wait until addon is initialised to show var rootNode = addon->RootNode; @@ -678,7 +679,7 @@ namespace BetterPartyFinder { } internal static class UiCategoryExt { - internal static string? Name(this UiCategory category, DataManager data) { + internal static string? Name(this UiCategory category, IDataManager data) { var ct = data.GetExcelSheet()!; var addon = data.GetExcelSheet()!; @@ -702,7 +703,7 @@ namespace BetterPartyFinder { }; } - internal static bool ListingMatches(this UiCategory category, DataManager data, PartyFinderListing listing) { + internal static bool ListingMatches(this UiCategory category, IDataManager data, PartyFinderListing listing) { var cr = data.GetExcelSheet()!; var isDuty = listing.Category == DutyCategory.Duty; diff --git a/BetterPartyFinder/Util.cs b/BetterPartyFinder/Util.cs index 031c30e..678a9d9 100755 --- a/BetterPartyFinder/Util.cs +++ b/BetterPartyFinder/Util.cs @@ -1,15 +1,15 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using Dalamud.Data; using Dalamud.Game.ClientState.Objects.SubKinds; +using Dalamud.Plugin.Services; using Lumina.Excel.GeneratedSheets; namespace BetterPartyFinder { public static class Util { internal static uint MaxItemLevel { get; private set; } - internal static void CalculateMaxItemLevel(DataManager data) { + internal static void CalculateMaxItemLevel(IDataManager data) { if (MaxItemLevel > 0) { return; } @@ -28,7 +28,7 @@ namespace BetterPartyFinder { return CultureInfo.InvariantCulture.CompareInfo.IndexOf(haystack, needle, CompareOptions.IgnoreCase) >= 0; } - internal static IEnumerable WorldsOnDataCentre(DataManager data, PlayerCharacter character) { + internal static IEnumerable WorldsOnDataCentre(IDataManager data, PlayerCharacter character) { var dcRow = character.HomeWorld.GameData.DataCenter.Row; return data.GetExcelSheet()! .Where(world => world.IsPublic && world.DataCenter.Row == dcRow); diff --git a/BetterPartyFinder/packages.lock.json b/BetterPartyFinder/packages.lock.json index 47b2267..475c11f 100644 --- a/BetterPartyFinder/packages.lock.json +++ b/BetterPartyFinder/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0-windows7.0": { + "net7.0-windows7.0": { "DalamudPackager": { "type": "Direct", "requested": "[2.1.8, )",