moved options into separated header

Author: war3i4i

Diff for: kg_LastEpoch_Improvements/Utils.cs

@@ -36,28 +36,43 @@ public static void set<T>(this Il2CppSystem.Collections.Generic.List<T> list, in
         method.Invoke(list, new object[] { index, value });
     }
     //adds an option to vanilla last epoch UI settings
-    public static void CreateNewOption(this SettingsPanelTabNavigable settings, string Name, MelonPreferences_Entry<bool> option, Action<bool> a)
+    private static int CreateCategoryIfNeeded(SettingsPanelTabNavigable settings, string Category)
+    {
+        Transform findExisting = settings.transform.GetChild(0).GetChild(0).Find($"ModsCategory - {Category}");
+        if (findExisting) return findExisting.GetSiblingIndex();
+        Transform headerInterface = settings.transform.GetChild(0).GetChild(0).Find("Header-Interface");
+        if (!headerInterface) return 0;
+        Transform newCategory = UnityEngine.Object.Instantiate(headerInterface, headerInterface.parent);
+        newCategory.name = $"ModsCategory - {Category}";
+        newCategory.GetChild(0).GetChild(0).GetComponent<TMP_Text>().text = Category;
+        newCategory.GetChild(0).GetChild(0).GetComponent<TMP_Text>().color = Color.green;
+        UnityEngine.Object.DestroyImmediate(newCategory.GetChild(0).GetChild(0).GetComponent<LocalizeStringEvent>());
+        newCategory.transform.SetSiblingIndex(headerInterface.GetSiblingIndex());
+        return newCategory.GetSiblingIndex();
+    }
+    public static void CreateNewOption(this SettingsPanelTabNavigable settings, string Category, string Name, MelonPreferences_Entry<bool> option, Action<bool> a)
     {
         Transform optionsTransform = settings.transform.GetChild(0).GetChild(0).Find("Option - Minion Health Bars");
         if (!optionsTransform) return;
+        int orderIndex = CreateCategoryIfNeeded(settings, Category);
         Transform newButton = UnityEngine.Object.Instantiate(optionsTransform, optionsTransform.parent);
         newButton.name = Name;
-        newButton.SetSiblingIndex(optionsTransform.GetSiblingIndex() + 1);
+        newButton.SetSiblingIndex(orderIndex + 1);
         newButton.GetChild(0).GetComponent<Toggle>().isOn = option.Value;
         newButton.GetChild(0).GetComponent<Toggle>().onValueChanged.AddListener(a);
         UnityEngine.Object.DestroyImmediate(newButton.GetChild(1).GetChild(0).GetComponent<LocalizeStringEvent>());
         newButton.GetChild(1).GetChild(0).GetComponent<TMP_Text>().text = Name;
     }
-    public static void CreateNewOption_EnumDropdown<T>(this SettingsPanelTabNavigable settings, string Name, string Description, MelonPreferences_Entry<T> option, Action<int> a) where T : Enum
+    public static void CreateNewOption_EnumDropdown<T>(this SettingsPanelTabNavigable settings, string Category, string Name, string Description, MelonPreferences_Entry<T> option, Action<int> a) where T : Enum
     {
         Transform optionsTransform = settings.transform.GetChild(0).GetChild(0).Find("Dropdown - Language Selection");
-        Transform orderTransform = settings.transform.GetChild(0).GetChild(0).Find("Option - Minion Health Bars");
-        if (!optionsTransform || !orderTransform) return;
+        if (!optionsTransform) return;
+        int orderIndex = CreateCategoryIfNeeded(settings, Category);
         Transform newDropdown = UnityEngine.Object.Instantiate(optionsTransform, optionsTransform.parent);
         UnityEngine.Object.DestroyImmediate(newDropdown.GetComponent<LocalizationSettingsPanelUI>());
         UnityEngine.Object.DestroyImmediate(newDropdown.GetComponent<LootFilterSettingsPanelUI>());
         newDropdown.name = Name;
-        newDropdown.SetSiblingIndex(orderTransform.GetSiblingIndex() + 1);
+        newDropdown.SetSiblingIndex(orderIndex + 1);
 
         newDropdown.GetChild(0).GetComponent<TMP_Text>().text = Name;
         UnityEngine.Object.DestroyImmediate(newDropdown.GetChild(0).GetComponent<LocalizeStringEvent>());

Diff for: kg_LastEpoch_Improvements/kg_LastEpoch_Improvements.cs

@@ -285,35 +285,36 @@ private static class SettingsPanelTabNavigable_Awake_Patch
     {
         private static void Postfix(SettingsPanelTabNavigable __instance)
         {
+            const string CategoryName = "KG Improvements";
 #if CHEATVERSION
-            __instance.CreateNewOption("<color=green>[Cheat] Clear fog on map on start</color>", Cheat_FogOfWar, (tf) =>
+            __instance.CreateNewOption(CategoryName, "<color=green>[Cheat] Clear fog on map on start</color>", Cheat_FogOfWar, (tf) =>
             {
                 Cheat_FogOfWar.Value = tf;
                 ImprovementsModCategory.SaveToFile();
             });
-            __instance.CreateNewOption("<color=green>[Cheat] Enhanced camera</color>", Cheat_EnhancedCamera, (tf) =>
+            __instance.CreateNewOption(CategoryName, "<color=green>[Cheat] Enhanced camera</color>", Cheat_EnhancedCamera, (tf) =>
             {
                 Cheat_EnhancedCamera.Value = tf;
                 ImprovementsModCategory.SaveToFile(); 
                 CameraManager_Start_Patch.Switch();
             });
 #endif
-            __instance.CreateNewOption_EnumDropdown("<color=green>Affix Show Roll (Tooltip)</color>", "Show affix roll on tooltip text", AffixShowRoll, (i) =>
+            __instance.CreateNewOption_EnumDropdown(CategoryName, "<color=green>Affix Show Roll (Tooltip)</color>", "Show affix roll on tooltip text", AffixShowRoll, (i) =>
             {
                 AffixShowRoll.Value = (DisplayAffixType)i;
                 ImprovementsModCategory.SaveToFile();
             });
-            __instance.CreateNewOption_EnumDropdown("<color=green>Affix Show Roll (Ground)", "Show affix roll on ground text", ShowAffixOnLabel, (i) =>
+            __instance.CreateNewOption_EnumDropdown(CategoryName, "<color=green>Affix Show Roll (Ground)</color>", "Show affix roll on ground text", ShowAffixOnLabel, (i) =>
             {
                 ShowAffixOnLabel.Value = (DisplayAffixType_GroundLabel)i;
                 ImprovementsModCategory.SaveToFile();
             });
-            __instance.CreateNewOption("<color=green>Map Filter Show All</color>", ShowAll, (tf) =>
+            __instance.CreateNewOption(CategoryName, "<color=green>Map Filter Show All</color>", ShowAll, (tf) =>
             {
                 ShowAll.Value = tf;
                 ImprovementsModCategory.SaveToFile();
             });
-            __instance.CreateNewOption("<color=green>Auto storage craft materials</color>", AutoStoreCraftMaterials, (ascm) =>
+            __instance.CreateNewOption(CategoryName, "<color=green>Auto storage craft materials</color>", AutoStoreCraftMaterials, (ascm) =>
             {
                 AutoStoreCraftMaterials.Value = ascm;
                 ImprovementsModCategory.SaveToFile();
@@ -326,7 +327,7 @@ private static void Postfix(SettingsPanelTabNavigable __instance)
     private static class MinimapFogOfWar_Initialize_Patch
     {
         private const float cheatDiscovery = 10000f;
-        private static void Prefix(MinimapFogOfWar __instance, out float __state)
+        private static void Prefix(MinimapFogOfWar __instance, out float __state) 
         {
             __state = __instance.discoveryDistance;
             if (Cheat_FogOfWar.Value) __instance.discoveryDistance = cheatDiscovery;
@@ -372,13 +373,10 @@ private static void Postfix(CameraManager __instance)
             Switch();
         }
     }
-    
-    
-    
 #endif 
 
 
-    //OpenInvneotryPanel invokes at loadingscreen after InventoryPanelUI.Awake, we cannot call StoreMaterialsButtonPress() at this moment
+    //OpenInventoryPanel invokes at loadingscreen after InventoryPanelUI.Awake, we cannot call StoreMaterialsButtonPress() at this moment
     //cause it throws an exception (probably some stuff didn't load yet)
     [HarmonyPatch(typeof(InventoryPanelUI),nameof(InventoryPanelUI.Awake))]
     private static class InventoryPanelUI_Awake_Patch