From eb84d6f68904d69bd557c8e675914c6ed72c4d6b Mon Sep 17 00:00:00 2001
From: gompoc <91314780+gompoc@users.noreply.github.com>
Date: Tue, 9 Nov 2021 15:09:18 +0000
Subject: [PATCH] UI Update 2.0

---
 ActionMenuUtils/Utils.cs                                 | 4 ++--
 CHANGELOG.md                                             | 8 +++++++-
 RELEASE.md                                               | 6 +++++-
 StandaloneThirdPerson/Main.cs                            | 9 +++++----
 WorldPredownload/DownloadManager/DownloadComplete.cs     | 4 ++--
 WorldPredownload/DownloadManager/DownloadProgress.cs     | 2 +-
 WorldPredownload/DownloadManager/WorldDownloadManager.cs | 4 ++--
 WorldPredownload/Helpers/Utilities.cs                    | 2 +-
 WorldPredownload/Main.cs                                 | 2 +-
 WorldPredownload/Patches.cs                              | 2 +-
 WorldPredownload/UI/WorldDownloadStatus.cs               | 3 +++
 11 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/ActionMenuUtils/Utils.cs b/ActionMenuUtils/Utils.cs
index 825af93..312580c 100644
--- a/ActionMenuUtils/Utils.cs
+++ b/ActionMenuUtils/Utils.cs
@@ -44,7 +44,7 @@ private static GoHomeDelegate GetGoHomeDelegate
 
         public static void Respawn()
         {
-            GameObject.Find("UserInterface/QuickMenu/ShortcutMenu/RespawnButton").GetComponent<Button>().onClick.Invoke();
+            GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Dashboard/ScrollRect/Viewport/VerticalLayoutGroup/Buttons_QuickActions/Button_Respawn").GetComponent<Button>().onClick.Invoke();
             VRCPlayer.field_Internal_Static_VRCPlayer_0.GetComponent<VRCMotionState>().Reset();
         }
 
@@ -59,7 +59,7 @@ public static void Home()
             if (ModSettings.forceGoHome)
                 GoHome();
             else
-                GameObject.Find("UserInterface/QuickMenu/ShortcutMenu/GoHomeButton").GetComponent<Button>().onClick.Invoke();
+                GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Dashboard/ScrollRect/Viewport/VerticalLayoutGroup/Buttons_QuickActions/Button_GoHome").GetComponent<Button>().onClick.Invoke();
         }
 
         public static void ResetAvatar()
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf6e12..61d3e43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
+### ActionMenuUtils v2.0.3
+- Fixed compatibility for ui update
+
 ### ActionMenuApi v0.3.5
-- Fixed compatibility for upcoming beta
+- Fixed compatibility for ui update
+
+### StandaloneThirdPerson v1.3.3
+- Fixed compatibility for ui update
 
 ### ActionMenuUtils v2.0.2
 - Change text on uix button to fit it better
diff --git a/RELEASE.md b/RELEASE.md
index 790b894..b54d1ad 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,2 +1,6 @@
+### ActionMenuUtils v2.0.3
+- Fixed compatibility for ui update
 ### ActionMenuApi v0.3.5
-- Fixed compatibility for upcoming beta
+- Fixed compatibility for ui update
+### StandaloneThirdPerson v1.3.3
+- Fixed compatibility for ui update
diff --git a/StandaloneThirdPerson/Main.cs b/StandaloneThirdPerson/Main.cs
index 6ef805d..52109e8 100644
--- a/StandaloneThirdPerson/Main.cs
+++ b/StandaloneThirdPerson/Main.cs
@@ -43,14 +43,15 @@ private static IEnumerator WaitForUIInit()
                 yield return new WaitForEndOfFrame();
             if (XRDevice.isPresent)
                 yield break;
+            ModSettings.RegisterSettings();
+            ModSettings.LoadSettings();
+            while (GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/MicButton") == null)
+                yield return null;
             OnUIInit();
         }
 
         private static void OnUIInit()
         {
-            ModSettings.RegisterSettings();
-            ModSettings.LoadSettings();
-            
             vrcCamera = GameObject.Find("Camera (eye)")?.GetComponent<Camera>();
 
             if (vrcCamera == null)
@@ -66,7 +67,7 @@ private static void OnUIInit()
             thirdPersonCamera.enabled = false;
             thirdPersonCamera.transform.parent = originalCameraTransform.parent;
 
-            GameObject.Find("UserInterface/QuickMenu/MicControls").AddComponent<QMEnableDisableListener>();
+            GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/MicButton").AddComponent<QMEnableDisableListener>();
 
             initialised = true;
         }
diff --git a/WorldPredownload/DownloadManager/DownloadComplete.cs b/WorldPredownload/DownloadManager/DownloadComplete.cs
index 19670d2..d8f0765 100644
--- a/WorldPredownload/DownloadManager/DownloadComplete.cs
+++ b/WorldPredownload/DownloadManager/DownloadComplete.cs
@@ -30,7 +30,7 @@ public static partial class WorldDownloadManager
                 InviteButton.UpdateTextDownloadStopped();
                 FriendButton.UpdateTextDownloadStopped();
                 WorldButton.UpdateTextDownloadStopped();
-                WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
+                //WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
                 if (!string.IsNullOrEmpty(file)) File.Delete(file);
                 if (!args.Cancelled)
                     MelonLogger.Error(
@@ -77,7 +77,7 @@ private static async void OnRecompress()
             InviteButton.UpdateTextDownloadStopped();
             FriendButton.UpdateTextDownloadStopped();
             WorldButton.UpdateTextDownloadStopped();
-            WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
+            //WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
             switch (DownloadInfo.DownloadType)
             {
                 case DownloadType.Friend:
diff --git a/WorldPredownload/DownloadManager/DownloadProgress.cs b/WorldPredownload/DownloadManager/DownloadProgress.cs
index 320a6c4..a290416 100644
--- a/WorldPredownload/DownloadManager/DownloadProgress.cs
+++ b/WorldPredownload/DownloadManager/DownloadProgress.cs
@@ -16,7 +16,7 @@ public static partial class WorldDownloadManager
             await TaskUtilities.YieldToMainThread();
             if (!Downloading) return;
             var text = $"Progress:{args.ProgressPercentage} %";
-            if (ModSettings.showStatusOnQM) WorldDownloadStatus.GameObject.SetText(text);
+            //if (ModSettings.showStatusOnQM) WorldDownloadStatus.GameObject.SetText(text);
             //if (InviteButton.CanChangeText) InviteButton.Button.SetText(text);
             if (FriendButton.CanChangeText) FriendButton.Button.SetText(text);
             if (WorldButton.CanChangeText) WorldButton.Button.SetText(text);
diff --git a/WorldPredownload/DownloadManager/WorldDownloadManager.cs b/WorldPredownload/DownloadManager/WorldDownloadManager.cs
index 2dc5939..ff137d7 100644
--- a/WorldPredownload/DownloadManager/WorldDownloadManager.cs
+++ b/WorldPredownload/DownloadManager/WorldDownloadManager.cs
@@ -54,7 +54,7 @@ private static void DisplayWorldPopup()
                 new Action(delegate
                 {
                     Utilities.HideCurrentPopup();
-                    GameObject.Find("UserInterface/QuickMenu/ShortcutMenu/WorldsButton").GetComponent<Button>().onClick
+                    GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Dashboard/ScrollRect/Viewport/VerticalLayoutGroup/Buttons_QuickLinks/Button_Worlds").GetComponent<Button>().onClick
                         .Invoke();
                     Utilities.ShowPage(DownloadInfo.PageWorldInfo!);
 
@@ -101,7 +101,7 @@ private static void DisplayFriendPopup()
                 new Action(delegate
                 {
                     Utilities.HideCurrentPopup();
-                    GameObject.Find("UserInterface/QuickMenu/ShortcutMenu/SocialButton").GetComponent<Button>().onClick
+                    GameObject.Find("UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Dashboard/ScrollRect/Viewport/VerticalLayoutGroup/Buttons_QuickLinks/Button_Social").GetComponent<Button>().onClick
                         .Invoke();
                     _ = DownloadInfo.APIUser ?? throw new NullReferenceException("Friend User Info Null Uh Oh");
                     Utilities.ShowPage(DownloadInfo.PageUserInfo!);
diff --git a/WorldPredownload/Helpers/Utilities.cs b/WorldPredownload/Helpers/Utilities.cs
index 92c5ca6..3f7455e 100644
--- a/WorldPredownload/Helpers/Utilities.cs
+++ b/WorldPredownload/Helpers/Utilities.cs
@@ -49,7 +49,7 @@ public static void ShowDismissPopup(string title, string body, string middleButt
         {
             Delegates.GetShowDismissPopupDelegate(title, body, middleButtonText, buttonAction);
         }
-
+        
 
         public static void ShowPage(VRCUiPage page)
         {
diff --git a/WorldPredownload/Main.cs b/WorldPredownload/Main.cs
index eddd1d4..f5fca7c 100644
--- a/WorldPredownload/Main.cs
+++ b/WorldPredownload/Main.cs
@@ -46,7 +46,7 @@ private void UiManagerInit()
             InviteButton.Setup();
             FriendButton.Setup();
             WorldButton.Setup();
-            WorldDownloadStatus.Setup();
+            //WorldDownloadStatus.Setup();
             HudIcon.Setup();
         }
 
diff --git a/WorldPredownload/Patches.cs b/WorldPredownload/Patches.cs
index 086d791..fd25227 100644
--- a/WorldPredownload/Patches.cs
+++ b/WorldPredownload/Patches.cs
@@ -39,7 +39,7 @@ private static void Prefix()
             InviteButton.UpdateTextDownloadStopped();
             FriendButton.UpdateTextDownloadStopped();
             WorldButton.UpdateTextDownloadStopped();
-            WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
+            //WorldDownloadStatus.GameObject.SetText(Constants.STATUS_IDLE_TEXT);
         }
     }
 
diff --git a/WorldPredownload/UI/WorldDownloadStatus.cs b/WorldPredownload/UI/WorldDownloadStatus.cs
index 6a17118..041dffc 100644
--- a/WorldPredownload/UI/WorldDownloadStatus.cs
+++ b/WorldPredownload/UI/WorldDownloadStatus.cs
@@ -15,6 +15,7 @@ public static class WorldDownloadStatus
 
         public static void Setup()
         {
+            return;
             GameObject = Utilities.CloneGameObject(PATH_TO_GAMEOBJECT_TO_CLONE, PATH_TO_CLONE_PARENT);
             GameObject.GetRectTrans().SetAnchoredPos(Constants.DwldStatusPos);
             if (ModSettings.showStatusOnQM && !ModSettings.hideQMStatusWhenInActive) GameObject.SetActive(true);
@@ -27,6 +28,7 @@ public static void Setup()
 
         public static void Enable()
         {
+            return;
             if (GameObject != null)
             {
                 GameObject.SetActive(true);
@@ -36,6 +38,7 @@ public static void Enable()
 
         public static void Disable()
         {
+            return;
             if (GameObject != null)
                 GameObject.SetActive(false);
         }