From a4fc9bc9544cb7ca91ccf439b3f41a87d5e51f05 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Thu, 9 Nov 2023 11:28:31 +0100
Subject: [PATCH] Update header icon logic for Dalamud changes

---
 ARDiscard/ARDiscard.csproj         | 6 +++---
 ARDiscard/AutoDiscardPlogon.cs     | 2 +-
 ARDiscard/Windows/ConfigWindow.cs  | 4 +---
 ARDiscard/Windows/DiscardWindow.cs | 9 ++-------
 LLib                               | 2 +-
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/ARDiscard/ARDiscard.csproj b/ARDiscard/ARDiscard.csproj
index 860d7c7..8c845fd 100644
--- a/ARDiscard/ARDiscard.csproj
+++ b/ARDiscard/ARDiscard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>3.1</Version>
+        <Version>3.2</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -24,8 +24,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj" />
-        <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" />
+        <ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj"/>
+        <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj"/>
         <ProjectReference Include="..\LLib\LLib.csproj"/>
     </ItemGroup>
 
diff --git a/ARDiscard/AutoDiscardPlogon.cs b/ARDiscard/AutoDiscardPlogon.cs
index 9b6e6c7..1ad31da 100644
--- a/ARDiscard/AutoDiscardPlogon.cs
+++ b/ARDiscard/AutoDiscardPlogon.cs
@@ -68,7 +68,7 @@ public class AutoDiscardPlogon : IDalamudPlugin
         _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
         _pluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi;
 
-        _discardWindow = new(_pluginInterface, _inventoryUtils, itemCache, clientState, condition);
+        _discardWindow = new(_inventoryUtils, itemCache, clientState, condition);
         _windowSystem.AddWindow(_discardWindow);
 
         _configWindow = new(_pluginInterface, _configuration, itemCache, clientState, condition);
diff --git a/ARDiscard/Windows/ConfigWindow.cs b/ARDiscard/Windows/ConfigWindow.cs
index e6ef117..4cda12c 100644
--- a/ARDiscard/Windows/ConfigWindow.cs
+++ b/ARDiscard/Windows/ConfigWindow.cs
@@ -16,7 +16,7 @@ using LLib;
 
 namespace ARDiscard.Windows;
 
-internal sealed class ConfigWindow : Window
+internal sealed class ConfigWindow : LImGui.LWindow
 {
     private readonly DalamudPluginInterface _pluginInterface;
     private readonly Configuration _configuration;
@@ -58,8 +58,6 @@ internal sealed class ConfigWindow : Window
 
     public override void Draw()
     {
-        LImGui.AddPatreonIcon(_pluginInterface);
-
         bool runAfterVenture = _configuration.RunAfterVenture;
         if (ImGui.Checkbox("[Global] Run automatically after AutoRetainer's venture", ref runAfterVenture))
         {
diff --git a/ARDiscard/Windows/DiscardWindow.cs b/ARDiscard/Windows/DiscardWindow.cs
index ca2075e..3b828bb 100644
--- a/ARDiscard/Windows/DiscardWindow.cs
+++ b/ARDiscard/Windows/DiscardWindow.cs
@@ -5,7 +5,6 @@ using ARDiscard.GameData;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
-using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Common.Math;
 using ImGuiNET;
@@ -13,20 +12,19 @@ using LLib;
 
 namespace ARDiscard.Windows;
 
-internal sealed class DiscardWindow : Window
+internal sealed class DiscardWindow : LImGui.LWindow
 {
     private readonly InventoryUtils _inventoryUtils;
     private readonly ItemCache _itemCache;
     private readonly IClientState _clientState;
     private readonly ICondition _condition;
-    private readonly DalamudPluginInterface _pluginInterface;
 
     private List<SelectableItem> _displayedItems = new();
 
     public event EventHandler? OpenConfigurationClicked;
     public event EventHandler<ItemFilter>? DiscardAllClicked;
 
-    public DiscardWindow(DalamudPluginInterface pluginInterface, InventoryUtils inventoryUtils, ItemCache itemCache,
+    public DiscardWindow(InventoryUtils inventoryUtils, ItemCache itemCache,
         IClientState clientState, ICondition condition)
         : base("Discard Items###AutoDiscardDiscard")
     {
@@ -34,7 +32,6 @@ internal sealed class DiscardWindow : Window
         _itemCache = itemCache;
         _clientState = clientState;
         _condition = condition;
-        _pluginInterface = pluginInterface;
 
         Size = new Vector2(600, 400);
         SizeCondition = ImGuiCond.FirstUseEver;
@@ -50,8 +47,6 @@ internal sealed class DiscardWindow : Window
 
     public override void Draw()
     {
-        LImGui.AddPatreonIcon(_pluginInterface);
-
         ImGui.Text("With your current configuration, the following items would be discarded:");
 
         ImGui.BeginDisabled(Locked);
diff --git a/LLib b/LLib
index e59d291..865a608 160000
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit e59d291f04473eae0b76712397733e2e25349953
+Subproject commit 865a6080319f8ccbcd5fd5b0004404822b6e60d4