fix: play audio absolute paths in a relative controller break (#1555)

In MA 1.11.x, while we corrected relative play audio paths where possible,
we would leave them unchanged if no corresponding object was found. This
meant that we maintained compatibility with older assets that uses absolute
addressing for their Play Audio paths. This change restores that behavior.

.crowdin.yml

@@ -0,0 +1,6 @@
+base_path: .
+base_url: 'https://api.crowdin.com'
+preserve_hierarchy: 1
+files:
+  - source: /Editor/Localization/en-US.json
+    translation: /Editor/Localization/%locale%.json

.github/CHANGELOG-HEADER.md

@@ -0,0 +1,14 @@
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: [bdunderscore]
+# patreon: # Replace with a single Patreon username
+# open_collective: # Replace with a single Open Collective username
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+# polar: # Replace with a single Polar username
+# buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ProjectRoot/Packages/.gitignore

@@ -2,3 +2,5 @@
 !com.vrchat.core.*/
 com.vrchat.*/
 !nadena.dev.*/
+nadena.dev.ndmf/
+*.zip

.github/ProjectRoot/Packages/manifest.json

@@ -4,12 +4,15 @@
     "com.unity.ide.rider": "3.0.17",
     "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.33",
+    "com.unity.test-framework": "1.3.2",
+    "com.unity.testtools.codecoverage": "1.2.2",
     "com.unity.textmeshpro": "2.1.6",
     "com.unity.timeline": "1.2.18",
     "com.unity.ugui": "1.0.0",
+    "com.unity.xr.oculus.android": "2.38.6",
     "com.unity.xr.oculus.standalone": "2.38.4",
     "com.unity.xr.openvr.standalone": "2.0.5",
+    "de.thryrallo.vrc.avatar-performance-tools": "https://github.com/Thryrallo/VRC-Avatar-Performance-Tools.git",
     "nadena.dev.modular-avatar": "0.0.1",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

.github/ProjectRoot/Packages/packages-lock.json

@@ -17,7 +17,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -56,23 +56,49 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.2",
+      "version": "3.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.postprocessing": {
+      "version": "3.1.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.settings-manager": {
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.3.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.testtools.codecoverage": {
+      "version": "1.2.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.0.16",
+        "com.unity.settings-manager": "1.0.1"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.textmeshpro": {
       "version": "2.1.6",
       "depth": 0,
@@ -103,6 +129,13 @@
         "com.unity.modules.imgui": "1.0.0"
       }
     },
+    "com.unity.xr.oculus.android": {
+      "version": "2.38.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.xr.oculus.standalone": {
       "version": "2.38.4",
       "depth": 0,
@@ -130,17 +163,42 @@
       "dependencies": {
         "com.unity.burst": "1.4.11",
         "com.unity.mathematics": "1.2.5",
-        "com.unity.nuget.newtonsoft-json": "2.0.2"
+        "com.unity.nuget.newtonsoft-json": "3.0.2"
       }
     },
-    "com.vrchat.core.vpm-resolver": {
-      "version": "file:com.vrchat.core.vpm-resolver",
+    "de.thryrallo.vrc.avatar-performance-tools": {
+      "version": "https://github.com/Thryrallo/VRC-Avatar-Performance-Tools.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "ba9c16e482e7a376db18e9a85e24fabc04649d37"
+    },
+    "dev.onevr.vrworldtoolkit": {
+      "version": "file:dev.onevr.vrworldtoolkit",
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.2"
+        "com.unity.postprocessing": "3.1.1"
       }
     },
+    "jp.lilxyzw.liltoon": {
+      "version": "file:jp.lilxyzw.liltoon",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "jp.suzuryg.face-emo": {
+      "version": "file:jp.suzuryg.face-emo",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "lyuma.av3emulator": {
+      "version": "file:lyuma.av3emulator",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "nadena.dev.modular-avatar": {
       "version": "file:nadena.dev.modular-avatar",
       "depth": 0,
@@ -149,6 +207,18 @@
         "com.unity.nuget.newtonsoft-json": "2.0.0"
       }
     },
+    "nadena.dev.ndmf": {
+      "version": "file:nadena.dev.ndmf",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "vrchat.blackstartx.gesture-manager": {
+      "version": "file:vrchat.blackstartx.gesture-manager",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,

.github/ProjectRoot/ProjectSettings/BurstAotSettings_Android.json

@@ -0,0 +1,13 @@
+{
+  "MonoBehaviour": {
+    "Version": 3,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0
+  }
+}

.github/ProjectRoot/ProjectSettings/BurstAotSettings_StandaloneWindows.json

@@ -0,0 +1,16 @@
+{
+  "MonoBehaviour": {
+    "Version": 3,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "UsePlatformSDKLinker": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX32": 6,
+    "CpuTargetsX64": 72
+  }
+}

.github/ProjectRoot/ProjectSettings/EditorSettings.asset

@@ -23,7 +23,7 @@ EditorSettings:
   m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
   m_AsyncShaderCompilation: 1
-  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptionsEnabled: 1
   m_EnterPlayModeOptions: 3
   m_ShowLightmapResolutionOverlay: 1
   m_UseLegacyProbeSampleCount: 0

.github/ProjectRoot/ProjectSettings/GraphicsSettings.asset

@@ -28,16 +28,7 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
-  m_AlwaysIncludedShaders:
-  - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  m_AlwaysIncludedShaders: []
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

.github/ProjectRoot/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json

@@ -0,0 +1,7 @@
+{
+    "m_Name": "Settings",
+    "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
+    "m_Dictionary": {
+        "m_DictionaryValues": []
+    }
+}

.github/ProjectRoot/ProjectSettings/ProjectSettings.asset

@@ -176,7 +176,7 @@ PlayerSettings:
   applicationIdentifier: {}
   buildNumber: {}
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 19
+  AndroidMinSdkVersion: 25
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -184,7 +184,7 @@ PlayerSettings:
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 0
-  ForceSDCardPermission: 0
+  ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0
@@ -250,7 +250,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.vrchat.template.base@1.0.0
   templateDefaultScene: Assets/VRCWelcome.unity
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -313,7 +313,7 @@ PlayerSettings:
   - m_BuildTarget: LuminSupport
     m_GraphicsJobs: 0
   - m_BuildTarget: AndroidPlayer
-    m_GraphicsJobs: 0
+    m_GraphicsJobs: 1
   - m_BuildTarget: WebGLSupport
     m_GraphicsJobs: 0
   m_BuildTargetGraphicsJobMode:
@@ -327,7 +327,7 @@ PlayerSettings:
     m_Automatic: 0
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
-    m_Automatic: 1
+    m_Automatic: 0
   - m_BuildTarget: AppleTVSupport
     m_APIs: 10000000
     m_Automatic: 0
@@ -337,6 +337,9 @@ PlayerSettings:
   - m_BuildTarget: WindowsStandaloneSupport
     m_APIs: 02000000
     m_Automatic: 0
+  - m_BuildTarget: MacStandaloneSupport
+    m_APIs: 10000000
+    m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone
     m_Enabled: 1
@@ -344,6 +347,12 @@ PlayerSettings:
     - None
     - OpenVR
     - Oculus
+  - m_BuildTarget: Android
+    m_Enabled: 1
+    m_Devices:
+    - None
+    - OpenVR
+    - Oculus
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
@@ -619,20 +628,35 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLWasmStreaming: 0
   scriptingDefineSymbols:
-    1: VRC_SDK_VRCSDK3
+    1: VRC_SDK_VRCSDK3;UNITY_POST_PROCESSING_STACK_V2
+    7: UNITY_POST_PROCESSING_STACK_V2;VRC_SDK_VRCSDK3
+    13: UNITY_POST_PROCESSING_STACK_V2
+    14: UNITY_POST_PROCESSING_STACK_V2
+    19: UNITY_POST_PROCESSING_STACK_V2
+    21: UNITY_POST_PROCESSING_STACK_V2
+    25: UNITY_POST_PROCESSING_STACK_V2
+    27: UNITY_POST_PROCESSING_STACK_V2
+    28: UNITY_POST_PROCESSING_STACK_V2
+    29: UNITY_POST_PROCESSING_STACK_V2
+    30: UNITY_POST_PROCESSING_STACK_V2
+    32: UNITY_POST_PROCESSING_STACK_V2
+    33: UNITY_POST_PROCESSING_STACK_V2
   platformArchitecture: {}
   scriptingBackend: {}
-  il2cppCompilerConfiguration: {}
+  il2cppCompilerConfiguration:
+    Android: 1
+    Standalone: 1
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
   allowUnsafeCode: 0
-  additionalIl2CppArgs: 
+  additionalIl2CppArgs: --compiler-flags="" --linker-flags=""
   scriptingRuntimeVersion: 1
   gcIncremental: 1
   assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
+    Android: 3
     Standalone: 3
   m_RenderingPath: 1
   m_MobileRenderingPath: 1

.github/ProjectRoot/ProjectSettings/QualitySettings.asset

@@ -4,13 +4,13 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 3
+  m_CurrentQuality: 2
   m_QualitySettings:
   - serializedVersion: 2
     name: VRC Low
     pixelLightCount: 4
     shadows: 2
-    shadowResolution: 2
+    shadowResolution: 1
     shadowProjection: 1
     shadowCascades: 2
     shadowDistance: 75
@@ -58,7 +58,7 @@ QualitySettings:
     skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 4
+    antiAliasing: 2
     softParticles: 1
     softVegetation: 1
     realtimeReflectionProbes: 1
@@ -86,43 +86,6 @@ QualitySettings:
     shadows: 2
     shadowResolution: 3
     shadowProjection: 1
-    shadowCascades: 2
-    shadowDistance: 75
-    shadowNearPlaneOffset: 2
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
-    skinWeights: 4
-    textureQuality: 0
-    anisotropicTextures: 2
-    antiAliasing: 4
-    softParticles: 1
-    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
-    vSyncCount: 0
-    lodBias: 2
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4096
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 128
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
-    excludedTargetPlatforms:
-    - Android
-  - serializedVersion: 2
-    name: VRC Ultra
-    pixelLightCount: 8
-    shadows: 2
-    shadowResolution: 3
-    shadowProjection: 1
     shadowCascades: 4
     shadowDistance: 150
     shadowNearPlaneOffset: 2

.github/ProjectRoot/manifest-2022.json

@@ -0,0 +1,44 @@
+{
+  "dependencies": {
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.7.5",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}

.github/ProjectRoot/modular-avatar.sln.DotSettings

@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=blendshape/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Blendshapes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nadena/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

.github/ProjectRoot/packages-lock-2022.json

@@ -0,0 +1,397 @@
+{
+  "dependencies": {
+    "com.unity.ai.navigation": {
+      "version": "1.1.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.ai": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.burst": {
+      "version": "1.8.7",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.mathematics": "1.2.1"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.collab-proxy": {
+      "version": "2.0.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ext.nunit": {
+      "version": "1.0.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.rider": {
+      "version": "3.0.24",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ext.nunit": "1.0.6"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.18",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.vscode": {
+      "version": "1.2.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.mathematics": {
+      "version": "1.2.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.test-framework": {
+      "version": "1.1.33",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.textmeshpro": {
+      "version": "3.0.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.timeline": {
+      "version": "1.7.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ugui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      }
+    },
+    "com.vrchat.avatars": {
+      "version": "file:com.vrchat.avatars",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "com.vrchat.base": {
+      "version": "file:com.vrchat.base",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.burst": "1.4.11",
+        "com.unity.mathematics": "1.2.5",
+        "com.unity.nuget.newtonsoft-json": "3.0.2"
+      }
+    },
+    "com.vrchat.core.vpm-resolver": {
+      "version": "file:com.vrchat.core.vpm-resolver",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "3.0.2"
+      }
+    },
+    "jp.lilxyzw.liltoon": {
+      "version": "file:jp.lilxyzw.liltoon",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "nadena.dev.modular-avatar": {
+      "version": "file:nadena.dev.modular-avatar",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0"
+      }
+    },
+    "com.unity.modules.ai": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.androidjni": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.animation": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.assetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.audio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.cloth": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.director": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.animation": "1.0.0"
+      }
+    },
+    "com.unity.modules.imageconversion": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.imgui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.jsonserialize": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.particlesystem": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics2d": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.screencapture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.subsystems": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.terrain": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.terrainphysics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.terrain": "1.0.0"
+      }
+    },
+    "com.unity.modules.tilemap": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics2d": "1.0.0"
+      }
+    },
+    "com.unity.modules.ui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.uielements": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.umbra": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unityanalytics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequest": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unitywebrequestassetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestaudio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.audio": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequesttexture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestwww": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequestaudio": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.vehicles": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.video": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.vr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      }
+    },
+    "com.unity.modules.wind": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.xr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.subsystems": "1.0.0"
+      }
+    }
+  }
+}

.github/ProjectRoot/vpm-manifest-2019.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "com.vrchat.avatars": {
+      "version": "3.4.2"
+    },
+    "nadena.dev.ndmf": {
+      "version": "1.4.0"
+    }
+  },
+  "locked": {
+    "com.vrchat.avatars": {
+      "version": "3.4.2",
+      "dependencies": {
+        "com.vrchat.base": "3.4.2"
+      }
+    },
+    "com.vrchat.base": {
+      "version": "3.4.2",
+      "dependencies": {}
+    },
+    "nadena.dev.ndmf": {
+      "version": "1.4.0"
+    }
+  }
+}

.github/ProjectRoot/vpm-manifest-2022.json

@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "com.vrchat.avatars": {
+      "version": "3.7.4"
+    },
+    "nadena.dev.ndmf": {
+      "version": "1.8.0-alpha.4"
+    }
+  },
+  "locked": {
+    "com.vrchat.avatars": {
+      "version": "3.7.4",
+      "dependencies": {
+        "com.vrchat.base": "3.7.4"
+      }
+    },
+    "com.vrchat.base": {
+      "version": "3.7.4",
+      "dependencies": {}
+    },
+    "nadena.dev.ndmf": {
+      "version": "1.8.0-alpha.4"
+    }
+  }
+}

.github/cut-changelog.pl

@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my ($changelog_file, $header_file, $version, $excerpt_file) = @ARGV;
+
+open my $changelog, '<', $changelog_file or die "Can't open $changelog_file: $!";
+open my $header, '<', $header_file or die "Can't open $header_file: $!";
+open my $new_changelog, '>', "$changelog_file.new" or die "Can't open $changelog_file.new: $!";
+
+if (!$excerpt_file) {
+    $excerpt_file = '/dev/null';
+}
+
+open my $excerpt, '>', $excerpt_file or die "Can't open $excerpt_file: $!";
+
+# Copy all lines before the first "## "
+while (my $line = <$changelog>) {
+    last if $line =~ /^## /;
+    print $new_changelog $line;
+}
+
+# Copy header into the output changelog
+while (my $line = <$header>) {
+    print $new_changelog $line;
+}
+
+# Generate new header: ## [version] - [YYYY-mm-DD]
+
+my $date = `date +%Y-%m-%d`;
+chomp $date;
+
+print $new_changelog "## [$version] - [$date]\n";
+
+# Copy all lines until the next ## into both the new changelog and $excerpt.
+# Prune any ###-sections that contain no content
+
+my @buffered;
+
+while (my $line = <$changelog>) {
+    if ($line =~ /^### /) {
+        @buffered = ($line);
+    } elsif ($line =~ /^\s*$/) {
+        if (@buffered) {
+          push @buffered, $line;
+        } else {
+            print $new_changelog $line;
+            print $excerpt $line;
+        }
+    } elsif ($line =~ /^## /) {
+        @buffered = ();
+        print $new_changelog $line;
+        last;
+    } else {
+        for my $buffered_line (@buffered){
+            print $new_changelog $buffered_line;
+            print $excerpt $buffered_line;
+        }
+        @buffered = ();
+        print $new_changelog $line; 
+        print $excerpt $line;
+    }
+}
+
+# Copy remainder of changelog into new changelog
+while (my $line = <$changelog>) {
+    print $new_changelog $line;
+}
+
+rename "$changelog_file.new", $changelog_file or die "Can't rename $changelog_file.new to $changelog_file: $!";

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/docs" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    schedule:
+      interval: "weekly"
+    directory: .github/workflows

.github/gen-docs-changelog.pl

@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+# We want to skip two sections - the main header, then up to the first version header.
+# In a prerelease, we only want to skip the first section (not including the unreleased header)
+
+if ($ENV{PRERELEASE} eq 'false') {
+    while (<>) {
+        if (/^\## /) { last; }
+    }
+}
+
+
+while (<>) {
+    if (/^## /) { print; last; }
+}
+
+while (<>) {
+    print;
+}

.github/workflows/build-release.yml

@@ -1,81 +0,0 @@
-name: Build Release
-
-on:
-  workflow_dispatch:
-  pull_request: 
-  push:
-    branches:
-      - main
-    tags:
-      - '**'
-
-env:
-  packageName: "nadena.dev.modular-avatar"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        
-      - name: Checkout logo assets
-        uses: actions/checkout@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          repository: bdunderscore/modular-avatar-images
-          path: image-assets
-      - name: Inject logo assets
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          cp -f image-assets/img/logo/ma_logo.png Packages/${{env.packageName}}/Editor/Images/logo.png
-
-      - name: get version
-        id: version
-        uses: notiz-dev/github-action-json-property@7c8cf5cc36eb85d8d287a8086a39dac59628eb31
-        with:
-          path: "Packages/${{env.packageName}}/package.json"
-          prop_path: "version"
-          
-      - name: Check tag consistency
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          if [ "${{ steps.version.outputs.prop }}" != "${GITHUB_REF##*/}" ]; then
-            echo "Version in package.json does not match tag name: ${{ steps.version.outputs.prop }} != ${GITHUB_REF##*/}"
-            exit 1
-          fi
-
-      - run: echo ${{steps.version.outputs.prop}}
-
-      - name: Set Environment Variables
-        run: |
-          echo "zipFile=${{ env.packageName }}-${{ steps.version.outputs.prop }}".zip >> $GITHUB_ENV
-          echo "unityPackage=${{ env.packageName }}-${{ steps.version.outputs.prop }}.unitypackage" >> $GITHUB_ENV
-
-      - name: Create Zip
-        uses: thedoctor0/zip-release@09336613be18a8208dfa66bd57efafd9e2685657
-        with:
-          type: "zip"
-          directory: "Packages/${{env.packageName}}/"
-          filename: "../../${{env.zipFile}}" # make the zip file two directories up, since we start two directories in above
-
-      - run: find "Packages/${{env.packageName}}/" -name \*.meta >> metaList
-
-      - name: Create UnityPackage
-        uses: pCYSl5EDgo/create-unitypackage@e28c7a4616b2754c564b0a959a03b3c89b756fdb
-        with:
-          package-path: ${{ env.unityPackage }}
-          include-files: metaList
-
-      - name: Make Release
-        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          draft: true
-          generate_release_notes: true
-          tag_name: ${{ steps.version.outputs.prop }}
-          files: |
-            ${{ env.zipFile }}
-            ${{ env.unityPackage }}
-            Packages/${{ env.packageName }}/package.json

.github/workflows/build-test-docs.yml

@@ -1,34 +1,108 @@
-name: Build documentation
+name: Build documentation
 
 on:
+  push:
+    branches:
+      - refactor-structure
   pull_request:
   workflow_call:
+    inputs:
+      ref:
+        description: 'commit to build'
+        type: string
+        required: false
+      path:
+        description: 'path within the docs pages to build to'
+        type: string
+        required: false
+      artifact:
+        description: 'artifact name to write'
+        type: string
+        required: false
+      latest:
+        description: 'build the latest release'
+        type: boolean
+        required: false
+      prerelease:
+        description: 'use prerelease changelog'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   build-docs:
     name: Build documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - uses: actions/checkout@v3 # check out this repo
-      - uses: actions/checkout@v3
+      
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }} 
+      - uses: actions/checkout@v4
         with:
           repository: bdunderscore/modular-avatar-images
           path: modular-avatar-images
       - name: Install logo assets
         run: |
-          cp -Rv modular-avatar-images/img/* docs/static/img
+          cp -Rv modular-avatar-images/img/* docs~/static/img
+          
+      - name: Setup yarn 2.0
+        run: |
+          corepack enable
+          corepack prepare yarn@stable --activate
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(cd docs~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+    
+      - uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-docs-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-docs-
+
+      - name: Set baseUri
+        if: ${{ inputs.path }}
+        run: |
+          BASEURL="/${{ inputs.path }}/" perl -i -p -e "s{baseUrl: '/'}{baseUrl: '\$ENV{BASEURL}'}" docs~/docusaurus.config.js
+          cat docs~/docusaurus.config.js
+
+      - name: Format changelogs
+        run: |
+          SUFFIX=""
+          export PRERELEASE=${{ inputs.prerelease && 'true' || 'false' }}
+
+          if [ ${{ inputs.prerelease }} == true ]; then
+            SUFFIX="-PRERELEASE"
+          fi
+          
+          perl -n .github/gen-docs-changelog.pl < CHANGELOG$SUFFIX.md >> docs~/docs/changelog.md
+          perl -n .github/gen-docs-changelog.pl < CHANGELOG$SUFFIX''-jp.md >> docs~/i18n/ja/docusaurus-plugin-content-docs/current/changelog.md
 
       - name: Build docs
         run: |
-          cd docs
-          yarn install
+          cd docs~
+          yarn install --immutable
           yarn build
+          ls -lR build
+
+      - name: Set robots.txt
+        run: |
+          if [ -e docs~/robots.txt ]; then
+            cp docs~/robots.txt docs~/build/robots.txt
+          fi
+          
+      - name: Package documentation
+        run: |
+          tar -cf docs.tar -C docs~/build .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: docs
-          path: docs/build
+          name: ${{ inputs.artifact || 'docs' }}
+          path: docs.tar

.github/workflows/changelog-check.yml

@@ -0,0 +1,58 @@
+# From https://github.com/anatawa12/AvatarOptimizer/blob/ccb863243433019f323c23a3a2e24b27e15b2f6c/.github/workflows/changelog-check.yml
+# Copyright 2022 anatawa12
+# MIT license.
+
+# this workflow checks CHANGELOG.md & CHANGELOG-SNAPSHOTS.md is updated correctly
+# to skip this check, include `NO-CHANGELOG` for CHANGELOG.md
+# and `NO-CHANGELOG-PRERELEASE` for CHANGELOG-PRERELEASE.md in tags of PR.
+# also, this action ignores `dependencies` pull requests (expected to be generated by dependabot)
+
+name: CHANGELOG check
+
+on:
+  pull_request_target:
+    branches: [ main, main-* ]
+    types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  releasenote-check:
+    if: ${{ ! github.event.pull_request.draft }}
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        file: [CHANGELOG.md, CHANGELOG-jp.md, CHANGELOG-PRERELEASE.md, CHANGELOG-PRERELEASE-jp.md]
+
+    env:
+      NO_CHANGELOG: ${{
+        contains(github.event.pull_request.labels.*.name, 'NO-CHANGELOG')
+        || contains(github.event.pull_request.labels.*.name, 'documentation')
+        || contains(github.event.pull_request.labels.*.name, 'localization')
+        || contains(github.event.pull_request.labels.*.name, 'ci')
+        || contains(github.event.pull_request.labels.*.name, 'refactor')
+        || startsWith(github.event.pull_request.head.label, 'bdunderscore:dependabot/')
+        || '' }}
+      SNAPSHOT_ONLY: ${{ contains(github.event.pull_request.labels.*.name, 'PRERELEASE-ONLY') || '' }}
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - name: Fetch pull_request info
+        env:
+          GH_REPO: ${{ github.repositoryUrl }}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          PR_NUM: ${{ github.event.number }}
+        run: |
+          gh pr view $PR_NUM --json=files | jq --raw-output '.files[].path' > files.txt
+      - name: Changelog check for ${{ matrix.file }}
+        if: always() && !env.NO_CHANGELOG && (startsWith(matrix.file, 'CHANGELOG-PRERELEASE') || !env.SNAPSHOT_ONLY)
+        run: |
+          if ! grep -e '^${{ matrix.file }}$' < files.txt > /dev/null; then
+            echo "::error::An entry in ${{ matrix.file }} is required for this PR."
+            echo "If this change is only relevant between snapshot versions: Add the label 'PRERELEASE-ONLY' to this PR." >> $GITHUB_STEP_SUMMARY
+            echo "If this change does not warrant any release notes: Add the label 'NO-CHANGELOG' to this PR." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi

.github/workflows/deploy-pages.yml

@@ -3,44 +3,130 @@ on:
   push:
     branches:
       - main
-  workflow_dispatch: 
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
+      - docs-snapshot
+      - docs-ci-test
+  workflow_dispatch: {}
+  release:
+    types:
+      - released
 
 concurrency:
-  group: "pages"
+  group: "pages-cf"
   cancel-in-progress: true
-  
+
 jobs:
+  snapshot-docs:
+    name: Snapshot documentation
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        # Run on releases only
+        if: ${{ github.event.release }}
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Merge with existing branch
+        # Run on releases only
+        if: ${{ github.event.release }}
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "github-actions@nadena.dev"
+          git merge -s ours origin/docs-snapshot
+          git push origin HEAD:docs-snapshot
+  
   build-docs:
-    name: Build documentation
+    name: Build documentation (latest release)
+    # TODO - update to build-docs.yml
     uses: bdunderscore/modular-avatar/.github/workflows/build-test-docs.yml@main
+    needs:
+      - snapshot-docs
+    with:
+      ref: docs-snapshot
+      prerelease: false
+    
+  build-docs-dev:
+    name: Build documentation (main branch)
+    uses: bdunderscore/modular-avatar/.github/workflows/build-test-docs.yml@main
+    with:
+      ref: main
+      path: dev
+      artifact: docs-dev
+      prerelease: true
+
   deploy-docs:
     name: Deploy documentation
-    needs: build-docs
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
+    needs: 
+      - build-docs
+      - build-docs-dev
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Download artifact (tagged)
+        uses: actions/download-artifact@v4
         with:
           name: docs
           path: docs/build
 
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+      - name: Download artifact (latest)
+        uses: actions/download-artifact@v4
         with:
-          path: docs/build
+          name: docs-dev
+          path: docs/build/dev
 
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1
+      - name: Dump file listing
+        run: |
+          ls -lR docs/build
+
+      - name: Unpack documentation
+        run: |
+          mkdir -p docs-site~/public/dev
+          tar -xf docs/build/docs.tar -C docs-site~/public
+          tar -xf docs/build/dev/docs.tar -C docs-site~/public/dev
+      
+      - name: Setup yarn 2.0
+        run: |
+          corepack enable
+          corepack prepare yarn@stable --activate
+          
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(cd docs-site~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-site-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-site-
+          
+      - name: Build CF site
+        run: |
+          cd docs-site~
+          YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
+          
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          command: deploy --name modular-avatar-docs
+          workingDirectory: docs-site~
+          
+      - name: Purge cache
+        uses: nathanvaughn/actions-cloudflare-purge@784d555fc0fc48946a1e34873a43fc8cf634bcfa
+        continue-on-error: true
+        with:
+          cf_zone: ${{ secrets.CF_ZONE_ID }}
+          cf_auth: ${{ secrets.CF_API_TOKEN }}

.github/workflows/export-gameci-license.yml

@@ -0,0 +1,56 @@
+name: Export GameCI license
+on:
+  workflow_dispatch: {}
+
+jobs:
+  export:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup
+        run: |
+          sudo apt-get -y install gnupg
+          gpg --import <<EOF
+          -----BEGIN PGP PUBLIC KEY BLOCK-----
+          
+          mQGNBGT9rngBDAC92NQAEUXfPlYHESpYjovuSjTwxZBy8R1NR/8czcEnnNUSo09z
+          ygzyRpgvxar5wL00WNY3cF03vXURJCV2FQYrsJEt0zAEQ+hTxwpVFcGjGr4ttI4+
+          HW/kDXeWgH/Fk72eiv6KwmTSVEnjMQAGMOnpPgPxh9Brj0n3wQjp9WinEwRX2gFn
+          gSoOQy6tLWtyLD6rYHDvAZ5FpSuuLqZfc3miHPcrs62IpeE6MaC4FGy7QLCnkL3X
+          JBKYY4Y3/nsiNUv+I2U8laJ1CkUDZfoJ/t6XP35n4PCD/phOxa5E96hrGQqlIrnL
+          vdYWVlZL/Wv+v7v/9taXcQUrqeKudFar2xFkH+LmBs6NRJUf84zRWpJhOTYS7Owo
+          JqJX1GSeZjDbUc/pDX6RIz6iG/cjcCbooLwCtu/oCGJtznVD/bBxnmdmP20UK4Zd
+          JuaG05/FbSM+dtBpAQ68yejloCngPuIYZYcvRi3l/rDl6+IwjsFEzg02yr8Cx6bQ
+          d/gKL3W54Gn4Q5sAEQEAAbQXYmRfYmRfIDxiZF9AbmFkZW5hLmRldj6JAdQEEwEK
+          AD4WIQQgqEPycUKGtLegx/izugd8bgW0LgUCZP2ueAIbAwUJA8JnAAULCQgHAgYV
+          CgkICwIEFgIDAQIeAQIXgAAKCRCzugd8bgW0LnZkDACXHH2lIGemnMvpF+vfUlWt
+          24CYbitrkNyEzFXf+Ya4XssL/9vacXhlPvW04vYRpZAPcqTZxuziLKWTigkymj+k
+          ufRfhK9+XbZQHp10rLiG53o/SM8azXyYFH6PrFJERPD6O1hbTwwfcpfKN3GiNQCM
+          1Oe1Ao/orI/hIViRlMrD8xEjNgZB/5FDzGIYZxsRzjX0Psm+Xmh92DueCf9oVFXe
+          et1wPaxqzP7+YqvrzgTLVksEtieYiauElsEpGcVobVGupKI2K4Du+j2yffPPQJyU
+          fSjw1Xdlpho2ZQu21bMXpl3vQswnkyrfBAIEqd6EsTZFk8B8Xv99U4Jy7fUouf8l
+          8QlCOWIDv0z2mt5OKqGhQuEbKKTmTRIBWnBIfDsE0tZSmInVbChPfefGRTP3Jj2W
+          0Y66yc4rIN560wnwB7yMccgC/hISBb1jsZCW+c87NSDkUz3dgwWVCJQ1sOb5L7Sc
+          ZpfWffOxPewWUjOwTpPXmjoj5YPvGvcC+73gKIgdVn25AY0EZP2ueAEMAMZTMq8X
+          B5I+QsNGkim/bOORflezCPDJYc2ivpdxdiEKSwyj5s9NTJ/huwi/6wnfZ1/EY7L1
+          NOg5MP7V6OXsiQd+i/KNq1pl24UsmAJr4bfVM1D6Kkgg8iC3pBqabFWAQ6Vlh0TK
+          lXAcUGC7VO4BGmdDGp+f9n4tOa7ieDiH0LIsKkj/nVa2chPnvycruNtgOLQ3iusy
+          7DhlacdKFN56n1/somuhfk0t6bIEI3b0d4c2Htu81Xtpm8bkzhwmm9fw6bTBjTjh
+          UtFraj2vmybfujqqofh0FHDz8BJsrZYkQtKmnBGR+9HWGiWuEVx2lQHj4xN/7E8d
+          I+liA+sJtPON3lfBybsEkTx0GwPmwvZ2LnC7dCx8v/aMQMPy7AsnP2SxAkKPKJc7
+          hIeAkobTbQjBHuk+PelimnvUdmdPg+RR4eUDmpCOlRib6x3WKnadOafsO96hAoUg
+          kbcwwlML3TQSauBVbov1ZlLYtXpCQalX0DwdGWvHDHFTXSyvY0IJ36vCFwARAQAB
+          iQG8BBgBCgAmFiEEIKhD8nFChrS3oMf4s7oHfG4FtC4FAmT9rngCGwwFCQPCZwAA
+          CgkQs7oHfG4FtC4cVwv/QHDqWDfJXXRArbsn+n/xofgnt1sB2KwvRaA/DQpI5zk8
+          AFXbqwPClIf+8kvTgGEgDdIBAmLcj5ZEqbu5Y25sbSlNY4Kbk1nYSwan3Jwpakgo
+          04zwPiThLO0kboJ+dsu4TUX8qN1hYRcgomHDe1DocVsvX4Bp+JA809+iCk5FKD95
+          OKeeo++Ulyzigf49qUe70HkqI+LYo4S5nN+EyiqMrcjh4NXDgJkPxt/rCClQVbVi
+          zotM3zo5iqy8sV/GsVzIr6LapxIvfIvrgcchShwLMhl7xy9WhaASdzv/+VnJZrmQ
+          6i6gqZ6fHz/RPeEWdoMU+OojoiQHpjyVsLv8Vj4pilzVKdqofTQ6tyMv6i37C7SJ
+          6OqdaNUCVlM4iFCjm8fg/L+LXIIhmjhdmXtaPDgYwwwcpK2n5IcItp526+6Bu2Wt
+          VhTIRf5zG/qTj/r3P+jrApgbtDpaJST/hrRaqCYiOxkJU2krrrBy9ttq9h4lSiiZ
+          6nL+CD9YfkV6cDH7BWlz
+          =So9v
+          -----END PGP PUBLIC KEY BLOCK-----
+          EOF
+  
+          echo "foo" | gpg --encrypt -a --recipient bd_@nadena.dev

.github/workflows/gameci.yml

@@ -0,0 +1,203 @@
+#  MIT License
+#
+#  Copyright (c) 2022 anatawa12
+#  Copyright (c) 2022 bd_
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+
+
+name: GameCI
+
+on:
+  push:
+    branches: [main, dev, ci, refactor-structure]
+  # This is a bit of a radioactive event; we need to be very careful with what permissions
+  # we assign this action, as we're allowing arbitrary code execution with the context of
+  # whatever permissions we assign.
+  pull_request_target: {}
+  workflow_dispatch: {}
+  workflow_call:
+    secrets:
+      UNITY_LICENSE:
+        required: true
+
+# pull_request_target grants access to a privileged GITHUB_TOKEN by default, revoke this
+permissions: {}
+
+jobs:
+  build-and-test:
+    name: Unit tests
+    strategy:
+      matrix:
+        unity_major_version: [ 2022 ]
+        sdk: [ vrcsdk ]
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      contents: read
+    steps:
+      - id: configure
+        name: Configure
+        env:
+          unity_major_version: ${{ matrix.unity_major_version }}
+        run: |
+          if [ $unity_major_version == 2019 ]; then
+            echo "unity_version=2019.4.31f1" >> $GITHUB_OUTPUT
+          elif [ $unity_major_version == 2022 ]; then
+            echo "unity_version=2022.3.6f1" >> $GITHUB_OUTPUT
+          else
+            echo "Invalid unity_major_version: $unity_major_version"
+            exit 1
+          fi 
+      - id: setup
+        name: Setup
+        env:
+          unity_version: ${{ steps.configure.outputs.unity_version }}
+          sdk: ${{ matrix.sdk }}
+        run: |
+          set -x
+          
+          sudo apt-get install xmlstarlet -y
+          
+          should_test=true
+          echo should_test=$should_test >> $GITHUB_OUTPUT
+          
+          can_fail=false
+          if [ $sdk == standalone ]; then
+            can_fail=$should_test
+          fi
+          echo can_fail=$can_fail >> $GITHUB_OUTPUT
+          
+          if $can_fail; then
+            check_name="Unsupported test result ($unity_version, $sdk)"
+          else
+            check_name="Test result ($unity_version, $sdk)"
+          fi
+          echo check_name=$check_name >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@v4
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - id: prepare-project
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        name: Prepare project
+        run: |
+          mkdir .github/ProjectRoot/Packages/nadena.dev.modular-avatar -p
+          mv * .github/ProjectRoot/Packages/nadena.dev.modular-avatar
+          mv .github/ProjectRoot/* .
+          mv 'Packages/nadena.dev.modular-avatar/UnitTests~' 'Packages/nadena.dev.modular-avatar/UnitTests'
+          for i in packages-lock manifest vpm-manifest; do
+            if [ -e "$i-${{ matrix.unity_major_version }}.json" ]; then
+              mv "$i-${{ matrix.unity_major_version }}.json" Packages/$i.json -v
+            fi
+          done
+
+      - uses: anatawa12/sh-actions/setup-vrc-get@master
+
+      - name: Resolve packages
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        run: |
+          vrc-get repo add -- "https://vpm.nadena.dev/vpm-prerelease.json" || true
+          vrc-get repo add -- "https://vrchat.github.io/packages/index.json?download" || true
+          vrc-get resolve --project .
+          vrc-get info project --project .
+
+      - if: ${{ steps.setup.outputs.should_test == 'true' }}
+        name: "Debug: List project contents"
+        run: |
+          ls -lR
+          ls -lR Packages/nadena*
+          
+      - if: ${{ steps.setup.outputs.should_test == 'true' }}
+        name: "Debug: List package versions"
+        run: |
+          for i in Packages/*/package.json; do
+            echo $i
+            cat $i | jq .version
+          done
+
+      - uses: actions/cache@v4
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        with:
+          path: Library
+          key: Library-${{ steps.configure.outputs.unity_version }}-${{ matrix.sdk }}
+          restore-keys: Library-
+
+      - uses: game-ci/unity-test-runner@v3
+        id: gameci
+        continue-on-error: ${{ steps.setup.outputs.can_fail == 'true' }}
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        env:
+          # meh, just a personal license...
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+        with:
+          testMode: EditMode
+          unityVersion: ${{ steps.configure.outputs.unity_version }}
+          githubToken: ${{ github.token }}
+          coverageOptions: generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+nadena.dev.*
+          customParameters: -nographics -assemblyNames Tests
+          checkName: ${{ steps.setup.outputs.check_name }}
+
+      # For our main "supported" platforms, we report the conclusion of gameci as-is. However, for standalone, we report
+      # neutral if it failed.
+      - id: determine_conclusion
+        name: Determine conclusion
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        env:
+          unity_version: ${{ steps.configure.outputs.unity_version }}
+          sdk_platform: ${{ matrix.sdk }}
+          gameci_outcome: ${{ steps.gameci.outcome }}
+          can_fail: ${{ steps.setup.outputs.can_fail }}
+        run: |
+          set -x
+          outcome=$gameci_outcome          
+          
+          # Check whether any tests actually ran
+          test_count=$(
+              if ! cat ${{ steps.gameci.outputs.artifactsPath }}/editmode-results.xml | \
+                    xmlstarlet sel -t -v "/test-run/@total"; then
+                echo 0
+              fi
+          )
+          
+          if [ $test_count -eq 0 ] || [ x$test_count == x ]; then
+            outcome=failure
+            output="{ \"summary\": \"No tests ran\" }"
+          
+            if ! $can_fail; then
+              exit 1
+            fi
+          else
+            output="{ \"summary\": \"Result: $outcome ($test_count tests)\" }"
+          fi
+          
+          if [ "$outcome" == "failure" ] && $can_fail; then
+            outcome=neutral
+          fi
+          echo matrix_outcome=$outcome >> $GITHUB_OUTPUT
+          echo matrix_output=$output >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ steps.setup.outputs.should_test == 'true' && matrix.sdk == 'vrcsdk' }}
+        continue-on-error: true
+        with:
+          name: Coverage results ${{ steps.configure.outputs.unity_version }} ${{ matrix.sdk }}
+          path: ${{ steps.gameci.outputs.coveragePath }}

.github/workflows/gamici-activation.yml

@@ -0,0 +1,39 @@
+#  MIT License
+#
+#  Copyright (c) 2022 anatawa12
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+
+name: GameCI Acquire activation file
+on:
+  workflow_dispatch: {}
+jobs:
+  activation:
+    name: Request manual activation file 🔑
+    runs-on: ubuntu-latest
+    steps:
+      # Request manual activation file
+      - name: Request manual activation file
+        id: getManualLicenseFile
+        uses: game-ci/unity-request-activation-file@v2
+      - name: Expose as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
+          path: ${{ steps.getManualLicenseFile.outputs.filePath }}

.github/workflows/perform-release.yml

@@ -0,0 +1,231 @@
+name: Perform Release
+
+# Portions of this workflow are based on https://github.com/anatawa12/AvatarOptimizer/blob/master/.github/workflows/release.yml
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_kind:
+        type: choice
+        description: The type of release.
+        default: prerelease
+        required: true
+        options:
+          - prerelease
+          - stable
+          - adhoc
+      publish:
+        description: "True to publish release to git, vpm. if false, this creates release asset only"
+        type: boolean
+        required: false
+      version:
+        description: "Version to release"
+        type: string
+        required: false
+        
+env:
+  PKG_NAME: nadena.dev.modular-avatar
+  RELEASE_TYPE: ${{ github.event.inputs.release_kind }}
+
+concurrency:
+  group: publish
+  cancel-in-progress: true
+
+permissions: write-all
+
+jobs:
+  check-gameci:
+    uses: bdunderscore/modular-avatar/.github/workflows/gameci.yml@main
+    permissions:
+      checks: write
+      contents: read
+    secrets: inherit
+  
+  check-docs:
+    name: Build documentation (latest release)
+    uses: bdunderscore/modular-avatar/.github/workflows/build-test-docs.yml@main
+  
+  create-release:
+    needs: [ check-gameci, check-docs ]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      # https://github.com/orgs/community/discussions/13836#discussioncomment-8535364
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.RELEASER_APP_ID }}
+          private-key: ${{ secrets.RELEASER_PRIVATE_KEY }}
+
+      - name: Validate prerelease version
+        id: check-version
+        if: ${{ github.event.inputs.release_kind == 'prerelease' && !contains(github.event.inputs.version, '-') }}
+        run:
+          echo "Prerelease version must contain a hyphen"
+          exit 1
+
+      - name: Validate stable version
+        id: check-version-stable
+        if: ${{ github.event.inputs.release_kind == 'stable' && contains(github.event.inputs.version, '-') }}
+        run:
+          echo "Stable version must not contain a hyphen"
+          exit 1
+
+      - name: Validate adhoc
+        id: validate-adhoc
+        if: ${{ github.event.inputs.release_kind == 'adhoc' && github.event.inputs.publish == 'true' }}
+        run:
+          echo "Adhoc release cannot be published"
+          exit 1
+
+      - name: Set Environment Variables
+        run: |
+          echo "zipFile=${{ env.PKG_NAME }}-${{ github.event.inputs.version }}".zip >> $GITHUB_ENV
+          echo "unityPackage=${{ env.PKG_NAME }}-${{ github.event.inputs.version }}.unitypackage" >> $GITHUB_ENV
+
+          echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+
+          case "$RELEASE_TYPE" in
+            prerelease)
+              echo "PRERELEASE=true" >> $GITHUB_ENV
+              ;;
+            stable)
+              echo "PRERELEASE=false" >> $GITHUB_ENV
+              ;;
+            adhoc)
+              echo "PRERELEASE=true" >> $GITHUB_ENV
+              ;;
+          esac
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Checkout logo assets
+        uses: actions/checkout@v4
+        if: ${{ github.event.inputs.release_kind != 'adhoc' }}
+        with:
+          repository: bdunderscore/modular-avatar-images
+          path: .github/image-assets
+      - name: Inject logo assets
+        if: ${{ github.event.inputs.release_kind != 'adhoc' }}
+        run: |
+          cp -f .github/image-assets/img/logo/ma_logo.png Editor/Images/logo.png
+          cp -f .github/image-assets/img/logo/ma_icon.png Runtime/Icons/Icon_MA_Script.png
+
+      - name: Check semver syntax
+        if: steps.check-tag.outputs.need-new-tag == 'true'
+        id: semver-check
+        run: |
+          chmod +x .github/workflows/*.sh
+          .github/workflows/check-semver-syntax.sh ${{ github.event.inputs.version }}      
+
+      - name: Set git user and email
+        id: git-config
+        run: |
+          git config --global user.name "nadena.dev release bot"
+          git config --global user.email "ci@nadena.dev"
+      - name: Update version
+        id: update-version
+        run: |
+          jq '.version = env.VERSION' package.json > package.json.tmp
+          mv package.json.tmp package.json
+        env:
+          VERSION: ${{ github.event.inputs.version }}
+
+
+      - name: Update changelog
+        id: changelog
+        run: |
+          chmod +x .github/*.pl
+
+          if [ "${{ env.PRERELEASE }}" == "true" ]; then
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-en.md
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-jp.md
+          else
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }}
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }}
+            ./.github/cut-changelog.pl CHANGELOG.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-en.md
+            ./.github/cut-changelog.pl CHANGELOG-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-jp.md
+          fi
+
+          echo Version ${{ env.VERSION }} > release-note.md
+          echo >> release-note.md
+          if [ "${{ env.PRERELEASE }}" == "true" ]; then
+            echo '**This is a prerelease version.** There may be bugs, and API compatibility is not yet guaranteed.' >> release-note.md
+            echo 'Please: **BACK UP YOUR PROJECTS**' >> release-note.md
+            echo >> release-note.md
+          fi
+          echo '## Notable changes' >> release-note.md
+          cat .github/relnote-en.md >> release-note.md
+          echo >> release-note.md
+          echo '## 主な変更点' >> release-note.md
+          cat .github/relnote-jp.md >> release-note.md
+          
+      - name: Upload CHANGELOG.md
+        if: ${{ github.event.inputs.release_kind == 'stable' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: CHANGELOG
+          path: CHANGELOG.md
+      - name: Upload CHANGELOG-PRERELEASE.md
+        if: ${{ github.event.inputs.release_kind == 'prerelease' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: CHANGELOG-PRERELEASE
+          path: CHANGELOG-PRERELEASE.md
+      - name: Upload release note
+        uses: actions/upload-artifact@v4
+        with:
+          name: changelog
+          path: release-note.md
+      - run: mv release-note.md .github
+
+      - name: Commit and tag version update
+        run: |
+          git commit -am "Release ${{ github.event.inputs.version }}"
+          git tag -a ${{ github.event.inputs.version }} -m "Release ${{ github.event.inputs.version }}"
+      - name: Publish tag
+        if: ${{ github.event.inputs.publish == 'true' }}
+        run: |
+          BRANCH_NAME=$(git branch --show-current)
+          git push origin $BRANCH_NAME && git push origin ${{ github.event.inputs.version }}
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+
+      - name: Create Zip
+        run: |
+          zip ".github/${{env.zipFile}}" ./* -r -x .github .git '.git/*' '*~/*' '*.ps1*'
+
+      - name: Move zipfile
+        run: |
+          mv .github/${{env.zipFile}} ${{env.zipFile}}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: package-zip
+          path: ${{ env.zipFile }}
+
+      - name: Dump release notes
+        run: |
+          cat .github/release-note.md
+
+      - name: Make Release
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
+        if: ${{ github.event.inputs.publish == 'true' }}
+        with:
+          draft: true
+          body_path: .github/release-note.md
+          tag_name: ${{ github.event.inputs.version }}
+          name: ${{ github.event.inputs.version }}
+          make_latest: ${{ github.event.inputs.release_kind == 'stable' }}
+          files: |
+            ${{ env.zipFile }}
+            package.json

.github/workflows/test-docs-site-build.yml

@@ -0,0 +1,50 @@
+name: Test docs-site yarn installation
+on:
+  push:
+    branches:
+      - ci
+  pull_request:
+
+jobs:
+  build-docs:
+    name: Build documentation site
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - uses: actions/checkout@v4
+
+      - name: Setup yarn 2.0
+        run: |
+          corepack enable
+          corepack prepare yarn@stable --activate
+          yarn --version
+
+      #- name: Get yarn cache directory path
+      #  id: yarn-cache-dir-path
+      #  run: echo "dir=$(cd docs-site~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        if: false
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-site-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-site-
+
+      - name: Build CF site
+        run: |
+          cd docs-site~
+          YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
+
+      - name: Display diff on failure
+        if: ${{ failure() }}
+        run: |
+          cd docs-site~
+          env
+          YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install && git diff
+
+

.github/workflows/trigger-repo-rebuild.yml

@@ -1,4 +1,4 @@
-name: Trigger repo listing generator
+name: Trigger repo listing generator
 
 on:
   release:
@@ -9,7 +9,7 @@ jobs:
   dispatch:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.VPM_REPO_TOKEN }}
           script: |

.gitignore

@@ -1,73 +1,3 @@
-# This .gitignore file should be placed at the root of your Unity project directory
-#
-# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
-#
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/[Ll]ogs/
-/[Mm]emoryCaptures/
-
-# Asset meta data should only be ignored when the corresponding asset is also ignored
-!/[Aa]ssets/**/*.meta
-
-# Uncomment this line if you wish to ignore the asset store tools plugin
-# /[Aa]ssets/AssetStoreTools*
-
-# Autogenerated Jetbrains Rider plugin
-[Aa]ssets/Plugins/Editor/JetBrains*
-
-# Visual Studio cache directory
-.vs/
-
-# Gradle cache directory
-.gradle/
-
-# Autogenerated VS/MD/Consulo solution and project files
-ExportedObj/
-.consulo/
-*.csproj
-*.unityproj
-*.sln
-*.suo
-*.tmp
-*.user
-*.userprefs
-*.pidb
-*.booproj
-*.svd
-*.pdb
-*.mdb
-*.opendb
-*.VC.db
-
-# Unity3D generated meta files
-*.pidb.meta
-*.pdb.meta
-*.mdb.meta
-
-# Unity3D generated file on crash reports
-sysinfo.txt
-
-# Builds
-*.apk
-*.unitypackage
-
-# Crashlytics generated file
-crashlytics-build.properties
-
-/UpstreamAssets/
-/.idea/
-
-/Assets/**/*
-
-!/Assets/.gitkeep
-!/Assets/bd_/
-!/Assets/bd_/ModularAvatar/
-!/Assets/bd_/ModularAvatar/.gitkeep
-!/Assets/bd_/ModularAvatar.meta
-!/Assets/bd_.meta
-
-![Mm]odular[Aa]vatar.meta
+UnitTests
+UnitTests.meta
+/UnitTests/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Packages/nadena.dev.ndmf"]
+	path = Packages/nadena.dev.ndmf
+	url = https://github.com/bdunderscore/ndmf.git

Assets.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 45facc2394ac4e6d9c6a8427227dc931
+timeCreated: 1691906506

Assets/FixedPrefab.prefab

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4316036803263603590
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8830680306940261232}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8830680306940261232
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4316036803263603590}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/FixedPrefab.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 78828bfbcb4cb4ce3b00de044eb2d927
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

CHANGELOG-PRERELEASE-jp.md

@@ -0,0 +1,133 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.13.0-alpha.1] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Treeにて、メインアバターFXレイヤーと同じ名前のintやboolパラメーターがBlend Treeに含まれている場合、
+  パラメーター型が修正されない問題を修正
+- [#1553] リアクティブコンポーネントが生成するステートに、WD設定が正しくない問題を修正
+- [#1555] VRC Animator Play Audioが、Audio Sourceまでの絶対パスで設定されている場合に、相対パスのMerge Animator
+    コンポーネントとマージされた場合、指定されたオブジェクトが存在しないことを検出し、参照を絶対パスとして扱うように修正
+  - 対象のパスにオブジェクトがある場合は、相対パスとして扱われます。安定性向上のためMerge Animatorコンポーネントと同じ
+  　指定方法を使用することをお勧めします。
+
+### Changed
+- [#1551] Merge Animatorは、遷移のない単一のstateを持つブレンドツリーのレイヤーに対して常にWDをONに設定します。
+  - 一部、以前の挙動に依存したアセットとの互換性を向上させるための変更です。
+
+## [1.13.0-alpha.0] - [2025-04-08]
+
+### Added
+- (実験的機能) VRC以外のプラットフォームのサポートを有効化
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
+
+### Changed
+- [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
+　    ブレンドツリーを含む場合は一致させないように変更されました。
+  - これにより、1.12で導入された互換性の問題が修正されます（1.12.0では、単一のstateアニメーションクリップに対してWD設定
+    と一致しないように変更されました）。
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] アニメーターパラメーターをアニメーションさせるカーブが、`Merge Motion` コンポーネントを使用して追加された場合、
+  `Rename Parameters` によって更新されない問題を修正``
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatarが新しく作成したプロジェクトでコンパイラエラーを出す問題を修正
+
+## [1.12.0] - [2025-04-01]
+
+### Fixed
+- [#1531] lylicalInventoryとの互換性問題を修正
+
+### Changed
+- [#1530] `MA Menu Item`の自動パラメーター機能も、オブジェクトのパスに基づいて名前を割り当てるようになりました。
+
+## [1.12.0-rc.1] - [2025-03-28]
+
+### Added
+- [#1524] MMDワールド対応をアバター全体で無効にする機能を追加
+
+### Fixed
+- [#1522] `Convert Constraints` がアニメーション参照を変換できない問題を修正
+- [#1528] `Merge Animator` が `アバターのWrite Defaults設定に合わせる` 設定を無視し、常に合わせてしまう問題を修正
+
+### Changed
+- [#1529] `MA Parameters` の自動リネームは、オブジェクトのパスに基づいて新しい名前を割り当てるように変更されました。これにより、
+  `MA Sync Parameter Sequence` との互換性が向上します。
+  - `MA Sync Parameter Sequence` を使用している場合は、このバージョンに更新した後、SyncedParamsアセットを空にして、
+    すべてのプラットフォームを再アップロードすることをお勧めします。
+
+## [1.12.0-rc.0] - [2025-03-22]
+
+### Fixed
+- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
+- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮が壊れる問題を修正
+
+### Changed
+- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました
+
+## [1.12.0-beta.0] - [2025-03-17]
+
+### Added
+- [#1497] CHANGELOGをドキュメンテーションサイトに追加
+- [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加
+- [#1481] [World Scale Object](https://m-a.nadena.dev/dev/ja/docs/reference/world-scale-object)を追加
+- [#1489] [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を追加
+
+### Fixed
+- [#1492] 前回のプレリリースでアイコンとロゴアセットが間違っていた問題を修正
+- [#1501] MA Parametersコンポーネントのテキスト入力欄を編集する際にUnityのキーボードショートカットが機能しない問題を修正
+- [#1410] 同期レイヤー内のモーションオーバーライドがBone Proxy/Merge Armatureオブジェクトの移動に対して更新されない問題を修正
+- [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更
+  - これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します
+
+### Changed
+- [#1483] Merge Animator の 「アバターの Write Defaults 設定に合わせる」設定では、Additiveなレイヤー、および単一Stateかつ遷移のないレイヤー
+　に対してはWrite Defaultsを調整しないように変更。
+- [#1429] Merge Armature は、特定の場合にPhysBoneに指定されたヒューマノイドボーンをマージできるようになりました。
+  - 具体的には、子ヒューマノイドボーンがある場合はPhysBoneから除外される必要があります。
+- [#1437] Create Toggle for Selectionにおいて、複数選択時時に必要に応じてサブメニューを生成し、子としてトグルを生成するように変更されました。
+- [#1499] `Object Toggle`で制御される`Audio Source`がアニメーションブロックされたときに常にアクティブにならないように、
+  アニメーションがブロックされたときにオーディオソースを無効にするように変更。
+- [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。
+  詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
+- [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。
+
+## [1.12.0-alpha.2] - [2025-03-10]
+
+### Added
+- Added CHANGELOG files
+
+### Changed
+- [#1476] ModularAvatarMergeAnimator と ModularAvatarMergeParameter を新しい NDMF API (`IVirtualizeMotion` と `IVirtualizeAnimatorController`) を使用するように変更
+
+## Older versions
+
+Please see CHANGELOG.md

CHANGELOG-PRERELEASE-jp.md.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2f89fef1421c4126b6086156ff536d8f
+timeCreated: 1741573199

CHANGELOG-PRERELEASE.md

@@ -0,0 +1,135 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.13.0-alpha.1] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Tree failed to correct parameter types when the main avatar FX layer contained an int or bool
+  parameter with the same name as one used in the blend tree.
+- [#1553] Reactive components might generate states with incorrect write default settings
+- [#1555] Fixed compatibility regression from 1.11.x: VRC Animator Play Audio, when configured with an absolute path
+  but merged with a relative-path merge animator component, will now detect that the indicated object does not
+  exist, and treat the reference as an absolute path.
+  - Note that if there is an object in the target path, then it will be treated as a relative path. Using
+    addressing for Play Audio behaviors consistent with Merge Animator settings is therefore recommended as it will be
+    more robust.
+
+### Changed
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+  - This fixes compatibility issues with assets which relied on the prior behavior.
+
+## [1.13.0-alpha.0] - [2025-04-08]
+
+### Added
+- (Experimental feature) Enabled support for non-VRC platforms
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
+
+### Changed
+- [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
+  but not if it contains a blend tree. This fixes some compatibility issues introduced in 1.12 (where the behavior
+  was changed to not match WD settings for single-state animation clips).
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] Curves which animated animator parameters, when added using a `Merge Motion` component, would not be updated by
+  `Rename Parameters`
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatar has compiler errors in a newly created project
+
+## [1.12.0] - [2025-04-01]
+
+### Fixed
+- [#1531] Fix compatibility issue with lylicalInventory
+
+### Changed
+- [#1530] `MA Menu Item` auto parameters now also assign names based on object paths
+
+## [1.12.0-rc.1] - [2025-03-28]
+
+### Added
+- [#1524] Added support for disabling MMD world handling at an avatar level
+
+### Fixed
+- [#1522] `Convert Constraints` failed to convert animation references
+- [#1528] `Merge Animator` ignored the `Match Avatar Write Defaults` setting and always matched
+
+### Changed
+- [#1529] `MA Parameters` auto-rename now assigns new names based on the path of the object. This should improve
+  compatibility with `MA Sync Parameter Sequence`
+  - If you are using `MA Sync Parameter Sequence`, it's a good idea to empty your SyncedParams asset and reupload all
+    platforms after updating to this version.
+
+## [1.12.0-rc.0] - [2025-03-22]
+
+### Fixed
+- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
+  not divisible by four.
+- [#1513] Expression menu icon compression broke on iOS builds
+
+### Changed
+- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees
+
+## [1.12.0-beta.0] - [2025-03-17]
+
+### Added
+- [#1497] Added changelog to docs site
+- [#1482] Added support for replacing pre-existing animator controllers to `Merge Animator`
+- [#1481] Added [World Scale Object](https://m-a.nadena.dev/dev/docs/reference/world-scale-object)
+- [#1489] Added [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)
+
+### Fixed
+- [#1492] Fixed incorrect icon and logo assets in prior prerelease
+- [#1489] Fixed compatibility issues between `Merge Blend Tree` or reactive components and MMD worlds.
+  See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling.
+- [#1501] Unity keyboard shortcuts don't work when editing text fields on the MA Parameters component
+- [#1410] Motion overrides on synced layers are not updated for Bone Proxy/Merge Armature object movement
+- [#1504] The internal `DelayDisable` layer no longer references unnecessary objects in some situations
+  - This helps improve compatibility with AAO and other tools that track whether objects are animated
+
+### Changed
+- [#1483] The Merge Animator "Match Avatar Write Defaults" option will no longer adjust write defaults on states in
+  additive layers, or layers with only one state and no transitions.
+- [#1429] Merge Armature will now allow you to merge humanoid bones with PhysBones attached in certain cases.
+    - Specifically, child humanoid bones (if there are any) must be excluded from all attached Physbones.
+- [#1437] Create Toggle for Selection now creates submenus as necessary when multiple items are selected, and creates toggles as children.
+- [#1499] When an audio source is controlled by an Object Toggle, disable the audio source when animations are blocked
+  to avoid it unintentionally being constantly active.
+- [#1502] `World Fixed Object` now uses `VRCParentConstraint` and is therefore compatible with Android builds
+
+## [1.12.0-alpha.2] - [2025-03-10]
+
+### Added
+- Added CHANGELOG files
+
+### Changed
+- [#1476] Switch ModularAvatarMergeAnimator and ModularAvatarMergeParameter to use new NDMF APIs (`IVirtualizeMotion` and `IVirtualizeAnimatorController`)
+
+## Older versions
+
+Please see CHANGELOG.md

CHANGELOG-PRERELEASE.md.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cb586a9c85634b8b81015d16899d797b
+timeCreated: 1741571222

CHANGELOG-jp.md

@@ -0,0 +1,99 @@
+# Changelog
+
+Modular Avatarの主な変更点をこのファイルで記録しています。
+なお、プレリリース版の変更点は `CHANGELOG-PRERELEASE.md` に記録されます。
+
+この形式は [Keep a Changelog](https://keepachangelog.com/ja/1.0.0/) に基づいており、
+このプロジェクトは [Semantic Versioning](https://semver.org/lang/ja/) に従っています。
+
+## [Unreleased]
+
+### Added
+- (実験的機能) VRC以外のプラットフォームのサポートを有効化
+
+### Fixed
+- [#1555] VRC Animator Play Audioが、Audio Sourceまでの絶対パスで設定されている場合に、相対パスのMerge Animator
+  コンポーネントとマージされた場合、指定されたオブジェクトが存在しないことを検出し、参照を絶対パスとして扱うように修正
+  - 対象のパスにオブジェクトがある場合は、相対パスとして扱われます。安定性向上のためMerge Animatorコンポーネントと同じ
+  　指定方法を使用することをお勧めします。
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.12.4] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Treeにて、メインアバターFXレイヤーと同じ名前のintやboolパラメーターがBlend Treeに含まれている場合、
+  パラメーター型が修正されない問題を修正
+- [#1553] リアクティブコンポーネントが生成するステートに、WD設定が正しくない問題を修正
+
+### Changed
+- [#1551] Merge Animatorは、遷移のない単一のstateを持つブレンドツリーのレイヤーに対して常にWDをONに設定します。
+  - 一部、以前の挙動に依存したアセットとの互換性を向上させるための変更です。
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
+
+### Changed
+- [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
+　    ブレンドツリーを含む場合は一致させないように変更されました。
+  - これにより、1.12で導入された互換性の問題が修正されます（1.12.0では、単一のstateアニメーションクリップに対してWD設定
+    と一致しないように変更されました）。
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] アニメーターパラメーターをアニメーションさせるカーブが、`Merge Motion` コンポーネントを使用して追加された場合、
+  `Rename Parameters` によって更新されない問題を修正``
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatarが新しく作成したプロジェクトでコンパイラエラーを出す問題を修正
+
+## [1.12.0] - [2025-04-01]
+
+### Added
+- CHANGELOGファイルを追加
+- [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加
+- [#1481] [World Scale Object](https://m-a.nadena.dev/ja/docs/reference/world-scale-object)を追加
+- [#1489] [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を追加
+
+### Fixed
+- [#1460] パラメーターアセットをMA Parametersにインポートするとき、ローカルのみのパラメーターが間違ってアニメーターのみ扱いになる問題を修正
+- [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。
+  - 詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
+  - この動作を無効にするには、新しい `MA VRChat Settings` コンポーネントをアバターの適当なところに追加して、適切な設定を無効にしてください。
+- [#1501] MA Parametersコンポーネントのテキスト入力欄を編集する際にUnityのキーボードショートカットが機能しない問題を修正
+- [#1410] 同期レイヤー内のモーションオーバーライドがBone Proxy/Merge Armatureオブジェクトの移動に対して更新されない問題を修正
+- [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更
+  - これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します
+- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
+- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮処理が壊れる問題を修正
+
+### Changed
+- [#1529] `MA Parameters` の自動リネームと `MA Menu Item` の自動パラメーター機能は、オブジェクトのパスに基づいて名前
+  を割り当てるように変更されました。
+  - `MA Sync Parameter Sequence` を使用している場合は、このバージョンに更新した後、SyncedParamsアセットを空にして、
+    すべてのプラットフォームを再アップロードすることをお勧めします。
+- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました
+- [#1476] ModularAvatarMergeAnimator と ModularAvatarMergeParameter を新しい NDMF API (`IVirtualizeMotion` と `IVirtualizeAnimatorController`) を使用するように変更
+- [#1483] Merge Animator の 「アバターの Write Defaults 設定に合わせる」設定では、Additiveなレイヤー、および単一Stateかつ遷移のないレイヤー
+　に対してはWrite Defaultsを調整しないように変更。
+- [#1429] Merge Armature は、特定の場合にPhysBoneに指定されたヒューマノイドボーンをマージできるようになりました。
+  - 具体的には、子ヒューマノイドボーンがある場合はPhysBoneから除外される必要があります。
+- [#1437] Create Toggle for Selectionにおいて、複数選択時時に必要に応じてサブメニューを生成し、子としてトグルを生成するように変更されました。
+- [#1499] `Object Toggle`で制御される`Audio Source`がアニメーションブロックされたときに常にアクティブにならないように、
+    アニメーションがブロックされたときにオーディオソースを無効にするように変更。
+- [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。
+
+## それより前
+
+GitHubのリリースページをご確認ください: https://github.com/bdunderscore/modular-avatar/releases

CHANGELOG-jp.md.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1417544c34d9a4f4aacebf76247940a9
+guid: b27815ff13397374abcf9547a36bfaf4
 TextScriptImporter:
   externalObjects: {}
   userData: 

CHANGELOG.md

@@ -1 +1,105 @@
-Temporary test release
+# Changelog
+
+All notable changes to this project will be documented in this file.
+Changes between prerelease versions will be documented in `CHANGELOG-PRERELEASE.md` instead.
+
+[日本語版はこちらです。](CHANGELOG-jp.md)
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+- (Experimental feature) Enabled support for non-VRC platforms
+
+### Fixed
+- [#1555] Fixed compatibility regression from 1.11.x: VRC Animator Play Audio, when configured with an absolute path
+  but merged with a relative-path merge animator component, will now detect that the indicated object does not
+  exist, and treat the reference as an absolute path.
+  - Note that if there is an object in the target path, then it will be treated as a relative path. Using
+    addressing for Play Audio behaviors consistent with Merge Animator settings is therefore recommended as it will be
+    more robust.
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.12.4] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Tree failed to correct parameter types when the main avatar FX layer contained an int or bool
+  parameter with the same name as one used in the blend tree.
+- [#1553] Reactive components might generate states with incorrect write default settings
+
+### Changed
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+  - This fixes compatibility issues with assets which relied on the prior behavior.
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
+
+### Changed
+- [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
+  but not if it contains a blend tree. This fixes some compatibility issues introduced in 1.12 (where the behavior
+  was changed to not match WD settings for single-state animation clips).
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] Curves which animated animator parameters, when added using a `Merge Motion` component, would not be updated by
+  `Rename Parameters`
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatar has compiler errors in a newly created project
+
+## [1.12.0] - [2025-04-01]
+
+### Added
+- Added CHANGELOG files
+- [#1482] Added support for replacing pre-existing animator controllers to `Merge Animator`
+- [#1481] Added [World Scale Object](https://m-a.nadena.dev/docs/reference/world-scale-object)
+- [#1489] Added [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)
+
+### Fixed
+- [#1460] When importing parameter assets in MA Parameters, "local only" parameters were incorrectly treated as
+  "animator only"
+- [#1489] Fixed compatibility issues between `Merge Blend Tree` or reactive components and MMD worlds.
+  - See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling.
+  - To disable this behavior, attach the new `MA VRChat Settings` component to any object on your avatar and disable the appropriate setting.
+- [#1501] Unity keyboard shortcuts don't work when editing text fields on the MA Parameters component 
+- [#1410] Motion overrides on synced layers are not updated for Bone Proxy/Merge Armature object movement
+- [#1504] The internal `DelayDisable` layer no longer references unnecessary objects in some situations
+  - This helps improve compatibility with AAO and other tools that track whether objects are animated 
+- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
+  not divisible by four.
+- [#1513] Expression menu icon compression broke on iOS builds
+
+### Changed
+- [#1529] `MA Parameters` auto-rename and `MA Menu Item`'s automatic parameter feature now assign names based on the
+  path of the object. This should improve compatibility with `MA Sync Parameter Sequence`
+  - If you are using `MA Sync Parameter Sequence`, it's a good idea to empty your SyncedParams asset and reupload all
+    platforms after updating to this version.
+- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees
+- [#1476] Switch ModularAvatarMergeAnimator and ModularAvatarMergeParameter to use new NDMF APIs (`IVirtualizeMotion` and `IVirtualizeAnimatorController`)
+- [#1483] The Merge Animator "Match Avatar Write Defaults" option will no longer adjust write defaults on states in
+  additive layers, or layers with only one state and no transitions.
+- [#1429] Merge Armature will now allow you to merge humanoid bones with PhysBones attached in certain cases.
+  - Specifically, child humanoid bones (if there are any) must be excluded from all attached Physbones. 
+- [#1437] Create Toggle for Selection now creates submenus as necessary when multiple items are selected, and creates toggles as children.
+- [#1499] When an audio source is controlled by an Object Toggle, disable the audio source when animations are blocked
+  to avoid it unintentionally being constantly active.
+- [#1502] `World Fixed Object` now uses `VRCParentConstraint` and is therefore compatible with Android builds 
+
+## Older versions
+
+Please see the github releases page at https://github.com/bdunderscore/modular-avatar/releases

CHANGELOG.md.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1a7454bc513adb84d9ae85ed7e7268ba
+guid: fd88882c757966b4fa90915edb8487b1
 TextScriptImporter:
   externalObjects: {}
   userData: 

COPYING.md

@@ -1,12 +1,11 @@
-Source code is licensed under the MIT license, as reproduced below, with some exceptions:
+Files under Editor/images are licensed for redistribution as part of an official
+modular avatar package only. Please replace them with other images (or delete them)
+if you are making modifications. If you're interested in using the Modular Avatar
+logo as part of your own asset's advertising, please refer to
+https://modular-avatar.nadena.dev/docs/distributing-prefabs/logo-usage .
+
+All other files are under the MIT license.
 
-* Packages/com.vrchat.core.vpm-resolver is distributed under the VRChat Distro license.
-  See [the associated License.md file](Packages/com.vrchat.core.vpm-resolver/License.md) for details.
-* Images under docs/static/img/irasutoya are Copyrighted by, and/or a derivative work of works copyrighted by
-  いらすとや (irasutoya.com). See [their license page](https://www.irasutoya.com/p/terms.html) for license details.
-* The github source code distribution contains placeholder logo assets. The
-  [actual logo assets](https://github.com/bdunderscore/modular-avatar-images) are Copyright (c) Pumo,
-  and for use as part of packaged official modular avatar distributions only.
 ---
 
 MIT License
@@ -29,4 +28,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

Editor/ActiveAnimationRetargeter.cs

@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using nadena.dev.modular_avatar.animation;
+using nadena.dev.ndmf.animator;
+using UnityEditor;
+using UnityEngine;
+using EditorCurveBinding = UnityEditor.EditorCurveBinding;
+using Object = UnityEngine.Object;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    /// <summary>
+    /// The class to retarget m_IsActive animation to moved multiple objects
+    /// </summary>
+    internal class ActiveAnimationRetargeter
+    {
+        private readonly BuildContext _context;
+        private readonly BoneDatabase _boneDatabase;
+        private readonly AnimatorServicesContext _asc;
+        private readonly List<IntermediateObj> _intermediateObjs = new List<IntermediateObj>();
+
+        /// <summary>
+        /// Tracks an object whose Active state is animated, and which leads up to this Merge Animator component.
+        /// We use this tracking data to create proxy objects within the main armature, which track the same active
+        /// state.
+        /// </summary>
+        struct IntermediateObj
+        {
+            /// <summary>
+            /// The path of original object
+            /// </summary>
+            public string OriginalPath;
+
+            /// <summary>
+            /// Name of the intermediate object. Used to name proxy objects.
+            /// </summary>
+            public string Name;
+
+            /// <summary>
+            /// Whether this object is initially active.
+            /// </summary>
+            public bool InitiallyActive;
+
+            /// <summary>
+            /// List of created Intermediate Objects
+            /// </summary>
+            public List<GameObject> Created;
+        }
+
+        public ActiveAnimationRetargeter(
+            BuildContext context,
+            BoneDatabase boneDatabase,
+            Transform root
+        )
+        {
+            _context = context;
+            _boneDatabase = boneDatabase;
+            _asc = context.PluginBuildContext.Extension<AnimatorServicesContext>();
+
+            while (root != null && !RuntimeUtil.IsAvatarRoot(root))
+            {
+                var originalPath = RuntimeUtil.AvatarRootPath(root.gameObject);
+                System.Diagnostics.Debug.Assert(originalPath != null);
+
+                if (_asc.AnimationIndex.GetClipsForObjectPath(originalPath).Any(clip =>
+                        GetActiveBinding(clip, originalPath) != null
+                    ))
+                {
+                    _intermediateObjs.Add(new IntermediateObj
+                    {
+                        OriginalPath = originalPath,
+                        Name = $"{root.gameObject.name}${Guid.NewGuid()}",
+                        InitiallyActive = root.gameObject.activeSelf,
+                        Created = new List<GameObject>(),
+                    });
+                }
+
+                root = root.parent;
+            }
+
+            // currently _intermediateObjs is in child -> parent order.
+            // we want parent -> child order so reverse entire list
+            _intermediateObjs.Reverse();
+        }
+
+        public IEnumerable<GameObject> AddedGameObjects => _intermediateObjs.SelectMany(x => x.Created);
+
+        public GameObject CreateIntermediateObjects(GameObject sourceBone)
+        {
+            for (var i = 0; i < _intermediateObjs.Count; i++)
+            {
+                var intermediate = _intermediateObjs[i];
+                var preexisting = sourceBone.transform.Find(intermediate.Name);
+                if (preexisting != null)
+                {
+                    sourceBone = preexisting.gameObject;
+                    continue;
+                }
+
+                var switchObj = new GameObject(intermediate.Name);
+                switchObj.transform.SetParent(sourceBone.transform, false);
+                switchObj.transform.localPosition = Vector3.zero;
+                switchObj.transform.localRotation = Quaternion.identity;
+                switchObj.transform.localScale = Vector3.one;
+                switchObj.SetActive(intermediate.InitiallyActive);
+
+                if (i == 0)
+                {
+                    // This new leaf can break parent bone physbones. Add a PB Blocker
+                    // to prevent this becoming an issue.
+                    switchObj.GetOrAddComponent<ModularAvatarPBBlocker>();
+                }
+
+                intermediate.Created.Add(switchObj);
+
+                sourceBone = switchObj;
+
+                // Ensure mesh retargeting looks through this 
+                _boneDatabase.AddMergedBone(sourceBone.transform);
+                _boneDatabase.RetainMergedBone(sourceBone.transform);
+            }
+
+            return sourceBone;
+        }
+
+        public void FixupAnimations()
+        {
+            foreach (var intermediate in _intermediateObjs)
+            {
+                var path = intermediate.OriginalPath;
+
+                foreach (var clip in _asc.AnimationIndex.GetClipsForObjectPath(path))
+                {
+                    var curve = GetActiveBinding(clip, path);
+                    if (curve != null)
+                    {
+                        foreach (var mapping in intermediate.Created)
+                        {
+                            clip.SetFloatCurve(_asc.ObjectPathRemapper.GetVirtualPathForObject(mapping), typeof(GameObject), "m_IsActive",
+                                curve);
+                        }
+                    }
+                }
+            }
+        }
+
+        private AnimationCurve GetActiveBinding(VirtualClip clip, string path)
+        {
+            return clip.GetFloatCurve(EditorCurveBinding.FloatCurve(path, typeof(GameObject), "m_IsActive"));
+        }
+    }
+}

Editor/ActiveAnimationRetargeter.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7ebce0ceba4d48c48992702b5c446936
+timeCreated: 1691915242

Editor/Animation.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1058b5946fb23674cad310b1f4bd5b61
+guid: 9aeea331419795c41a97112c489b1632
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/Animation/FixupAbsolutePlayAudioPass.cs

@@ -0,0 +1,46 @@
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
+using nadena.dev.modular_avatar.core;
+using nadena.dev.ndmf;
+using nadena.dev.ndmf.animator;
+using VRC.SDK3.Avatars.Components;
+
+namespace nadena.dev.modular_avatar.animation
+{
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
+    public class FixupAbsolutePlayAudioPass : Pass<FixupAbsolutePlayAudioPass>
+    {
+        protected override void Execute(BuildContext context)
+        {
+            // Older versions of modular avatar did not adjust Animator Play Audio paths when they were absolute paths.
+            // Replicate this behavior here.
+
+            // Note that this runs before any object movement.
+
+            var asc = context.Extension<AnimatorServicesContext>();
+
+            foreach (var mama in context.AvatarRootTransform.GetComponentsInChildren<ModularAvatarMergeAnimator>(true))
+            {
+                if (!mama._wasRelative) continue;
+
+                var pathPrefix = asc.ObjectPathRemapper.GetVirtualPathForObject(mama.gameObject) + "/";
+
+                foreach (var state in asc.ControllerContext.Controllers[mama].AllReachableNodes()
+                             .OfType<VirtualState>())
+                {
+                    foreach (var behavior in state.Behaviours.OfType<VRCAnimatorPlayAudio>())
+                    {
+                        if (asc.ObjectPathRemapper.GetObjectForPath(behavior.SourcePath) != null) continue;
+                        if (behavior.SourcePath.StartsWith(pathPrefix))
+                        {
+                            behavior.SourcePath = behavior.SourcePath.Substring(pathPrefix.Length);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif

Editor/Animation/FixupAbsolutePlayAudioPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a763cbc4bac94063b6b084ea3f4d8206
+timeCreated: 1744422528

Editor/Animation/GameObjectDisableDelayPass.cs

@@ -0,0 +1,128 @@
+#if MA_VRCSDK3_AVATARS
+using System.Linq;
+using nadena.dev.modular_avatar.core.editor;
+using nadena.dev.ndmf;
+using nadena.dev.ndmf.animator;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEngine;
+using VRC.SDK3.Avatars.Components;
+using BuildContext = nadena.dev.ndmf.BuildContext;
+
+namespace nadena.dev.modular_avatar.animation
+{
+    /// <summary>
+    ///     This pass delays turning GameObjects OFF by one frame when those objects control a ReadableProperty. This
+    ///     ensures that we don't expose hidden meshes when removing articles of clothing, for example.
+    /// </summary>
+    internal class GameObjectDelayDisablePass : Pass<GameObjectDelayDisablePass>
+    {
+        protected override void Execute(BuildContext context)
+        {
+            var asc = context.Extension<AnimatorServicesContext>();
+            var activeProxies = context.GetState<ReadablePropertyExtension.Retained>().proxyProps
+                .ToDictionary(kv => kv.Key, kv => kv.Value);
+            if (activeProxies.Count == 0) return;
+
+            // Filter any proxies not used in animator transitions
+            var usedProxies = asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX]
+                .AllReachableNodes().OfType<VirtualTransitionBase>()
+                .SelectMany(t => t.Conditions)
+                .Select(c => c.parameter)
+                .ToHashSet();
+
+            foreach (var proxyBinding in activeProxies.ToList())
+            {
+                if (!usedProxies.Contains(proxyBinding.Value))
+                {
+                    activeProxies.Remove(proxyBinding.Key);
+                }
+            }
+            
+            var fx = asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX];
+            if (fx == null) return;
+            
+            var nullMotion = new AnimationClip();
+            nullMotion.name = "NullMotion";
+            
+            var blendTree = new BlendTree();
+            blendTree.blendType = BlendTreeType.Direct;
+            blendTree.useAutomaticThresholds = false;
+
+            blendTree.children = activeProxies
+                .Select(prop => GenerateDelayChild(nullMotion, (prop.Key, prop.Value)))
+                .ToArray();
+
+            var layer = fx.AddLayer(LayerPriority.Default, "DelayDisable");
+            var state = layer.StateMachine.AddState("DelayDisable");
+            layer.StateMachine.DefaultState = state;
+
+            state.WriteDefaultValues = true;
+            state.Motion = asc.ControllerContext.Clone(blendTree);
+
+            // Ensure the initial state of readable props matches the actual state of the gameobject
+            foreach (var controller in asc.ControllerContext.GetAllControllers())
+            {
+                foreach (var (binding, prop) in activeProxies)
+                {
+                    var obj = asc.ObjectPathRemapper.GetObjectForPath(binding.path);
+
+                    if (obj != null && controller.Parameters.TryGetValue(prop, out var p))
+                    {
+                        p.defaultFloat = obj.activeSelf ? 1 : 0;
+                        controller.Parameters = controller.Parameters.SetItem(prop, p);
+                    }
+                }
+            }
+        }
+
+        private ChildMotion GenerateDelayChild(Motion nullMotion, (EditorCurveBinding, string) binding)
+        {
+            var ecb = binding.Item1;
+            var prop = binding.Item2;
+
+            var motion = new AnimationClip();
+            var curve = new AnimationCurve();
+            curve.AddKey(0, 1);
+            AnimationUtility.SetEditorCurve(motion, ecb, curve);
+
+            // Occasionally, we'll have a very small value pop up, probably due to FP errors.
+            // To correct for this, instead of directly using the property in the direct blend tree,
+            // we'll use a 1D blend tree to give ourselves a buffer.
+
+            var bufferBlendTree = new BlendTree();
+            bufferBlendTree.blendType = BlendTreeType.Simple1D;
+            bufferBlendTree.useAutomaticThresholds = false;
+            bufferBlendTree.blendParameter = prop;
+            bufferBlendTree.children = new[]
+            {
+                new ChildMotion
+                {
+                    motion = nullMotion,
+                    timeScale = 1,
+                    threshold = 0
+                },
+                new ChildMotion
+                {
+                    motion = nullMotion,
+                    timeScale = 1,
+                    threshold = 0.01f
+                },
+                new ChildMotion
+                {
+                    motion = motion,
+                    timeScale = 1,
+                    threshold = 1
+                }
+            };
+
+            return new ChildMotion
+            {
+                motion = bufferBlendTree,
+                directBlendParameter = MergeBlendTreePass.ALWAYS_ONE,
+                timeScale = 1
+            };
+        }
+    }
+}
+#endif

Editor/Animation/GameObjectDisableDelayPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9b3eb561f76b459fbfbcf29fc4484261
+timeCreated: 1722222066

Editor/Animation/MMDRelayPass.cs

@@ -0,0 +1,248 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using nadena.dev.modular_avatar.core;
+using nadena.dev.modular_avatar.core.editor;
+using nadena.dev.ndmf;
+using nadena.dev.ndmf.animator;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEngine;
+using VRC.SDK3.Avatars.Components;
+using VRC.SDKBase;
+using BuildContext = nadena.dev.ndmf.BuildContext;
+using Object = UnityEngine.Object;
+
+namespace nadena.dev.modular_avatar.animation
+{
+    internal class MMDRelayState
+    {
+        internal HashSet<VirtualLayer> mmdAffectedOriginalLayers = new();
+    }
+
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
+    internal class MMDRelayEarlyPass : Pass<MMDRelayEarlyPass>
+    {
+        protected override void Execute(BuildContext context)
+        {
+            if (!MMDRelayPass.ShouldRun(context)) return;
+            
+            var asc = context.Extension<AnimatorServicesContext>();
+            if (asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx))
+            {
+                context.GetState<MMDRelayState>().mmdAffectedOriginalLayers = new HashSet<VirtualLayer>(
+                    fx.Layers.Skip(1).Take(2)
+                );
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Many MMD worlds animate the first three FX layers to weight zero. When MA injects new layers, this can hit
+    ///     unintended layers (eg the RC base state layer).
+    ///     To work around this, we'll inject a layer which will relay its active state into a parameter; then, we add a
+    ///     layer to relay this to layers which should be affected. Finally, any layer which _shouldn't_ be affected is
+    ///     pushed out of the first three layers by injecting dummy layers.
+    /// </summary>
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
+    internal class MMDRelayPass : Pass<MMDRelayPass>
+    {
+        private const string MMDRelayParam = "__MA/Internal/MMDNotActive";
+        internal const string ControlLayerName = "Modular Avatar: MMD Control";
+        internal const string DummyLayerName = "Modular Avatar: MMD Dummy";
+        internal const string StateNameInitial = "Initial";
+        internal const string StateNameNotMMD = "NotMMD";
+        internal const string StateNameMMD = "MMD";
+
+        internal static bool ShouldRun(BuildContext context)
+        {
+            var settings = context.AvatarRootObject.GetComponentsInChildren<ModularAvatarVRChatSettings>(true);
+            return settings.FirstOrDefault()?.MMDWorldSupport ?? true;
+        }
+        
+        protected override void Execute(BuildContext context)
+        {
+            if (!ShouldRun(context)) return;
+            
+            var asc = context.Extension<AnimatorServicesContext>();
+            if (!asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx))
+                return;
+
+            var affectedLayers = context.GetState<MMDRelayState>().mmdAffectedOriginalLayers;
+
+            foreach (var layer in fx.Layers)
+            {
+                if (layer.StateMachine == null) continue;
+                
+                var rootMMDModeBehaviors = layer.StateMachine.Behaviours
+                    .OfType<ModularAvatarMMDLayerControl>()
+                    .ToList();
+                
+                if (rootMMDModeBehaviors.Count == 0) continue;
+                if (rootMMDModeBehaviors.Count > 1)
+                {
+                    ErrorReport.ReportError(Localization.L, ErrorSeverity.Error,
+                        "error.mmd.multiple_mmd_mode_behaviors", layer.Name);
+                    continue;
+                }
+
+                if (rootMMDModeBehaviors[0].DisableInMMDMode)
+                {
+                    affectedLayers.Add(layer);
+                }
+                else
+                {
+                    affectedLayers.Remove(layer);
+                }
+
+                layer.StateMachine.Behaviours = layer.StateMachine.Behaviours
+                    .Where(b => b is not ModularAvatarMMDLayerControl).ToImmutableList();
+                Object.DestroyImmediate(rootMMDModeBehaviors[0]);
+
+                // check for child behaviors
+                // TODO: implement filtering on AllReachableNodes
+                foreach (var node in layer.AllReachableNodes())
+                {
+                    if (node is VirtualState state)
+                    {
+                        if (state.Behaviours.Any(b => b is ModularAvatarMMDLayerControl))
+                        {
+                            ErrorReport.ReportError(Localization.L, ErrorSeverity.Error,
+                                "error.mmd.mmd_mode_in_child_state", layer.Name, state.Name);
+                        }
+                    }
+                    else if (node is VirtualStateMachine vsm)
+                    {
+                        if (vsm.Behaviours.Any(b => b is ModularAvatarMMDLayerControl))
+                        {
+                            ErrorReport.ReportError(Localization.L, ErrorSeverity.Error,
+                                "error.mmd.mmd_mode_in_child_state_machine", layer.Name, vsm.Name);
+                        }
+                    }
+                }
+            }
+
+            var needsAdjustment = fx.Layers.Select((layer, index) => (layer, index))
+                .Any(pair => affectedLayers.Contains(pair.layer) != (pair.index < 3 && pair.index != 0));
+            if (!needsAdjustment) return;
+
+            var toDisable = fx.Layers.Where(l => affectedLayers.Contains(l))
+                .Select(l => l.VirtualLayerIndex)
+                .ToList();
+
+            fx.Parameters = fx.Parameters.Add(MMDRelayParam, new AnimatorControllerParameter
+            {
+                name = MMDRelayParam,
+                type = AnimatorControllerParameterType.Float,
+                defaultFloat = 0
+            });
+
+            var currentLayers = fx.Layers.ToList();
+            var newLayers = new List<VirtualLayer>();
+
+            // Layer zero's weight can't be changed anyway, so leave it where it is.
+            newLayers.Add(currentLayers[0]);
+            currentLayers.RemoveAt(0);
+            newLayers.Add(CreateMMDLayer(fx, toDisable));
+
+            // Add a dummy layer
+            var dummy = fx.AddLayer(new LayerPriority(0), DummyLayerName);
+            var s = dummy.StateMachine!.DefaultState = dummy.StateMachine.AddState("Dummy");
+            s.Motion = VirtualClip.Create("empty");
+            newLayers.Add(dummy);
+
+            fx.Layers = newLayers.Concat(currentLayers);
+        }
+
+        private static VirtualLayer CreateMMDLayer(VirtualAnimatorController fx, List<int> virtualLayers)
+        {
+            // We'll reorder this later, so the layer priority doesn't matter
+            var mmdControl = fx.AddLayer(new LayerPriority(0), ControlLayerName);
+            var stateMachine = mmdControl.StateMachine ?? throw new Exception("No state machine on MMD Control layer");
+
+            var motion = VirtualClip.Create("MMDRelay");
+            motion.SetFloatCurve(EditorCurveBinding.FloatCurve("", typeof(Animator), MMDRelayParam),
+                AnimationCurve.Constant(0, 1, 1)
+            );
+
+            var state_initial = stateMachine.AddState(StateNameInitial);
+            state_initial.Motion = motion;
+
+            var state_notmmd = stateMachine.AddState(StateNameNotMMD);
+            state_notmmd.Motion = motion;
+
+            var state_mmd = stateMachine.AddState(StateNameMMD);
+            state_mmd.Motion = motion;
+
+            var t = VirtualStateTransition.Create();
+            t.SetDestination(state_mmd);
+            t.Conditions = ImmutableList.Create(new AnimatorCondition
+            {
+                mode = AnimatorConditionMode.Less,
+                parameter = MMDRelayParam,
+                threshold = 0.5f
+            });
+
+            state_notmmd.Transitions = ImmutableList.Create(t);
+
+            t = VirtualStateTransition.Create();
+            t.SetDestination(state_notmmd);
+            t.Conditions = ImmutableList.Create(new AnimatorCondition
+            {
+                mode = AnimatorConditionMode.Greater,
+                parameter = MMDRelayParam,
+                threshold = 0.5f
+            });
+
+            state_mmd.Transitions = ImmutableList.Create(t);
+
+            t = VirtualStateTransition.Create();
+            t.SetDestination(state_mmd);
+            t.Conditions = ImmutableList.Create(new AnimatorCondition
+            {
+                mode = AnimatorConditionMode.Less,
+                parameter = MMDRelayParam,
+                threshold = 0.5f
+            });
+
+            state_initial.Transitions = ImmutableList.Create(t);
+
+            stateMachine.DefaultState = state_initial;
+
+            var mmd_behaviors = ImmutableList.CreateBuilder<StateMachineBehaviour>();
+            var notmmd_behaviors = ImmutableList.CreateBuilder<StateMachineBehaviour>();
+
+            foreach (var index in virtualLayers)
+            {
+                var behavior = ScriptableObject.CreateInstance<VRCAnimatorLayerControl>();
+                behavior.layer = index;
+                behavior.playable = VRC_AnimatorLayerControl.BlendableLayer.FX;
+                behavior.goalWeight = 0;
+                behavior.blendDuration = 0;
+
+                mmd_behaviors.Add(behavior);
+
+                behavior = ScriptableObject.CreateInstance<VRCAnimatorLayerControl>();
+                behavior.layer = index;
+                behavior.playable = VRC_AnimatorLayerControl.BlendableLayer.FX;
+                behavior.goalWeight = 1;
+                behavior.blendDuration = 0;
+
+                notmmd_behaviors.Add(behavior);
+            }
+
+            state_notmmd.Behaviours = notmmd_behaviors.ToImmutable();
+            state_mmd.Behaviours = mmd_behaviors.ToImmutable();
+
+            return mmdControl;
+        }
+
+        internal static bool IsRelayLayer(string layerName)
+        {
+            return layerName == ControlLayerName || layerName == DummyLayerName;
+        }
+    }
+}

Editor/Animation/MMDRelayPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 163fd3d0edea43d5969395079f561986
+timeCreated: 1741745889

Editor/Animation/ReadablePropertyExtension.cs

@@ -0,0 +1,82 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using nadena.dev.ndmf;
+using nadena.dev.ndmf.animator;
+using UnityEditor;
+using UnityEngine;
+
+namespace nadena.dev.modular_avatar.animation
+{
+    [DependsOnContext(typeof(AnimatorServicesContext))]
+    internal class ReadablePropertyExtension : IExtensionContext
+    {
+        // This is a temporary hack for GameObjectDelayDisablePass
+        public class Retained
+        {
+            public Dictionary<EditorCurveBinding, string> proxyProps = new();
+        }
+
+        private AnimatorServicesContext? _asc;
+        private Retained _retained = null!;
+
+        private AnimatorServicesContext asc =>
+            _asc ?? throw new InvalidOperationException("ActiveSelfProxyExtension is not active");
+
+        private Dictionary<EditorCurveBinding, string> proxyProps => _retained.proxyProps;
+        private int index;
+
+        public IEnumerable<(EditorCurveBinding, string)> ActiveProxyProps =>
+            proxyProps.Select(kvp => (kvp.Key, kvp.Value));
+
+        public string GetActiveSelfProxy(GameObject obj)
+        {
+            var path = asc.ObjectPathRemapper.GetVirtualPathForObject(obj);
+            var ecb = EditorCurveBinding.FloatCurve(path, typeof(GameObject), "m_IsActive");
+
+            if (proxyProps.TryGetValue(ecb, out var prop)) return prop;
+
+            prop = $"__MA/ActiveSelfProxy/{obj.name}##{index++}";
+            proxyProps[ecb] = prop;
+
+            // Add prop to all animators
+            foreach (var animator in asc.ControllerContext.GetAllControllers())
+            {
+                animator.Parameters = animator.Parameters.SetItem(
+                    prop,
+                    new AnimatorControllerParameter
+                    {
+                        name = prop,
+                        type = AnimatorControllerParameterType.Float,
+                        defaultFloat = obj.activeSelf ? 1 : 0
+                    }
+                );
+            }
+
+            return prop;
+        }
+
+        public void OnActivate(BuildContext context)
+        {
+            _asc = context.Extension<AnimatorServicesContext>();
+            _retained = context.GetState<Retained>();
+        }
+
+        public void OnDeactivate(BuildContext context)
+        {
+            asc.AnimationIndex.EditClipsByBinding(proxyProps.Keys, clip =>
+            {
+                foreach (var b in clip.GetFloatCurveBindings().ToList())
+                {
+                    if (proxyProps.TryGetValue(b, out var proxyProp))
+                    {
+                        var curve = clip.GetFloatCurve(b);
+                        clip.SetFloatCurve("", typeof(Animator), proxyProp, curve);
+                    }
+                }
+            });
+        }
+    }
+}

Editor/Animation/ReadablePropertyExtension.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 511cbc0373a2469192e0351e2222a203
+timeCreated: 1732496091

Editor/ApplyAnimatorDefaultValuesPass.cs

@@ -0,0 +1,58 @@
+#if MA_VRCSDK3_AVATARS
+#region
+
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using nadena.dev.ndmf;
+using nadena.dev.ndmf.animator;
+using UnityEditor.Animations;
+using UnityEngine;
+
+#endregion
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
+    internal class ApplyAnimatorDefaultValuesPass : Pass<ApplyAnimatorDefaultValuesPass>
+    {
+        protected override void Execute(ndmf.BuildContext context)
+        {
+            if (!context.AvatarDescriptor) return;
+
+            var values = context.GetState<DefaultValues>()?.InitialValueOverrides
+                         ?? ImmutableDictionary<string, float>.Empty;
+
+            var asc = context.Extension<AnimatorServicesContext>();
+
+            foreach (var controller in asc.ControllerContext.GetAllControllers())
+            {
+                var parameters = controller.Parameters;
+                foreach (var (name, parameter) in parameters)
+                {
+                    if (!values.TryGetValue(name, out var defaultValue)) continue;
+
+                    switch (parameter.type)
+                    {
+                        case AnimatorControllerParameterType.Bool:
+                            parameter.defaultBool = defaultValue != 0.0f;
+                            break;
+                        case AnimatorControllerParameterType.Int:
+                            parameter.defaultInt = Mathf.RoundToInt(defaultValue);
+                            break;
+                        case AnimatorControllerParameterType.Float:
+                            parameter.defaultFloat = defaultValue;
+                            break;
+                        default:
+                            continue; // unhandled type, e.g. trigger
+                    }
+
+                    parameters = parameters.SetItem(name, parameter);
+                }
+                
+                controller.Parameters = parameters;
+            }
+        }
+    }
+}
+#endif

Editor/ApplyAnimatorDefaultValuesPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e8f311932a744459aed7d22dee0e126c
+timeCreated: 1707045893

Editor/AvatarProcessor.cs

@@ -0,0 +1,79 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 bd_
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#region
+
+using System;
+using System.Runtime.CompilerServices;
+using nadena.dev.modular_avatar.ui;
+using UnityEditor;
+using UnityEngine;
+
+#endregion
+
+[assembly: InternalsVisibleTo("Tests")]
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    public class AvatarProcessor
+    {
+        [MenuItem(UnityMenuItems.GameObject_ManualBake, true, UnityMenuItems.GameObject_ManualBakeOrder)]
+        static bool ValidateApplyToCurrentAvatarGameobject()
+        {
+            return ValidateApplyToCurrentAvatar();
+        }
+
+        [MenuItem(UnityMenuItems.GameObject_ManualBake, false, UnityMenuItems.GameObject_ManualBakeOrder)]
+        static void ApplyToCurrentAvatarGameobject()
+        {
+            ApplyToCurrentAvatar();
+        }
+
+        [MenuItem(UnityMenuItems.TopMenu_ManualBakeAvatar, true, UnityMenuItems.TopMenu_ManualBakeAvatarOrder)]
+        private static bool ValidateApplyToCurrentAvatar()
+        {
+            return ndmf.AvatarProcessor.CanProcessObject(Selection.activeGameObject);
+        }
+
+        [MenuItem("Tools/Modular Avatar/Manual bake avatar", false)]
+        private static void ApplyToCurrentAvatar()
+        {
+            ndmf.AvatarProcessor.ProcessAvatarUI(Selection.activeGameObject);
+        }
+
+        public static void ProcessAvatar(GameObject avatarGameObject)
+        {
+            ndmf.AvatarProcessor.ProcessAvatar(avatarGameObject);
+        }
+
+        // ReSharper disable once InconsistentNaming
+        // ReSharper disable once MemberCanBeMadeStatic.Global
+        [Obsolete("This is only for compile time compatibility with legacy AAO")]
+        public int callbackOrder => throw new NotImplementedException();
+
+        [Obsolete("This is only for compile time compatibility with legacy AAO")]
+        // ReSharper disable once MemberCanBeMadeStatic.Global
+        public bool OnPreprocessAvatar(GameObject avatarGameObject) => throw new NotImplementedException();
+    }
+}

Editor/BlendshapeSyncAnimationProcessor.cs

@@ -0,0 +1,159 @@
+#if MA_VRCSDK3_AVATARS
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using nadena.dev.modular_avatar.editor.ErrorReporting;
+using nadena.dev.ndmf.animator;
+using UnityEditor;
+using UnityEngine;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    /**
+     * Ensures that any blendshapes marked for syncing by BlendshapeSync propagate values in all animation clips.
+     *
+     * Note that we only look at the FX layer, as any other layer won't work properly with mirror reflections anyway.
+     */
+    internal class BlendshapeSyncAnimationProcessor
+    {
+        private readonly ndmf.BuildContext _context;
+        private Dictionary<SummaryBinding, List<SummaryBinding>> _bindingMappings;
+
+        internal BlendshapeSyncAnimationProcessor(ndmf.BuildContext context)
+        {
+            _context = context;
+            _bindingMappings = new Dictionary<SummaryBinding, List<SummaryBinding>>();
+        }
+
+        private struct SummaryBinding : IEquatable<SummaryBinding>
+        {
+            private const string PREFIX = "blendShape.";
+            public string path;
+            public string propertyName;
+
+            public SummaryBinding(string path, string blendShape)
+            {
+                this.path = path;
+                this.propertyName = PREFIX + blendShape;
+            }
+
+            public static SummaryBinding? FromEditorBinding(EditorCurveBinding binding)
+            {
+                if (binding.type != typeof(SkinnedMeshRenderer) || !binding.propertyName.StartsWith(PREFIX))
+                {
+                    return null;
+                }
+
+                return new SummaryBinding(binding.path, binding.propertyName.Substring(PREFIX.Length));
+            }
+
+            public EditorCurveBinding ToEditorCurveBinding()
+            {
+                return EditorCurveBinding.FloatCurve(
+                    path,
+                    typeof(SkinnedMeshRenderer),
+                    propertyName
+                );
+            }
+
+            public bool Equals(SummaryBinding other)
+            {
+                return path == other.path && propertyName == other.propertyName;
+            }
+
+            public override bool Equals(object? obj)
+            {
+                return obj is SummaryBinding other && Equals(other);
+            }
+
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(path, propertyName);
+            }
+        }
+
+        public void OnPreprocessAvatar()
+        {
+            var avatarGameObject = _context.AvatarRootObject;
+            var animDb = _context.Extension<AnimatorServicesContext>().AnimationIndex;
+            
+            _bindingMappings = new Dictionary<SummaryBinding, List<SummaryBinding>>();
+
+            var components = avatarGameObject.GetComponentsInChildren<ModularAvatarBlendshapeSync>(true);
+            if (components.Length == 0) return;
+
+            foreach (var component in components)
+            {
+                BuildReport.ReportingObject(component, () => ProcessComponent(avatarGameObject, component));
+            }
+
+            var clips = new HashSet<VirtualClip>();
+            foreach (var key in _bindingMappings.Keys)
+            {
+                var ecb = key.ToEditorCurveBinding();
+                clips.UnionWith(animDb.GetClipsForBinding(ecb));
+            }
+
+            // Walk and transform all clips
+            foreach (var clip in clips)
+            {
+                ProcessClip(clip);
+            }
+        }
+
+        private void ProcessComponent(GameObject avatarGameObject, ModularAvatarBlendshapeSync component)
+        {
+            var targetObj = RuntimeUtil.RelativePath(avatarGameObject, component.gameObject);
+
+            if (targetObj == null) return;
+
+            foreach (var binding in component.Bindings)
+            {
+                var refObj = binding.ReferenceMesh.Get(component);
+                if (refObj == null) continue;
+                var refSmr = refObj.GetComponent<SkinnedMeshRenderer>();
+                if (refSmr == null) continue;
+
+                var refPath = RuntimeUtil.RelativePath(avatarGameObject, refObj);
+                if (refPath == null) continue;
+
+                var srcBinding = new SummaryBinding(refPath, binding.Blendshape);
+
+                if (!_bindingMappings.TryGetValue(srcBinding, out var dstBindings))
+                {
+                    dstBindings = new List<SummaryBinding>();
+                    _bindingMappings[srcBinding] = dstBindings;
+                }
+
+                var targetBlendshapeName = string.IsNullOrWhiteSpace(binding.LocalBlendshape)
+                    ? binding.Blendshape
+                    : binding.LocalBlendshape;
+
+                dstBindings.Add(new SummaryBinding(targetObj, targetBlendshapeName));
+            }
+        }
+
+        private void ProcessClip(VirtualClip clip)
+        {
+            foreach (var binding in clip.GetFloatCurveBindings().ToList())
+            {
+                var srcBinding = SummaryBinding.FromEditorBinding(binding);
+                if (srcBinding == null || !_bindingMappings.TryGetValue(srcBinding.Value, out var dstBindings))
+                {
+                    continue;
+                }
+
+                var curve = clip.GetFloatCurve(binding);
+                foreach (var dst in dstBindings)
+                {
+                    clip.SetFloatCurve(dst.ToEditorCurveBinding(), curve);
+                }
+            }
+        }
+    }
+}
+
+#endif

Editor/BoneProxyProcessor.cs

@@ -1,18 +1,18 @@
 /*
  * MIT License
- * 
+ *
  * Copyright (c) 2022 bd_
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+using nadena.dev.modular_avatar.editor.ErrorReporting;
+using UnityEditor;
 using UnityEngine;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -41,26 +43,52 @@ namespace nadena.dev.modular_avatar.core.editor
 
             foreach (var proxy in boneProxies)
             {
-                if (proxy.target != null && ValidateTarget(avatarGameObject, proxy.target) == ValidationResult.OK)
-                {
-                    var oldPath = RuntimeUtil.AvatarRootPath(proxy.gameObject);
-                    Transform transform = proxy.transform;
-                    transform.SetParent(proxy.target, true);
-                    if (proxy.attachmentMode != BoneProxyAttachmentMode.AsChildKeepWorldPosition)
-                    {
-                        transform.localPosition = Vector3.zero;
-                        transform.localRotation = Quaternion.identity;
-                    }
+                BuildReport.ReportingObject(proxy, () => ProcessProxy(avatarGameObject, proxy));
+            }
+        }
 
-                    PathMappings.Remap(oldPath, new PathMappings.MappingEntry()
-                    {
-                        path = RuntimeUtil.AvatarRootPath(proxy.gameObject),
-                        transformPath = RuntimeUtil.AvatarRootPath(proxy.gameObject)
-                    });
+        private void ProcessProxy(GameObject avatarGameObject, ModularAvatarBoneProxy proxy)
+        {
+            if (proxy.target != null && ValidateTarget(avatarGameObject, proxy.target) == ValidationResult.OK)
+            {
+                string suffix = "";
+                int i = 1;
+                while (proxy.target.Find(proxy.gameObject.name + suffix) != null)
+                {
+                    suffix = $" ({i++})";
                 }
 
-                Object.DestroyImmediate(proxy);
+                proxy.gameObject.name += suffix;
+
+                Transform transform = proxy.transform;
+                transform.SetParent(proxy.target, true);
+
+                bool keepPos, keepRot;
+                switch (proxy.attachmentMode)
+                {
+                    default:
+                    case BoneProxyAttachmentMode.Unset:
+                    case BoneProxyAttachmentMode.AsChildAtRoot:
+                        keepPos = keepRot = false;
+                        break;
+                    case BoneProxyAttachmentMode.AsChildKeepWorldPose:
+                        keepPos = keepRot = true;
+                        break;
+                    case BoneProxyAttachmentMode.AsChildKeepPosition:
+                        keepPos = true;
+                        keepRot = false;
+                        break;
+                    case BoneProxyAttachmentMode.AsChildKeepRotation:
+                        keepRot = true;
+                        keepPos = false;
+                        break;
+                }
+
+                if (!keepPos) transform.localPosition = Vector3.zero;
+                if (!keepRot) transform.localRotation = Quaternion.identity;
             }
+
+            Object.DestroyImmediate(proxy);
         }
 
         internal static ValidationResult ValidateTarget(GameObject avatarGameObject, Transform proxyTarget)

Editor/BuildContext.cs

@@ -0,0 +1,85 @@
+#if MA_VRCSDK3_AVATARS
+using VRC.SDK3.Avatars.Components;
+using VRC.SDK3.Avatars.ScriptableObjects;
+#endif
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    internal class BuildContext
+    {
+        internal readonly ndmf.BuildContext PluginBuildContext;
+
+#if MA_VRCSDK3_AVATARS
+        internal VRCAvatarDescriptor AvatarDescriptor => PluginBuildContext.AvatarDescriptor;
+#endif
+        internal GameObject AvatarRootObject => PluginBuildContext.AvatarRootObject;
+        internal Transform AvatarRootTransform => PluginBuildContext.AvatarRootTransform;
+
+        private bool SaveImmediate = false;
+
+#if MA_VRCSDK3_AVATARS
+        internal readonly Dictionary<VRCExpressionsMenu, VRCExpressionsMenu> ClonedMenus
+            = new Dictionary<VRCExpressionsMenu, VRCExpressionsMenu>();
+
+        /// <summary>
+        /// This dictionary overrides the _original contents_ of ModularAvatarMenuInstallers. Notably, this does not
+        /// replace the source menu for the purposes of identifying any other MAMIs that might install to the same
+        /// menu asset.
+        /// </summary>
+        internal readonly Dictionary<Object, Action<VRCExpressionsMenu.Control>> PostProcessControls = new();
+#endif
+        public static implicit operator BuildContext(ndmf.BuildContext ctx) =>
+            ctx.Extension<ModularAvatarContext>().BuildContext;
+
+        public BuildContext(ndmf.BuildContext PluginBuildContext)
+        {
+            this.PluginBuildContext = PluginBuildContext;
+        }
+
+#if MA_VRCSDK3_AVATARS
+        public BuildContext(VRCAvatarDescriptor avatarDescriptor)
+            : this(new ndmf.BuildContext(avatarDescriptor, null))
+        {
+        }
+#endif
+
+        public BuildContext(GameObject avatarGameObject)
+            : this(new ndmf.BuildContext(avatarGameObject, null))
+        {
+        }
+
+        public void SaveAsset(Object obj)
+        {
+            if (!SaveImmediate || AssetDatabase.IsMainAsset(obj) || AssetDatabase.IsSubAsset(obj)) return;
+
+            PluginBuildContext.AssetSaver.SaveAsset(obj);
+        }
+
+
+#if MA_VRCSDK3_AVATARS
+        public VRCExpressionsMenu CloneMenu(VRCExpressionsMenu menu)
+        {
+            if (menu == null) return null;
+            if (ClonedMenus.TryGetValue(menu, out var newMenu)) return newMenu;
+            newMenu = Object.Instantiate(menu);
+            this.SaveAsset(newMenu);
+            ClonedMenus[menu] = newMenu;
+
+            foreach (var control in newMenu.controls)
+            {
+                if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu && control.subMenu != newMenu)
+                {
+                    control.subMenu = CloneMenu(control.subMenu);
+                }
+            }
+
+            return newMenu;
+        }
+#endif
+    }
+}

Editor/BuildContext.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 41bbb1832c9d409a999605fae058dd19
+timeCreated: 1671624226

Editor/CreateBlendTree.cs

@@ -0,0 +1,32 @@
+using System.IO;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEditor.ProjectWindowCallback;
+using UnityEngine;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    internal static class CreateBlendTree
+    {
+        [MenuItem("Assets/Create/BlendTree", priority = 411)]
+        static void CreateNewBlendTree()
+        {
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(
+               0,
+               Editor.CreateInstance<DoCreateBlendTree>(),
+               "New BlendTree.asset",
+               EditorGUIUtility.IconContent("BlendTree Icon").image as Texture2D,
+               null);
+        }
+
+        class DoCreateBlendTree : EndNameEditAction
+        {
+            public override void Action(int instanceId, string pathName, string resourceFile)
+            {
+                BlendTree blendTree = new BlendTree { name = Path.GetFileNameWithoutExtension(pathName) };
+                AssetDatabase.CreateAsset(blendTree, pathName);
+                Selection.activeObject = blendTree;
+            }
+        }
+    }
+}

Editor/CreateBlendTree.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d75fcaecb8b9e7f4bbe783e5f4c9838a
+guid: e608a27c3d14edf43858004513948da1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Editor/ErrorReporting.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 0fb1980d53a548a996bdfca622d468ca
+timeCreated: 1674039787
+folderAsset: yes

Editor/ErrorReporting/ComponentValidation.cs

@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using nadena.dev.modular_avatar.core;
+using nadena.dev.ndmf;
+
+#if MA_VRCSDK3_AVATARS
+using nadena.dev.modular_avatar.core.menu;
+#endif
+
+using UnityEngine;
+
+namespace nadena.dev.modular_avatar.editor.ErrorReporting
+{
+    internal static class ComponentValidation
+    {
+        /// <summary>
+        /// Validates the provided tag component.
+        /// </summary>
+        /// <param name="tagComponent"></param>
+        /// <returns>Null if valid, otherwise a list of configuration errors</returns>
+        internal static void CheckComponent(this AvatarTagComponent tagComponent)
+        {
+            ErrorReport.WithContextObject(tagComponent, () =>
+            {
+                switch (tagComponent)
+                {
+                    case ModularAvatarBlendshapeSync bs:
+                        CheckInternal(bs);
+                        break;
+                    case ModularAvatarBoneProxy bp:
+                        CheckInternal(bp);
+                        break;
+#if MA_VRCSDK3_AVATARS
+                    case ModularAvatarMenuInstaller mi:
+                        CheckInternal(mi);
+                        break;
+                    case ModularAvatarMergeAnimator obj:
+                        CheckInternal(obj);
+                        break;
+#endif
+                    case ModularAvatarMergeArmature obj:
+                        CheckInternal(obj);
+                        break;
+                    default:
+                        return;
+                }
+            });
+        }
+
+        internal static void ValidateAll(GameObject root)
+        {
+            foreach (var component in root.GetComponentsInChildren<AvatarTagComponent>(true))
+            {
+                component.CheckComponent();
+            }
+        }
+
+        private static void CheckInternal(ModularAvatarBlendshapeSync bs)
+        { 
+            var localMesh = bs.GetComponent<SkinnedMeshRenderer>();
+            if (localMesh == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_local_renderer", bs);
+            }
+
+            if (localMesh.sharedMesh == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_local_mesh", bs);
+            }
+
+            if (bs.Bindings == null || bs.Bindings.Count == 0)
+            {
+                BuildReport.Log(ErrorSeverity.Information,"validation.blendshape_sync.no_bindings", bs);
+            }
+
+            foreach (var binding in bs.Bindings)
+            {
+                var localShape = string.IsNullOrWhiteSpace(binding.LocalBlendshape)
+                    ? binding.Blendshape
+                    : binding.LocalBlendshape;
+
+                if (localMesh.sharedMesh.GetBlendShapeIndex(localShape) == -1)
+                {
+                    BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.missing_local_shape",
+                        localShape, bs);
+                }
+
+                var targetObj = binding.ReferenceMesh.Get(bs.transform);
+                if (targetObj == null)
+                {
+                    BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_target", bs);
+                    continue;
+                }
+
+                var targetRenderer = targetObj.GetComponent<SkinnedMeshRenderer>();
+                if (targetRenderer == null)
+                {
+                    BuildReport.Log(ErrorSeverity.NonFatal,
+                        "validation.blendshape_sync.missing_target_renderer", bs, targetRenderer);
+                    continue;
+                }
+
+                var targetMesh = targetRenderer.sharedMesh;
+                if (targetMesh == null)
+                {
+                    BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.missing_target_mesh",
+                        bs, targetRenderer);
+                    continue;
+                }
+
+                if (targetMesh.GetBlendShapeIndex(binding.Blendshape) == -1)
+                {
+                    BuildReport.Log(ErrorSeverity.NonFatal,
+                        "validation.blendshape_sync.missing_target_shape", binding.Blendshape, bs,
+                        targetRenderer);
+                }
+            }
+        }
+
+        private static void CheckInternal(ModularAvatarBoneProxy bp)
+        {
+            if (bp.target == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.bone_proxy.no_target", bp);
+            }
+        }
+
+#if MA_VRCSDK3_AVATARS
+        private static void CheckInternal(ModularAvatarMenuInstaller mi)
+        {
+            // TODO - check that target menu is in the avatar
+            if (mi.menuToAppend == null && mi.GetComponent<MenuSource>() == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.menu_installer.no_menu", mi);
+            }
+        }
+
+        private static void CheckInternal(ModularAvatarMergeAnimator ma)
+        {
+            if (ma.animator == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.merge_animator.no_animator", ma);
+            }
+        }
+#endif
+
+        private static void CheckInternal(ModularAvatarMergeArmature ma)
+        {
+            if (ma.mergeTargetObject == null)
+            {
+                BuildReport.Log(ErrorSeverity.NonFatal, "validation.merge_armature.no_target", ma);
+                return;
+            }
+
+            if (ma.mergeTargetObject == ma.gameObject || ma.mergeTargetObject.transform.IsChildOf(ma.transform))
+            {
+                BuildReport.Log(ErrorSeverity.Error, "error.merge_armature.circular_dependency", ma,
+                    ma.mergeTargetObject);
+            }
+        }
+    }
+}

Editor/ErrorReporting/ComponentValidation.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3b500f7714e4401aa090eef81c0bab01
+timeCreated: 1675855192

Editor/ErrorReporting/ErrorLog.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using nadena.dev.modular_avatar.core;
+using nadena.dev.modular_avatar.core.editor;
+using nadena.dev.ndmf;
+using Newtonsoft.Json;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.SceneManagement;
+using Object = UnityEngine.Object;
+
+namespace nadena.dev.modular_avatar.editor.ErrorReporting
+{
+    internal class BuildReport
+    {
+        private const string Path = "Library/ModularAvatarBuildReport.json";
+
+        internal static void Log(ErrorSeverity severity, string code, params object[] objects)
+        {
+            ErrorReport.ReportError(Localization.L, severity, code, objects);
+        }
+
+        internal static void LogFatal(string code, params object[] objects)
+        {
+            ErrorReport.ReportError(Localization.L, ErrorSeverity.Error, code, objects);
+        }
+
+        internal static void LogException(Exception e, string additionalStackTrace = "")
+        {
+            ErrorReport.ReportException(e, additionalStackTrace);
+        }
+
+        internal static T ReportingObject<T>(UnityEngine.Object obj, Func<T> action)
+        {
+            return ErrorReport.WithContextObject(obj, action);
+        }
+
+        internal static void ReportingObject(UnityEngine.Object obj, Action action)
+        {
+            ErrorReport.WithContextObject(obj, action);
+        }
+
+        [Obsolete("Use NDMF's ObjectRegistry instead")]
+        public static void RemapPaths(string original, string cloned)
+        {
+        }
+    }
+}

Editor/ErrorReporting/ErrorLog.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 08d5f5d12365416d94e2d97970a24f5d
+timeCreated: 1674039799

Editor/FixupPasses.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 597d4035b7eb43e180a013ceac128a84
+timeCreated: 1694687629

Editor/FixupPasses/FixupExpressionsMenuPass.cs

@@ -0,0 +1,183 @@
+#if MA_VRCSDK3_AVATARS
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using VRC.SDK3.Avatars.ScriptableObjects;
+using Object = UnityEngine.Object;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    internal class FixupExpressionsMenuPass
+    {
+        private const string DEFAULT_EXP_MENU_GUID = "024fb8ef5b3988c46b446863c92f4522";
+        private const string DEFAULT_EXP_PARAM_GUID = "03a6d797deb62f0429471c4e17ea99a7";
+
+        internal static void FixupExpressionsMenu(BuildContext context)
+        {
+            if (!context.AvatarDescriptor) return;
+
+            context.AvatarDescriptor.customExpressions = true;
+
+            var expressionsMenu = context.AvatarDescriptor.expressionsMenu;
+            if (expressionsMenu == null)
+            {
+                var defaultExpMenu = AssetDatabase.LoadAssetAtPath<VRCExpressionsMenu>(
+                    AssetDatabase.GUIDToAssetPath(DEFAULT_EXP_MENU_GUID)
+                );
+
+                expressionsMenu = Object.Instantiate(defaultExpMenu);
+                context.AvatarDescriptor.expressionsMenu = expressionsMenu;
+            }
+
+            if (context.AvatarDescriptor.expressionParameters == null)
+            {
+                var defaultExpParam = AssetDatabase.LoadAssetAtPath<VRCExpressionParameters>(
+                    AssetDatabase.GUIDToAssetPath(DEFAULT_EXP_PARAM_GUID)
+                );
+
+                context.AvatarDescriptor.expressionParameters = Object.Instantiate(defaultExpParam);
+            }
+
+            var parameters = context.AvatarDescriptor.expressionParameters.parameters
+                             ?? Array.Empty<VRCExpressionParameters.Parameter>();
+            var parameterNames = parameters.Select(p => p.name).ToImmutableHashSet();
+
+            if (!context.PluginBuildContext.IsTemporaryAsset(expressionsMenu))
+            {
+                expressionsMenu = context.CloneMenu(expressionsMenu);
+                context.AvatarDescriptor.expressionsMenu = expressionsMenu;
+            }
+
+            // Walk menu recursively
+            var visitedMenus = new HashSet<VRCExpressionsMenu>();
+            var iconMapping = new Dictionary<Texture2D, Texture2D>();
+
+            VisitMenu(expressionsMenu);
+
+            void VisitMenu(VRCExpressionsMenu menu)
+            {
+                if (!visitedMenus.Add(menu)) return;
+
+                foreach (var control in menu.controls)
+                {
+                    if (control.parameter != null &&
+                        !string.IsNullOrEmpty(control.parameter.name) &&
+                        !parameterNames.Contains(control.parameter.name))
+                    {
+                        control.parameter.name = "";
+                    }
+
+                    foreach (var subParam in control.subParameters ??
+                                             Array.Empty<VRCExpressionsMenu.Control.Parameter>())
+                    {
+                        if (subParam != null &&
+                            !string.IsNullOrEmpty(subParam.name) &&
+                            !parameterNames.Contains(subParam.name))
+                        {
+                            subParam.name = "";
+                        }
+                    }
+
+                    if (control.icon != null)
+                    {
+                        if (!iconMapping.TryGetValue(control.icon, out var newIcon))
+                        {
+                            iconMapping[control.icon] = newIcon = MaybeScaleIcon(context, control.icon);
+                        }
+
+                        control.icon = newIcon;
+                    }
+
+                    if (control.subMenu != null)
+                    {
+                        VisitMenu(control.subMenu);
+                    }
+
+                    if (control.labels != null)
+                    {
+                        for (int i = 0; i < control.labels.Length; i++)
+                        {
+                            var label = control.labels[i];
+
+                            if (label.icon != null)
+                            {
+                                if (!iconMapping.TryGetValue(label.icon, out var newIcon))
+                                {
+                                    iconMapping[label.icon] = newIcon = MaybeScaleIcon(context, label.icon);
+                                }
+
+                                label.icon = newIcon;
+                                control.labels[i] = label;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        internal static TextureFormat TargetFormat
+        {
+            get
+            {
+                switch (EditorUserBuildSettings.activeBuildTarget)
+                {
+                    case BuildTarget.StandaloneWindows64:
+                        return TextureFormat.DXT5;
+                    default:
+                        return TextureFormat.ASTC_4x4;
+                }
+            }
+        }
+        
+
+        private static Texture2D MaybeScaleIcon(BuildContext context, Texture2D original)
+        {
+            if (original.width <= 256 && original.height <= 256 && IsCompressedFormat(original.format))
+            {
+                return original;
+            }
+
+            var newRatio = Math.Min(1, Math.Min(256f / original.width, 256f / original.height));
+            var newWidth = Math.Min(256, Mathf.RoundToInt(original.width * newRatio));
+            var newHeight = Math.Min(256, Mathf.RoundToInt(original.height * newRatio));
+
+            // Round up to a multiple of four
+            newWidth = (newWidth + 3) & ~3;
+            newHeight = (newHeight + 3) & ~3;
+
+            var newTex = new Texture2D(newWidth, newHeight, TextureFormat.RGBA32, true);
+            context.SaveAsset(newTex);
+
+            var tmpRenderTex = RenderTexture.GetTemporary(newWidth, newHeight, 0, RenderTextureFormat.ARGB32);
+            var originalActiveRenderTex = RenderTexture.active;
+
+            try
+            {
+                Graphics.Blit(original, tmpRenderTex);
+                RenderTexture.active = tmpRenderTex;
+                newTex.ReadPixels(new Rect(0, 0, newWidth, newHeight), 0, 0);
+                newTex.Apply();
+                EditorUtility.CompressTexture(newTex, TargetFormat, TextureCompressionQuality.Normal);
+
+                return newTex;
+            }
+            finally
+            {
+                RenderTexture.active = originalActiveRenderTex;
+                RenderTexture.ReleaseTemporary(tmpRenderTex);
+            }
+        }
+
+        private static bool IsCompressedFormat(TextureFormat format)
+        {
+            var name = format.ToString();
+            return name.StartsWith("DXT") || name.StartsWith("ASTC");
+        }
+    }
+}
+
+#endif

Editor/FixupPasses/FixupExpressionsMenuPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1020bef86d91452ba6b138c249d25bb5
+timeCreated: 1694688050

Editor/HarmonyPatches.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cf056e4454ad43ababbfff1dd06ec1d0
+timeCreated: 1708235917

Editor/HarmonyPatches/PatchLoader.cs

@@ -0,0 +1,41 @@
+#region
+
+using System;
+using HarmonyLib;
+using UnityEditor;
+using UnityEngine;
+
+#endregion
+
+namespace nadena.dev.modular_avatar.core.editor.HarmonyPatches
+{
+    internal class PatchLoader
+    {
+        private const string HarmonyId = "nadena.dev.modular_avatar";
+
+        private static readonly Action<Harmony>[] patches = new Action<Harmony>[]
+        {
+            //HierarchyViewPatches.Patch,
+        };
+
+        [InitializeOnLoadMethod]
+        static void ApplyPatches()
+        {
+            var harmony = new Harmony(HarmonyId);
+
+            foreach (var patch in patches)
+            {
+                try
+                {
+                    patch(harmony);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogException(e);
+                }
+            }
+
+            AssemblyReloadEvents.beforeAssemblyReload += () => { harmony.UnpatchAll(HarmonyId); };
+        }
+    }
+}

Editor/HarmonyPatches/PatchLoader.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e92aedf0fa324b8fb1b425a7fc2b1771
+timeCreated: 1708235934

Editor/HarmonyPatches/nadena.dev.modular-avatar.harmony-patches.asmdef

@@ -0,0 +1,29 @@
+{
+    "name": "nadena.dev.modular-avatar.harmony-patches",
+    "rootNamespace": "",
+    "references": [
+        "nadena.dev.modular-avatar.core",
+        "nadena.dev.modular-avatar.core.editor",
+        "VRC.SDKBase.Editor",
+        "nadena.dev.modular-avatar.param-introspection"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [
+        "VRCSDK_HAS_HARMONY"
+    ],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.base",
+            "expression": "(3.3.99999,)",
+            "define": "VRCSDK_HAS_HARMONY"
+        }
+    ],
+    "noEngineReferences": false
+}