Add category pages and WingMenu toggles.

RequiDev · Jan 4, 2022 · 51f072b · 51f072b
1 parent d440c10
commit 51f072b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/ReModCE/Components/FlyComponent.cs b/ReModCE/Components/FlyComponent.cs
@@ -2,18 +2,16 @@
 using System.Linq;
 using ReMod.Core;
 using ReMod.Core.Managers;
-using ReMod.Core.UI;
 using ReMod.Core.UI.QuickMenu;
+using ReMod.Core.UI.Wings;
 using ReMod.Core.VRChat;
-using ReModCE.Core;
 using ReModCE.Managers;
 using UnhollowerRuntimeLib;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.XR;
 using VRC.Animation;
 using VRC.SDK3.Components;
-using VRC.UI.Elements;
 using VRCSDK2;
 using VRC_AvatarPedestal = VRC.SDKBase.VRC_AvatarPedestal;
 using VRC_Pickup = VRC.SDKBase.VRC_Pickup;
@@ -35,6 +33,7 @@ internal class FlyComponent : ModComponent
         private ReMenuButton _flySpeedButton;
 
         private ReMenuToggle _flyToggle;
+        private ReMirroredWingToggle _noclipWingToggle;
         private ReMenuToggle _noclipToggle;
         private ReMenuToggle _hotkeyToggle;
 
@@ -56,6 +55,11 @@ public FlyComponent()
                     _noclipToggle.Interactable = allowed;
                 }
 
+                if (_noclipWingToggle != null)
+                {
+                    _noclipWingToggle.Interactable = allowed;
+                }
+
                 if (!allowed)
                 {
                     ToggleNoclip(false);
@@ -70,6 +74,18 @@ public override void OnUiManagerInit(UiManager uiManager)
 
             _flyToggle = movementMenu.AddToggle("Fly", "Enable/Disable Fly", ToggleFly, _flyEnabled);
             _noclipToggle = movementMenu.AddToggle("Noclip", "Enable/Disable Noclip", ToggleNoclip, _noclipEnabled);
+            _noclipWingToggle = ReModCE.WingMenu.AddToggle("Noclip", "Enable/Disable Noclip", b =>
+            {
+                if (b)
+                {
+                    ToggleNoclip(true);
+                }
+                else
+                {
+                    ToggleFly(false);
+                }
+            }, _noclipEnabled);
+
             _hotkeyToggle = hotkeyMenu.AddToggle("Fly Hotkey", "Enable/Disable fly hotkey",
                 EnableFlyHotkey.SetValue, EnableFlyHotkey);
 

diff --git a/ReModCE/Components/HighlightsComponent.cs b/ReModCE/Components/HighlightsComponent.cs
@@ -1,9 +1,9 @@
 using ReMod.Core;
 using ReMod.Core.Managers;
 using ReMod.Core.UI.QuickMenu;
+using ReMod.Core.UI.Wings;
 using ReMod.Core.Unity;
 using ReMod.Core.VRChat;
-using ReModCE.Core;
 using ReModCE.Managers;
 using UnityEngine;
 using UnityEngine.UI;
@@ -20,6 +20,8 @@ internal class HighlightsComponent : ModComponent
         private ConfigValue<Color> FriendsColor;
         private ConfigValue<Color> OthersColor;
         private ConfigValue<bool> ESPEnabled;
+
+        private ReMirroredWingToggle _espMirroredToggle;
         private ReMenuToggle _espToggle;
         private ReMenuButton _friendsColorButton;
         private ReMenuButton _othersColorButton;
@@ -38,6 +40,11 @@ public HighlightsComponent()
                 {
                     _espToggle.Interactable = allowed;
                 }
+                if(_espMirroredToggle != null)
+                {
+                    _espMirroredToggle.Interactable = allowed;
+                }
+
                 if (!allowed)
                     ESPEnabled.SetValue(false);
             };
@@ -57,13 +64,15 @@ public override void OnUiManagerInit(UiManager uiManager)
         {
             base.OnUiManagerInit(uiManager);
 
-            var menu = uiManager.MainMenu.GetMenuPage("Visuals");
+            var menu = uiManager.MainMenu.GetCategoryPage("Visuals").GetCategory("ESP/Highlights");
             _espToggle = menu.AddToggle("ESP/Highlights", "Enable ESP (Highlight players through walls)", b =>
             {
                 ESPEnabled.SetValue(b);
                 ToggleESP(b);
             }, ESPEnabled);
 
+            _espMirroredToggle = ReModCE.WingMenu.AddToggle("ESP", "Enable/Disable ESP", ESPEnabled.SetValue, ESPEnabled);
+
             _friendsColorButton = menu.AddButton($"<color=#{FriendsColor.Value.ToHex()}>Friends</color> Color",
                 $"Set your <color=#{FriendsColor.Value.ToHex()}>friends</color> highlight color",
                 () =>

diff --git a/ReModCE/Components/WireframeComponent.cs b/ReModCE/Components/WireframeComponent.cs
@@ -3,10 +3,8 @@
 using MelonLoader;
 using ReMod.Core;
 using ReMod.Core.Managers;
-using ReMod.Core.UI;
 using ReMod.Core.UI.QuickMenu;
 using ReMod.Core.VRChat;
-using ReModCE.Core;
 using ReModCE.Managers;
 using UnityEngine;
 using UnityEngine.Rendering.PostProcessing;
@@ -124,7 +122,7 @@ public override void OnUiManagerInitEarly()
 
         public override void OnUiManagerInit(UiManager uiManager)
         {
-            var menu = uiManager.MainMenu.GetMenuPage("Visuals").AddMenuPage("Wireframe", "Access wireframe settings", ResourceManager.GetSprite("remodce.wireframe"));
+            var menu = uiManager.MainMenu.GetCategoryPage("Visuals").GetCategory("Wireframe").AddMenuPage("Wireframe", "Access wireframe settings", ResourceManager.GetSprite("remodce.wireframe"));
             _wireframeToggle = menu.AddToggle("Enable", "Highlight objects using wireframe.", ToggleWireframe, _wireframeEnabled);
 
             _rangeButton = menu.AddButton($"Range: {WireframeRange}",

diff --git a/ReModCE/ReMod.cs b/ReModCE/ReMod.cs
@@ -12,15 +12,14 @@
 using ReMod.Core.UI.Wings;
 using ReMod.Core.Unity;
 using ReModCE.Components;
-using ReModCE.Core;
 using ReModCE.Loader;
-using ReModCE.Managers;
 using UnhollowerRuntimeLib;
 using UnhollowerRuntimeLib.XrefScans;
 using VRC;
 using VRC.Core;
 using VRC.DataModel;
 using VRC.UI.Elements.Menus;
+using ConfigManager = ReMod.Core.Managers.ConfigManager;
 
 namespace ReModCE
 {
@@ -132,11 +131,14 @@ public static void OnUiManagerInit()
             ReLogger.Msg("Initializing UI...");
 
             _uiManager = new UiManager("ReMod <color=#00ff00>CE</color>", ResourceManager.GetSprite("remodce.remod"));
-
             WingMenu = ReMirroredWingMenu.Create("ReModCE", "Open the RemodCE menu", ResourceManager.GetSprite("remodce.remod"));
 
             _uiManager.MainMenu.AddMenuPage("Movement", "Access movement related settings", ResourceManager.GetSprite("remodce.running"));
-            _uiManager.MainMenu.AddMenuPage("Visuals", "Access anything that will affect your game visually", ResourceManager.GetSprite("remodce.eye"));
+
+            var visualPage = _uiManager.MainMenu.AddCategoryPage("Visuals", "Access anything that will affect your game visually", ResourceManager.GetSprite("remodce.eye"));
+            visualPage.AddCategory("ESP/Highlights");
+            visualPage.AddCategory("Wireframe");
+
             _uiManager.MainMenu.AddMenuPage("Dynamic Bones", "Access your global dynamic bone settings", ResourceManager.GetSprite("remodce.bone"));
             _uiManager.MainMenu.AddMenuPage("Avatars", "Access avatar related settings", ResourceManager.GetSprite("remodce.hanger"));