refactor: update for API changes

This commit is contained in:
Anna 2021-08-29 12:58:37 -04:00
parent eb88765278
commit 1d3f97f2b3
2 changed files with 3 additions and 6 deletions

View File

@ -3,7 +3,6 @@ using Dalamud.Game.ClientState;
using Dalamud.Game.Command; using Dalamud.Game.Command;
using Dalamud.Game.Gui; using Dalamud.Game.Gui;
using Dalamud.Game.Gui.PartyFinder; using Dalamud.Game.Gui.PartyFinder;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using XivCommon; using XivCommon;
@ -34,9 +33,6 @@ namespace BetterPartyFinder {
[PluginService] [PluginService]
internal PartyFinderGui PartyFinderGui { get; init; } = null!; internal PartyFinderGui PartyFinderGui { get; init; } = null!;
[PluginService]
internal SeStringManager SeStringManager { get; init; } = null!;
internal Configuration Config { get; } internal Configuration Config { get; }
private Filter Filter { get; } private Filter Filter { get; }
internal PluginUi Ui { get; } internal PluginUi Ui { get; }

View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Numerics; using System.Numerics;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Game.Gui.PartyFinder.Types; using Dalamud.Game.Gui.PartyFinder.Types;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Interface; using Dalamud.Interface;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using ImGuiNET; using ImGuiNET;
@ -367,13 +368,13 @@ namespace BetterPartyFinder {
var searchQuery = this.DutySearchQuery.Trim(); var searchQuery = this.DutySearchQuery.Trim();
if (searchQuery.Trim() != "") { if (searchQuery.Trim() != "") {
duties = duties.Where(duty => { duties = duties.Where(duty => {
var sestring = this.Plugin.SeStringManager.Parse(duty.Name.RawData.ToArray()); var sestring = (SeString) duty.Name;
return sestring.TextValue.ContainsIgnoreCase(searchQuery); return sestring.TextValue.ContainsIgnoreCase(searchQuery);
}); });
} }
foreach (var cf in duties) { foreach (var cf in duties) {
var sestring = this.Plugin.SeStringManager.Parse(cf.Name.RawData.ToArray()); var sestring = (SeString) cf.Name;
var selected = filter.Duties.Contains(cf.RowId); var selected = filter.Duties.Contains(cf.RowId);
var name = sestring.TextValue; var name = sestring.TextValue;
name = char.ToUpperInvariant(name[0]) + name[1..]; name = char.ToUpperInvariant(name[0]) + name[1..];