Make plugin compatible with AllaganTools 1.7.1.1+

Influx/AllaganTools/AllaganToolsIpc.cs

@@ -65,10 +65,8 @@ internal sealed class AllaganToolsIpc : IDisposable
             {
                 if (_dalamudReflector.TryGetDalamudPlugin("Allagan Tools", out var it, false, true))
                 {
-                    var pluginLoader = it.GetType()
+                    var hostedPlugin = it.GetType().BaseType!;
-                        .GetProperty("PluginLoader", BindingFlags.NonPublic | BindingFlags.Instance)!
+                    var host = hostedPlugin.GetField("host", BindingFlags.NonPublic | BindingFlags.Instance)!.GetValue(it)!;
-                        .GetValue(it)!;
-                    var host = pluginLoader.GetType().GetProperty("Host")!.GetValue(pluginLoader)!;
                     var serviceProvider = host.GetType().GetProperty("Services")!.GetValue(host)!;
                     var getServiceMethod = serviceProvider.GetType().GetMethod("GetService")!;
                     object GetService(Type t) => getServiceMethod.Invoke(serviceProvider, [t])!;
@@ -128,7 +126,7 @@ internal sealed class AllaganToolsIpc : IDisposable
 
     public Dictionary<Character, Currencies> CountCurrencies()
     {
-        _pluginLog.Debug($"{_characters.GetType()}, {_inventories.GetType()}");
+        _pluginLog.Verbose($"Updating characters with {_characters.GetType()} and {_inventories.GetType()}");
         var characters = _characters.All.ToDictionary(x => x.CharacterId, x => x);
         return _inventories.All
             .Where(x => characters.ContainsKey(x.Value.CharacterId))

Influx/AllaganTools/FilterResult.cs

@@ -3,27 +3,26 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Influx.AllaganTools;
 
 internal sealed class FilterResult
 {
-    private readonly object _delegate;
+    private readonly IEnumerable _searchResultList;
-    private readonly PropertyInfo _sortedItems;
 
-    public FilterResult(object @delegate)
+    public FilterResult(IEnumerable searchResultList)
     {
-        ArgumentNullException.ThrowIfNull(@delegate);
+        ArgumentNullException.ThrowIfNull(searchResultList);
-        _delegate = @delegate;
+        _searchResultList = searchResultList;
-        _sortedItems =
-            _delegate.GetType().GetProperty("SortedItems") ?? throw new MissingMemberException();
     }
 
     public IReadOnlyList<SortingResult> GenerateFilteredList()
     {
-        return ((IEnumerable)_sortedItems.GetValue(_delegate)!)
+        return _searchResultList
             .Cast<object>()
+            .Select(x => x.GetType()
+                .GetField("_sortingResult", BindingFlags.Instance | BindingFlags.NonPublic)!
+                .GetValue(x)!)
             .Select(x => new SortingResult(x))
             .ToList();
     }

Influx/AllaganTools/ListService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Reflection;
 
 namespace Influx.AllaganTools;
@@ -23,6 +24,6 @@ internal sealed class ListService : IListService
     public FilterResult? GetFilterByKeyOrName(string keyOrName)
     {
         var f = _getListByKeyOrName.Invoke(_listService, [keyOrName]);
-        return f != null ? new FilterResult(_refreshList.Invoke(_listFilterService, [f])!) : null;
+        return f != null ? new FilterResult((IEnumerable)_refreshList.Invoke(_listFilterService, [f])!) : null;
     }
 }

Influx/Influx.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Dalamud.NET.Sdk/9.0.2">
+<Project Sdk="Dalamud.NET.Sdk/10.0.0">
     <PropertyGroup>
-        <Version>1.0</Version>
+        <Version>1.3</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 

Influx/LocalStatistics/FcStatsCalculator.cs

@@ -162,9 +162,9 @@ internal sealed class FcStatsCalculator : IDisposable
                 {
                     var atkArrays = Framework.Instance()->GetUIModule()->GetRaptureAtkModule()->AtkModule
                         .AtkArrayDataHolder;
-                    if (atkArrays.NumberArrayCount > 50)
+                    if (atkArrays.NumberArrayCount > 51)
                     {
-                        var fcArrayData = atkArrays.GetNumberArrayData(50);
+                        var fcArrayData = atkArrays.GetNumberArrayData(51);
                         FcStats fcStats = new FcStats
                         {
                             ContentId = localContentId,

LLib

@@ -1 +1 @@
-Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe
+Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc