Deliveroo/Configuration.cs

@@ -29,7 +29,7 @@ internal sealed class Configuration : IPluginConfiguration
     public bool UncapFrameRate { get; set; }
     public VirtualKey QuickTurnInKey { get; set; } = VirtualKey.SHIFT;
 
-    public MinimizableWindowConfig TurnInWindowConfig { get; } = new();
+    public WindowConfig TurnInWindowConfig { get; } = new();
     public WindowConfig ConfigWindowConfig { get; } = new();
 
     internal sealed class PurchaseOption
@@ -84,9 +84,4 @@ 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="PackagePluginDebug" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
         <DalamudPackager
                 ProjectDir="$(ProjectDir)"
                 OutputPath="$(OutputPath)"

Deliveroo/Deliveroo.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/11.0.0">
     <PropertyGroup>
-        <Version>6.3</Version>
+        <Version>6.0</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 

Deliveroo/GameData/GameStrings.cs

@@ -23,7 +23,7 @@ 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)
+            dataManager.GetString<Addon>(102434, addon => addon.Text, pluginLog)?.ReplaceLineEndings("")
             ?? throw new ConstraintException($"Unable to resolve {nameof(TradeHighQualityItem)}");
 
         var rankUpFc = dataManager.GetExcelSheet<LogMessage>().GetRow(3123);
@@ -42,16 +42,14 @@ internal sealed class GameStrings
 
     [Sheet("custom/000/ComDefGrandCompanyOfficer_00073")]
     [SuppressMessage("Performance", "CA1812")]
-    private readonly struct ComDefGrandCompanyOfficer(ExcelPage page, uint offset, uint row)
+    private readonly struct ComDefGrandCompanyOfficer(ExcelPage page, uint offset, uint row) : IQuestDialogueText, IExcelRow<ComDefGrandCompanyOfficer>
-        : IQuestDialogueText, IExcelRow<ComDefGrandCompanyOfficer>
     {
-        public uint RowId => row;
+    public uint RowId => row;
 
-        public ReadOnlySeString Key => page.ReadString(offset, offset);
+    public ReadOnlySeString Key => page.ReadString(offset, offset);
-        public ReadOnlySeString Value => page.ReadString(offset + 4, offset);
+    public ReadOnlySeString Value => page.ReadString(offset + 4, offset);
 
-        static ComDefGrandCompanyOfficer IExcelRow<ComDefGrandCompanyOfficer>.Create(ExcelPage page, uint offset,
+    static ComDefGrandCompanyOfficer IExcelRow<ComDefGrandCompanyOfficer>.Create(ExcelPage page, uint offset, uint row) =>
-            uint row) =>
+        new(page, offset, row);
-            new(page, offset, row);
+}
-    }
 }

Deliveroo/Windows/TurnInWindow.cs

@@ -10,7 +10,6 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
-using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Deliveroo.GameData;
@@ -22,7 +21,7 @@ using LLib.ImGui;
 
 namespace Deliveroo.Windows;
 
-internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configuration.MinimizableWindowConfig>
+internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig
 {
     private static readonly IReadOnlyList<InventoryType> InventoryTypes = new[]
     {
@@ -56,7 +55,6 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
     private readonly IconCache _iconCache;
     private readonly IKeyState _keyState;
     private readonly GameFunctions _gameFunctions;
-    private readonly TitleBarButton _minimizeButton;
 
     private bool _state;
     private Guid? _draggedItem;
@@ -90,20 +88,6 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
         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,
@@ -119,17 +103,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
         });
     }
 
-    public Configuration.MinimizableWindowConfig WindowConfig => _configuration.TurnInWindowConfig;
+    public WindowConfig WindowConfig => _configuration.TurnInWindowConfig;
-
-    private bool IsMinimized
-    {
-        get => WindowConfig.IsMinimized;
-        set
-        {
-            WindowConfig.IsMinimized = value;
-            SaveWindowConfig();
-        }
-    }
 
     public bool State
     {
@@ -244,59 +218,56 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
         }
 
         float indentSize = ImGui.GetFrameHeight() + ImGui.GetStyle().ItemInnerSpacing.X;
+        ImGui.Indent(indentSize);
         if (!string.IsNullOrEmpty(Error))
         {
-            using (ImRaii.PushIndent(indentSize))
+            ImGui.TextColored(ImGuiColors.DalamudRed, Error);
-                ImGui.TextColored(ImGuiColors.DalamudRed, Error);
         }
         else
         {
-            using (ImRaii.PushIndent(indentSize))
+            if (_configuration.BehaviorOnOtherWorld == Configuration.EBehaviorOnOtherWorld.Warning && !IsOnHomeWorld)
             {
-                if (_configuration.BehaviorOnOtherWorld == Configuration.EBehaviorOnOtherWorld.Warning &&
+                ImGui.TextColored(ImGuiColors.DalamudRed,
-                    !IsOnHomeWorld)
+                    "You are not on your home world and will not earn FC points.");
-                {
+            }
-                    ImGui.TextColored(ImGuiColors.DalamudRed,
-                        "You are not on your home world and will not earn FC points.");
-                }
 
-                if (Multiplier == 1m)
+            if (Multiplier == 1m)
-                {
+            {
-                    ImGui.TextColored(ImGuiColors.DalamudYellow, "You do not have an active seal buff.");
+                ImGui.TextColored(ImGuiColors.DalamudYellow, "You do not have an active seal buff.");
-                }
+            }
-                else
+            else
-                {
+            {
-                    ImGui.TextColored(ImGuiColors.HealerGreen, $"Current Buff: {(Multiplier - 1m) * 100:N0}%%");
+                ImGui.TextColored(ImGuiColors.HealerGreen, $"Current Buff: {(Multiplier - 1m) * 100:N0}%%");
-                }
+            }
 
-                if (Multiplier <= 1.10m)
+            if (Multiplier <= 1.10m)
+            {
+                InventoryManager* inventoryManager = InventoryManager.Instance();
+                AgentInventoryContext* agentInventoryContext = AgentInventoryContext.Instance();
+                if (inventoryManager->GetInventoryItemCount(ItemIds.PrioritySealAllowance) > 0)
                 {
-                    InventoryManager* inventoryManager = InventoryManager.Instance();
+                    ImGui.BeginDisabled(_condition[ConditionFlag.OccupiedInQuestEvent] ||
-                    AgentInventoryContext* agentInventoryContext = AgentInventoryContext.Instance();
+                                        _condition[ConditionFlag.Casting] ||
-                    if (inventoryManager->GetInventoryItemCount(ItemIds.PrioritySealAllowance) > 0)
+                                        agentInventoryContext == null);
+                    if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bolt, "Use Priority Seal Allowance (15%)"))
                     {
-                        ImGui.BeginDisabled(_condition[ConditionFlag.OccupiedInQuestEvent] ||
+                        agentInventoryContext->UseItem(ItemIds.PrioritySealAllowance);
-                                            _condition[ConditionFlag.Casting] ||
-                                            agentInventoryContext == null);
-                        if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bolt,
-                                "Use Priority Seal Allowance (15%)"))
-                        {
-                            agentInventoryContext->UseItem(ItemIds.PrioritySealAllowance);
-                        }
-
-                        ImGui.EndDisabled();
                     }
+
+                    ImGui.EndDisabled();
                 }
             }
 
-            if (!IsMinimized)
+            ImGui.Unindent(indentSize);
-            {
+            ImGui.Separator();
-                ImGui.Separator();
+            ImGui.BeginDisabled(state);
-                using (ImRaii.Disabled(state))
+
-                    DrawItemsToBuy(grandCompany);
+            DrawItemsToBuy(grandCompany);
-            }
+
+            ImGui.EndDisabled();
         }
 
+        ImGui.Separator();
         if (_configuration.QuickTurnInKey != VirtualKey.NO_KEY)
         {
             var key = _configuration.QuickTurnInKey switch
@@ -307,22 +278,14 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
                 _ => _configuration.QuickTurnInKey.ToString()
             };
             if (!State && _keyState[_configuration.QuickTurnInKey])
-            {
-                ImGui.Separator();
                 ImGui.TextColored(ImGuiColors.HealerGreen, "Click an item to turn it in without confirmation");
-            }
+            else
-            else if (!IsMinimized)
-            {
-                ImGui.Separator();
                 ImGui.Text($"Hold '{key}' when clicking an item to turn it in without confirmation.");
-            }
+
+            ImGui.Separator();
         }
 
-        if (!IsMinimized)
+        ImGui.Text($"Debug (State): {_plugin.CurrentStage}");
-        {
-            ImGui.Separator();
-            ImGui.Text($"Debug (State): {_plugin.CurrentStage}");
-        }
     }
 
     private unsafe void DrawNextRankPrequesites()
@@ -482,7 +445,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
         }
 
         if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Cog, "Configure available Items"))
-            _configWindow.IsOpen = true;
+                _configWindow.IsOpen = true;
     }
 
     private void DrawItemToBuy(GrandCompany grandCompany, int i, IItemsToPurchase itemsWrapper,
@@ -640,7 +603,7 @@ internal sealed class TurnInWindow : LWindow, IPersistableWindowConfig<Configura
                     : "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);
+                    int newLimit =  Math.Min(Math.Max(0, limit), (int)comboItem.Item.InventoryLimit);
                     if (purchaseOption != null)
                     {
                         purchaseOption.GlobalLimit = newLimit;

LLib

@@ -1 +1 @@
-Subproject commit b581e2ea2a61f44ed3f0cb4f6ea8cc1595525544
+Subproject commit 538329a1e80acbcd09e28bd6dd459c35b5563c0a