API 10

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,
@@ -75,7 +74,7 @@ internal sealed class CharacterSwitch : IDisposable
             UpdateDtrBar();
     }
 
-    private Target? FindCharacter(int direction)
+    private Target? FindCharacter(int direction, bool showError = true)
     {
         _pluginLog.Verbose($"Switching characters ({direction})");
 
@@ -83,7 +82,8 @@ internal sealed class CharacterSwitch : IDisposable
         int index = characterIds.IndexOf(_clientState.LocalContentId);
         if (index < 0)
         {
-            _chatGui.PrintError("[KitchenSink] Current character not known.");
+            if (showError)
+                _chatGui.PrintError("[KitchenSink] Current character not known.");
             return null;
         }
 
@@ -94,7 +94,8 @@ internal sealed class CharacterSwitch : IDisposable
             target = _autoRetainerApi.GetOfflineCharacterData(characterIds[index]);
             if (target?.CID == _clientState.LocalContentId)
             {
-                _chatGui.PrintError("[KitchenSink] No character to switch to found.");
+                if (showError)
+                    _chatGui.PrintError("[KitchenSink] No character to switch to found.");
                 return null;
             }
 
@@ -184,14 +185,14 @@ internal sealed class CharacterSwitch : IDisposable
         {
             _dtrBarEntry.Text = seIconChar.ToIconString();
 
-            var previous = FindCharacter(-1);
-            var next = FindCharacter(1);
+            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;
         }
@@ -205,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+");
@@ -214,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,263 +1,262 @@
 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;
 
-namespace KitchenSink.Commands
+namespace KitchenSink.Commands;
+
+internal sealed class DropboxQueue : IDisposable
 {
-    internal sealed class DropboxQueue : IDisposable
+    private static readonly InventoryType[] DefaultInventoryTypes =
+    [
+        InventoryType.Inventory1,
+        InventoryType.Inventory2,
+        InventoryType.Inventory3,
+        InventoryType.Inventory4,
+        InventoryType.Crystals,
+        InventoryType.Currency,
+    ];
+
+    private readonly ICommandManager _commandManager;
+    private readonly IChatGui _chatGui;
+    private readonly DropboxApi _dropboxApi;
+
+    public DropboxQueue(IDalamudPluginInterface pluginInterface, ICommandManager commandManager, IChatGui chatGui,
+        IPluginLog pluginLog)
     {
-        private static readonly InventoryType[] DefaultInventoryTypes =
-        [
-            InventoryType.Inventory1,
-            InventoryType.Inventory2,
-            InventoryType.Inventory3,
-            InventoryType.Inventory4,
-            InventoryType.Crystals,
-            InventoryType.Currency,
-        ];
+        _commandManager = commandManager;
+        _chatGui = chatGui;
+        _dropboxApi = new DropboxApi(pluginInterface, pluginLog);
 
-        private readonly ICommandManager _commandManager;
-        private readonly IChatGui _chatGui;
-        private readonly DropboxApi _dropboxApi;
-
-        public DropboxQueue(DalamudReflector reflector, ICommandManager commandManager, IChatGui chatGui,
-            IPluginLog pluginLog)
+        _commandManager.AddHandler("/dbq", new CommandInfo(Queue)
         {
-            _commandManager = commandManager;
-            _chatGui = chatGui;
-            _dropboxApi = new DropboxApi(reflector, pluginLog);
+            HelpMessage =
+                $"Queue items to be imported into dropbox{Environment.NewLine}" +
+                $"\t/dbq item1:qty1 item2:qty2 [...] - queues items for the next trade (use * as quantity for 'all'){Environment.NewLine}n" +
+                $"\t/dbq clear - remove all items in the queue{Environment.NewLine}" +
+                $"\t/dbq request item1:qty1 item2:qty2 [...] - show the command to fill your inventory with the specific item quantities{Environment.NewLine}" +
+                $"\t/dbq [shards/crystals/shards+crystals] - show the command to fill shards and/or crystals to 9999"
+        });
+    }
 
-            _commandManager.AddHandler("/dbq", new CommandInfo(Queue)
-            {
-                HelpMessage =
-                    $"Queue items to be imported into dropbox{Environment.NewLine}\t/dbq item1:qty1 item2:qty2 [...] - queues items for the next trade (use * as quantity for 'all'){Environment.NewLine}\t/dbq clear - remove all items in the queue{Environment.NewLine}\t/dbq crystals - show the command to fill all shards & crystals to 9999"
-            });
+    private void Queue(string command, string arguments)
+    {
+        string[] parts = arguments.Split(" ", 2);
+        switch (parts[0])
+        {
+            case "shards":
+                BuildRequest(string.Join(" ", Enumerable.Range(2, 6).Select(x => $"{x}:9999")));
+                break;
+            case "crystals":
+                BuildRequest(string.Join(" ", Enumerable.Range(8, 6).Select(x => $"{x}:9999")));
+                break;
+            case "shards+crystals":
+                BuildRequest(string.Join(" ", Enumerable.Range(2, 12).Select(x => $"{x}:9999")));
+                break;
+            case "request":
+                BuildRequest(parts.Length == 2 ? parts[1] : string.Empty);
+                break;
+            case "clear":
+                //_dropboxApi.ClearQueue();
+                break;
+            default:
+                AddToQueue(arguments);
+                break;
+        }
+    }
+
+    private unsafe void BuildRequest(string arguments)
+    {
+        if (string.IsNullOrEmpty(arguments))
+        {
+            _chatGui.PrintError("Usage: /dbq request item1:qty1 item2:qty2 [...]");
         }
 
-        private void Queue(string command, string arguments)
+        InventoryManager* inventoryManger = InventoryManager.Instance();
+        if (inventoryManger == null)
+            return;
+
+        IReadOnlyList<NeededItem>? parsedItems = ParseArguments(arguments);
+        if (parsedItems == null)
+            return;
+
+        var missingItems = parsedItems
+            .Select(item => item with
+            {
+                Needed = item.Needed - inventoryManger->GetItemCountInContainer(item.ItemId, InventoryType.Crystals)
+            })
+            .Where(x => x.Needed > 0)
+            .ToList();
+        if (missingItems.Count == 0)
         {
-            if (arguments == "crystals")
+            _chatGui.Print("No items need to be filled");
+            return;
+        }
+
+        _chatGui.Print(new SeStringBuilder().AddUiForeground("[KitchenSink] ", 504)
+            .Append($"/dbq {string.Join(" ", missingItems)}").Build());
+    }
+
+    private void AddToQueue(string arguments)
+    {
+        IReadOnlyList<NeededItem>? parsedItems = ParseArguments(arguments);
+        if (parsedItems == null)
+            return;
+
+        Dictionary<uint, ItemCount> allItems = GetItemCounts();
+        foreach (var neededItem in parsedItems)
+        {
+            if (!allItems.TryGetValue(neededItem.ItemId, out ItemCount? itemCount))
+                continue;
+
+            int normalQualityQuantity = Math.Min(neededItem.Needed, itemCount.NormalQualityQuantity);
+            int highQualityQuantity = Math.Min(neededItem.Needed - normalQualityQuantity,
+                itemCount.HighQualityQuantity);
+
+            if (normalQualityQuantity > 0)
+                _dropboxApi.EnqueueItem(neededItem.ItemId, false, normalQualityQuantity);
+
+            if (highQualityQuantity > 0)
+                _dropboxApi.EnqueueItem(neededItem.ItemId, true, highQualityQuantity);
+
+            if (normalQualityQuantity > 0 || highQualityQuantity > 0)
             {
-                ShowCrystals();
-            }
-            else if (arguments == "clear")
-            {
-                _dropboxApi.ClearQueue();
-            }
-            else
-            {
-                var parsedItems = arguments.Split(' ')
-                    .Select(x => x.Split(':'))
-                    .Select(x =>
-                    {
-                        if (x.Length != 2)
-                            return ($"Unable to parse {string.Join(" ", x)}.", null);
-
-                        if (!uint.TryParse(x[0], out uint itemId))
-                            return ($"Unable to parse item id {x[0]}.", null);
-
-                        int needed;
-                        if (x[1] == "*")
-                            needed = int.MaxValue;
-                        else if (!int.TryParse(x[1], out needed))
-                            return ($"Unable to parse quantity {x[1]}.", null);
-
-                        return (string.Empty, new NeededItem(itemId, needed));
-                    }).ToList();
-                if (parsedItems.Count == 0)
-                    return;
-
-                var problematic = parsedItems.Where(x => !string.IsNullOrEmpty(x.Item1)).Select(x => x.Item1).ToList();
-                if (problematic.Count == 1)
-                {
-                    _chatGui.PrintError($"dbq: {problematic.First()}");
-                }
-                else if (problematic.Count >= 2)
-                {
-                    _chatGui.PrintError("dbq: Multiple errors occured:");
-                    foreach (string problem in problematic)
-                        _chatGui.PrintError($" - {problem}");
-                }
-                else
-                {
-                    Dictionary<uint, ItemCount> allItems = GetItemCounts();
-                    foreach (var neededItem in parsedItems.Select(x => x.Item2).Cast<NeededItem>())
-                    {
-                        if (!allItems.TryGetValue(neededItem.ItemId, out ItemCount? itemCount))
-                            continue;
-
-                        int normalQualityQuantity = Math.Min(neededItem.Needed, itemCount.NormalQualityQuantity);
-                        int highQualityQuantity = Math.Min(neededItem.Needed - normalQualityQuantity,
-                            itemCount.HighQualityQuantity);
-
-                        if (normalQualityQuantity > 0)
-                            _dropboxApi.EnqueueItem(neededItem.ItemId, false, normalQualityQuantity);
-
-                        if (highQualityQuantity > 0)
-                            _dropboxApi.EnqueueItem(neededItem.ItemId, true, highQualityQuantity);
-
-                        if (normalQualityQuantity > 0 || highQualityQuantity > 0)
-                        {
-                            allItems[neededItem.ItemId] =
-                                new ItemCount(
-                                    itemCount.NormalQualityQuantity - normalQualityQuantity,
-                                    itemCount.HighQualityQuantity - highQualityQuantity);
-                        }
-                    }
-                }
+                allItems[neededItem.ItemId] =
+                    new ItemCount(
+                        itemCount.NormalQualityQuantity - normalQualityQuantity,
+                        itemCount.HighQualityQuantity - highQualityQuantity);
             }
         }
 
-        private unsafe Dictionary<uint, ItemCount> GetItemCounts()
-        {
-            Dictionary<uint, ItemCount> allItems = new();
+        _dropboxApi.BeginTrade();
+    }
 
-            InventoryManager* inventoryManager = InventoryManager.Instance();
-            if (inventoryManager == null)
-                return allItems;
-
-            foreach (var type in DefaultInventoryTypes)
+    private ReadOnlyCollection<NeededItem>? ParseArguments(string arguments)
+    {
+        var parsedItems = arguments.Split(' ')
+            .Select(x => x.Split(':'))
+            .Select<string[], (string, NeededItem?)>(x =>
             {
-                InventoryContainer* container = inventoryManager->GetInventoryContainer(type);
-                for (int i = 0; i < container->Size; ++i)
-                {
-                    var item = container->GetInventorySlot(i);
-                    if (item != null && item->ItemID != 0)
-                    {
-                        if (item->Spiritbond > 0)
-                            continue;
+                if (x.Length != 2)
+                    return ($"Unable to parse {string.Join(" ", x)}.", null);
 
-                        if (!allItems.TryGetValue(item->ItemID, out ItemCount? itemCount))
-                            itemCount = new(0, 0);
+                if (!uint.TryParse(x[0], out uint itemId))
+                    return ($"Unable to parse item id {x[0]}.", null);
 
-                        if (item->Flags.HasFlag(InventoryItem.ItemFlags.HQ))
-                            itemCount = itemCount with
-                            {
-                                HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity
-                            };
-                        else
-                            itemCount = itemCount with
-                            {
-                                NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity
-                            };
+                int needed;
+                if (x[1] == "*")
+                    needed = int.MaxValue;
+                else if (!int.TryParse(x[1], out needed))
+                    return ($"Unable to parse quantity {x[1]}.", null);
 
-                        allItems[item->ItemID] = itemCount;
-                    }
-                }
-            }
+                return (string.Empty, new NeededItem(itemId, needed));
+            }).ToList();
+        if (parsedItems.Count == 0)
+            return null;
 
+        var problematic = parsedItems.Where(x => !string.IsNullOrEmpty(x.Item1)).Select(x => x.Item1).ToList();
+        if (problematic.Count == 1)
+        {
+            _chatGui.PrintError($"dbq: {problematic.First()}");
+            return null;
+        }
+        else if (problematic.Count >= 2)
+        {
+            _chatGui.PrintError("dbq: Multiple errors occured:");
+            foreach (string problem in problematic)
+                _chatGui.PrintError($" - {problem}");
+            return null;
+        }
+        else
+            return parsedItems.Select(x => x.Item2!).ToList().AsReadOnly();
+    }
+
+    private unsafe Dictionary<uint, ItemCount> GetItemCounts()
+    {
+        Dictionary<uint, ItemCount> allItems = new();
+
+        InventoryManager* inventoryManager = InventoryManager.Instance();
+        if (inventoryManager == null)
             return allItems;
+
+        foreach (var type in DefaultInventoryTypes)
+        {
+            InventoryContainer* container = inventoryManager->GetInventoryContainer(type);
+            for (int i = 0; i < container->Size; ++i)
+            {
+                var item = container->GetInventorySlot(i);
+                if (item != null && item->ItemId != 0)
+                {
+                    if (item->Spiritbond > 0)
+                        continue;
+
+                    if (!allItems.TryGetValue(item->ItemId, out ItemCount? itemCount))
+                        itemCount = new(0, 0);
+
+                    if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality))
+                        itemCount = itemCount with
+                        {
+                            HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity
+                        };
+                    else
+                        itemCount = itemCount with
+                        {
+                            NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity
+                        };
+
+                    allItems[item->ItemId] = itemCount;
+                }
+            }
         }
 
-        private unsafe void ShowCrystals()
+        return allItems;
+    }
+
+    public void Dispose()
+    {
+        _commandManager.RemoveHandler("/dbq");
+    }
+
+    private sealed record NeededItem(uint ItemId, int Needed)
+    {
+        public override string ToString() => $"{ItemId}:{Needed}";
+    }
+
+    private sealed record ItemCount(int NormalQualityQuantity, int HighQualityQuantity);
+
+    private sealed class DropboxApi
+    {
+        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(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
         {
-            InventoryManager* inventoryManger = InventoryManager.Instance();
-            if (inventoryManger == null)
+            _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");
+        }
+
+        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;
 
-            var missingCrystals = Enumerable.Range(2, 12).Select(itemId => (uint)itemId)
-                .Select(itemId => new NeededItem(itemId,
-                    9999 - inventoryManger->GetItemCountInContainer(itemId, InventoryType.Crystals)))
-                .Where(x => x.Needed > 0)
-                .ToList();
-            if (missingCrystals.Count == 0)
-            {
-                _chatGui.Print("No crystals need to be filled");
-                return;
-            }
-
-            _chatGui.Print($"Command: /dbq {string.Join(" ", missingCrystals)}");
-        }
-
-        public void Dispose()
-        {
-            _commandManager.RemoveHandler("/dbq");
-        }
-
-        private sealed record NeededItem(uint ItemId, int Needed)
-        {
-            public override string ToString() => $"{ItemId}:{Needed}";
-        }
-
-        private sealed record ItemCount(int NormalQualityQuantity, int HighQualityQuantity);
-
-        private sealed class DropboxApi
-        {
-            private readonly DalamudReflector _reflector;
-            private readonly IPluginLog _pluginLog;
-
-            public DropboxApi(DalamudReflector reflector, IPluginLog pluginLog)
-            {
-                _reflector = reflector;
-                _pluginLog = pluginLog;
-            }
-
-            [SuppressMessage("Performance", "CA2000", Justification = "Should not dispose other plugin")]
-            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))
-                    throw new InvalidOperationException("Could not retrieve item quantities");
-
-                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))
-                    throw new InvalidOperationException("Could not retrieve item quantities");
-
-                itemQuantities.Clear();
-            }
-
-            private bool TryGetItemQuantities([NotNullWhen(true)] out IDalamudPlugin? dropboxPlugin,
-                [NotNullWhen(true)] out IDictionary? itemQuantities)
-            {
-                if (!_reflector.TryGetDalamudPlugin("Dropbox", out dropboxPlugin))
-                {
-                    itemQuantities = null;
-                    return false;
-                }
-
-                var itemQueueUiType = dropboxPlugin.GetType().Assembly.GetType("Dropbox.ItemQueueUI")!;
-                itemQuantities =
-                    (IDictionary?)itemQueueUiType.GetField("ItemQuantities", BindingFlags.Public | BindingFlags.Static)!
-                        .GetValue(null);
-                return itemQuantities != null;
-            }
+            int currentQuantity = _getItemQuantity.InvokeFunc(itemId, hq);
+            _setItemQuantity.InvokeAction(itemId, hq, quantity + currentQuantity);
         }
     }
 }

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>0.3</Version>
-        <LangVersion>12</LangVersion>
-        <Nullable>enable</Nullable>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+        <Version>1.0</Version>
         <OutputPath>dist</OutputPath>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <DebugType>portable</DebugType>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-    </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>
+    <Import Project="..\LLib\LLib.targets"/>
+    <Import Project="..\LLib\RenameZip.targets"/>
 
     <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

@@ -4,7 +4,6 @@ using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using ECommons;
 using KitchenSink.Commands;
-using LLib;
 
 namespace KitchenSink;
 
@@ -16,17 +15,15 @@ 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, IPluginLog pluginLog)
     {
-        DalamudReflector reflector = new DalamudReflector(pluginInterface, framework, pluginLog);
-
         ECommonsMain.Init(pluginInterface, this);
         _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, 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, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "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