Add 'compact' turn-in UI

Reviewed-on: #3

Deliveroo/CharacterConfiguration.cs

@@ -17,10 +17,10 @@ internal sealed class CharacterConfiguration
     public bool OverrideItemsToPurchase { get; set; }
     public List<Configuration.PurchasePriority> ItemsToPurchase { get; set; } = new();
 
-    public static string ResolveFilePath(DalamudPluginInterface pluginInterface, ulong localContentId)
+    public static string ResolveFilePath(IDalamudPluginInterface pluginInterface, ulong localContentId)
         => Path.Join(pluginInterface.GetPluginConfigDirectory(), $"char.{localContentId:X}.json");
 
-    public static CharacterConfiguration? Load(DalamudPluginInterface pluginInterface, ulong localContentId)
+    public static CharacterConfiguration? Load(IDalamudPluginInterface pluginInterface, ulong localContentId)
     {
         string path = ResolveFilePath(pluginInterface, localContentId);
         if (!File.Exists(path))
@@ -29,11 +29,11 @@ internal sealed class CharacterConfiguration
         return JsonConvert.DeserializeObject<CharacterConfiguration>(File.ReadAllText(path));
     }
 
-    public void Save(DalamudPluginInterface pluginInterface)
+    public void Save(IDalamudPluginInterface pluginInterface)
     {
         File.WriteAllText(ResolveFilePath(pluginInterface, LocalContentId), JsonConvert.SerializeObject(this, Formatting.Indented));
     }
 
-    public void Delete(DalamudPluginInterface pluginInterface) =>
+    public void Delete(IDalamudPluginInterface pluginInterface) =>
         File.Delete(ResolveFilePath(pluginInterface, LocalContentId));
 }

Deliveroo/Configuration.cs

@@ -1,5 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using Dalamud.Configuration;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text;
 using Deliveroo.GameData;
 using LLib.ImGui;
@@ -8,10 +11,13 @@ namespace Deliveroo;
 
 internal sealed class Configuration : IPluginConfiguration
 {
-    public int Version { get; set; } = 1;
+    public int Version { get; set; } = 2;
 
-    public List<uint> ItemsAvailableForPurchase { get; set; } = new();
+    [Obsolete]
-    public List<PurchasePriority> ItemsToPurchase { get; set; } = new();
+    public List<uint> ItemsAvailableForPurchase { get; set; } = [];
+
+    public List<PurchaseOption> ItemsAvailableToPurchase { get; set; } = [];
+    public List<PurchasePriority> ItemsToPurchase { get; set; } = [];
 
     public int ReservedSealCount { get; set; }
     public bool ReserveDifferentSealCountAtMaxRank { get; set; }
@@ -21,12 +27,23 @@ internal sealed class Configuration : IPluginConfiguration
     public EBehaviorOnOtherWorld BehaviorOnOtherWorld { get; set; } = EBehaviorOnOtherWorld.Warning;
     public bool DisableFrameLimiter { get; set; } = true;
     public bool UncapFrameRate { get; set; }
+    public VirtualKey QuickTurnInKey { get; set; } = VirtualKey.SHIFT;
 
-    public WindowConfig TurnInWindowConfig { get; } = new();
+    public MinimizableWindowConfig TurnInWindowConfig { get; } = new();
     public WindowConfig ConfigWindowConfig { get; } = new();
 
+    internal sealed class PurchaseOption
+    {
+        public uint ItemId { get; set; }
+        public bool SameQuantityForAllLists { get; set; }
+        public int GlobalLimit { get; set; }
+    }
+
     internal sealed class PurchasePriority
     {
+        [JsonIgnore]
+        public Guid InternalId { get; } = Guid.NewGuid();
+
         public uint ItemId { get; set; }
         public int Limit { get; set; }
         public bool Enabled { get; set; } = true;
@@ -52,9 +69,9 @@ internal sealed class Configuration : IPluginConfiguration
 
     public bool AddVentureIfNoItemToPurchaseSelected()
     {
-        if (ItemsAvailableForPurchase.Count == 0)
+        if (ItemsAvailableToPurchase.Count == 0)
         {
-            ItemsAvailableForPurchase.Add(ItemIds.Venture);
+            ItemsAvailableToPurchase.Add(new PurchaseOption { ItemId = ItemIds.Venture });
             return true;
         }
 
@@ -67,4 +84,9 @@ internal sealed class Configuration : IPluginConfiguration
         Warning,
         DisableTurnIn,
     }
+
+    internal sealed class MinimizableWindowConfig : WindowConfig
+    {
+        public bool IsMinimized { get; set; }
+    }
 }

Deliveroo/DalamudPackager.targets

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PackagePluginDebug" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
         <DalamudPackager
                 ProjectDir="$(ProjectDir)"
                 OutputPath="$(OutputPath)"

Deliveroo/Deliveroo.csproj

@@ -1,63 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/11.0.0">
     <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <Version>6.3</Version>
-        <Version>4.9</Version>
-        <LangVersion>12</LangVersion>
-        <Nullable>enable</Nullable>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <OutputPath>dist</OutputPath>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <DebugType>portable</DebugType>
-        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
     </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>
         <ProjectReference Include="..\LLib\LLib.csproj" />
     </ItemGroup>
-
-    <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>
-
-    <Target Name="RenameLatestZip" AfterTargets="PackagePlugin">
-        <Exec Command="rename $(OutDir)$(AssemblyName)\latest.zip $(AssemblyName)-$(Version).zip"/>
-    </Target>
 </Project>

Deliveroo/DeliverooPlugin.GrandCompanySupplyReward.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Linq;
+using Dalamud.Game.Addon.Lifecycle;
+using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using Dalamud.Game.ClientState.Keys;
+using Dalamud.Game.Text.SeStringHandling;
+using Deliveroo.GameData;
+using FFXIVClientStructs.FFXIV.Client.UI;
+using LLib.GameUI;
+
+namespace Deliveroo;
+
+partial class DeliverooPlugin
+{
+    private unsafe void GrandCompanySupplyRewardPostSetup(AddonEvent type, AddonArgs args)
+    {
+        bool quickTurnIn = CurrentStage == Stage.Stopped && _configuration.QuickTurnInKey != VirtualKey.NO_KEY && _keyState[_configuration.QuickTurnInKey];
+        if (CurrentStage == Stage.TurnInSelected || quickTurnIn)
+        {
+            AddonGrandCompanySupplyReward* addonSupplyReward = (AddonGrandCompanySupplyReward*)args.Addon;
+
+            string? itemName = addonSupplyReward->AtkUnitBase.AtkValues[4].ReadAtkString();
+            if (itemName != null && _itemCache.GetItemIdFromItemName(itemName)
+                    .Any(itemId => InternalConfiguration.QuickVentureExclusiveItems.Contains(itemId)))
+            {
+                DeliveryResult = new MessageDeliveryResult
+                {
+                    Message = new SeStringBuilder()
+                        .Append("Won't turn in ")
+                        .AddItemLink(_itemCache.GetItemIdFromItemName(itemName).First())
+                        .Append(", as it can only be obtained through Quick Ventures.")
+                        .Build(),
+                };
+
+                addonSupplyReward->AtkUnitBase.FireCallbackInt(1);
+                if (quickTurnIn)
+                    CurrentStage = Stage.RequestStop;
+                else
+                    CurrentStage = Stage.CloseGcSupplyWindowThenStop;
+                return;
+            }
+
+            _pluginLog.Information($"Turning in '{itemName}'");
+
+            addonSupplyReward->AtkUnitBase.FireCallbackInt(0);
+            ContinueAt = DateTime.Now.AddSeconds(0.58);
+            if (quickTurnIn)
+            {
+                DeliveryResult = new NoDeliveryResult();
+                CurrentStage = Stage.SingleFinalizeTurnIn;
+            }
+            else
+                CurrentStage = Stage.FinalizeTurnIn;
+        }
+    }
+}

Deliveroo/DeliverooPlugin.SelectYesNo.cs

@@ -1,6 +1,7 @@
 using System;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Memory;
 using FFXIVClientStructs.FFXIV.Client.UI;
 
@@ -40,7 +41,7 @@ partial class DeliverooPlugin
                 CurrentStage = Stage.CloseGcExchange;
             ContinueAt = DateTime.Now.AddSeconds(0.5);
         }
-        else if (CurrentStage == Stage.TurnInSelected &&
+        else if ((CurrentStage == Stage.TurnInSelected || (_configuration.QuickTurnInKey != VirtualKey.NO_KEY && _keyState[_configuration.QuickTurnInKey])) &&
                  _gameStrings.TradeHighQualityItem == text)
         {
             _pluginLog.Information($"Selecting 'yes' ({text})");

Deliveroo/DeliverooPlugin.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects;
@@ -25,7 +26,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
 {
     private readonly WindowSystem _windowSystem = new(typeof(DeliverooPlugin).AssemblyQualifiedName);
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IChatGui _chatGui;
     private readonly IGameGui _gameGui;
     private readonly IFramework _framework;
@@ -34,6 +35,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
     private readonly ICommandManager _commandManager;
     private readonly IPluginLog _pluginLog;
     private readonly IAddonLifecycle _addonLifecycle;
+    private readonly IKeyState _keyState;
 
     // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
     private readonly Configuration _configuration;
@@ -46,6 +48,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
     private readonly GcRewardsCache _gcRewardsCache;
 
     private readonly IconCache _iconCache;
+    private readonly ItemCache _itemCache;
     private readonly ExchangeHandler _exchangeHandler;
     private readonly SupplyHandler _supplyHandler;
     private readonly ConfigWindow _configWindow;
@@ -53,10 +56,10 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
 
     private Stage _currentStageInternal = Stage.Stopped;
 
-    public DeliverooPlugin(DalamudPluginInterface pluginInterface, IChatGui chatGui, IGameGui gameGui,
+    public DeliverooPlugin(IDalamudPluginInterface pluginInterface, IChatGui chatGui, IGameGui gameGui,
         IFramework framework, IClientState clientState, IObjectTable objectTable, ITargetManager targetManager,
         IDataManager dataManager, ICondition condition, ICommandManager commandManager, IPluginLog pluginLog,
-        IAddonLifecycle addonLifecycle, ITextureProvider textureProvider, IGameConfig gameConfig)
+        IAddonLifecycle addonLifecycle, ITextureProvider textureProvider, IGameConfig gameConfig, IKeyState keyState)
     {
         ArgumentNullException.ThrowIfNull(dataManager);
 
@@ -69,25 +72,27 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
         _commandManager = commandManager;
         _pluginLog = pluginLog;
         _addonLifecycle = addonLifecycle;
+        _keyState = keyState;
 
         _configuration = (Configuration?)_pluginInterface.GetPluginConfig() ?? new Configuration();
+        MigrateConfiguration();
+
         _gameStrings = new GameStrings(dataManager, _pluginLog);
         _externalPluginHandler = new ExternalPluginHandler(_pluginInterface, gameConfig, _configuration, _pluginLog);
         _gameFunctions = new GameFunctions(objectTable, _clientState, targetManager, dataManager,
             _externalPluginHandler, _pluginLog);
         _gcRewardsCache = new GcRewardsCache(dataManager);
         _iconCache = new IconCache(textureProvider);
-        var itemCache = new ItemCache(dataManager);
+        _itemCache = new ItemCache(dataManager);
 
         _exchangeHandler = new ExchangeHandler(this, _gameFunctions, targetManager, _gameGui, _chatGui, _pluginLog);
-        _supplyHandler = new SupplyHandler(this, _gameFunctions, targetManager, _gameGui, itemCache,
+        _supplyHandler = new SupplyHandler(this, _gameFunctions, targetManager, _gameGui, _pluginLog);
-            _pluginLog);
 
         _configWindow = new ConfigWindow(_pluginInterface, this, _configuration, _gcRewardsCache, _clientState,
             _pluginLog, _iconCache, _gameFunctions);
         _windowSystem.AddWindow(_configWindow);
         _turnInWindow = new TurnInWindow(this, _pluginInterface, _configuration, _condition, _clientState,
-            _gcRewardsCache, _configWindow, _iconCache, _gameFunctions);
+            _gcRewardsCache, _configWindow, _iconCache, _keyState, _gameFunctions);
         _windowSystem.AddWindow(_turnInWindow);
 
         _framework.Update += FrameworkUpdate;
@@ -109,9 +114,27 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
 
         _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "SelectString", SelectStringPostSetup);
         _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "SelectYesno", SelectYesNoPostSetup);
+        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GrandCompanySupplyReward", GrandCompanySupplyRewardPostSetup);
     }
 
-    private void ChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString message,
+    private void MigrateConfiguration()
+    {
+#pragma warning disable CS0612 // Type or member is obsolete
+        if (_configuration.Version == 1)
+        {
+            _configuration.ItemsAvailableToPurchase = _configuration.ItemsAvailableForPurchase.Select(x =>
+                new Configuration.PurchaseOption
+                {
+                    ItemId = x,
+                    SameQuantityForAllLists = false,
+                }).ToList();
+            _configuration.Version = 2;
+            _pluginInterface.SavePluginConfig(_configuration);
+        }
+#pragma warning restore CS0612 // Type or member is obsolete
+    }
+
+    private void ChatMessage(XivChatType type, int timestamp, ref SeString sender, ref SeString message,
         ref bool isHandled)
     {
         if (_configuration.PauseAtRank <= 0)
@@ -130,7 +153,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
             {
                 _turnInWindow.State = false;
                 _pluginLog.Information($"Pausing GC delivery, FC reached rank {rank}");
-                DeliveryResult = new DeliveryResult
+                DeliveryResult = new MessageDeliveryResult
                 {
                     Message = new SeStringBuilder()
                         .Append($"Pausing Deliveroo, your FC reached rank {rank}.")
@@ -160,7 +183,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
     internal DateTime ContinueAt { private get; set; } = DateTime.MinValue;
     internal List<PurchaseItemRequest> ItemsToPurchaseNow { get; private set; } = new();
     internal int LastTurnInListSize { get; set; } = int.MaxValue;
-    internal DeliveryResult? DeliveryResult { get; set; }
+    internal IDeliveryResult? DeliveryResult { get; set; }
 
     internal bool TurnInState
     {
@@ -195,11 +218,11 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
             {
                 if (CharacterConfiguration.CachedPlayerName != _clientState.LocalPlayer!.Name.ToString() ||
                     CharacterConfiguration.CachedWorldName !=
-                    _clientState.LocalPlayer.HomeWorld.GameData!.Name.ToString())
+                    _clientState.LocalPlayer.HomeWorld.Value.Name.ToString())
                 {
                     CharacterConfiguration.CachedPlayerName = _clientState.LocalPlayer!.Name.ToString();
                     CharacterConfiguration.CachedWorldName =
-                        _clientState.LocalPlayer.HomeWorld.GameData!.Name.ToString();
+                        _clientState.LocalPlayer.HomeWorld.Value.Name.ToString();
 
                     CharacterConfiguration.Save(_pluginInterface);
                 }
@@ -219,7 +242,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
         }
     }
 
-    private void Logout()
+    private void Logout(int type, int code)
     {
         CharacterConfiguration = null;
     }
@@ -230,8 +253,8 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
         if (!_clientState.IsLoggedIn ||
             _clientState.TerritoryType is not 128 and not 130 and not 132 ||
             _condition[ConditionFlag.OccupiedInCutSceneEvent] ||
-            _gameFunctions.GetDistanceToNpc(_gameFunctions.GetQuartermasterId(), out GameObject? quartermaster) >= 7f ||
+            _gameFunctions.GetDistanceToNpc(_gameFunctions.GetQuartermasterId(), out IGameObject? quartermaster) >= 7f ||
-            _gameFunctions.GetDistanceToNpc(_gameFunctions.GetPersonnelOfficerId(), out GameObject? personnelOfficer) >=
+            _gameFunctions.GetDistanceToNpc(_gameFunctions.GetPersonnelOfficerId(), out IGameObject? personnelOfficer) >=
             7f ||
             CharacterConfiguration is { DisableForCharacter: true } ||
             _configWindow.IsOpen)
@@ -254,7 +277,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
             {
                 CurrentStage = Stage.TargetPersonnelOfficer;
                 ItemsToPurchaseNow = _turnInWindow.SelectedItems;
-                DeliveryResult = new();
+                DeliveryResult = new MessageDeliveryResult();
                 _supplyHandler.ResetTurnInErrorHandling();
                 if (ItemsToPurchaseNow.Count > 0)
                 {
@@ -310,10 +333,11 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
                     break;
 
                 case Stage.TurnInSelected:
-                    _supplyHandler.TurnInSelectedItem();
+                    // see GrandCompanySupplyReward
                     break;
 
                 case Stage.FinalizeTurnIn:
+                case Stage.SingleFinalizeTurnIn:
                     _supplyHandler.FinalizeTurnInItem();
                     break;
 
@@ -374,40 +398,43 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
             _externalPluginHandler.Restore();
             CurrentStage = Stage.Stopped;
 
-            var text = DeliveryResult?.Message ?? "Delivery completed.";
+            if (DeliveryResult is null or MessageDeliveryResult)
-            var message = _configuration.ChatType switch
             {
-                XivChatType.Say
+                var text = (DeliveryResult as MessageDeliveryResult)?.Message ?? "Delivery completed.";
-                    or XivChatType.Shout
+                var message = _configuration.ChatType switch
-                    or XivChatType.TellOutgoing
-                    or XivChatType.TellIncoming
-                    or XivChatType.Party
-                    or XivChatType.Alliance
-                    or (>= XivChatType.Ls1 and <= XivChatType.Ls8)
-                    or XivChatType.FreeCompany
-                    or XivChatType.NoviceNetwork
-                    or XivChatType.Yell
-                    or XivChatType.CrossParty
-                    or XivChatType.PvPTeam
-                    or XivChatType.CrossLinkShell1
-                    or XivChatType.NPCDialogue
-                    or XivChatType.NPCDialogueAnnouncements
-                    or (>= XivChatType.CrossLinkShell2 and <= XivChatType.CrossLinkShell8)
-                    => new XivChatEntry
-                    {
-                        Message = text,
-                        Type = _configuration.ChatType,
-                        Name = new SeStringBuilder().AddUiForeground("Deliveroo", 52).Build(),
-                    },
-                _ => new XivChatEntry
                 {
-                    Message = new SeStringBuilder().AddUiForeground("[Deliveroo] ", 52)
+                    XivChatType.Say
-                        .Append(text)
+                        or XivChatType.Shout
-                        .Build(),
+                        or XivChatType.TellOutgoing
-                    Type = _configuration.ChatType,
+                        or XivChatType.TellIncoming
-                }
+                        or XivChatType.Party
-            };
+                        or XivChatType.Alliance
-            _chatGui.Print(message);
+                        or (>= XivChatType.Ls1 and <= XivChatType.Ls8)
+                        or XivChatType.FreeCompany
+                        or XivChatType.NoviceNetwork
+                        or XivChatType.Yell
+                        or XivChatType.CrossParty
+                        or XivChatType.PvPTeam
+                        or XivChatType.CrossLinkShell1
+                        or XivChatType.NPCDialogue
+                        or XivChatType.NPCDialogueAnnouncements
+                        or (>= XivChatType.CrossLinkShell2 and <= XivChatType.CrossLinkShell8)
+                        => new XivChatEntry
+                        {
+                            Message = text,
+                            Type = _configuration.ChatType,
+                            Name = new SeStringBuilder().AddUiForeground("Deliveroo", 52).Build(),
+                        },
+                    _ => new XivChatEntry
+                    {
+                        Message = new SeStringBuilder().AddUiForeground("[Deliveroo] ", 52)
+                            .Append(text)
+                            .Build(),
+                        Type = _configuration.ChatType,
+                    }
+                };
+                _chatGui.Print(message);
+            }
 
             DeliveryResult = null;
         }
@@ -415,6 +442,7 @@ public sealed partial class DeliverooPlugin : IDalamudPlugin
 
     public void Dispose()
     {
+        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "GrandCompanySupplyReward", GrandCompanySupplyRewardPostSetup);
         _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "SelectYesno", SelectYesNoPostSetup);
         _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "SelectString", SelectStringPostSetup);
 

Deliveroo/DeliveryResult.cs

@@ -1,9 +0,0 @@
-using Dalamud.Game.Text.SeStringHandling;
-
-namespace Deliveroo
-{
-    internal sealed class DeliveryResult
-    {
-        public SeString? Message { get; init; }
-    }
-}

Deliveroo/External/AllaganToolsIpc.cs

@@ -25,7 +25,7 @@ internal sealed class AllaganToolsIpc
 
     private readonly ICallGateSubscriber<uint, bool, uint[], uint> _itemCountOwned;
 
-    public AllaganToolsIpc(DalamudPluginInterface pluginInterface, IPluginLog pluginLog)
+    public AllaganToolsIpc(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
     {
         _pluginLog = pluginLog;
         _itemCountOwned = pluginInterface.GetIpcSubscriber<uint, bool, uint[], uint>("AllaganTools.ItemCountOwned");

Deliveroo/External/DeliverooIpc.cs

@@ -16,7 +16,7 @@ internal sealed class DeliverooIpc : IDisposable
 
     private bool _running;
 
-    public DeliverooIpc(DalamudPluginInterface pluginInterface)
+    public DeliverooIpc(IDalamudPluginInterface pluginInterface)
     {
         _isTurnInRunning = pluginInterface.GetIpcProvider<bool>(IsTurnInRunning);
         _turnInStarted = pluginInterface.GetIpcProvider<object>(TurnInStarted);

Deliveroo/External/ExternalPluginHandler.cs

@@ -7,7 +7,7 @@ namespace Deliveroo.External;
 
 internal sealed class ExternalPluginHandler : IDisposable
 {
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IGameConfig _gameConfig;
     private readonly Configuration _configuration;
     private readonly IPluginLog _pluginLog;
@@ -19,7 +19,7 @@ internal sealed class ExternalPluginHandler : IDisposable
     private SystemConfigState? _limitFrameRateWhenClientInactive;
     private SystemConfigState? _uncapFrameRate;
 
-    public ExternalPluginHandler(DalamudPluginInterface pluginInterface, IGameConfig gameConfig,
+    public ExternalPluginHandler(IDalamudPluginInterface pluginInterface, IGameConfig gameConfig,
         Configuration configuration, IPluginLog pluginLog)
     {
         _pluginInterface = pluginInterface;

Deliveroo/External/PandoraIpc.cs

@@ -13,7 +13,7 @@ internal sealed class PandoraIpc
     private readonly ICallGateSubscriber<string, bool?> _getEnabled;
     private readonly ICallGateSubscriber<string, bool, object?> _setEnabled;
 
-    public PandoraIpc(DalamudPluginInterface pluginInterface, IPluginLog pluginLog)
+    public PandoraIpc(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
     {
         _pluginLog = pluginLog;
         _getEnabled = pluginInterface.GetIpcSubscriber<string, bool?>("PandorasBox.GetFeatureEnabled");

Deliveroo/GameData/GameStrings.cs

@@ -1,13 +1,12 @@
-using System;
+using System.Data;
-using System.Data;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 using Dalamud.Game.Text;
 using Dalamud.Plugin.Services;
 using LLib;
 using Lumina.Excel;
-using Lumina.Excel.CustomSheets;
+using Lumina.Excel.Sheets;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Text.ReadOnly;
 
 namespace Deliveroo.GameData;
 
@@ -24,10 +23,10 @@ internal sealed class GameStrings
         ExchangeItems = dataManager.GetRegex<Addon>(3290, addon => addon.Text, pluginLog)
                         ?? throw new ConstraintException($"Unable to resolve {nameof(ExchangeItems)}");
         TradeHighQualityItem =
-            dataManager.GetString<Addon>(102434, addon => addon.Text, pluginLog)?.ReplaceLineEndings("")
+            dataManager.GetString<Addon>(102434, addon => addon.Text, pluginLog)
             ?? throw new ConstraintException($"Unable to resolve {nameof(TradeHighQualityItem)}");
 
-        var rankUpFc = dataManager.GetExcelSheet<LogMessage>()!.GetRow(3123)!;
+        var rankUpFc = dataManager.GetExcelSheet<LogMessage>().GetRow(3123);
         RankUpFc = rankUpFc.GetRegex(logMessage => logMessage.Text, pluginLog)
                    ?? throw new ConstraintException($"Unable to resolve {nameof(RankUpFc)}");
         RankUpFcType = (XivChatType)rankUpFc.LogKind;
@@ -43,7 +42,16 @@ internal sealed class GameStrings
 
     [Sheet("custom/000/ComDefGrandCompanyOfficer_00073")]
     [SuppressMessage("Performance", "CA1812")]
-    private sealed class ComDefGrandCompanyOfficer : QuestDialogueText
+    private readonly struct ComDefGrandCompanyOfficer(ExcelPage page, uint offset, uint row)
+        : IQuestDialogueText, IExcelRow<ComDefGrandCompanyOfficer>
     {
+        public uint RowId => row;
+
+        public ReadOnlySeString Key => page.ReadString(offset, offset);
+        public ReadOnlySeString Value => page.ReadString(offset + 4, offset);
+
+        static ComDefGrandCompanyOfficer IExcelRow<ComDefGrandCompanyOfficer>.Create(ExcelPage page, uint offset,
+            uint row) =>
+            new(page, offset, row);
     }
 }

Deliveroo/GameData/GcRewardsCache.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany;
 
 namespace Deliveroo.GameData;
@@ -10,31 +10,32 @@ internal sealed class GcRewardsCache
 {
     public GcRewardsCache(IDataManager dataManager)
     {
-        var categories = dataManager.GetExcelSheet<GCScripShopCategory>()!
+        var categories = dataManager.GetExcelSheet<GCScripShopCategory>()
             .Where(x => x.RowId > 0)
             .ToDictionary(x => x.RowId,
                 x =>
-                    (GrandCompany: (GrandCompany)x.GrandCompany.Row,
+                    (GrandCompany: (GrandCompany)x.GrandCompany.RowId,
                         Tier: (RewardTier)x.Tier,
                         SubCategory: (RewardSubCategory)x.SubCategory));
 
-        Rewards = dataManager.GetExcelSheet<GCScripShopItem>()!
+        Rewards = dataManager.GetSubrowExcelSheet<GCScripShopItem>()
-            .Where(x => x.RowId > 0 && x.Item.Row > 0)
+            .SelectMany(x => x)
+            .Where(x => x.RowId > 0 && x.Item.RowId > 0)
             .GroupBy(item =>
             {
                 var category = categories[item.RowId];
                 return new
                 {
-                    ItemId = item.Item.Row,
+                    ItemId = item.Item.RowId,
-                    Name = item.Item.Value!.Name.ToString(),
+                    Name = item.Item.Value.Name.ToString(),
-                    IconId = item.Item.Row == ItemIds.Venture ? 25917 : item.Item.Value!.Icon,
+                    IconId = item.Item.RowId == ItemIds.Venture ? 25917 : item.Item.Value.Icon,
                     category.Tier,
                     category.SubCategory,
-                    RequiredRank = item.RequiredGrandCompanyRank.Row,
+                    RequiredRank = item.RequiredGrandCompanyRank.RowId,
-                    item.Item!.Value.StackSize,
+                    item.Item.Value.StackSize,
                     SealCost = item.CostGCSeals,
-                    InventoryLimit = item.Item.Value!.IsUnique ? 1
+                    InventoryLimit = item.Item.Value.IsUnique ? 1
-                        : item.Item.Row == ItemIds.Venture ? item.Item.Value!.StackSize
+                        : item.Item.RowId == ItemIds.Venture ? item.Item.Value.StackSize
                         : int.MaxValue,
                 };
             })

Deliveroo/GameData/ItemCache.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Deliveroo.GameData;
 
@@ -10,7 +10,7 @@ internal sealed class ItemCache
 
     public ItemCache(IDataManager dataManager)
     {
-        foreach (var item in dataManager.GetExcelSheet<Item>()!)
+        foreach (var item in dataManager.GetExcelSheet<Item>())
         {
             string name = item.Name.ToString();
             if (string.IsNullOrWhiteSpace(name))
@@ -19,9 +19,10 @@ internal sealed class ItemCache
             if (_itemNamesToIds.TryGetValue(name, out HashSet<uint>? itemIds))
                 itemIds.Add(item.RowId);
             else
-                _itemNamesToIds.Add(name, new HashSet<uint>{item.RowId});
+                _itemNamesToIds.Add(name, [item.RowId]);
         }
     }
 
-    public HashSet<uint> GetItemIdFromItemName(string name) => _itemNamesToIds[name];
+    public HashSet<uint> GetItemIdFromItemName(string name) => 
+        _itemNamesToIds.TryGetValue(name, out var itemIds) ? itemIds : [];
 }

Deliveroo/GameFunctions.cs

@@ -15,8 +15,10 @@ using FFXIVClientStructs.FFXIV.Client.Game.Control;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Common.Math;
+using FFXIVClientStructs.FFXIV.Component.Excel;
 using Lumina.Excel;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
+using Lumina.Text.ReadOnly;
 using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany;
 
 namespace Deliveroo;
@@ -41,7 +43,7 @@ internal sealed class GameFunctions : IDisposable
         _pluginLog = pluginLog;
 
 
-        _gcRankInfo = dataManager.GetExcelSheet<GrandCompanyRank>()!.Where(x => x.RowId > 0)
+        _gcRankInfo = dataManager.GetExcelSheet<GrandCompanyRank>().Where(x => x.RowId > 0)
             .ToDictionary(x => x.RowId, x => new GcRankInfo
             {
                 NameTwinAddersMale = ExtractRankName<GCRankGridaniaMaleText>(dataManager, x.RowId, r => r.Singular),
@@ -53,7 +55,7 @@ internal sealed class GameFunctions : IDisposable
                     ExtractRankName<GCRankUldahFemaleText>(dataManager, x.RowId, r => r.Singular),
                 MaxSeals = x.MaxSeals,
                 RequiredSeals = x.RequiredSeals,
-                RequiredHuntingLog = x.Unknown10,
+                RequiredHuntingLog = x.Unknown0,
             })
             .AsReadOnly();
 
@@ -61,14 +63,14 @@ internal sealed class GameFunctions : IDisposable
         _clientState.TerritoryChanged += TerritoryChanged;
     }
 
-    private static string ExtractRankName<T>(IDataManager dataManager, uint rankId, Func<T, Lumina.Text.SeString> func)
+    private static string ExtractRankName<T>(IDataManager dataManager, uint rankId, Func<T, ReadOnlySeString> func)
-        where T : ExcelRow
+        where T : struct, IExcelRow<T>
     {
-        return func(dataManager.GetExcelSheet<T>()!.GetRow(rankId)!).ToString();
+        return func(dataManager.GetExcelSheet<T>().GetRow(rankId)).ToString();
     }
 
 
-    private void Logout()
+    private void Logout(int type, int code)
     {
         _retainerItemCache.Clear();
     }
@@ -79,10 +81,10 @@ internal sealed class GameFunctions : IDisposable
         _retainerItemCache.Clear();
     }
 
-    public unsafe void InteractWithTarget(GameObject obj)
+    public unsafe void InteractWithTarget(IGameObject obj)
     {
         _pluginLog.Information($"Setting target to {obj}");
-        if (_targetManager.Target == null || _targetManager.Target != obj)
+        if (_targetManager.Target == null || _targetManager.Target.EntityId != obj.EntityId)
         {
             _targetManager.Target = obj;
         }
@@ -111,13 +113,13 @@ internal sealed class GameFunctions : IDisposable
 
     public unsafe byte GetGrandCompanyRank() => PlayerState.Instance()->GetGrandCompanyRank();
 
-    public float GetDistanceToNpc(int npcId, out GameObject? o)
+    public float GetDistanceToNpc(int npcId, out IGameObject? o)
     {
         foreach (var obj in _objectTable)
         {
-            if (obj.ObjectKind == ObjectKind.EventNpc && obj is Character c)
+            if (obj.ObjectKind == ObjectKind.EventNpc && obj is ICharacter c)
             {
-                if (GetNpcId(obj) == npcId)
+                if (c.DataId == npcId)
                 {
                     o = obj;
                     return Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, c.Position);
@@ -129,7 +131,7 @@ internal sealed class GameFunctions : IDisposable
         return float.MaxValue;
     }
 
-    public static int GetNpcId(GameObject obj)
+    public static int GetNpcId(IGameObject obj)
     {
         return Marshal.ReadInt32(obj.Address + 128);
     }

Deliveroo/Handlers/ExchangeHandler.cs

@@ -31,7 +31,7 @@ internal sealed class ExchangeHandler
         _pluginLog = pluginLog;
     }
 
-    public void InteractWithQuartermaster(GameObject personnelOfficer, GameObject quartermaster)
+    public void InteractWithQuartermaster(IGameObject personnelOfficer, IGameObject quartermaster)
     {
         if (_gameFunctions.GetCurrentSealCount() < _plugin.EffectiveReservedSealCount)
         {

Deliveroo/Handlers/SupplyHandler.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
 using Deliveroo.GameData;
 using FFXIVClientStructs.FFXIV.Client.UI;
@@ -20,25 +18,23 @@ internal sealed class SupplyHandler
     private readonly GameFunctions _gameFunctions;
     private readonly ITargetManager _targetManager;
     private readonly IGameGui _gameGui;
-    private readonly ItemCache _itemCache;
     private readonly IPluginLog _pluginLog;
 
     private uint _turnInErrors;
 
     public SupplyHandler(DeliverooPlugin plugin, GameFunctions gameFunctions, ITargetManager targetManager,
-        IGameGui gameGui, ItemCache itemCache, IPluginLog pluginLog)
+        IGameGui gameGui, IPluginLog pluginLog)
     {
         _plugin = plugin;
         _gameFunctions = gameFunctions;
         _targetManager = targetManager;
         _gameGui = gameGui;
-        _itemCache = itemCache;
         _pluginLog = pluginLog;
     }
 
-    public void InteractWithPersonnelOfficer(GameObject personnelOfficer, GameObject quartermaster)
+    public void InteractWithPersonnelOfficer(IGameObject personnelOfficer, IGameObject quartermaster)
     {
-        if (_targetManager.Target == quartermaster)
+        if (_targetManager.Target?.EntityId == quartermaster.EntityId)
             return;
 
         _gameFunctions.InteractWithTarget(personnelOfficer);
@@ -50,7 +46,7 @@ internal sealed class SupplyHandler
         var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply);
         if (agentInterface != null && agentInterface->IsAgentActive())
         {
-            var addonId = agentInterface->GetAddonID();
+            var addonId = agentInterface->GetAddonId();
             if (addonId == 0)
                 return;
 
@@ -93,7 +89,7 @@ internal sealed class SupplyHandler
         var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply);
         if (agentInterface != null && agentInterface->IsAgentActive())
         {
-            var addonId = agentInterface->GetAddonID();
+            var addonId = agentInterface->GetAddonId();
             if (addonId == 0)
                 return;
 
@@ -103,7 +99,7 @@ internal sealed class SupplyHandler
 
             var addonGc = (AddonGrandCompanySupplyList*)addon;
             if (addonGc->ExpertDeliveryList == null ||
-                !addonGc->ExpertDeliveryList->AtkComponentBase.OwnerNode->AtkResNode.IsVisible)
+                !addonGc->ExpertDeliveryList->AtkComponentBase.OwnerNode->AtkResNode.IsVisible())
                 return;
 
             if (addonGc->SelectedTab != 2)
@@ -121,7 +117,7 @@ internal sealed class SupplyHandler
             }
 
             int currentListSize = addonGc->ExpertDeliveryList->ListLength;
-            if (addonGc->ListEmptyTextNode->AtkResNode.IsVisible || currentListSize == 0)
+            if (addonGc->ListEmptyTextNode->AtkResNode.IsVisible() || currentListSize == 0)
             {
                 _pluginLog.Information(
                     $"No items to turn in ({addonGc->ListEmptyTextNode->AtkResNode.IsVisible}, {currentListSize})");
@@ -198,37 +194,6 @@ internal sealed class SupplyHandler
         }
     }
 
-    public unsafe void TurnInSelectedItem()
-    {
-        if (_gameGui.TryGetAddonByName<AddonGrandCompanySupplyReward>("GrandCompanySupplyReward",
-                out var addonSupplyReward) && LAddon.IsAddonReady(&addonSupplyReward->AtkUnitBase))
-        {
-            string? itemName = addonSupplyReward->AtkUnitBase.AtkValues[4].ReadAtkString();
-            if (itemName != null && _itemCache.GetItemIdFromItemName(itemName)
-                    .Any(itemId => InternalConfiguration.QuickVentureExclusiveItems.Contains(itemId)))
-            {
-                _plugin.DeliveryResult = new DeliveryResult
-                {
-                    Message = new SeStringBuilder()
-                        .Append("Won't turn in ")
-                        .AddItemLink(_itemCache.GetItemIdFromItemName(itemName).First())
-                        .Append(", as it can only be obtained through Quick Ventures.")
-                        .Build(),
-                };
-
-                addonSupplyReward->AtkUnitBase.FireCallbackInt(1);
-                _plugin.CurrentStage = Stage.CloseGcSupplyWindowThenStop;
-                return;
-            }
-
-            _pluginLog.Information($"Turning in '{itemName}'");
-
-            addonSupplyReward->AtkUnitBase.FireCallbackInt(0);
-            _plugin.ContinueAt = DateTime.Now.AddSeconds(0.58);
-            _plugin.CurrentStage = Stage.FinalizeTurnIn;
-        }
-    }
-
     public unsafe void FinalizeTurnInItem()
     {
         if (_gameGui.TryGetAddonByName<AddonGrandCompanySupplyList>("GrandCompanySupplyList",
@@ -241,7 +206,10 @@ internal sealed class SupplyHandler
                 new() { Type = 0, Int = 0 }
             };
             addonSupplyList->AtkUnitBase.FireCallback(3, updateFilter);
-            _plugin.CurrentStage = Stage.SelectItemToTurnIn;
+            if (_plugin.CurrentStage == Stage.FinalizeTurnIn)
+                _plugin.CurrentStage = Stage.SelectItemToTurnIn;
+            else
+                _plugin.CurrentStage = Stage.RequestStop;
         }
     }
 
@@ -258,7 +226,7 @@ internal sealed class SupplyHandler
         var agentInterface = AgentModule.Instance()->GetAgentByInternalId(AgentId.GrandCompanySupply);
         if (agentInterface != null && agentInterface->IsAgentActive())
         {
-            var addonId = agentInterface->GetAddonID();
+            var addonId = agentInterface->GetAddonId();
             if (addonId == 0)
                 return;
 

Deliveroo/MessageDeliveryResult.cs

@@ -0,0 +1,12 @@
+using Dalamud.Game.Text.SeStringHandling;
+
+namespace Deliveroo;
+
+internal interface IDeliveryResult;
+
+internal sealed class MessageDeliveryResult : IDeliveryResult
+{
+    public SeString? Message { get; init; }
+}
+
+internal sealed class NoDeliveryResult : IDeliveryResult;

Deliveroo/Stage.cs

@@ -21,4 +21,6 @@ internal enum Stage
 
     RequestStop,
     Stopped,
+
+    SingleFinalizeTurnIn,
 }

Deliveroo/Windows/ConfigWindow.cs

@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text;
 using Dalamud.Interface;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
@@ -19,7 +20,7 @@ namespace Deliveroo.Windows;
 
 internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
 {
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly DeliverooPlugin _plugin;
     private readonly Configuration _configuration;
     private readonly GcRewardsCache _gcRewardsCache;
@@ -29,10 +30,19 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
     private readonly GameFunctions _gameFunctions;
 
     private readonly IReadOnlyDictionary<uint, GcRewardItem> _itemLookup;
-    private string _searchString = string.Empty;
-    private uint _dragDropSource;
 
-    public ConfigWindow(DalamudPluginInterface pluginInterface, DeliverooPlugin plugin, Configuration configuration,
+    private readonly List<(VirtualKey Key, string Label)> _keyCodes =
+    [
+        (VirtualKey.NO_KEY, "Disabled"),
+        (VirtualKey.CONTROL, "CTRL"),
+        (VirtualKey.SHIFT, "SHIFT"),
+        (VirtualKey.MENU, "ALT"),
+    ];
+
+    private string _searchString = string.Empty;
+    private Configuration.PurchaseOption? _dragDropSource;
+
+    public ConfigWindow(IDalamudPluginInterface pluginInterface, DeliverooPlugin plugin, Configuration configuration,
         GcRewardsCache gcRewardsCache, IClientState clientState, IPluginLog pluginLog, IconCache iconCache,
         GameFunctions gameFunctions)
         : base("Deliveroo - Configuration###DeliverooConfig")
@@ -79,68 +89,80 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
     {
         if (ImGui.BeginTabItem("Items for Auto-Buy"))
         {
-            uint? itemToRemove = null;
+            Configuration.PurchaseOption? itemToRemove = null;
-            uint? itemToAdd = null;
+            Configuration.PurchaseOption? itemToAdd = null;
             int indexToAdd = 0;
             if (ImGui.BeginChild("Items", new Vector2(-1, -ImGui.GetFrameHeightWithSpacing()), true,
                     ImGuiWindowFlags.NoSavedSettings))
             {
-                for (int i = 0; i < _configuration.ItemsAvailableForPurchase.Count; ++i)
+                for (int i = 0; i < _configuration.ItemsAvailableToPurchase.Count; ++i)
                 {
-                    uint itemId = _configuration.ItemsAvailableForPurchase[i];
+                    var purchaseOption = _configuration.ItemsAvailableToPurchase[i];
                     ImGui.PushID($"###Item{i}");
                     ImGui.BeginDisabled(
-                        _configuration.ItemsAvailableForPurchase.Count == 1 && itemId == ItemIds.Venture);
+                        _configuration.ItemsAvailableToPurchase.Count == 1 && purchaseOption.ItemId == ItemIds.Venture);
 
-                    var item = _itemLookup[itemId];
+                    var item = _itemLookup[purchaseOption.ItemId];
-                    IDalamudTextureWrap? icon = _iconCache.GetIcon(item.IconId);
+                    using (var icon = _iconCache.GetIcon(item.IconId))
-                    Vector2 pos = ImGui.GetCursorPos();
-                    Vector2 iconSize = new Vector2(ImGui.GetTextLineHeight() + ImGui.GetStyle().ItemSpacing.Y);
-                    if (icon != null)
                     {
-                        ImGui.SetCursorPos(pos + new Vector2(iconSize.X + ImGui.GetStyle().FramePadding.X,
+                        Vector2 pos = ImGui.GetCursorPos();
-                            ImGui.GetStyle().ItemSpacing.Y / 2));
+                        Vector2 iconSize = new Vector2(ImGui.GetTextLineHeight() + ImGui.GetStyle().ItemSpacing.Y);
-                    }
 
-                    ImGui.Selectable($"{item.Name}{(item.Limited ? $" {SeIconChar.Hyadelyn.ToIconString()}" : "")}",
+                        if (icon != null)
-                        false, ImGuiSelectableFlags.SpanAllColumns);
-
-                    if (icon != null)
-                    {
-                        ImGui.SameLine(0, 0);
-                        ImGui.SetCursorPos(pos);
-                        ImGui.Image(icon.ImGuiHandle, iconSize);
-                    }
-
-                    if (ImGui.BeginDragDropSource())
-                    {
-                        ImGui.SetDragDropPayload("DeliverooDragDrop", nint.Zero, 0);
-                        _dragDropSource = itemId;
-
-                        ImGui.EndDragDropSource();
-                    }
-
-                    if (ImGui.BeginDragDropTarget())
-                    {
-                        if (_dragDropSource > 0 &&
-                            ImGui.AcceptDragDropPayload("DeliverooDragDrop").NativePtr != null)
                         {
-                            itemToAdd = _dragDropSource;
+                            ImGui.SetCursorPos(pos + new Vector2(iconSize.X + ImGui.GetStyle().FramePadding.X,
-                            indexToAdd = i;
+                                ImGui.GetStyle().ItemSpacing.Y / 2));
-
-                            _dragDropSource = 0;
                         }
 
-                        ImGui.EndDragDropTarget();
+                        ImGui.Selectable(
-                    }
+                            $"{item.Name}{(item.Limited ? $" {SeIconChar.Hyadelyn.ToIconString()}" : "")}{(purchaseOption.SameQuantityForAllLists ? $" {((SeIconChar)57412).ToIconString()} (Limit: {purchaseOption.GlobalLimit:N0})" : "")}",
+                            false, ImGuiSelectableFlags.SpanAllColumns);
 
-                    ImGui.OpenPopupOnItemClick($"###ctx{i}", ImGuiPopupFlags.MouseButtonRight);
+                        if (ImGui.BeginDragDropSource())
-                    if (ImGui.BeginPopup($"###ctx{i}"))
+                        {
-                    {
+                            ImGui.SetDragDropPayload("DeliverooDragDrop", nint.Zero, 0);
-                        if (ImGui.Selectable($"Remove {_itemLookup[itemId].Name}"))
+                            _dragDropSource = purchaseOption;
-                            itemToRemove = itemId;
 
-                        ImGui.EndPopup();
+                            ImGui.EndDragDropSource();
+                        }
+
+                        if (ImGui.BeginDragDropTarget())
+                        {
+                            if (_dragDropSource != null &&
+                                ImGui.AcceptDragDropPayload("DeliverooDragDrop").NativePtr != null)
+                            {
+                                itemToAdd = _dragDropSource;
+                                indexToAdd = i;
+
+                                _dragDropSource = null;
+                            }
+
+                            ImGui.EndDragDropTarget();
+                        }
+
+                        ImGui.OpenPopupOnItemClick($"###ctx{i}", ImGuiPopupFlags.MouseButtonRight);
+                        if (ImGui.BeginPopup($"###ctx{i}"))
+                        {
+                            bool sameQuantityForAllLists = purchaseOption.SameQuantityForAllLists;
+                            if (ImGui.MenuItem("Use same quantity for global and character-specific lists", null,
+                                    ref sameQuantityForAllLists))
+                            {
+                                purchaseOption.SameQuantityForAllLists = sameQuantityForAllLists;
+                                Save();
+                            }
+
+                            if (ImGui.MenuItem($"Remove {_itemLookup[purchaseOption.ItemId].Name}"))
+                                itemToRemove = purchaseOption;
+
+                            ImGui.EndPopup();
+                        }
+
+                        if (icon != null)
+                        {
+                            ImGui.SameLine(0, 0);
+                            ImGui.SetCursorPos(pos);
+                            ImGui.Image(icon.ImGuiHandle, iconSize);
+                        }
                     }
 
                     ImGui.EndDisabled();
@@ -152,20 +174,20 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
 
             if (itemToRemove != null)
             {
-                _configuration.ItemsAvailableForPurchase.Remove(itemToRemove.Value);
+                _configuration.ItemsAvailableToPurchase.Remove(itemToRemove);
                 Save();
             }
 
             if (itemToAdd != null)
             {
-                _configuration.ItemsAvailableForPurchase.Remove(itemToAdd.Value);
+                _configuration.ItemsAvailableToPurchase.Remove(itemToAdd);
-                _configuration.ItemsAvailableForPurchase.Insert(indexToAdd, itemToAdd.Value);
+                _configuration.ItemsAvailableToPurchase.Insert(indexToAdd, itemToAdd);
                 Save();
             }
 
             List<(uint ItemId, string Name, ushort IconId, bool Limited)> comboValues = _gcRewardsCache.Rewards
                 .Where(x => x.SubCategory is RewardSubCategory.Materials or RewardSubCategory.Materiel)
-                .Where(x => !_configuration.ItemsAvailableForPurchase.Contains(x.ItemId))
+                .Where(x => _configuration.ItemsAvailableToPurchase.All(y => y.ItemId != x.ItemId))
                 .Select(x => (x.ItemId, x.Name, x.IconId, x.Limited))
                 .OrderBy(x => x.Name)
                 .ThenBy(x => x.GetHashCode())
@@ -180,12 +202,14 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
                 foreach (var item in comboValues.Where(x =>
                              x.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase)))
                 {
-                    IDalamudTextureWrap? icon = _iconCache.GetIcon(item.IconId);
+                    using (var icon = _iconCache.GetIcon(item.IconId))
-                    if (icon != null)
                     {
-                        ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                        if (icon != null)
-                        ImGui.SameLine();
+                        {
-                        ImGui.SetCursorPosY(ImGui.GetCursorPosY() + ImGui.GetStyle().FramePadding.X);
+                            ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                            ImGui.SameLine();
+                            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + ImGui.GetStyle().FramePadding.X);
+                        }
                     }
 
                     bool addThis =
@@ -193,7 +217,8 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
                             $"{item.Name}{(item.Limited ? $" {SeIconChar.Hyadelyn.ToIconString()}" : "")}##SelectVenture{item.IconId}");
                     if (addThis || addFirst)
                     {
-                        _configuration.ItemsAvailableForPurchase.Add(item.ItemId);
+                        _configuration.ItemsAvailableToPurchase.Add(new Configuration.PurchaseOption
+                            { ItemId = item.ItemId });
 
                         if (addFirst)
                         {
@@ -219,7 +244,7 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
             if (_clientState is { IsLoggedIn: true, LocalContentId: > 0 })
             {
                 string currentCharacterName = _clientState.LocalPlayer!.Name.ToString();
-                string currentWorldName = _clientState.LocalPlayer.HomeWorld.GameData!.Name.ToString();
+                string currentWorldName = _clientState.LocalPlayer.HomeWorld.Value.Name.ToString();
                 ImGui.Text($"Current Character: {currentCharacterName} @ {currentWorldName}");
                 ImGui.Spacing();
                 ImGui.Separator();
@@ -362,6 +387,15 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
 
             ImGui.EndDisabled();
 
+            ImGui.SetNextItemWidth(ImGuiHelpers.GlobalScale * 120);
+            int selectedKey = Math.Max(0, _keyCodes.FindIndex(x => x.Key == _configuration.QuickTurnInKey));
+            if (ImGui.Combo("Quick Turn-In Key", ref selectedKey, _keyCodes.Select(x => x.Label).ToArray(),
+                    _keyCodes.Count))
+            {
+                _configuration.QuickTurnInKey = _keyCodes[selectedKey].Key;
+                Save();
+            }
+
             ImGui.SetNextItemWidth(ImGuiHelpers.GlobalScale * 120);
             var xivChatTypes = Enum.GetValues<XivChatType>()
                 .Where(x => x != XivChatType.StandardEmote)

Deliveroo/Windows/TurnInWindow.cs

@@ -3,11 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.ClientState.Keys;
+using Dalamud.Game.Text;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Deliveroo.GameData;
@@ -19,7 +22,7 @@ using LLib.ImGui;
 
 namespace Deliveroo.Windows;
 
-internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
+internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configuration.MinimizableWindowConfig>
 {
     private static readonly IReadOnlyList<InventoryType> InventoryTypes = new[]
     {
@@ -44,20 +47,23 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
     private static readonly string[] StockingTypeLabels = { "Purchase Once", "Keep in Stock" };
 
     private readonly DeliverooPlugin _plugin;
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly Configuration _configuration;
     private readonly ICondition _condition;
     private readonly IClientState _clientState;
     private readonly GcRewardsCache _gcRewardsCache;
     private readonly ConfigWindow _configWindow;
     private readonly IconCache _iconCache;
+    private readonly IKeyState _keyState;
     private readonly GameFunctions _gameFunctions;
+    private readonly TitleBarButton _minimizeButton;
 
     private bool _state;
+    private Guid? _draggedItem;
 
-    public TurnInWindow(DeliverooPlugin plugin, DalamudPluginInterface pluginInterface, Configuration configuration,
+    public TurnInWindow(DeliverooPlugin plugin, IDalamudPluginInterface pluginInterface, Configuration configuration,
         ICondition condition, IClientState clientState, GcRewardsCache gcRewardsCache, ConfigWindow configWindow,
-        IconCache iconCache, GameFunctions gameFunctions)
+        IconCache iconCache, IKeyState keyState, GameFunctions gameFunctions)
         : base("GC Delivery###DeliverooTurnIn")
     {
         _plugin = plugin;
@@ -68,6 +74,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
         _gcRewardsCache = gcRewardsCache;
         _configWindow = configWindow;
         _iconCache = iconCache;
+        _keyState = keyState;
         _gameFunctions = gameFunctions;
 
         Position = new Vector2(100, 100);
@@ -83,6 +90,20 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
         ShowCloseButton = false;
         AllowClickthrough = false;
 
+        _minimizeButton = new TitleBarButton
+        {
+            Icon = FontAwesomeIcon.Minus,
+            Priority = int.MinValue,
+            IconOffset = new Vector2(1.5f, 1),
+            Click = _ =>
+            {
+                IsMinimized = !IsMinimized;
+                _minimizeButton!.Icon = IsMinimized ? FontAwesomeIcon.WindowMaximize : FontAwesomeIcon.Minus;
+            },
+            AvailableClickthrough = true,
+        };
+        TitleBarButtons.Insert(0, _minimizeButton);
+
         TitleBarButtons.Add(new TitleBarButton
         {
             Icon = FontAwesomeIcon.Cog,
@@ -98,7 +119,17 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
         });
     }
 
-    public WindowConfig WindowConfig => _configuration.TurnInWindowConfig;
+    public Configuration.MinimizableWindowConfig WindowConfig => _configuration.TurnInWindowConfig;
+
+    private bool IsMinimized
+    {
+        get => WindowConfig.IsMinimized;
+        set
+        {
+            WindowConfig.IsMinimized = value;
+            SaveWindowConfig();
+        }
+    }
 
     public bool State
     {
@@ -121,7 +152,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
 
     private bool IsOnHomeWorld =>
         _clientState.LocalPlayer == null ||
-        _clientState.LocalPlayer.HomeWorld.Id == _clientState.LocalPlayer.CurrentWorld.Id;
+        _clientState.LocalPlayer.HomeWorld.RowId == _clientState.LocalPlayer.CurrentWorld.RowId;
 
     private IItemsToPurchase ItemsWrapper => UseCharacterSpecificItemsToPurchase
         ? new CharacterSpecificItemsToPurchase(_plugin.CharacterConfiguration!, _pluginInterface)
@@ -145,13 +176,16 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
                 .Where(x => x.Reward.RequiredRank <= rank)
                 .Select(x =>
                 {
+                    var purchaseOption = _configuration.ItemsAvailableToPurchase.Where(y => y.SameQuantityForAllLists)
+                        .FirstOrDefault(y => y.ItemId == x.Item.ItemId);
+                    int limit = purchaseOption?.GlobalLimit ?? x.Item.Limit;
                     var request = new PurchaseItemRequest
                     {
                         ItemId = x.Item.ItemId,
                         Name = x.Reward.Name,
                         EffectiveLimit = CalculateEffectiveLimit(
                             x.Item.ItemId,
-                            x.Item.Limit <= 0 ? uint.MaxValue : (uint)x.Item.Limit,
+                            limit <= 0 ? uint.MaxValue : (uint)limit,
                             x.Reward.StackSize,
                             x.Reward.InventoryLimit),
                         SealCost = x.Reward.SealCost,
@@ -210,57 +244,85 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
         }
 
         float indentSize = ImGui.GetFrameHeight() + ImGui.GetStyle().ItemInnerSpacing.X;
-        ImGui.Indent(indentSize);
         if (!string.IsNullOrEmpty(Error))
         {
-            ImGui.TextColored(ImGuiColors.DalamudRed, Error);
+            using (ImRaii.PushIndent(indentSize))
+                ImGui.TextColored(ImGuiColors.DalamudRed, Error);
         }
         else
         {
-            if (_configuration.BehaviorOnOtherWorld == Configuration.EBehaviorOnOtherWorld.Warning && !IsOnHomeWorld)
+            using (ImRaii.PushIndent(indentSize))
             {
-                ImGui.TextColored(ImGuiColors.DalamudRed,
+                if (_configuration.BehaviorOnOtherWorld == Configuration.EBehaviorOnOtherWorld.Warning &&
-                    "You are not on your home world and will not earn FC points.");
+                    !IsOnHomeWorld)
-            }
-
-            if (Multiplier == 1m)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudYellow, "You do not have an active seal buff.");
-            }
-            else
-            {
-                ImGui.TextColored(ImGuiColors.HealerGreen, $"Current Buff: {(Multiplier - 1m) * 100:N0}%%");
-            }
-
-            if (Multiplier <= 1.10m)
-            {
-                InventoryManager* inventoryManager = InventoryManager.Instance();
-                AgentInventoryContext* agentInventoryContext = AgentInventoryContext.Instance();
-                if (inventoryManager->GetInventoryItemCount(ItemIds.PrioritySealAllowance) > 0)
                 {
-                    ImGui.BeginDisabled(_condition[ConditionFlag.OccupiedInQuestEvent] ||
+                    ImGui.TextColored(ImGuiColors.DalamudRed,
-                                        _condition[ConditionFlag.Casting] ||
+                        "You are not on your home world and will not earn FC points.");
-                                        agentInventoryContext == null);
+                }
-                    if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bolt, "Use Priority Seal Allowance (15%)"))
-                    {
-                        agentInventoryContext->UseItem(ItemIds.PrioritySealAllowance);
-                    }
 
-                    ImGui.EndDisabled();
+                if (Multiplier == 1m)
+                {
+                    ImGui.TextColored(ImGuiColors.DalamudYellow, "You do not have an active seal buff.");
+                }
+                else
+                {
+                    ImGui.TextColored(ImGuiColors.HealerGreen, $"Current Buff: {(Multiplier - 1m) * 100:N0}%%");
+                }
+
+                if (Multiplier <= 1.10m)
+                {
+                    InventoryManager* inventoryManager = InventoryManager.Instance();
+                    AgentInventoryContext* agentInventoryContext = AgentInventoryContext.Instance();
+                    if (inventoryManager->GetInventoryItemCount(ItemIds.PrioritySealAllowance) > 0)
+                    {
+                        ImGui.BeginDisabled(_condition[ConditionFlag.OccupiedInQuestEvent] ||
+                                            _condition[ConditionFlag.Casting] ||
+                                            agentInventoryContext == null);
+                        if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bolt,
+                                "Use Priority Seal Allowance (15%)"))
+                        {
+                            agentInventoryContext->UseItem(ItemIds.PrioritySealAllowance);
+                        }
+
+                        ImGui.EndDisabled();
+                    }
                 }
             }
 
-            ImGui.Unindent(indentSize);
+            if (!IsMinimized)
-            ImGui.Separator();
+            {
-            ImGui.BeginDisabled(state);
+                ImGui.Separator();
-
+                using (ImRaii.Disabled(state))
-            DrawItemsToBuy(grandCompany);
+                    DrawItemsToBuy(grandCompany);
-
+            }
-            ImGui.EndDisabled();
         }
 
-        ImGui.Separator();
+        if (_configuration.QuickTurnInKey != VirtualKey.NO_KEY)
-        ImGui.Text($"Debug (State): {_plugin.CurrentStage}");
+        {
+            var key = _configuration.QuickTurnInKey switch
+            {
+                VirtualKey.MENU => "ALT",
+                VirtualKey.SHIFT => "SHIFT",
+                VirtualKey.CONTROL => "CTRL",
+                _ => _configuration.QuickTurnInKey.ToString()
+            };
+            if (!State && _keyState[_configuration.QuickTurnInKey])
+            {
+                ImGui.Separator();
+                ImGui.TextColored(ImGuiColors.HealerGreen, "Click an item to turn it in without confirmation");
+            }
+            else if (!IsMinimized)
+            {
+                ImGui.Separator();
+                ImGui.Text($"Hold '{key}' when clicking an item to turn it in without confirmation.");
+            }
+        }
+
+        if (!IsMinimized)
+        {
+            ImGui.Separator();
+            ImGui.Text($"Debug (State): {_plugin.CurrentStage}");
+        }
     }
 
     private unsafe void DrawNextRankPrequesites()
@@ -272,7 +334,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
             uint requiredSeals = _gameFunctions.GetSealsRequiredForNextRank();
 
             int currentHuntingLog =
-                MonsterNoteManager.Instance()->RankDataArraySpan[(int)_gameFunctions.GetGrandCompany() + 7]
+                MonsterNoteManager.Instance()->RankData[(int)_gameFunctions.GetGrandCompany() + 7]
                     .Rank;
             byte requiredHuntingLog = _gameFunctions.GetRequiredHuntingLogForNextRank();
 
@@ -319,13 +381,20 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
         {
             (GcRewardItem.None, GcRewardItem.None.Name, GcRewardItem.None.Name),
         };
-        foreach (uint itemId in _configuration.ItemsAvailableForPurchase)
+        foreach (Configuration.PurchaseOption purchaseOption in _configuration.ItemsAvailableToPurchase)
         {
-            var gcReward = _gcRewardsCache.GetReward(itemId);
+            var gcReward = _gcRewardsCache.GetReward(purchaseOption.ItemId);
-            int itemCountWithoutRetainers = _gameFunctions.GetItemCount(itemId, false);
+            int itemCountWithoutRetainers = _gameFunctions.GetItemCount(purchaseOption.ItemId, false);
-            int itemCountWithRetainers = _gameFunctions.GetItemCount(itemId, true);
+            int itemCountWithRetainers = _gameFunctions.GetItemCount(purchaseOption.ItemId, true);
             string itemNameWithoutRetainers = gcReward.Name;
             string itemNameWithRetainers = gcReward.Name;
+
+            if (purchaseOption.SameQuantityForAllLists)
+            {
+                itemNameWithoutRetainers += $" {((SeIconChar)57412).ToIconString()}";
+                itemNameWithRetainers += $" {((SeIconChar)57412).ToIconString()}";
+            }
+
             if (itemCountWithoutRetainers > 0)
                 itemNameWithoutRetainers += $" ({itemCountWithoutRetainers:N0})";
             if (itemCountWithRetainers > 0)
@@ -339,161 +408,42 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
             itemsWrapper.Save();
         }
 
-        int? itemToRemove = null;
+        Configuration.PurchasePriority? itemToRemove = null;
         Configuration.PurchasePriority? itemToAdd = null;
         int indexToAdd = 0;
+
+        float width = ImGui.GetContentRegionAvail().X;
+        List<(Vector2 TopLeft, Vector2 BottomRight)> itemPositions = [];
+
         for (int i = 0; i < itemsWrapper.GetItemsToPurchase().Count; ++i)
         {
-            ImGui.PushID($"ItemToBuy{i}");
+            DrawItemToBuy(grandCompany, i, itemsWrapper, comboValues, width, ref itemToRemove, itemPositions);
-            Configuration.PurchasePriority item = itemsWrapper.GetItemsToPurchase()[i];
+        }
 
-            float indentX = ImGui.GetCursorPosX();
+        if (!ImGui.IsMouseDragging(ImGuiMouseButton.Left))
-            bool enabled = item.Enabled;
+            _draggedItem = null;
-            int popColors = 0;
+        else if (_draggedItem != null)
-            if (!enabled)
+        {
+            var items = itemsWrapper.GetItemsToPurchase().ToList();
+            var draggedItem = items.Single(x => x.InternalId == _draggedItem);
+            int oldIndex = items.IndexOf(draggedItem);
+
+            var (topLeft, bottomRight) = itemPositions[oldIndex];
+            ImGui.GetWindowDrawList().AddRect(topLeft, bottomRight, ImGui.GetColorU32(ImGuiColors.DalamudGrey), 3f,
+                ImDrawFlags.RoundCornersAll);
+
+            int newIndex = itemPositions.FindIndex(x => ImGui.IsMouseHoveringRect(x.TopLeft, x.BottomRight, true));
+            if (newIndex >= 0 && oldIndex != newIndex)
             {
-                ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(1f, 0.5f, 0.35f, 1f));
+                itemToAdd = items.Single(x => x.InternalId == _draggedItem);
-                popColors++;
+                indexToAdd = newIndex;
             }
+        }
 
-            if (ImGui.Button($"{item.GetIcon()}"))
+        if (itemToRemove != null)
-                ImGui.OpenPopup($"Configure{i}");
+        {
-
+            itemsWrapper.Remove(itemToRemove);
-            ImGui.PopStyleColor(popColors);
+            itemsWrapper.Save();
-
-            if (ImGui.BeginPopup($"Configure{i}"))
-            {
-                if (ImGui.Checkbox($"Enabled##Enabled{i}", ref enabled))
-                {
-                    item.Enabled = enabled;
-                    itemsWrapper.Save();
-                }
-
-                ImGui.SetNextItemWidth(375 * ImGuiHelpers.GlobalScale);
-                int type = (int)item.Type;
-                if (ImGui.Combo($"##Type{i}", ref type, StockingTypeLabels, StockingTypeLabels.Length))
-                {
-                    item.Type = (Configuration.PurchaseType)type;
-                    if (item.Type != Configuration.PurchaseType.KeepStocked)
-                        item.CheckRetainerInventory = false;
-                    itemsWrapper.Save();
-                }
-
-                if (item.Type == Configuration.PurchaseType.KeepStocked && item.ItemId != ItemIds.Venture)
-                {
-                    bool checkRetainerInventory = item.CheckRetainerInventory;
-                    if (ImGui.Checkbox("Check Retainer Inventory for items (requires AllaganTools)",
-                            ref checkRetainerInventory))
-                    {
-                        item.CheckRetainerInventory = checkRetainerInventory;
-                        itemsWrapper.Save();
-                    }
-                }
-
-                ImGui.EndPopup();
-            }
-
-            ImGui.SameLine(0, 3);
-            ImGui.BeginDisabled(!enabled);
-            int comboValueIndex = comboValues.FindIndex(x => x.Item.ItemId == item.ItemId);
-            if (comboValueIndex < 0)
-            {
-                item.ItemId = 0;
-                item.Limit = 0;
-                itemsWrapper.Save();
-
-                comboValueIndex = 0;
-            }
-
-            var comboItem = comboValues[comboValueIndex];
-            IDalamudTextureWrap? icon = _iconCache.GetIcon(comboItem.Item.IconId);
-            if (icon != null)
-            {
-                ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
-                ImGui.SameLine(0, 3);
-            }
-
-            indentX = ImGui.GetCursorPosX() - indentX;
-
-            if (ImGui.Combo("", ref comboValueIndex,
-                    comboValues.Select(x => item.CheckRetainerInventory ? x.NameWithRetainers : x.NameWithoutRetainers)
-                        .ToArray(), comboValues.Count))
-            {
-                comboItem = comboValues[comboValueIndex];
-                item.ItemId = comboItem.Item.ItemId;
-                itemsWrapper.Save();
-            }
-
-            ImGui.EndDisabled();
-
-            if (itemsWrapper.GetItemsToPurchase().Count >= 2)
-            {
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton($"##Up{i}", FontAwesomeIcon.ArrowUp))
-                {
-                    itemToAdd = item;
-                    if (i > 0)
-                        indexToAdd = i - 1;
-                    else
-                        indexToAdd = itemsWrapper.GetItemsToPurchase().Count - 1;
-                }
-
-                ImGui.SameLine(0, 0);
-                if (ImGuiComponents.IconButton($"##Down{i}", FontAwesomeIcon.ArrowDown))
-                {
-                    itemToAdd = item;
-                    if (i < itemsWrapper.GetItemsToPurchase().Count - 1)
-                        indexToAdd = i + 1;
-                    else
-                        indexToAdd = 0;
-                }
-
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton($"###Remove{i}", FontAwesomeIcon.Times))
-                    itemToRemove = i;
-            }
-
-            if (enabled)
-            {
-                ImGui.Indent(indentX);
-                if (comboValueIndex > 0)
-                {
-                    ImGui.SetNextItemWidth(ImGuiHelpers.GlobalScale * 130);
-                    int limit = Math.Min(item.Limit, (int)comboItem.Item.InventoryLimit);
-                    int stepSize = comboItem.Item.StackSize < 99 ? 1 : 50;
-                    string label = item.Type == Configuration.PurchaseType.KeepStocked
-                        ? "Maximum items to buy"
-                        : "Remaining items to buy";
-                    if (ImGui.InputInt(label, ref limit, stepSize, stepSize * 10))
-                    {
-                        item.Limit = Math.Min(Math.Max(0, limit), (int)comboItem.Item.InventoryLimit);
-                        itemsWrapper.Save();
-                    }
-                }
-                else if (item.Limit != 0)
-                {
-                    item.Limit = 0;
-                    itemsWrapper.Save();
-                }
-
-                if (comboValueIndex > 0)
-                {
-                    if (!comboItem.Item.GrandCompanies.Contains(grandCompany))
-                    {
-                        ImGui.TextColored(ImGuiColors.DalamudRed,
-                            "This item will be skipped, as you are in the wrong Grand Company.");
-                    }
-                    else if (comboItem.Item.RequiredRank > _gameFunctions.GetGrandCompanyRank())
-                    {
-                        ImGui.TextColored(ImGuiColors.DalamudRed,
-                            "This item will be skipped, your rank isn't high enough to buy it.");
-                    }
-                }
-
-                ImGui.Unindent(indentX);
-            }
-
-            ImGui.PopID();
         }
 
         if (itemToAdd != null)
@@ -503,27 +453,22 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
             itemsWrapper.Save();
         }
 
-        if (itemToRemove != null)
+        if (_configuration.ItemsAvailableToPurchase.Any(x =>
-        {
+                itemsWrapper.GetItemsToPurchase().All(y => x.ItemId != y.ItemId)))
-            itemsWrapper.RemoveAt(itemToRemove.Value);
-            itemsWrapper.Save();
-        }
-
-        if (_configuration.ItemsAvailableForPurchase.Any(x =>
-                itemsWrapper.GetItemsToPurchase().All(y => x != y.ItemId)))
         {
             if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Plus, "Add Item"))
                 ImGui.OpenPopup("##AddItem");
 
             if (ImGui.BeginPopupContextItem("##AddItem", ImGuiPopupFlags.NoOpenOverItems))
             {
-                foreach (var itemId in _configuration.ItemsAvailableForPurchase.Distinct())
+                foreach (var purchaseOption in _configuration.ItemsAvailableToPurchase.Distinct())
                 {
-                    if (_gcRewardsCache.RewardLookup.TryGetValue(itemId, out var reward))
+                    if (_gcRewardsCache.RewardLookup.TryGetValue(purchaseOption.ItemId, out var reward))
                     {
-                        if (ImGui.MenuItem($"{reward.Name}##{itemId}"))
+                        if (ImGui.MenuItem($"{reward.Name}##{purchaseOption.ItemId}"))
                         {
-                            itemsWrapper.Add(new Configuration.PurchasePriority { ItemId = itemId, Limit = 0 });
+                            itemsWrapper.Add(new Configuration.PurchasePriority
+                                { ItemId = purchaseOption.ItemId, Limit = 0 });
                             itemsWrapper.Save();
                             ImGui.CloseCurrentPopup();
                         }
@@ -534,9 +479,208 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
             }
 
             ImGui.SameLine();
-            if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Cog, "Configure available Items"))
-                _configWindow.IsOpen = true;
         }
+
+        if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Cog, "Configure available Items"))
+            _configWindow.IsOpen = true;
+    }
+
+    private void DrawItemToBuy(GrandCompany grandCompany, int i, IItemsToPurchase itemsWrapper,
+        List<(GcRewardItem Item, string NameWithoutRetainers, string NameWithRetainers)> comboValues, float width,
+        ref Configuration.PurchasePriority? itemToRemove, List<(Vector2 TopLeft, Vector2 BottomRight)> itemPositions)
+    {
+        Vector2 topLeft = ImGui.GetCursorScreenPos() + new Vector2(0, -ImGui.GetStyle().ItemSpacing.Y / 2);
+
+        ImGui.PushID($"ItemToBuy{i}");
+        Configuration.PurchasePriority item = itemsWrapper.GetItemsToPurchase()[i];
+
+        float indentX = ImGui.GetCursorPosX();
+        bool enabled = item.Enabled;
+        int popColors = 0;
+        if (!enabled)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(1f, 0.5f, 0.35f, 1f));
+            popColors++;
+        }
+
+        if (ImGui.Button($"{item.GetIcon()}"))
+            ImGui.OpenPopup($"Configure{i}");
+
+        ImGui.PopStyleColor(popColors);
+
+        if (ImGui.BeginPopup($"Configure{i}"))
+        {
+            if (ImGui.Checkbox($"Enabled##Enabled{i}", ref enabled))
+            {
+                item.Enabled = enabled;
+                itemsWrapper.Save();
+            }
+
+            ImGui.SetNextItemWidth(375 * ImGuiHelpers.GlobalScale);
+            int type = (int)item.Type;
+            if (ImGui.Combo($"##Type{i}", ref type, StockingTypeLabels, StockingTypeLabels.Length))
+            {
+                item.Type = (Configuration.PurchaseType)type;
+                if (item.Type != Configuration.PurchaseType.KeepStocked)
+                    item.CheckRetainerInventory = false;
+                itemsWrapper.Save();
+            }
+
+            if (item.Type == Configuration.PurchaseType.KeepStocked && item.ItemId != ItemIds.Venture)
+            {
+                bool checkRetainerInventory = item.CheckRetainerInventory;
+                if (ImGui.Checkbox("Check Retainer Inventory for items (requires AllaganTools)",
+                        ref checkRetainerInventory))
+                {
+                    item.CheckRetainerInventory = checkRetainerInventory;
+                    itemsWrapper.Save();
+                }
+            }
+
+            ImGui.EndPopup();
+        }
+
+        ImGui.SameLine(0, 3);
+        ImGui.BeginDisabled(!enabled);
+        int comboValueIndex = comboValues.FindIndex(x => x.Item.ItemId == item.ItemId);
+        if (comboValueIndex < 0)
+        {
+            item.ItemId = 0;
+            item.Limit = 0;
+            itemsWrapper.Save();
+
+            comboValueIndex = 0;
+        }
+
+        var comboItem = comboValues[comboValueIndex];
+        using (var icon = _iconCache.GetIcon(comboItem.Item.IconId))
+        {
+            if (icon != null)
+            {
+                ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                ImGui.SameLine(0, 3);
+            }
+        }
+
+        indentX = ImGui.GetCursorPosX() - indentX;
+
+        ImGui.PushFont(UiBuilder.IconFont);
+        ImGui.SetNextItemWidth(width -
+                               ImGui.GetStyle().WindowPadding.X -
+                               ImGui.CalcTextSize(FontAwesomeIcon.Circle.ToIconString()).X -
+                               ImGui.CalcTextSize(FontAwesomeIcon.ArrowsUpDown.ToIconString()).X -
+                               ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
+                               ImGui.GetStyle().FramePadding.X * 8 -
+                               ImGui.GetStyle().ItemSpacing.X * 2 - 3 * 3);
+        ImGui.PopFont();
+
+        if (ImGui.Combo("", ref comboValueIndex,
+                comboValues.Select(x => item.CheckRetainerInventory ? x.NameWithRetainers : x.NameWithoutRetainers)
+                    .ToArray(), comboValues.Count))
+        {
+            comboItem = comboValues[comboValueIndex];
+            item.ItemId = comboItem.Item.ItemId;
+            itemsWrapper.Save();
+        }
+
+        ImGui.EndDisabled();
+
+        if (itemsWrapper.GetItemsToPurchase().Count >= 2)
+        {
+            ImGui.PushFont(UiBuilder.IconFont);
+            ImGui.SameLine(ImGui.GetContentRegionAvail().X +
+                           ImGui.GetStyle().WindowPadding.X -
+                           ImGui.CalcTextSize(FontAwesomeIcon.ArrowsUpDown.ToIconString()).X -
+                           ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
+                           ImGui.GetStyle().FramePadding.X * 4 -
+                           ImGui.GetStyle().ItemSpacing.X);
+            ImGui.PopFont();
+
+            if (_draggedItem == item.InternalId)
+            {
+                ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown,
+                    ImGui.ColorConvertU32ToFloat4(ImGui.GetColorU32(ImGuiCol.ButtonActive)));
+            }
+            else
+                ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown);
+
+            if (_draggedItem == null && ImGui.IsItemActive() && ImGui.IsMouseDragging(ImGuiMouseButton.Left))
+                _draggedItem = item.InternalId;
+
+            ImGui.SameLine();
+        }
+        else
+        {
+            ImGui.PushFont(UiBuilder.IconFont);
+            ImGui.SameLine(ImGui.GetContentRegionAvail().X +
+                           ImGui.GetStyle().WindowPadding.X -
+                           ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
+                           ImGui.GetStyle().FramePadding.X * 2);
+            ImGui.PopFont();
+        }
+
+        if (ImGuiComponents.IconButton($"###Remove{i}", FontAwesomeIcon.Times))
+            itemToRemove = item;
+
+        if (enabled)
+        {
+            ImGui.Indent(indentX);
+            if (comboValueIndex > 0)
+            {
+                var purchaseOption =
+                    _configuration.ItemsAvailableToPurchase
+                        .Where(x => x.SameQuantityForAllLists)
+                        .FirstOrDefault(x => x.ItemId == item.ItemId);
+
+                ImGui.SetNextItemWidth(ImGuiHelpers.GlobalScale * 130);
+                int limit = Math.Min(purchaseOption?.GlobalLimit ?? item.Limit, (int)comboItem.Item.InventoryLimit);
+                int stepSize = comboItem.Item.StackSize < 99 ? 1 : 50;
+                string label = item.Type == Configuration.PurchaseType.KeepStocked
+                    ? "Maximum items to buy"
+                    : "Remaining items to buy";
+                if (ImGui.InputInt(label, ref limit, stepSize, stepSize * 10))
+                {
+                    int newLimit = Math.Min(Math.Max(0, limit), (int)comboItem.Item.InventoryLimit);
+                    if (purchaseOption != null)
+                    {
+                        purchaseOption.GlobalLimit = newLimit;
+                        _pluginInterface.SavePluginConfig(_configuration);
+                    }
+                    else
+                    {
+                        item.Limit = newLimit;
+                        itemsWrapper.Save();
+                    }
+                }
+            }
+            else if (item.Limit != 0)
+            {
+                item.Limit = 0;
+                itemsWrapper.Save();
+            }
+
+            if (comboValueIndex > 0)
+            {
+                if (!comboItem.Item.GrandCompanies.Contains(grandCompany))
+                {
+                    ImGui.TextColored(ImGuiColors.DalamudRed,
+                        "This item will be skipped, as you are in the wrong Grand Company.");
+                }
+                else if (comboItem.Item.RequiredRank > _gameFunctions.GetGrandCompanyRank())
+                {
+                    ImGui.TextColored(ImGuiColors.DalamudRed,
+                        "This item will be skipped, your rank isn't high enough to buy it.");
+                }
+            }
+
+            ImGui.Unindent(indentX);
+        }
+
+        ImGui.PopID();
+
+        Vector2 bottomRight = new Vector2(topLeft.X + width,
+            ImGui.GetCursorScreenPos().Y - ImGui.GetStyle().ItemSpacing.Y + 2);
+        itemPositions.Add((topLeft, bottomRight));
     }
 
     private unsafe uint CalculateEffectiveLimit(uint itemId, uint limit, uint stackSize, uint inventoryLimit)
@@ -553,7 +697,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
                 for (int i = 0; i < container->Size; ++i)
                 {
                     var item = container->GetInventorySlot(i);
-                    if (item == null || item->ItemID == 0 || item->ItemID == itemId)
+                    if (item == null || item->ItemId == 0 || item->ItemId == itemId)
                     {
                         slotsThatCanBeUsed++;
                     }
@@ -581,10 +725,10 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
     private sealed class CharacterSpecificItemsToPurchase : IItemsToPurchase
     {
         private readonly CharacterConfiguration _characterConfiguration;
-        private readonly DalamudPluginInterface _pluginInterface;
+        private readonly IDalamudPluginInterface _pluginInterface;
 
         public CharacterSpecificItemsToPurchase(CharacterConfiguration characterConfiguration,
-            DalamudPluginInterface pluginInterface)
+            IDalamudPluginInterface pluginInterface)
         {
             _characterConfiguration = characterConfiguration;
             _pluginInterface = pluginInterface;
@@ -614,9 +758,9 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
     private sealed class GlobalItemsToPurchase : IItemsToPurchase
     {
         private readonly Configuration _configuration;
-        private readonly DalamudPluginInterface _pluginInterface;
+        private readonly IDalamudPluginInterface _pluginInterface;
 
-        public GlobalItemsToPurchase(Configuration configuration, DalamudPluginInterface pluginInterface)
+        public GlobalItemsToPurchase(Configuration configuration, IDalamudPluginInterface pluginInterface)
         {
             _configuration = configuration;
             _pluginInterface = pluginInterface;

Deliveroo/packages.lock.json

@@ -4,12 +4,83 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
+        "requested": "[11.0.0, )",
-        "resolved": "2.1.12",
+        "resolved": "11.0.0",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
+      },
+      "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"
+        }
       },
       "llib": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "DalamudPackager": "[11.0.0, )"
+        }
       }
     }
   }

LLib

@@ -1 +1 @@
-Subproject commit b5125d4b3f7cdc0c7514a01764e5b5d4d85f80a7
+Subproject commit b581e2ea2a61f44ed3f0cb4f6ea8cc1595525544