From 5f1fa472739f3311135b3fcdf2fd69bb5941ca80 Mon Sep 17 00:00:00 2001
From: bd_ <bdunderscore@fushizen.net>
Date: Mon, 31 Oct 2022 08:43:38 -0700
Subject: [PATCH] Update component allowlist patch for latest VRCSDK

Fixes: #68
---
 .../Editor/ComponentAllowlistPatch.cs         | 72 ++++++++++++++++---
 .../net.fushizen.modular-avatar/package.json  |  4 +-
 Packages/vpm-manifest.json                    |  4 +-
 3 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs b/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs
index 3bc19950..2c92a9d4 100644
--- a/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs
+++ b/Packages/net.fushizen.modular-avatar/Editor/ComponentAllowlistPatch.cs
@@ -26,6 +26,9 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using UnityEditor;
+using UnityEditor.PackageManager.Requests;
+using UnityEngine;
+using VRC.SDK3.Avatars.Components;
 
 namespace net.fushizen.modular_avatar.core.editor
 {
@@ -33,27 +36,74 @@ namespace net.fushizen.modular_avatar.core.editor
     internal static class ComponentAllowlistPatch
     {
         static ComponentAllowlistPatch()
+        {
+            try
+            {
+                PatchAllowlist();
+            }
+            catch (Exception e)
+            {
+                Debug.LogException(e);
+            }
+        }
+
+        static void PatchAllowlist()
         {
             // When running on non-VCC versions of the SDK, we can't reference AvatarValidation directly as it's not in
             // an assembly definition. So just search all of the assemblies for the type.
-            string typeName = "VRC.SDK3.Validation.AvatarValidation";
-            Type avatarValidationType = null;
+            var avatarValidation = FindType("VRC.SDK3.Validation.AvatarValidation");
+            var validationUtils = FindType("VRC.SDKBase.Validation.ValidationUtils");
+            if (avatarValidation == null)
+            {
+                Debug.LogError("Failed to find AvatarValidation type");
+                return;
+            }
+
+            if (validationUtils == null)
+            {
+                Debug.LogError("Failed to find ValidationUtils type");
+                return;
+            }
+
+            var getWhitelistForSDK =
+                avatarValidation.GetMethod("GetComponentWhitelist", BindingFlags.Static | BindingFlags.NonPublic);
+            var addDerivedClasses =
+                validationUtils.GetMethod("AddDerivedClasses", BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (getWhitelistForSDK == null)
+            {
+                Debug.LogError("Failed to find GetWhitelistForSDK method");
+                return;
+            }
+
+            if (addDerivedClasses == null)
+            {
+                Debug.LogError("Failed to find AddDerivedClasses method");
+                return;
+            }
+
+            if (getWhitelistForSDK.Invoke(null, new object[] { }) is HashSet<Type> allowlist)
+            {
+                // The allowlist is cached, so we can inject our own type into the cached hashset (and then invoke the
+                // AddDerivedClasses method to find all derived types from the AvatarTagComponent automatically).
+                allowlist.Add(typeof(AvatarTagComponent));
+                addDerivedClasses.Invoke(null, new object[] {allowlist});
+            }
+        }
+
+        private static Type FindType(string typeName)
+        {
+            Type avatarValidation = null;
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
-                avatarValidationType = assembly.GetType(typeName);
-                if (avatarValidationType != null)
+                avatarValidation = assembly.GetType(typeName);
+                if (avatarValidation != null)
                 {
                     break;
                 }
             }
 
-            if (avatarValidationType == null) return;
-
-            var listField = avatarValidationType.GetField("ComponentTypeWhiteListCommon",
-                BindingFlags.Static | BindingFlags.Public);
-            var currentList = new List<string>(listField.GetValue(null) as string[]);
-            currentList.Add(typeof(AvatarTagComponent).FullName);
-            listField.SetValue(null, currentList.ToArray());
+            return avatarValidation;
         }
     }
 }
\ No newline at end of file
diff --git a/Packages/net.fushizen.modular-avatar/package.json b/Packages/net.fushizen.modular-avatar/package.json
index 3a25114b..7f7ea08a 100644
--- a/Packages/net.fushizen.modular-avatar/package.json
+++ b/Packages/net.fushizen.modular-avatar/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
   },
   "vpmDependencies" : {
-    "com.vrchat.base": "3.1.x",
-    "com.vrchat.avatars": "3.1.x"
+    "com.vrchat.base": "3.1.9",
+    "com.vrchat.avatars": "3.1.9"
   }
 }
diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json
index 8e803181..d9cf5022 100644
--- a/Packages/vpm-manifest.json
+++ b/Packages/vpm-manifest.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.vrchat.avatars": {
-      "version": "3.1.5"
+      "version": "3.1.9"
     },
     "com.vrchat.core.vpm-resolver": {
       "version": "0.1.13"
@@ -18,7 +18,7 @@
       "version": "3.1.9"
     },
     "com.vrchat.core.vpm-resolver": {
-      "version": "0.1.15"
+      "version": "0.1.17"
     }
   }
 }
\ No newline at end of file