Merge pull request #101 from anatawa12/drop-support-for-3.1.12-or-older

Drop support for 3.1.12 or older

CHANGELOG-PRERELEASE.md

@@ -15,6 +15,8 @@ The format is based on [Keep a Changelog].
 - **BREAKING** Removed Prefab Safe List `#95`
 - **BREAKING** Removed RootTransform feature from MergePhysBone `#100`
   - See [this issue comment][about-root-transform] for more datails.
+- **BREAKING** Dropped support for VRCSDK 3.1.12 or older `#101`
+  - Now, we require VRCSDK since 3.1.13 (including) until 3.2.0 (excluding)
 
 [about-root-transform]: https://github.com/anatawa12/AvatarOptimizer/issues/62#issuecomment-1512586282
 

CHANGELOG.md

@@ -15,6 +15,8 @@ The format is based on [Keep a Changelog].
 - **BREAKING** Removed Prefab Safe List `#95`
 - **BREAKING** Removed RootTransform feature from MergePhysBone `#100`
   - See [this issue comment][about-root-transform] for more datails.
+- **BREAKING** Dropped support for VRCSDK 3.1.12 or older `#101`
+  - Now, we require VRCSDK since 3.1.13 (including) until 3.2.0 (excluding)
 
 [about-root-transform]: https://github.com/anatawa12/AvatarOptimizer/issues/62#issuecomment-1512586282
 

Editor/MergePhysBoneEditor.cs

@@ -150,17 +150,13 @@ protected override void OnInspectorGUIInner()
             EditorGUILayout.PropertyField(_grabMovementProp);
             EditorGUILayout.PropertyField(_allowPosingProp);
             EditorGUILayout.PropertyField(_maxStretchProp);
-#if VRCSDK_3_1_12
             EditorGUILayout.PropertyField(_snapToHandProp);
-#endif
             EditorGUI.indentLevel--;
             // == Others ==
             EditorGUILayout.LabelField("Others", EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
             EditorGUILayout.PropertyField(_isAnimatedProp);
-#if VRCSDK_3_1_12
             EditorGUILayout.PropertyField(_resetWhenDisabledProp);
-#endif
             EditorGUI.indentLevel--;
 
             EditorGUI.indentLevel--;

Editor/Processors/MergePhysBoneProcessor.cs

@@ -160,11 +160,7 @@ void Callback2(string arg1, string arg2)
             }
             void Advanced(string arg1, string arg2)
             {
-#if VRCSDK_3_1_12
                 advancedCallback(arg1, arg2);
-#else
-                callback(arg1);
-#endif
             }
 
             // == Forces ==
@@ -227,17 +223,13 @@ void Advanced(string arg1, string arg2)
             // == Grab & Pose ==
             if (!merge.allowGrabbing) Advanced("allowGrabbing", "grabFilter");
             if (!merge.allowPosing) Advanced("allowPosing", "poseFilter");
-#if VRCSDK_3_1_12
             if (!merge.snapToHand) Callback1("snapToHand");
-#endif
             if (!merge.grabMovement) Callback1("grabMovement");
             if (!merge.maxStretch) Callback2("maxStretch", "maxStretchCurve");
             // == Options ==
             // Parameter: ignore: must be empty
             // Is Animated: ignore: we can merge them.
-#if VRCSDK_3_1_12
             if (!merge.resetWhenDisabled) Callback1("resetWhenDisabled");
-#endif
             // Gizmos: ignore: it should not affect actual behaviour
         }
     }

Editor/com.anatawa12.avatar-optimizer.editor.asmdef

@@ -26,12 +26,6 @@
     ],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.vrchat.avatars",
-            "expression": "3.1.12",
-            "define": "VRCSDK_3_1_12"
-        }
-    ],
+    "versionDefines": [],
     "noEngineReferences": false
 }

package.json

@@ -12,6 +12,6 @@
   "repo": "https://vpm.anatawa12.com/vpm.json",
   "vpmDependencies": {
     "com.anatawa12.custom-localization-for-editor-extension": "^0.2.2",
-    "com.vrchat.avatars": ">=3.1.10 <4.0.0"
+    "com.vrchat.avatars": ">=3.1.13 <3.2.0"
   }
 }