chore: workaround VRCSDK bug

https://feedback.vrchat.com/sdk-bug-reports/p/string-conversion-errors-from-runtimeassemblygetcodebase-with-japanese-locale-an
bdunderscore · Sep 14, 2024 · 3123d9e · 3123d9e
1 parent 7e8c84c
commit 3123d9e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - [#379] Fix CurrentThreadIsMainThread assertion in AsyncProfiler
+- [#386]
+  Workaround [VRCSDK bug](https://feedback.vrchat.com/sdk-bug-reports/p/string-conversion-errors-from-runtimeassemblygetcodebase-with-japanese-locale-an)
+  caused by non-ASCII project paths.
 
 ### Changed
 

diff --git a/Editor/PreviewSystem/Harmony.meta → Editor/Harmony.meta b/Editor/PreviewSystem/Harmony.meta → Editor/Harmony.meta
diff --git a/...iewSystem/Harmony/HandleUtilityPatches.cs → Editor/Harmony/HandleUtilityPatches.cs b/...iewSystem/Harmony/HandleUtilityPatches.cs → Editor/Harmony/HandleUtilityPatches.cs
diff --git a/...stem/Harmony/HandleUtilityPatches.cs.meta → Editor/Harmony/HandleUtilityPatches.cs.meta b/...stem/Harmony/HandleUtilityPatches.cs.meta → Editor/Harmony/HandleUtilityPatches.cs.meta
diff --git a/Editor/PreviewSystem/Harmony/Patcher.cs → Editor/Harmony/Patcher.cs b/Editor/PreviewSystem/Harmony/Patcher.cs → Editor/Harmony/Patcher.cs
@@ -15,6 +15,7 @@ internal sealed class PatchLoader
         {
             HandleUtilityPatches.Patch_FilterInstanceIDs,
             PickingObjectPatch.Patch,
+            VRCSDKBug_AssemblyGetNameExceptionHandling.Patch
             //HierarchyViewPatches.Patch
         };
 

diff --git a/Editor/PreviewSystem/Harmony/Patcher.cs.meta → Editor/Harmony/Patcher.cs.meta b/Editor/PreviewSystem/Harmony/Patcher.cs.meta → Editor/Harmony/Patcher.cs.meta
diff --git a/...eviewSystem/Harmony/PickingObjectPatch.cs → Editor/Harmony/PickingObjectPatch.cs b/...eviewSystem/Harmony/PickingObjectPatch.cs → Editor/Harmony/PickingObjectPatch.cs
diff --git a/...System/Harmony/PickingObjectPatch.cs.meta → Editor/Harmony/PickingObjectPatch.cs.meta b/...System/Harmony/PickingObjectPatch.cs.meta → Editor/Harmony/PickingObjectPatch.cs.meta
diff --git a/Editor/Harmony/VRCSDKBug_AssemblyGetNameExceptionHandling.cs b/Editor/Harmony/VRCSDKBug_AssemblyGetNameExceptionHandling.cs
@@ -0,0 +1,23 @@
+using HarmonyLib;
+
+namespace nadena.dev.ndmf.preview
+{
+    internal static class VRCSDKBug_AssemblyGetNameExceptionHandling
+    {
+        internal static void Patch(Harmony h)
+        {
+            var t_Tools = AccessTools.TypeByName("VRC.Tools");
+            var p_HasTypeVRCApplication = AccessTools.Property(t_Tools, "HasTypeVRCApplication");
+
+            h.Patch(p_HasTypeVRCApplication.GetMethod,
+                new HarmonyMethod(typeof(VRCSDKBug_AssemblyGetNameExceptionHandling), nameof(AlwaysFalse)));
+        }
+
+        private static bool AlwaysFalse(ref bool __result)
+        {
+            __result = false;
+
+            return false;
+        }
+    }
+}
diff --git a/Editor/Harmony/VRCSDKBug_AssemblyGetNameExceptionHandling.cs.meta b/Editor/Harmony/VRCSDKBug_AssemblyGetNameExceptionHandling.cs.meta