Make /dbq request work with all items (not just shards/crystals/clusters)

AutoRetainerAPI

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

ECommons

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

KitchenSink/Commands/CharacterSwitch.cs

@@ -8,7 +8,6 @@ using Dalamud.Game.Command;
 using Dalamud.Game.Gui.Dtr;
 using Dalamud.Game.Text;
 using Dalamud.Interface.ImGuiNotification;
-using Dalamud.Interface.Internal.Notifications;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.UI;
 
@@ -25,7 +24,7 @@ internal sealed class CharacterSwitch : IDisposable
     private readonly INotificationManager _notificationManager;
     private readonly ICondition _condition;
     private readonly IPluginLog _pluginLog;
-    private readonly DtrBarEntry _dtrBarEntry;
+    private readonly IDtrBarEntry _dtrBarEntry;
 
     public CharacterSwitch(AutoRetainerApi autoRetainerApi, ICommandManager commandManager, IClientState clientState,
         IChatGui chatGui, INotificationManager notificationManager, IDtrBar dtrBar, ICondition condition,
@@ -189,11 +188,11 @@ internal sealed class CharacterSwitch : IDisposable
             var previous = FindCharacter(-1, showError: false);
             var next = FindCharacter(1, showError: false);
             if (previous != null && next != null)
-                _dtrBarEntry.Tooltip = $"Prev: {previous.Name}\nNext: {next.Name}";
+                _dtrBarEntry.Tooltip = $"Prev: {previous.ToString(homeWorld)}\nNext: {next.ToString(homeWorld)}";
             else if (previous != null)
-                _dtrBarEntry.Tooltip = $"Prev: {previous.Name}";
+                _dtrBarEntry.Tooltip = $"Prev: {previous.ToString(homeWorld)}";
             else if (next != null)
-                _dtrBarEntry.Tooltip = $"Next: {next.Name}";
+                _dtrBarEntry.Tooltip = $"Next: {next.ToString(homeWorld)}";
             else
                 _dtrBarEntry.Tooltip = null;
         }
@@ -207,7 +206,7 @@ internal sealed class CharacterSwitch : IDisposable
     public void Dispose()
     {
         _clientState.Login -= UpdateDtrBar;
-        _dtrBarEntry.Dispose();
+        _dtrBarEntry.Remove();
         _commandManager.RemoveHandler("/ks");
         _commandManager.RemoveHandler("/k-");
         _commandManager.RemoveHandler("/k+");
@@ -216,5 +215,10 @@ internal sealed class CharacterSwitch : IDisposable
     private sealed record Target(string Name, string World)
     {
         public override string ToString() => $"{Name}@{World}";
+
+        public string ToString(string? currentWorld)
+        {
+            return currentWorld != World ? ToString() : Name;
+        }
     }
 }

KitchenSink/Commands/DropboxQueue.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using Dalamud.Game.Command;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Ipc;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using LLib;
@@ -23,18 +25,35 @@ internal sealed class DropboxQueue : IDisposable
         InventoryType.Inventory4,
         InventoryType.Crystals,
         InventoryType.Currency,
+
+        InventoryType.ArmoryMainHand,
+        InventoryType.ArmoryOffHand,
+
+        InventoryType.ArmoryHead,
+        InventoryType.ArmoryBody,
+        InventoryType.ArmoryHands,
+        InventoryType.ArmoryLegs,
+        InventoryType.ArmoryFeets,
+
+        InventoryType.ArmoryEar,
+        InventoryType.ArmoryNeck,
+        InventoryType.ArmoryWrist,
+        InventoryType.ArmoryRings,
     ];
 
     private readonly ICommandManager _commandManager;
     private readonly IChatGui _chatGui;
     private readonly DropboxApi _dropboxApi;
 
-    public DropboxQueue(DalamudReflector reflector, ICommandManager commandManager, IChatGui chatGui,
+    public DropboxQueue(IDalamudPluginInterface pluginInterface,
+        DalamudReflector reflector,
+        ICommandManager commandManager,
+        IChatGui chatGui,
         IPluginLog pluginLog)
     {
         _commandManager = commandManager;
         _chatGui = chatGui;
-        _dropboxApi = new DropboxApi(reflector, pluginLog);
+        _dropboxApi = new DropboxApi(pluginInterface, reflector, pluginLog);
 
         _commandManager.AddHandler("/dbq", new CommandInfo(Queue)
         {
@@ -58,9 +77,18 @@ internal sealed class DropboxQueue : IDisposable
             case "crystals":
                 BuildRequest(string.Join(" ", Enumerable.Range(8, 6).Select(x => $"{x}:9999")));
                 break;
+            case "clusters":
+                BuildRequest(string.Join(" ", Enumerable.Range(14, 6).Select(x => $"{x}:9999")));
+                break;
             case "shards+crystals":
                 BuildRequest(string.Join(" ", Enumerable.Range(2, 12).Select(x => $"{x}:9999")));
                 break;
+            case "crystals+clusters":
+                BuildRequest(string.Join(" ", Enumerable.Range(8, 12).Select(x => $"{x}:9999")));
+                break;
+            case "shards+crystals+clusters":
+                BuildRequest(string.Join(" ", Enumerable.Range(2, 18).Select(x => $"{x}:9999")));
+                break;
             case "request":
                 BuildRequest(parts.Length == 2 ? parts[1] : string.Empty);
                 break;
@@ -91,7 +119,9 @@ internal sealed class DropboxQueue : IDisposable
         var missingItems = parsedItems
             .Select(item => item with
             {
-                Needed = item.Needed - inventoryManger->GetItemCountInContainer(item.ItemId, InventoryType.Crystals)
+                Needed = item.Needed - DefaultInventoryTypes.Sum(y =>
+                    inventoryManger->GetItemCountInContainer(item.ItemId, y) +
+                    inventoryManger->GetItemCountInContainer(item.ItemId, y, true))
             })
             .Where(x => x.Needed > 0)
             .ToList();
@@ -135,13 +165,15 @@ internal sealed class DropboxQueue : IDisposable
                         itemCount.HighQualityQuantity - highQualityQuantity);
             }
         }
+
+        _dropboxApi.BeginTrade();
     }
 
-    private IReadOnlyList<NeededItem>? ParseArguments(string arguments)
+    private ReadOnlyCollection<NeededItem>? ParseArguments(string arguments)
     {
         var parsedItems = arguments.Split(' ')
             .Select(x => x.Split(':'))
-            .Select(x =>
+            .Select<string[], (string, NeededItem?)>(x =>
             {
                 if (x.Length != 2)
                     return ($"Unable to parse {string.Join(" ", x)}.", null);
@@ -191,15 +223,15 @@ internal sealed class DropboxQueue : IDisposable
             for (int i = 0; i < container->Size; ++i)
             {
                 var item = container->GetInventorySlot(i);
-                if (item != null && item->ItemID != 0)
+                if (item != null && item->ItemId != 0)
                 {
                     if (item->Spiritbond > 0)
                         continue;
 
-                    if (!allItems.TryGetValue(item->ItemID, out ItemCount? itemCount))
+                    if (!allItems.TryGetValue(item->ItemId, out ItemCount? itemCount))
                         itemCount = new(0, 0);
 
-                    if (item->Flags.HasFlag(InventoryItem.ItemFlags.HQ))
+                    if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality))
                         itemCount = itemCount with
                         {
                             HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity
@@ -210,7 +242,7 @@ internal sealed class DropboxQueue : IDisposable
                             NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity
                         };
 
-                    allItems[item->ItemID] = itemCount;
+                    allItems[item->ItemId] = itemCount;
                 }
             }
         }
@@ -234,54 +266,36 @@ internal sealed class DropboxQueue : IDisposable
     {
         private readonly DalamudReflector _reflector;
         private readonly IPluginLog _pluginLog;
+        private readonly ICallGateSubscriber<object> _beginTradingQueue;
+        private readonly ICallGateSubscriber<uint, bool, int> _getItemQuantity;
+        private readonly ICallGateSubscriber<uint, bool, int, object> _setItemQuantity;
 
-        public DropboxApi(DalamudReflector reflector, IPluginLog pluginLog)
+        public DropboxApi(IDalamudPluginInterface pluginInterface, DalamudReflector reflector, IPluginLog pluginLog)
         {
             _reflector = reflector;
             _pluginLog = pluginLog;
+
+            _beginTradingQueue = pluginInterface.GetIpcSubscriber<object>("Dropbox.BeginTradingQueue");
+            _getItemQuantity = pluginInterface.GetIpcSubscriber<uint, bool, int>("Dropbox.GetItemQuantity");
+            _setItemQuantity = pluginInterface.GetIpcSubscriber<uint, bool, int, object>("Dropbox.SetItemQuantity");
         }
 
-        [SuppressMessage("Performance", "CA2000", Justification = "Should not dispose other plugin")]
+        public void BeginTrade() => _beginTradingQueue.InvokeAction();
+
         public void EnqueueItem(uint itemId, bool hq, int quantity)
         {
             _pluginLog.Verbose($"Preparing to queue {itemId}, {hq}, {quantity}");
             if (quantity < 0)
                 return;
 
-            if (!TryGetItemQuantities(out IDalamudPlugin? dropboxPlugin, out IDictionary? itemQuantities))
+            int currentQuantity = _getItemQuantity.InvokeFunc(itemId, hq);
-                throw new InvalidOperationException("Could not retrieve item quantities");
+            _setItemQuantity.InvokeAction(itemId, hq, quantity + currentQuantity);
-
-            uint[] tradeableItemIds = (uint[])dropboxPlugin.GetType()
-                .GetField("TradeableItems", BindingFlags.Public | BindingFlags.Instance)!
-                .GetValue(dropboxPlugin)!;
-            if (!tradeableItemIds.Contains(itemId))
-            {
-                _pluginLog.Warning($"Item {itemId} is untradable");
-                return;
-            }
-
-
-            var itemDescriptorType = itemQuantities.GetType().GetGenericArguments()[0];
-            var itemDescriptor = Activator.CreateInstance(itemDescriptorType, args: [itemId, hq])!;
-
-            var queuedQuantity = itemQuantities[itemDescriptor];
-            _pluginLog.Verbose($"Retrieved quantity: {queuedQuantity}");
-            if (queuedQuantity == null)
-                return;
-
-            var boxType = queuedQuantity.GetType();
-            var valueField = boxType.GetField("Value", BindingFlags.Public | BindingFlags.Instance)!;
-
-            _pluginLog.Information($"Adding {itemDescriptor} to queue");
-            valueField.SetValue(queuedQuantity, quantity);
         }
 
         public void ClearQueue()
         {
-            if (!TryGetItemQuantities(out IDalamudPlugin? _, out IDictionary? itemQuantities))
+            if (TryGetItemQuantities(out _, out IDictionary? itemQuantities))
-                throw new InvalidOperationException("Could not retrieve item quantities");
+                itemQuantities.Clear();
-
-            itemQuantities.Clear();
         }
 
         private bool TryGetItemQuantities([NotNullWhen(true)] out IDalamudPlugin? dropboxPlugin,

KitchenSink/KitchenSink.csproj

@@ -1,65 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <Version>1.2</Version>
-        <Version>0.4</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"/>
-    </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>

KitchenSink/KitchenSinkPlugin.cs

@@ -16,9 +16,9 @@ internal sealed class KitchenSinkPlugin : IDalamudPlugin
     private readonly CharacterSwitch _characterSwitch;
     private readonly DropboxQueue _dropboxQueue;
 
-    public KitchenSinkPlugin(DalamudPluginInterface pluginInterface, ICommandManager commandManager,
+    public KitchenSinkPlugin(IDalamudPluginInterface pluginInterface, ICommandManager commandManager,
         IClientState clientState, IChatGui chatGui, INotificationManager notificationManager, IDtrBar dtrBar,
-        ICondition condition, IPluginLog pluginLog, IFramework framework)
+        ICondition condition, IFramework framework, IPluginLog pluginLog)
     {
         DalamudReflector reflector = new DalamudReflector(pluginInterface, framework, pluginLog);
 
@@ -26,7 +26,7 @@ internal sealed class KitchenSinkPlugin : IDalamudPlugin
         _autoRetainerApi = new AutoRetainerApi();
         _characterSwitch = new CharacterSwitch(_autoRetainerApi, commandManager, clientState, chatGui,
             notificationManager, dtrBar, condition, pluginLog);
-        _dropboxQueue = new DropboxQueue(reflector, commandManager, chatGui, pluginLog);
+        _dropboxQueue = new DropboxQueue(pluginInterface, reflector, commandManager, chatGui, pluginLog);
     }
 
     public void Dispose()

KitchenSink/packages.lock.json

@@ -4,21 +4,92 @@
     "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"
+        }
+      },
+      "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"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "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"
+        }
       },
       "autoretainerapi": {
         "type": "Project",
         "dependencies": {
-          "ECommons": "[2.2.0.1, )"
+          "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 93fac6efb01a1272192d929fd863328271512ea4