anna
/
BetterPartyFinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: update for api 9

This commit is contained in:
Anna 2023-09-28 01:57:00 -04:00
parent 38177fa27f
commit b15d22d533
Signed by: anna
GPG Key ID: D0943384CD9F87D1
7 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BetterPartyFinder/BetterPartyFinder.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6-windows</TargetFramework>
<TargetFramework>net7-windows</TargetFramework>
<Version>1.2.6</Version>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>

4
BetterPartyFinder/BetterPartyFinder.yaml
View File

@ -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

2
BetterPartyFinder/JoinHandler.cs
View File

@ -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,

22
BetterPartyFinder/Plugin.cs
View File

@ -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; }

11
BetterPartyFinder/PluginUi.cs
View File

@ -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<ContentType>()!;
var addon = data.GetExcelSheet<Addon>()!;
@ -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<ContentRoulette>()!;
var isDuty = listing.Category == DutyCategory.Duty;

6
BetterPartyFinder/Util.cs
View File

@ -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<World> WorldsOnDataCentre(DataManager data, PlayerCharacter character) {
internal static IEnumerable<World> WorldsOnDataCentre(IDataManager data, PlayerCharacter character) {
var dcRow = character.HomeWorld.GameData.DataCenter.Row;
return data.GetExcelSheet<World>()!
.Where(world => world.IsPublic && world.DataCenter.Row == dcRow);

2
BetterPartyFinder/packages.lock.json
View File

@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0-windows7.0": {
"net7.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[2.1.8, )",