Merge pull request #12 from FelkonEx/updates-2021-07-14

Updating UIX to build FavCatRestored with. - Based on knah@4e85998
FelkonEx · Jul 14, 2021 · 8fb950c · 8fb950c
2 parents b683d28 + 4b8b11d
commit 8fb950c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/FavCat/FavCat.csproj b/FavCat/FavCat.csproj
@@ -6,7 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <ClearOutputDirectory>False</ClearOutputDirectory>
-    <AssemblyVersion>1.1.5.0</AssemblyVersion>
+    <AssemblyVersion>1.1.5.2</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LiteDB" Version="5.0.9" />

diff --git a/FavCat/FavCatMod.cs b/FavCat/FavCatMod.cs
@@ -20,7 +20,7 @@
 using ImageDownloaderClosure = ImageDownloader.__c__DisplayClass11_1;
 using Object = UnityEngine.Object;
 
-[assembly:MelonInfo(typeof(FavCatMod), "FavCatRestored", "1.1.5", "Felkon (Original By Knah)", "https://github.com/FelkonEx/FavCat-Restored")]
+[assembly:MelonInfo(typeof(FavCatMod), "FavCatRestored", "1.1.5.2", "Felkon (Original By Knah)", "https://github.com/FelkonEx/FavCat-Restored")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 namespace FavCat

diff --git a/UIExpansionKit/API/ExpansionKitApi.cs b/UIExpansionKit/API/ExpansionKitApi.cs
@@ -12,6 +12,7 @@ public static class ExpansionKitApi
         internal static readonly Dictionary<string, GameObject> CustomCategoryUIs = new Dictionary<string, GameObject>();
         internal static readonly Dictionary<string, CustomLayoutedPageImpl> SettingPageExtensions = new Dictionary<string, CustomLayoutedPageImpl>();
         internal static readonly List<IEnumerator> ExtraWaitCoroutines = new List<IEnumerator>();
+        internal static bool CanAddWaitCoroutines = true;
 
         internal static readonly Dictionary<(string, string), IList<(string SettingsValue, string DisplayName)>> EnumSettings = new Dictionary<(string, string), IList<(string SettingsValue, string DisplayName)>>();
 
@@ -120,7 +121,10 @@ internal class ButtonRegistration
         /// </summary>
         public static void RegisterWaitConditionBeforeDecorating(IEnumerator coroutine)
         {
-            ExtraWaitCoroutines.Add(coroutine);
+            if (CanAddWaitCoroutines)
+                ExtraWaitCoroutines.Add(coroutine);
+            else
+                throw new InvalidOperationException("UIX init is already running or is complete, it's too late to register wait conditions");
         }
 
         /// <summary>

diff --git a/UIExpansionKit/UIExpansionKit.csproj b/UIExpansionKit/UIExpansionKit.csproj
@@ -4,7 +4,7 @@
         <VrcReferences>true</VrcReferences>
         <LangVersion>latest</LangVersion>
         <UseAltLibs>true</UseAltLibs>
-        <AssemblyVersion>0.3.2.0</AssemblyVersion>
+        <AssemblyVersion>0.3.3.0</AssemblyVersion>
         <DefineConstants>CUSTOMIZED_MOD_INTERNAL</DefineConstants>
     </PropertyGroup>
     <ItemGroup>

diff --git a/UIExpansionKit/UiExpansionKitMod.cs b/UIExpansionKit/UiExpansionKitMod.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using MelonLoader;
 using UIExpansionKit;
@@ -14,7 +15,7 @@
 using VRCSDK2;
 using Object = UnityEngine.Object;
 
-[assembly:MelonInfo(typeof(UiExpansionKitMod), "UI Expansion Kit", "0.3.2", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(UiExpansionKitMod), "UI Expansion Kit", "0.3.3", "knah", "https://github.com/knah/VRCMods")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 namespace UIExpansionKit
@@ -54,9 +55,9 @@ internal class UiExpansionKitMod : CustomizedMelonMod
             (ExpandedMenu.InvitesTab, "UserInterface/QuickMenu/QuickModeMenus/QuickModeNotificationsMenu", false),
         };
 
-        private readonly Dictionary<ExpandedMenu, GameObject> myMenuRoots = new Dictionary<ExpandedMenu, GameObject>();
-        private readonly Dictionary<ExpandedMenu, GameObject> myVisibilitySources = new Dictionary<ExpandedMenu, GameObject>();
-        private readonly Dictionary<ExpandedMenu, bool> myHasContents = new Dictionary<ExpandedMenu, bool>();
+        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;
 
@@ -128,7 +129,10 @@ private IEnumerator InitThings()
                 }
             }
 
-            foreach (var coroutine in ExpansionKitApi.ExtraWaitCoroutines)
+            var waitConditions = ExpansionKitApi.ExtraWaitCoroutines.ToList();
+            ExpansionKitApi.ExtraWaitCoroutines.Clear();
+            ExpansionKitApi.CanAddWaitCoroutines = false;
+            foreach (var coroutine in waitConditions)
             {
                 while (true)
                 {
@@ -292,6 +296,8 @@ private void DecorateCamera()
             var content = transform.Find("Content");
             toggleButton.gameObject.AddUiShapeWithTriggerCollider();
             content.gameObject.AddUiShapeWithTriggerCollider();
+            toggleButton.localScale *= 3;
+            toggleButton.localPosition += Vector3.left * 60;
             var toggleComponent = toggleButton.GetComponent<Toggle>();
 
             if (ExpansionKitSettings.IsCameraExpandoStartsCollapsed())