Merge branch 'master' of https://github.com/iiDk-the-actual/iis.Stupid.Menu

iiDk-the-actual · iiDk-the-actual · commit 5a48325eb1b3 · 2025-08-09T18:19:48.000-04:00
diff --git a/Menu/Main.cs b/Menu/Main.cs
@@ -1060,19 +1060,20 @@ public static void Prefix()
 
                             if (currentCategoryName == "Enabled Mods")
                             {
-                                List<string> enabledMods = new List<string>() { "Exit Enabled Mods" };
+                                List<ButtonInfo> enabledMods = new List<ButtonInfo>() { };
                                 int categoryIndex = 0;
                                 foreach (ButtonInfo[] buttonlist in Buttons.buttons)
                                 {
                                     foreach (ButtonInfo v in buttonlist)
                                     {
-                                        if (v.enabled && (!hideSettings || (hideSettings && !Buttons.categoryNames[categoryIndex].Contains("Settings"))))
-                                            enabledMods.Add(v.buttonText);
+                                        if (v.enabled && (!hideSettings || !Buttons.categoryNames[categoryIndex].Contains("Settings")))
+                                            enabledMods.Add(v);
                                     }
                                     categoryIndex++;
                                 }
-                                enabledMods = Alphabetize(enabledMods.ToArray()).ToList();
-                                toSortOf = StringsToInfos(enabledMods.ToArray());
+                                enabledMods = enabledMods.OrderBy(v => v.buttonText).ToList();
+                                enabledMods.Insert(0, GetIndex("Exit Enabled Mods"));
+                                toSortOf = enabledMods.ToArray();
                             }
 
                             Text watchTextText = watchText.GetComponent<Text>();
@@ -2705,8 +2706,19 @@ public static void Draw()
                     }
                     else if (currentCategoryName == "Enabled Mods")
                     {
-                        List<ButtonInfo> enabledMods = new List<ButtonInfo>() { GetIndex("Exit Enabled Mods") };
-                        enabledMods.AddRange(Buttons.buttons.SelectMany(buttonlist => buttonlist).Where(v => v.enabled));
+                        List<ButtonInfo> enabledMods = new List<ButtonInfo>() { };
+                        int categoryIndex = 0;
+                        foreach (ButtonInfo[] buttonlist in Buttons.buttons)
+                        {
+                            foreach (ButtonInfo v in buttonlist)
+                            {
+                                if (v.enabled && (!hideSettings || !Buttons.categoryNames[categoryIndex].Contains("Settings")))
+                                    enabledMods.Add(v);
+                            }
+                            categoryIndex++;
+                        }
+                        enabledMods = enabledMods.OrderBy(v => v.buttonText).ToList();
+                        enabledMods.Insert(0, GetIndex("Exit Enabled Mods"));
 
                         renderButtons = enabledMods.ToArray();
                     }
@@ -5573,13 +5585,15 @@ public static void Toggle(string buttonText, bool fromMenu = false, bool ignoreF
             if (currentCategoryName == "Enabled Mods")
             {
                 List<string> enabledMods = new List<string>() { "Exit Enabled Mods" };
+                int categoryIndex = 0;
                 foreach (ButtonInfo[] buttonlist in Buttons.buttons)
                 {
                     foreach (ButtonInfo v in buttonlist)
                     {
-                        if (v.enabled)
+                        if (v.enabled && (!hideSettings || !Buttons.categoryNames[categoryIndex].Contains("Settings")))
                             enabledMods.Add(v.buttonText);
                     }
+                    categoryIndex++;
                 }
                 lastPage = ((enabledMods.Count + pageSize - 1) / pageSize) - 1;
             }

Original file line number	Diff line number	Diff line change
`@@ -1060,19 +1060,20 @@ public static void Prefix()`
`1060`	`1060`
`1061`	`1061`	`if (currentCategoryName == "Enabled Mods")`
`1062`	`1062`	`{`
`1063`		`- List<string> enabledMods = new List<string>() { "Exit Enabled Mods" };`
	`1063`	`+ List<ButtonInfo> enabledMods = new List<ButtonInfo>() { };`
`1064`	`1064`	`int categoryIndex = 0;`
`1065`	`1065`	`foreach (ButtonInfo[] buttonlist in Buttons.buttons)`
`1066`	`1066`	`{`
`1067`	`1067`	`foreach (ButtonInfo v in buttonlist)`
`1068`	`1068`	`{`
`1069`		`- if (v.enabled && (!hideSettings \|\| (hideSettings && !Buttons.categoryNames[categoryIndex].Contains("Settings"))))`
`1070`		`- enabledMods.Add(v.buttonText);`
	`1069`	`+ if (v.enabled && (!hideSettings \|\| !Buttons.categoryNames[categoryIndex].Contains("Settings")))`
	`1070`	`+ enabledMods.Add(v);`
`1071`	`1071`	`}`
`1072`	`1072`	`categoryIndex++;`
`1073`	`1073`	`}`
`1074`		`- enabledMods = Alphabetize(enabledMods.ToArray()).ToList();`
`1075`		`- toSortOf = StringsToInfos(enabledMods.ToArray());`
	`1074`	`+ enabledMods = enabledMods.OrderBy(v => v.buttonText).ToList();`
	`1075`	`+ enabledMods.Insert(0, GetIndex("Exit Enabled Mods"));`
	`1076`	`+ toSortOf = enabledMods.ToArray();`
`1076`	`1077`	`}`
`1077`	`1078`
`1078`	`1079`	`Text watchTextText = watchText.GetComponent<Text>();`
`@@ -2705,8 +2706,19 @@ public static void Draw()`
`2705`	`2706`	`}`
`2706`	`2707`	`else if (currentCategoryName == "Enabled Mods")`
`2707`	`2708`	`{`
`2708`		`- List<ButtonInfo> enabledMods = new List<ButtonInfo>() { GetIndex("Exit Enabled Mods") };`
`2709`		`- enabledMods.AddRange(Buttons.buttons.SelectMany(buttonlist => buttonlist).Where(v => v.enabled));`
	`2709`	`+ List<ButtonInfo> enabledMods = new List<ButtonInfo>() { };`
	`2710`	`+ int categoryIndex = 0;`
	`2711`	`+ foreach (ButtonInfo[] buttonlist in Buttons.buttons)`
	`2712`	`+ {`
	`2713`	`+ foreach (ButtonInfo v in buttonlist)`
	`2714`	`+ {`
	`2715`	`+ if (v.enabled && (!hideSettings \|\| !Buttons.categoryNames[categoryIndex].Contains("Settings")))`
	`2716`	`+ enabledMods.Add(v);`
	`2717`	`+ }`
	`2718`	`+ categoryIndex++;`
	`2719`	`+ }`
	`2720`	`+ enabledMods = enabledMods.OrderBy(v => v.buttonText).ToList();`
	`2721`	`+ enabledMods.Insert(0, GetIndex("Exit Enabled Mods"));`
`2710`	`2722`
`2711`	`2723`	`renderButtons = enabledMods.ToArray();`
`2712`	`2724`	`}`
`@@ -5573,13 +5585,15 @@ public static void Toggle(string buttonText, bool fromMenu = false, bool ignoreF`
`5573`	`5585`	`if (currentCategoryName == "Enabled Mods")`
`5574`	`5586`	`{`
`5575`	`5587`	`List<string> enabledMods = new List<string>() { "Exit Enabled Mods" };`
	`5588`	`+ int categoryIndex = 0;`
`5576`	`5589`	`foreach (ButtonInfo[] buttonlist in Buttons.buttons)`
`5577`	`5590`	`{`
`5578`	`5591`	`foreach (ButtonInfo v in buttonlist)`
`5579`	`5592`	`{`
`5580`		`- if (v.enabled)`
	`5593`	`+ if (v.enabled && (!hideSettings \|\| !Buttons.categoryNames[categoryIndex].Contains("Settings")))`
`5581`	`5594`	`enabledMods.Add(v.buttonText);`
`5582`	`5595`	`}`
	`5596`	`+ categoryIndex++;`
`5583`	`5597`	`}`
`5584`	`5598`	`lastPage = ((enabledMods.Count + pageSize - 1) / pageSize) - 1;`
`5585`	`5599`	`}`