fix RemoveIllegalComponents method getting changed in newer vrc sdk. fix

#12
d4rkc0d3r · Oct 13, 2022 · 5981f43 · 5981f43
1 parent cf8c6d5
commit 5981f43
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.7
+### Bug Fixes
+* Fix optimizer not working with VRCSDK3-AVATAR-2022.10.12.21.07 SDK onwards. [(more)](https://github.com/d4rkc0d3r/d4rkAvatarOptimizer/issues/12)
+
 ## v1.6
 ### Features
 * Optimizer now shows a progress bar dialog when optimizing an avatar.

diff --git a/src/d4rkAvatarOptimizerEditor.cs b/src/d4rkAvatarOptimizerEditor.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using System.Globalization;
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.Animations;
 using UnityEngine.SceneManagement;
@@ -2839,6 +2840,34 @@ private void PerfRankChangeLabel(string label, int oldValue, int newValue, Avata
         EditorGUILayout.LabelField(label);
         EditorGUILayout.EndHorizontal();
     }
+
+    private void RemoveIllegalComponents(GameObject target)
+    {
+        // call VRC.SDK3.Validation.AvatarValidation.RemoveIllegalComponents(target, true) with reflection if it exists
+        var RemoveIllegalComponents = Type.GetType("VRC.SDK3.Validation.AvatarValidation, Assembly-CSharp")
+            ?.GetMethod("RemoveIllegalComponents", BindingFlags.Static | BindingFlags.Public);
+        if (RemoveIllegalComponents != null)
+        {
+            RemoveIllegalComponents.Invoke(null, new object[] { target, true });
+            return;
+        }
+
+        // if not found use newer sdk method with reflection
+        // VRC.SDK3.Validation.AvatarValidation.GetComponentWhitelist()
+        // VRC.SDKBase.Validation.ValidationUtils.RemoveIllegalComponents(GameObject target, HashSet<Type> whitelist, bool retry, bool onlySceneObjects, bool logStripping)
+        var GetComponentWhitelist = Type.GetType("VRC.SDK3.Validation.AvatarValidation, Assembly-CSharp")
+            ?.GetMethod("GetComponentWhitelist", BindingFlags.Static | BindingFlags.NonPublic);
+        RemoveIllegalComponents = Type.GetType("VRC.SDKBase.Validation.ValidationUtils, Assembly-CSharp")
+            ?.GetMethod("RemoveIllegalComponents", BindingFlags.Static | BindingFlags.Public);
+        if (GetComponentWhitelist != null && RemoveIllegalComponents != null)
+        {
+            var whitelist = GetComponentWhitelist.Invoke(null, null) as HashSet<Type>;
+            RemoveIllegalComponents.Invoke(null, new object[] { target, whitelist, true, false, true });
+            return;
+        }
+
+        Debug.LogWarning("Could not find RemoveIllegalComponents method");
+    }
 
     public override void OnInspectorGUI()
     {
@@ -2913,7 +2942,7 @@ public override void OnInspectorGUI()
                 copy.name = settings.gameObject.name + "(BrokenCopy)";
                 DestroyImmediate(copy.GetComponent<d4rkAvatarOptimizer>());
                 if (copy.GetComponent<VRCAvatarDescriptor>() != null)
-                    VRC.SDK3.Validation.AvatarValidation.RemoveIllegalComponents(copy);
+                    RemoveIllegalComponents(copy);
                 Optimize(copy);
                 copy.name = settings.gameObject.name + "(OptimizedCopy)";
                 copy.SetActive(true);