Fixes and no more integrity check again

Author: xAstroBoy

AdvancedSafety/AdvancedSafetyMod.cs

@@ -19,7 +19,7 @@
 using Object = UnityEngine.Object;
 
 [assembly:MelonGame("VRChat", "VRChat")]
-[assembly:MelonInfo(typeof(AdvancedSafetyMod), "Advanced Safety", "1.6.1", "knah, Requi, Ben", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(AdvancedSafetyMod), "Advanced Safety", "1.6.1", "knah, Requi, Ben", "https://github.com/xAstroBoy/VRCMods-Unchained")]
 [assembly:MelonOptionalDependencies("UIExpansionKit")]
 
 namespace AdvancedSafety
@@ -31,10 +31,31 @@ internal partial class AdvancedSafetyMod : MelonMod
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void VoidDelegate(IntPtr thisPtr, IntPtr nativeMethodInfo);
+        private static readonly Func<VRCUiManager> ourGetUiManager;
+
+        static AdvancedSafetyMod()
+        {
+            ourGetUiManager = (Func<VRCUiManager>)Delegate.CreateDelegate(typeof(Func<VRCUiManager>), typeof(VRCUiManager)
+                .GetProperties(BindingFlags.Static | BindingFlags.Public | BindingFlags.DeclaredOnly)
+                .First(it => it.PropertyType == typeof(VRCUiManager)).GetMethod);
+        }
+
+        internal static VRCUiManager GetUiManager() => ourGetUiManager();
+
+        private static void DoAfterUiManagerInit(Action code)
+        {
+            MelonCoroutines.Start(OnUiManagerInitCoro(code));
+        }
+
+        private static IEnumerator OnUiManagerInitCoro(Action code)
+        {
+            while (GetUiManager() == null)
+                yield return null;
+            code();
+        }
 
         public override void OnApplicationStart()
         {
-            if (!CheckWasSuccessful || !MustStayTrue || MustStayFalse) return;
 
             AdvancedSafetySettings.RegisterSettings();
             ClassInjector.RegisterTypeInIl2Cpp<SortingOrderHammerer>();

FavCat/Modules/ExtendedFavoritesModuleBase.cs

@@ -39,7 +39,6 @@ public abstract class ExtendedFavoritesModuleBase<T> where T: class, INamedStore
         private UISoundCollection mySoundCollection;
         private static ScrollRect? _AvatarPageScrollRect;
         protected internal abstract void RefreshFavButtons();
-
         protected abstract void OnFavButtonClicked(StoredCategory storedCategory);
         private static ScrollRect? AvatarPageScrollRect
         {

IKTweaks/IKTweaksMod.cs

@@ -19,7 +19,7 @@
 using Delegate = Il2CppSystem.Delegate;
 using Object = UnityEngine.Object;
 
-[assembly:MelonInfo(typeof(IKTweaksMod), "IKTweaks", "1.0.26", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(IKTweaksMod), "IKTweaks", "1.0.26", "knah", "https://github.com/xAstroBoy/VRCMods-Unchained")]
 [assembly:MelonGame("VRChat", "VRChat")]
 [assembly:MelonOptionalDependencies("UIExpansionKit")]
 
@@ -145,7 +145,7 @@ private static void ShowIKTweaksMenu()
 
             menu.AddSimpleButton("Clear per-avatar stored calibrations", CalibrationManager.ClearNonUniversal);
             menu.AddSpacer();
-            menu.AddSimpleButton("Open documentation in browser", () => Process.Start("https://github.com/knah/VRCMods#iktweaks"));
+            menu.AddSimpleButton("Open documentation in browser", () => Process.Start("https://github.com/xAstroBoy/VRCMods-Unchained#iktweaks"));
             menu.AddSpacer();
 
             menu.AddSimpleButton("Adjust hand offsets",

JoinNotifier/JoinNotifierMod.cs

@@ -16,7 +16,7 @@
 using VRC.Management;
 using Object = UnityEngine.Object;
 
-[assembly:MelonInfo(typeof(JoinNotifierMod), "JoinNotifier", "1.0.7", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(JoinNotifierMod), "JoinNotifier", "1.0.7", "knah", "https://github.com/xAstroBoy/VRCMods-Unchained")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 namespace JoinNotifier
@@ -35,21 +35,42 @@ internal partial class JoinNotifierMod : MelonMod
         private AudioSource myLeaveSource;
         private Text myJoinText;
         private Text myLeaveText;
-        
+
         private int myLastLevelLoad;
         private bool myObservedLocalPlayerJoin;
-        
+
         private AssetBundle myAssetBundle;
         private Sprite myJoinSprite;
         private AudioClip myJoinClip;
         private AudioClip myLeaveClip;
 
         private AudioMixerGroup myUIGroup;
+        private static readonly Func<VRCUiManager> ourGetUiManager;
+
+        static JoinNotifierMod()
+        {
+            ourGetUiManager = (Func<VRCUiManager>)Delegate.CreateDelegate(typeof(Func<VRCUiManager>), typeof(VRCUiManager)
+                .GetProperties(BindingFlags.Static | BindingFlags.Public | BindingFlags.DeclaredOnly)
+                .First(it => it.PropertyType == typeof(VRCUiManager)).GetMethod);
+        }
+
+        internal static VRCUiManager GetUiManager() => ourGetUiManager();
+
+        private static void DoAfterUiManagerInit(Action code)
+        {
+            MelonCoroutines.Start(OnUiManagerInitCoro(code));
+        }
+
+        private static IEnumerator OnUiManagerInitCoro(Action code)
+        {
+            while (GetUiManager() == null)
+                yield return null;
+            code();
+        }
 
         public override void OnApplicationStart()
         {
-            if (!CheckWasSuccessful || !MustStayTrue || MustStayFalse) return;
-            
+
             JoinNotifierSettings.RegisterSettings();
 
             MelonCoroutines.Start(InitThings());
@@ -58,7 +79,7 @@ public override void OnApplicationStart()
         public IEnumerator InitThings()
         {
             MelonDebug.Msg("Waiting for init");
-            
+
             while (ReferenceEquals(NetworkManager.field_Internal_Static_NetworkManager_0, null)) yield return null;
             while (ReferenceEquals(VRCAudioManager.field_Private_Static_VRCAudioManager_0, null)) yield return null;
             while (ReferenceEquals(GetUiManager(), null)) yield return null;
@@ -72,18 +93,18 @@ public IEnumerator InitThings()
             }.Single(it => it.name == "UI");
 
             MelonDebug.Msg("Start init");
-            
+
             NetworkManagerHooks.Initialize();
 
             using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("JoinNotifier.joinnotifier.assetbundle"))
-            using (var tempStream = new MemoryStream((int) stream.Length))
+            using (var tempStream = new MemoryStream((int)stream.Length))
             {
                 stream.CopyTo(tempStream);
-                
+
                 myAssetBundle = AssetBundle.LoadFromMemory_Internal(tempStream.ToArray(), 0);
                 myAssetBundle.hideFlags |= HideFlags.DontUnloadUnusedAsset;
             }
-            
+
             myJoinSprite = myAssetBundle.LoadAsset_Internal("Assets/JoinNotifier/JoinIcon.png", Il2CppType.Of<Sprite>()).Cast<Sprite>();
             myJoinSprite.hideFlags |= HideFlags.DontUnloadUnusedAsset;
 
@@ -94,34 +115,34 @@ public IEnumerator InitThings()
                 uwr.SendWebRequest();
 
                 while (!uwr.isDone) yield return null;
-                
+
                 myJoinClip = WebRequestWWW.InternalCreateAudioClipUsingDH(uwr.downloadHandler, uwr.url, false, false, AudioType.UNKNOWN);
             }
-            
+
             if (myJoinClip == null)
                 myJoinClip = myAssetBundle.LoadAsset_Internal("Assets/JoinNotifier/Chime.ogg", Il2CppType.Of<AudioClip>()).Cast<AudioClip>();
-            
+
             myJoinClip.hideFlags |= HideFlags.DontUnloadUnusedAsset;
 
             if (File.Exists(CustomLeaveSoundFileName))
             {
                 MelonLogger.Msg("Loading custom leave sound");
-                
+
                 var uwr = UnityWebRequest.Get($"file://{Path.Combine(Environment.CurrentDirectory, CustomLeaveSoundFileName)}");
                 uwr.SendWebRequest();
 
                 while (!uwr.isDone) yield return null;
-                
+
                 myLeaveClip = WebRequestWWW.InternalCreateAudioClipUsingDH(uwr.downloadHandler, uwr.url, false, false, AudioType.UNKNOWN);
             }
-            
+
             if (myLeaveClip == null)
                 myLeaveClip = myAssetBundle.LoadAsset_Internal("Assets/JoinNotifier/DoorClose.ogg", Il2CppType.Of<AudioClip>()).Cast<AudioClip>();
-            
+
             myLeaveClip.hideFlags |= HideFlags.DontUnloadUnusedAsset;
 
             CreateGameObjects();
-            
+
             NetworkManagerHooks.OnJoin += OnPlayerJoined;
             NetworkManagerHooks.OnLeave += OnPlayerLeft;
 
@@ -219,25 +240,25 @@ private void CreateGameObjects()
                 MelonLogger.Msg("Not creating gameobjects - no hud root");
                 return;
             }
-            
+
             MelonDebug.Msg("Creating gameobjects");
-//            var pathToThing = "UserInterface/UnscaledUI/HudContent_Old/Hud/NotificationDotParent/NotificationDot";
+            //            var pathToThing = "UserInterface/UnscaledUI/HudContent_Old/Hud/NotificationDotParent/NotificationDot";
             myJoinImage = CreateNotifierImage("join", 0f, JoinNotifierSettings.GetJoinIconColor());
             myJoinSource = CreateAudioSource(myJoinClip, myJoinImage.gameObject);
             myJoinText = CreateTextNear(myJoinImage, 110f, TextAnchor.LowerRight);
-            
+
             myLeaveImage = CreateNotifierImage("leave", 100f, JoinNotifierSettings.GetLeaveIconColor());
             myLeaveSource = CreateAudioSource(myLeaveClip, myLeaveImage.gameObject);
             myLeaveText = CreateTextNear(myLeaveImage, 110f, TextAnchor.LowerLeft);
         }
 
-        partial void OnSceneWasLoaded2(int buildIndex, string sceneName)
+
+        public override void OnSceneWasLoaded(int buildIndex, string sceneName)
         {
-            base.OnSceneWasLoaded(buildIndex, sceneName);
-            
             myLastLevelLoad = Environment.TickCount;
             myObservedLocalPlayerJoin = false;
         }
+    
 
         public void OnPlayerJoined(Player player)
         {

README.md

@@ -75,7 +75,7 @@ Requires UI Expansion Kit - new buttons are added to Camera expando (collapsed b
 * [Move the camera lens to not be instrusively in the middle of the camera screen](https://feedback.vrchat.com/feature-requests/p/move-the-camera-lens-to-not-be-instrusively-in-the-middle-of-the-camera-screen)
 
 ## EmojiPageButtons
-This mod is deprecated with the new Quick Menu (UI 1.5).  Last revision containing its code can be found [here](https://github.com/knah/VRCMods/tree/c1c21edbb0ce13ef4c12b5ffefe0d9fcc0161f77)
+This mod is deprecated with the new Quick Menu (UI 1.5).  Last revision containing its code can be found [here](https://github.com/xAstroBoy/VRCMods-Unchained/tree/c1c21edbb0ce13ef4c12b5ffefe0d9fcc0161f77)
 
 ## FavCat
 An all-in-one local favorites mod. Unlimited favorite lists with unlimited favorites in them and a searchable local database of content and players.  
@@ -144,7 +144,7 @@ I believe this step to be necessary to ensure that VRChat team sees (wholesome)
 On top of that, recent API changes indicate that VRChat Team is taking action to restrict access to avatars. It might be an attempt at ripping prevention, or it might be aimed at privacy enhancement, or it might be aimed at extended avatar favorites. There's no way to tell for sure, and there's no knowing how far those changes would go in the future. 
 Local favorite mods have to rely on the API to some degree, and with things changing quickly, there's no reliable way to ensure that things will stay working and stay safe ban-wise in the long run.
 
-Before you read on, please [scroll up a bit](https://github.com/knah/VRCMods#canny-tickets) and **upvote all linked Canny tickets related to avatar favorites**. If you decide to comment on them, remember to **stay civil** and **avoid mentioning mods**.
+Before you read on, please [scroll up a bit](https://github.com/xAstroBoy/VRCMods-Unchained#canny-tickets) and **upvote all linked Canny tickets related to avatar favorites**. If you decide to comment on them, remember to **stay civil** and **avoid mentioning mods**.
 
 In more practical terms, this means the following:
  * Starting with this update, you will not be able to add new avatar favorites, create new avatar favorite lists, or import avatar favorite lists  
@@ -359,7 +359,7 @@ It's not recommended to scale avatar too small (below 0.1 scale) or too big as t
  * [Remeasure avatar](https://vrchat.canny.io/avatar-30/p/remeasure-avatar) (not this exact feature, but a similar one)
 
 ## SparkleBeGone
-This mod is deprecated with the new Quick Menu (UI 1.5). Last revision containing its code can be found [here](https://github.com/knah/VRCMods/tree/c1c21edbb0ce13ef4c12b5ffefe0d9fcc0161f77)
+This mod is deprecated with the new Quick Menu (UI 1.5). Last revision containing its code can be found [here](https://github.com/xAstroBoy/VRCMods-Unchained/tree/c1c21edbb0ce13ef4c12b5ffefe0d9fcc0161f77)
 
 ## Styletor
 This mod allows you to reskin your Quick Menu (and, eventually, main menu and other UI elements) using VRChat's new UI Styling system.  
@@ -471,7 +471,7 @@ These two serve to tightly integrate integrity check with mods to make automated
 
 ## Installation
 To install these mods, you will need to install [MelonLoader](https://discord.gg/2Wn3N2P) (discord link, see \#how-to-install).  
-Then, you will have to put mod .dll files from [releases](https://github.com/knah/VRCMods/releases) into the `Mods` folder of your game directory
+Then, you will have to put mod .dll files from [releases](https://github.com/xAstroBoy/VRCMods-Unchained/releases) into the `Mods` folder of your game directory
 
 ## Building
 To build these, drop required libraries (found in `<vrchat instanll dir>/MelonLoader/Managed` after melonloader installation, list found in `Directory.Build.props`) into Libs folder, then use your IDE of choice to build.

ScaleGoesBrr/ScaleGoesBrrMod.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections;
+using System.Linq;
+using System.Reflection;
 using HarmonyLib;
 using MelonLoader;
 using RootMotion.FinalIK;
@@ -8,7 +10,7 @@
 using UnityEngine;
 using VRC.SDKBase;
 
-[assembly:MelonInfo(typeof(ScaleGoesBrrMod), "Scale Goes Brr", "1.1.1", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(ScaleGoesBrrMod), "Scale Goes Brr", "1.1.1", "knah", "https://github.com/xAstroBoy/VRCMods-Unchained")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 namespace ScaleGoesBrr
@@ -28,6 +30,28 @@ internal static void FireScaleChange(Transform avatarRoot, float newScale)
         {
             OnAvatarScaleChanged?.Invoke(avatarRoot, newScale);
         }
+        private static readonly Func<VRCUiManager> ourGetUiManager;
+
+        static ScaleGoesBrrMod()
+        {
+            ourGetUiManager = (Func<VRCUiManager>)Delegate.CreateDelegate(typeof(Func<VRCUiManager>), typeof(VRCUiManager)
+                .GetProperties(BindingFlags.Static | BindingFlags.Public | BindingFlags.DeclaredOnly)
+                .First(it => it.PropertyType == typeof(VRCUiManager)).GetMethod);
+        }
+
+        internal static VRCUiManager GetUiManager() => ourGetUiManager();
+
+        private static void DoAfterUiManagerInit(Action code)
+        {
+            MelonCoroutines.Start(OnUiManagerInitCoro(code));
+        }
+
+        private static IEnumerator OnUiManagerInitCoro(Action code)
+        {
+            while (GetUiManager() == null)
+                yield return null;
+            code();
+        }
 
         public override void OnApplicationStart()
         {

Styletor/Styletor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
         <Version>0.3.3.0</Version>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>

Styletor/StyletorMod.cs

@@ -14,7 +14,7 @@
 using UnhollowerRuntimeLib.XrefScans;
 using VRC.UI.Core.Styles;
 
-[assembly:MelonInfo(typeof(StyletorMod), "Styletor", "0.3.3", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(StyletorMod), "Styletor", "0.3.3", "knah", "https://github.com/xAstroBoy/VRCMods-Unchained")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 #nullable disable
@@ -49,7 +49,7 @@ public override void OnApplicationStart()
             settingMenu.AddSimpleButton("Reload styles from disk", ReloadStyles);
             settingMenu.AddSimpleButton("Export default VRChat style reference", ExportStyleClick);
             settingMenu.AddSimpleButton("Export QM object/style tree", ExportTreeClick);
-            settingMenu.AddSimpleButton("Open mod documentation in browser", () => Process.Start("https://github.com/knah/VRCMods#Styletor"));
+            settingMenu.AddSimpleButton("Open mod documentation in browser", () => Process.Start("https://github.com/xAstroBoy/VRCMods-Unchained#Styletor"));
 
             MelonCoroutines.Start(WaitForStyleInit());
         }