From 153d8adfe07f43de9f8b47d7726190cbcec80db5 Mon Sep 17 00:00:00 2001
From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:48:33 -0500
Subject: [PATCH] [OriginShift] Fixed BTKUI icons

---
 .../Integrations/BTKUI/BtkUiAddon_CAT_OriginShiftMod.cs     | 4 ++--
 OriginShift/Integrations/BTKUI/BtkuiAddon.cs                | 4 +++-
 OriginShift/Integrations/BTKUI/BtkuiAddon_Utils.cs          | 6 ------
 OriginShift/OriginShift.csproj                              | 3 ---
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/OriginShift/Integrations/BTKUI/BtkUiAddon_CAT_OriginShiftMod.cs b/OriginShift/Integrations/BTKUI/BtkUiAddon_CAT_OriginShiftMod.cs
index 02eda40..646b8e8 100644
--- a/OriginShift/Integrations/BTKUI/BtkUiAddon_CAT_OriginShiftMod.cs
+++ b/OriginShift/Integrations/BTKUI/BtkUiAddon_CAT_OriginShiftMod.cs
@@ -18,10 +18,10 @@ namespace NAK.OriginShiftMod.Integrations
         private static void Setup_OriginShiftModCategory(Page page)
         {
             // dear category
-            _ourCategory = AddMelonCategory(ref page, ModSettings.OSM_SettingsCategory);
+            _ourCategory = page.AddCategory(ModSettings.OSM_SettingsCategory, ModSettings.ModName, true, true, false);
             
             // the button
-            _ourMainButton = _ourCategory.AddButton(string.Empty, string.Empty, string.Empty, ButtonStyle.TextOnly);
+            _ourMainButton = _ourCategory.AddButton(string.Empty, string.Empty, string.Empty, ButtonStyle.TextWithIcon);
             _ourMainButton.OnPress += OnMainButtonClick;
             SetButtonState(OriginShiftManager.OriginShiftState.Inactive); // default state
             
diff --git a/OriginShift/Integrations/BTKUI/BtkuiAddon.cs b/OriginShift/Integrations/BTKUI/BtkuiAddon.cs
index 97ff328..aa64098 100644
--- a/OriginShift/Integrations/BTKUI/BtkuiAddon.cs
+++ b/OriginShift/Integrations/BTKUI/BtkuiAddon.cs
@@ -22,8 +22,10 @@ namespace NAK.OriginShiftMod.Integrations
         {
             QuickMenuAPI.PrepareIcon(ModSettings.ModName, "OriginShift-Icon-Active",
                 GetIconStream("OriginShift-Icon-Active.png"));
+            
             QuickMenuAPI.PrepareIcon(ModSettings.ModName, "OriginShift-Icon-Inactive",
-                GetIconStream("OriginShift-Icon-Inactive.png"));            
+                GetIconStream("OriginShift-Icon-Inactive.png"));         
+            
             QuickMenuAPI.PrepareIcon(ModSettings.ModName, "OriginShift-Icon-Forced",
                 GetIconStream("OriginShift-Icon-Forced.png"));
         }
diff --git a/OriginShift/Integrations/BTKUI/BtkuiAddon_Utils.cs b/OriginShift/Integrations/BTKUI/BtkuiAddon_Utils.cs
index 226af66..a5cec73 100644
--- a/OriginShift/Integrations/BTKUI/BtkuiAddon_Utils.cs
+++ b/OriginShift/Integrations/BTKUI/BtkuiAddon_Utils.cs
@@ -48,12 +48,6 @@ namespace NAK.OriginShiftMod.Integrations
             return category;
         }
         
-        private static Category AddMelonCategory(ref Page page, string displayName, bool showHeader = true)
-        {
-            Category category = page.AddCategory(displayName, showHeader);
-            return category;
-        }
-        
         #endregion Melon Preference Helpers
 
         #region Icon Utils
diff --git a/OriginShift/OriginShift.csproj b/OriginShift/OriginShift.csproj
index 36bb74e..d65c89e 100644
--- a/OriginShift/OriginShift.csproj
+++ b/OriginShift/OriginShift.csproj
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>Sprays</RootNamespace>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BTKUILib">
       <HintPath>..\.ManagedLibs\BTKUILib.dll</HintPath>