Make plugin compatible with AllaganTools 1.7.1.1+

AutoRetainerAPI

@@ -1 +1 @@
-Subproject commit 6f0aaa55bce6ec79fd4d72f84f21597b39e5445d
+Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a

ECommons

@@ -1 +1 @@
-Subproject commit d238d4188e8b47b11252d75cb5e4b678b8da2756
+Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a

Influx/AllaganTools/AllaganToolsIpc.cs

@@ -24,7 +24,7 @@ internal sealed class AllaganToolsIpc : IDisposable
     private IInventoryMonitor _inventories;
     private IListService _lists;
 
-    public AllaganToolsIpc(DalamudPluginInterface pluginInterface, IChatGui chatGui, DalamudReflector dalamudReflector,
+    public AllaganToolsIpc(IDalamudPluginInterface pluginInterface, IChatGui chatGui, DalamudReflector dalamudReflector,
         IFramework framework, IPluginLog pluginLog)
     {
         _chatGui = chatGui;
@@ -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/AllaganTools/SortingResult.cs

@@ -22,7 +22,7 @@ internal sealed class SortingResult
     public ItemFlags Flags { get; }
     public int Quantity { get; }
 
-    public bool IsHq => Flags.HasFlag(ItemFlags.HQ);
+    public bool IsHq => Flags.HasFlag(ItemFlags.HighQuality);
 
     public override string ToString()
     {

Influx/Influx.csproj

@@ -1,67 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/10.0.0">
     <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <Version>1.3</Version>
-        <Version>0.18</Version>
-        <LangVersion>12</LangVersion>
-        <Nullable>enable</Nullable>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <OutputPath>dist</OutputPath>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <DebugType>portable</DebugType>
     </PropertyGroup>
 
-    <PropertyGroup>
+    <Import Project="..\LLib\LLib.targets"/>
-        <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
+    <Import Project="..\LLib\RenameZip.targets"/>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
-        <DalamudLibPath>$(DALAMUD_HOME)/</DalamudLibPath>
-    </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.12"/>
         <PackageReference Include="InfluxDB.Client" Version="4.14.0" />
         <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.1.24081.5" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Reference Include="Dalamud">
-            <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="ImGui.NET">
-            <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina">
-            <HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina.Excel">
-            <HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Newtonsoft.Json">
-            <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="FFXIVClientStructs">
-            <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj" />
       <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" />
       <ProjectReference Include="..\LLib\LLib.csproj" />
     </ItemGroup>
-
-    <Target Name="RenameLatestZip" AfterTargets="PackagePlugin">
-        <Exec Command="rename $(OutDir)$(AssemblyName)\latest.zip $(AssemblyName)-$(Version).zip"/>
-    </Target>
 </Project>

Influx/Influx/InfluxStatisticsClient.cs

@@ -216,6 +216,10 @@ internal sealed class InfluxStatisticsClient : IDisposable
             {
                 foreach (var (expIndex, job) in _expToJobs)
                 {
+                    // last update to this char was in 6.x, so we don't have PCT/VPR data
+                    if (localStats.ClassJobLevels.Count <= expIndex)
+                        continue;
+
                     var level = localStats.ClassJobLevels[expIndex];
                     if (level > 0)
                     {

Influx/InfluxPlugin.cs

@@ -22,7 +22,7 @@ namespace Influx;
 internal sealed class InfluxPlugin : IDalamudPlugin
 {
     private readonly object _lock = new();
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly Configuration _configuration;
     private readonly IClientState _clientState;
     private readonly ICommandManager _commandManager;
@@ -38,7 +38,7 @@ internal sealed class InfluxPlugin : IDalamudPlugin
     private readonly ConfigurationWindow _configurationWindow;
     private readonly Timer _timer;
 
-    public InfluxPlugin(DalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog,
+    public InfluxPlugin(IDalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog,
         ICommandManager commandManager, IChatGui chatGui, IDataManager dataManager, IFramework framework,
         IAddonLifecycle addonLifecycle, IGameGui gameGui, ICondition condition)
     {

Influx/LocalStatistics/FcStatsCalculator.cs

@@ -18,7 +18,7 @@ namespace Influx.LocalStatistics;
 
 internal sealed class FcStatsCalculator : IDisposable
 {
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IClientState _clientState;
     private readonly IAddonLifecycle _addonLifecycle;
     private readonly IGameGui _gameGui;
@@ -33,7 +33,7 @@ internal sealed class FcStatsCalculator : IDisposable
 
     public FcStatsCalculator(
         IDalamudPlugin plugin,
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
         IClientState clientState,
         IAddonLifecycle addonLifecycle,
         IGameGui gameGui,
@@ -86,9 +86,9 @@ internal sealed class FcStatsCalculator : IDisposable
         if (infoProxy != null)
         {
             var fcProxy = (InfoProxyFreeCompany*)infoProxy;
-            if (fcProxy->ID != 0)
+            if (fcProxy->Id != 0)
             {
-                _pluginLog.Information($"Requesting post-process, FC is {fcProxy->ID}");
+                _pluginLog.Information($"Requesting post-process, FC is {fcProxy->Id}");
                 _autoRetainerApi.RequestCharacterPostprocess();
             }
             else
@@ -157,14 +157,14 @@ internal sealed class FcStatsCalculator : IDisposable
             if (infoProxy != null)
             {
                 var fcProxy = (InfoProxyFreeCompany*)infoProxy;
-                ulong localContentId = fcProxy->ID;
+                ulong localContentId = fcProxy->Id;
                 if (localContentId != 0)
                 {
-                    var atkArrays = Framework.Instance()->GetUiModule()->GetRaptureAtkModule()->AtkModule
+                    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,

Influx/LocalStatistics/LocalStatsCalculator.cs

@@ -27,7 +27,7 @@ internal sealed class LocalStatsCalculator : IDisposable
 
     private const uint JointQuest = 65781;
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IClientState _clientState;
     private readonly IAddonLifecycle _addonLifecycle;
     private readonly IPluginLog _pluginLog;
@@ -40,7 +40,7 @@ internal sealed class LocalStatsCalculator : IDisposable
 
 
     public LocalStatsCalculator(
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
         IClientState clientState,
         IAddonLifecycle addonLifecycle,
         IPluginLog pluginLog,
@@ -58,11 +58,9 @@ internal sealed class LocalStatsCalculator : IDisposable
         Task.Run(() =>
         {
             List<QuestInfo> msq = new();
-            foreach (var quest in dataManager.GetExcelSheet<Quest>()!.Where(x => x.JournalGenre.Row is >= 1 and <= 12))
+            foreach (var quest in dataManager.GetExcelSheet<Quest>()!.Where(x => x.JournalGenre.Row is >= 1 and <= 13))
             {
                 var previousQuests = quest.PreviousQuest?.Select(x => x.Row).Where(x => x != 0).ToList();
-                if (previousQuests != null && quest.Unknown12 != 0)
-                    previousQuests.Add(quest.Unknown12);
 
                 msq.Add(new QuestInfo
                 {
@@ -248,8 +246,8 @@ internal sealed class LocalStatsCalculator : IDisposable
     private unsafe List<short> ExtractClassJobLevels(PlayerState* playerState)
     {
         List<short> levels = new();
-        for (int i = 0; i < 30; ++i)
+        for (int i = 0; i < 32; ++i)
-            levels.Add(playerState->ClassJobLevelArray[i]);
+            levels.Add(playerState->ClassJobLevels[i]);
         return levels;
     }
 

Influx/Windows/ConfigurationWindow.cs

@@ -14,14 +14,14 @@ namespace Influx.Windows;
 
 internal sealed class ConfigurationWindow : Window
 {
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IClientState _clientState;
     private readonly Configuration _configuration;
     private readonly AllaganToolsIpc _allaganToolsIpc;
-    private string[] _filterNames = Array.Empty<string>();
+    private string[] _filterNames = [];
     private int _filterIndexToAdd;
 
-    public ConfigurationWindow(DalamudPluginInterface pluginInterface, IClientState clientState,
+    public ConfigurationWindow(IDalamudPluginInterface pluginInterface, IClientState clientState,
         Configuration configuration, AllaganToolsIpc allaganToolsIpc)
         : base("Configuration###InfluxConfiguration")
     {

Influx/packages.lock.json

@@ -4,9 +4,21 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
+        "requested": "[2.1.13, )",
-        "resolved": "2.1.12",
+        "resolved": "2.1.13",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+      },
+      "DotNet.ReproducibleBuilds": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
+        "dependencies": {
+          "Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
+          "Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
+          "Microsoft.SourceLink.GitHub": "1.1.1",
+          "Microsoft.SourceLink.GitLab": "1.1.1"
+        }
       },
       "InfluxDB.Client": {
         "type": "Direct",
@@ -29,6 +41,16 @@
         "resolved": "9.0.0-preview.1.24081.5",
         "contentHash": "aAR7YW+pUUdvHk3vj7GtAi71dWGDIuY9270lsmQ6lKw23zzY+r8pLP3cGNbJdlnA9VWl+S+gnIVkBCqj2ROlEg=="
       },
+      "Microsoft.SourceLink.Gitea": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "KOBodmDnlWGIqZt2hT47Q69TIoGhIApDVLCyyj9TT5ct8ju16AbHYcB4XeknoHX562wO1pMS/1DfBIZK+V+sxg==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
       "CsvHelper": {
         "type": "Transitive",
         "resolved": "30.0.1",
@@ -54,6 +76,11 @@
           "Newtonsoft.Json": "13.0.1"
         }
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -72,6 +99,47 @@
           "System.Buffers": "4.5.0"
         }
       },
+      "Microsoft.SourceLink.AzureRepos.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Bitbucket.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.GitLab": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
       "Microsoft.Win32.SystemEvents": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -195,14 +263,17 @@
       "autoretainerapi": {
         "type": "Project",
         "dependencies": {
-          "ECommons": "[2.1.0.7, )"
+          "ECommons": "[2.2.0.2, )"
         }
       },
       "ecommons": {
         "type": "Project"
       },
       "llib": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "DalamudPackager": "[2.1.13, )"
+        }
       }
     }
   }

LLib

@@ -1 +1 @@
-Subproject commit 3792244261a9f5426a7916f5a6dd1966238ba84a
+Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc