Merge remote-tracking branch 'upstream/master'

Author: xAstroBoy

UIExpansionKit/Resources/modui.assetbundle

@@ -3,7 +3,7 @@
         <TargetFramework>net48</TargetFramework>
         <VrcReferences>true</VrcReferences>
         <LangVersion>latest</LangVersion>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyVersion>1.0.1.0</AssemblyVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <ItemGroup>

UIExpansionKit/UIExpansionKit.csproj

@@ -20,15 +20,15 @@
 using Object = UnityEngine.Object;
 using QuickMenuNew = VRC.UI.Elements.QuickMenu;
 
-[assembly: MelonInfo(typeof(UiExpansionKitMod), "UI Expansion Kit", "1.0.0", "knah", "https://github.com/knah/VRCMods")]
-[assembly: MelonGame("VRChat", "VRChat")]
+[assembly:MelonInfo(typeof(UiExpansionKitMod), "UI Expansion Kit", "1.0.1", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonGame("VRChat", "VRChat")]
 
 namespace UIExpansionKit
 {
     internal partial class UiExpansionKitMod : MelonMod
     {
         internal static UiExpansionKitMod Instance;
-
+        
         private PreloadedBundleContents myStuffBundle;
 
         private GameObject myModSettingsExpando;
@@ -39,7 +39,7 @@ internal partial class UiExpansionKitMod : MelonMod
         private GameObject myInputKeypadPopup;
         internal Transform myCameraExpandoRoot;
         internal Transform myQmExpandosRoot;
-
+        
         private static readonly List<(ExpandedMenu, string, bool isFullMenu)> GameObjectToCategoryList = new List<(ExpandedMenu, string, bool)>
         {
             (ExpandedMenu.AvatarMenu, "UserInterface/MenuContent/Screens/Avatar", true),
@@ -49,7 +49,7 @@ internal partial class UiExpansionKitMod : MelonMod
             (ExpandedMenu.WorldDetailsMenu, "UserInterface/MenuContent/Screens/WorldInfo", true),
             (ExpandedMenu.UserDetailsMenu, "UserInterface/MenuContent/Screens/UserInfo", true),
             (ExpandedMenu.SocialMenu, "UserInterface/MenuContent/Screens/Social", true),
-
+            
             (ExpandedMenu.QuickMenu,            "UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Dashboard", false),
             (ExpandedMenu.UserQuickMenu,        "UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_SelectedUser_Local", false),
             (ExpandedMenu.UserQuickMenuRemote,        "UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_SelectedUser_Remote", false),
@@ -61,17 +61,17 @@ internal partial class UiExpansionKitMod : MelonMod
             (ExpandedMenu.InvitesTab,           "UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_Notifications", false),
             (ExpandedMenu.AvatarStatsQuickMenu,           "UserInterface/Canvas_QuickMenu(Clone)/Container/Window/QMParent/Menu_QM_AvatarDetails", false),
         };
-
+        
         private readonly Dictionary<ExpandedMenu, GameObject> myMenuRoots = new();
         private readonly Dictionary<ExpandedMenu, GameObject> myVisibilitySources = new();
         private readonly Dictionary<ExpandedMenu, bool> myHasContents = new();
 
         public PreloadedBundleContents StuffBundle => myStuffBundle;
-
+        
         internal static bool AreSettingsDirty = false;
 
         private static bool IsInDesktop;
-
+        
         internal static QuickMenuNew? GetQuickMenu() => UnityUtils.FindInactiveObjectInActiveRoot("UserInterface/Canvas_QuickMenu(Clone)")?.GetComponent<QuickMenuNew>();
 
         public override void OnApplicationStart()
@@ -116,26 +116,28 @@ private IEnumerator InitThings()
             while (GetQuickMenu() == null)
                 yield return null;
 
+            if (!CheckWasSuccessful) yield break;
+            
             IsInDesktop = !XRDevice.isPresent || Environment.CommandLine.Contains("--no-vr");
-
+            
             {
                 using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("UIExpansionKit.Resources.modui.assetbundle");
-                using var memStream = new MemoryStream((int)stream.Length);
+                using var memStream = new MemoryStream((int) stream.Length);
                 stream.CopyTo(memStream);
                 var assetBundle = AssetBundle.LoadFromMemory_Internal(memStream.ToArray(), 0);
                 assetBundle.hideFlags |= HideFlags.DontUnloadUnusedAsset;
-
+                
                 myStuffBundle = new PreloadedBundleContents(assetBundle);
             }
-
+            
             // attach it to QuickMenu. VRChat changes render queue on QM contents on world load that makes it render properly
             myStuffBundle.StoredThingsParent.transform.SetParent(GetQuickMenu().transform);
 
             StylingHelper.StyleEngine = GetQuickMenu().GetComponent<StyleEngine>();
 
             {
                 using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("UIExpansionKit.Resources.uix-style-main.vrcss");
-                using var memStream = new MemoryStream((int)stream.Length);
+                using var memStream = new MemoryStream((int) stream.Length);
                 stream.CopyTo(memStream);
                 var newStyle = Encoding.UTF8.GetString(memStream.ToArray());
                 var resourcesList = StylingHelper.StyleEngine.field_Public_StyleResource_0.resources;
@@ -148,9 +150,10 @@ private IEnumerator InitThings()
                     resourcesList[i] = resource;
                     break;
                 }
-
+                
                 resourcesList.Add(new StyleResource.Resource { address = "style-sheet", obj = new TextAsset(TextAsset.CreateOptions.CreateNativeObject, newStyle) });
             }
+            
 
             var delegatesToInvoke = ExpansionKitApi.onUiManagerInitDelegateList;
             ExpansionKitApi.onUiManagerInitDelegateList = null;
@@ -188,7 +191,7 @@ private IEnumerator InitThings()
 
             myInputPopup = GameObject.Find("UserInterface/MenuContent/Popups/InputPopup");
             myInputKeypadPopup = GameObject.Find("UserInterface/MenuContent/Popups/InputKeypadPopup");
-
+            
             // Wait an extra frame to ve very sure that all other mods had the chance to register buttons in their wait-for-ui-manager coroutine
             yield return null;
 
@@ -201,27 +204,28 @@ private IEnumerator InitThings()
 
             UnityUtils.FindInactiveObjectInActiveRoot("UserInterface/Canvas_QuickMenu(Clone)/Container")
                 .AddComponent<EnableDisableListener>().OnDisabled += BuiltinUiUtils.InvokeQuickMenuClosed;
-
+            
             var mainMenuBackground = GameObject.Find("UserInterface/MenuContent/Backdrop/Backdrop");
             mainMenuBackground.AddComponent<EnableDisableListener>().OnDisabled += BuiltinUiUtils.InvokeFullMenuClosed;
             mainMenuBackground.AddComponent<StyleEngineUpdateDriver>().StyleEngine = StylingHelper.StyleEngine;
 
             DecorateFullMenu();
+            CheckA();
             DecorateMenuPages();
             DecorateCamera();
         }
 
         private void DecorateMenuPages()
         {
             MelonLogger.Msg("Decorating menus");
-
+            
             var quickMenuExpandoPrefab = myStuffBundle.QuickMenuExpando;
             var quickMenuRoot = GetQuickMenu().transform.Find("Container").gameObject;
-
+            
             var fullMenuExpandoPrefab = myStuffBundle.BigMenuExpando;
             var fullMenuRoot = GetUiManager().field_Public_GameObject_0;
 
-            var qmExpandosRootGo = new GameObject("UIX QM Expandos Root", new[] { Il2CppType.Of<RectTransform>() });
+            var qmExpandosRootGo = new GameObject("UIX QM Expandos Root", new []{Il2CppType.Of<RectTransform>()});
             myQmExpandosRoot = qmExpandosRootGo.transform;
 
             var qmExpandosXform = myQmExpandosRoot.Cast<RectTransform>();
@@ -243,7 +247,7 @@ private void DecorateMenuPages()
                     MelonLogger.Error($"GameObject at path {gameObjectPath} for category {categoryEnum} was not found, not decorating");
                     continue;
                 }
-
+                
                 myVisibilitySources[categoryEnum] = gameObject;
 
                 if (isBigMenu)
@@ -265,7 +269,7 @@ private void DecorateMenuPages()
                         if (categoryEnum == ExpandedMenu.AvatarMenu)
                             gameObject.transform.Find("AvatarPreviewBase").gameObject.SetActive(!willBeRight);
                     }));
-
+                    
                     var listener = gameObject.GetOrAddComponent<EnableDisableListener>();
                     listener.OnEnabled += () =>
                     {
@@ -286,7 +290,7 @@ private void DecorateMenuPages()
                     // todo: reparent to expandos root?
                     var transform = expando.transform;
                     transform.localScale = Vector3.one * 3f; // the original menu already has scale of 0.0005
-                    if (!IsInDesktop)
+                    if (!IsInDesktop) 
                         transform.RotateAround(transform.position, transform.right, 30);
 
                     transform.Cast<RectTransform>().localPosition = new Vector3(55, -750, -5);
@@ -303,7 +307,7 @@ private void DecorateMenuPages()
                     {
                         var flipToggle = flipButton.GetComponent<Toggle>();
                         var flipIcon = flipButton.Find("Image");
-
+                        
                         flipToggle.isOn = false;
                         flipToggle.onValueChanged.AddListener(new Action<bool>(isUp =>
                         {
@@ -316,30 +320,30 @@ private void DecorateMenuPages()
                         flipButton.gameObject.SetActive(false);
                     }
 
-                    if (ExpansionKitSettings.IsQmExpandoStartsCollapsed())
+                    if (ExpansionKitSettings.IsQmExpandoStartsCollapsed()) 
                         toggle.isOn = false;
-
+                    
                     var listener = gameObject.GetOrAddComponent<EnableDisableListener>();
                     listener.OnEnabled += () =>
                     {
                         expando.SetActive(myHasContents[categoryEnum]);
                         BuiltinUiUtils.InvokeMenuOpened(categoryEnum);
                     };
                     listener.OnDisabled += () => expando.SetActive(false);
-
+                    
                     FillQuickMenuExpando(expando, categoryEnum);
 
                     expando.GetOrAddComponent<EnableDisableListener>().OnEnabled += () =>
                     {
                         MelonCoroutines.Start(ResizeExpandoAfterDelay(expando, toggle.isOn));
                     };
-
+                    
                     SetLayerRecursively(expando, quickMenuRoot.layer);
                 }
-
+                
                 UpdateCategoryVisibility(valueTuple.Item1);
             }
-
+            
             myQmExpandosRoot.SetAsLastSibling();
         }
 
@@ -351,7 +355,7 @@ private void DecorateCamera()
                 MelonLogger.Warning("Camera controller not found, not decorating the camera");
                 return;
             }
-
+            
             var cameraTransform = cameraController.transform.Find("ViewFinder");
             var controlsTransform = cameraTransform.Find("PhotoControls");
             var dummyTransform = new GameObject("UixCameraDummy");
@@ -361,7 +365,7 @@ private void DecorateCamera()
             constraint.constraintActive = true;
             StylingHelper.AddStyleElement(dummyTransform, "");
             dummyTransform.AddComponent<StyleEngineUpdateDriver>().StyleEngine = StylingHelper.StyleEngine;
-
+            
             var expando = Object.Instantiate(myStuffBundle.QuickMenuExpando, dummyTransform.transform, false);
             myMenuRoots[ExpandedMenu.Camera] = expando;
 
@@ -383,7 +387,7 @@ private void DecorateCamera()
             toggleButton.localScale = Vector3.one * 3;
             var toggleComponent = toggleButton.GetComponent<Toggle>();
 
-            if (ExpansionKitSettings.IsCameraExpandoStartsCollapsed())
+            if (ExpansionKitSettings.IsCameraExpandoStartsCollapsed()) 
                 toggleComponent.isOn = false;
 
             var listener = cameraTransform.gameObject.GetOrAddComponent<EnableDisableListener>();
@@ -419,7 +423,7 @@ private static IEnumerator ResizeExpandoAfterDelay(GameObject expando, bool cont
             yield return null;
             DoResizeExpando(expando, contentsCanBeVisible);
             if (afterResize == null) yield break;
-
+            
             yield return null;
             afterResize();
         }
@@ -432,7 +436,7 @@ private static void DoResizeExpando(GameObject expando, bool contentsCanBeVisibl
                 if (o.Cast<Transform>().gameObject.activeSelf)
                     totalButtons++;
             }
-
+            
             var content = expando.transform.Find("Content");
             var targetRows = ExpansionKitSettings.ClampQuickMenuExpandoRowCount((totalButtons + 3) / 4);
             var expandoRectTransform = expando.transform.Cast<RectTransform>();
@@ -449,7 +453,7 @@ private void FillBigMenuExpando(GameObject expando, ExpandedMenu categoryEnum)
             var expandoRoot = expando.transform.Find("Content").Cast<RectTransform>();
 
             myHasContents[categoryEnum] = false;
-
+            
             expandoRoot.DestroyChildren();
 
             if (ExpansionKitApi.ExpandedMenus.TryGetValue(categoryEnum, out var registrations))
@@ -475,6 +479,8 @@ private void UpdateModSettingsVisibility()
         private void DecorateFullMenu()
         {
             var fullMenuRoot = GetUiManager().field_Public_GameObject_0;
+            CheckC();
+
             var settingsExpandoPrefab = myStuffBundle.SettingsMenuExpando;
             myModSettingsExpando = Object.Instantiate(settingsExpandoPrefab, fullMenuRoot.transform, false);
             myModSettingsExpandoTransform = myModSettingsExpando.transform;
@@ -494,21 +500,21 @@ private void DecorateFullMenu()
 
             Object.Destroy(myModSettingsExpandoTransform.Find("Content/ApplyButton").gameObject);
             Object.Destroy(myModSettingsExpandoTransform.Find("Content/RefreshButton").gameObject);
-
+            
             SetLayerRecursively(myModSettingsExpando, mySettingsPage.gameObject.layer);
         }
 
         internal static void SetLayerRecursively(GameObject obj, int layer)
         {
             obj.layer = layer;
-            foreach (var o in obj.transform)
+            foreach (var o in obj.transform) 
                 SetLayerRecursively(o.Cast<Transform>().gameObject, layer);
         }
 
         private void FillQuickMenuExpando(GameObject expando, ExpandedMenu expandedMenu)
         {
             var expandoRoot = expando.transform.Find("Content/Scroll View/Viewport/Content").Cast<RectTransform>();
-
+            
             expandoRoot.DestroyChildren();
 
             myHasContents[expandedMenu] = false;
@@ -526,12 +532,12 @@ private void FillQuickMenuExpando(GameObject expando, ExpandedMenu expandedMenu)
                 {
                     var entry = MelonPreferences.GetCategory(category)?.GetEntry(prefId);
                     if (entry == null) continue;
-
+                    
                     if (PinnedPrefUtil.CreatePinnedPrefButton(entry, expandoRoot, myStuffBundle))
                         myHasContents[expandedMenu] = true;
                 }
             }
-
+            
             DoResizeExpando(expando, expando.transform.Find("QuickMenuExpandoToggle").GetComponent<Toggle>().isOn);
         }