From 6591f35a7840a2a071f7ceb0c8986bd7b4fd9ec8 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Tue, 22 Aug 2023 18:44:02 +0900 Subject: [PATCH] fix: missing references when VPM resolver is not present * chore: configure overrideReferences false and referenced dlls * chore: clear unused using * chore: remove unused meta file * fix: missing reference --- .../AnimateAddedBones/AnimateAddedBones.cs | 5 +--- .../EditModeTests/BoneProxyTest.cs | 1 - .../DirectBlendTreeParameters.cs | 2 -- .../GameObjectGC/GameObjectGC.cs | 4 +--- .../MergeArmatureTests/MergeArmatureTests.cs | 5 +--- .../MergeArmatureTests/MultiLevelMergeTest.cs | 4 +--- .../EditModeTests/PathMappingTest.cs | 7 +----- .../RenameParametersTests.cs | 2 -- .../ReplaceObject/ReplaceObjectTests.cs | 1 - .../EditModeTests/SerializationSweepTest.cs | 1 - .../SimpleArmatureToggle.cs | 4 +--- .../VirtualMenuTests/VirtualMenuTests.cs | 1 - .../Editor/PackageMaker/PackageMakerWindow.cs | 2 -- .../Editor/ApplyOnPlay.cs | 2 -- .../BlendshapeSyncAnimationProcessor.cs | 4 +--- .../Editor/EasySetupOutfit.cs | 5 +--- .../ErrorReporting/ComponentValidation.cs | 2 -- .../Editor/ErrorReporting/ErrorElement.cs | 1 - .../Editor/ErrorReporting/ErrorLog.cs | 2 -- .../Editor/ErrorReporting/SelectionButton.cs | 1 - .../Inspector/AvatarParametersEditor.cs | 1 - .../Inspector/BlendshapeSelectTreeView.cs | 2 -- .../Editor/Inspector/BlendshapeSyncEditor.cs | 4 ---- .../Inspector/FirstPersonVisibleEditor.cs | 4 +--- .../Editor/Inspector/InspectorCommon.cs | 1 - .../Editor/Inspector/MAAssetBundleEditor.cs | 1 - .../Inspector/Menu/MAMenuItemInspector.cs | 9 +------- .../Inspector/Menu/MenuInstallerEditor.cs | 1 - .../Editor/Inspector/Menu/MenuItemGUI.cs | 1 - .../Editor/Inspector/Menu/ParameterField.cs | 1 - .../Editor/Inspector/MergeAnimationEditor.cs | 1 - .../Editor/Inspector/MergeArmatureEditor.cs | 3 +-- .../Editor/Inspector/MeshSettingsEditor.cs | 3 +-- .../Editor/Menu/ActionProcessing.meta | 8 ------- .../Editor/Menu/MenuExtractor.cs | 4 +--- .../Editor/Menu/VirtualMenu.cs | 1 - .../Editor/MenuInstallHook.cs | 3 --- .../Editor/MergeAnimatorProcessor.cs | 9 ++++---- .../Editor/MeshRetargeter.cs | 2 -- .../Editor/ModularAvatarSettings.cs | 1 - .../Editor/ParameterPolicy.cs | 3 +-- .../Editor/PathMappings.cs | 3 --- .../Editor/RemapAnimationPass.cs | 1 - .../nadena.dev.modular-avatar/Editor/Util.cs | 1 - .../VisibleHeadAccessoryMeshProcessor.cs | 1 - ...dena.dev.modular-avatar.core.editor.asmdef | 23 +++++++++++++++---- .../Runtime/Activator.cs | 2 -- .../Runtime/Menu/ModularAvatarMenuGroup.cs | 5 +--- .../Menu/ModularAvatarMenuInstaller.cs | 1 - .../Runtime/ModularAvatarMenuInstallTarget.cs | 5 +--- .../Runtime/ModularAvatarMenuItem.cs | 5 +--- .../Runtime/ModularAvatarMeshSettings.cs | 1 - .../Runtime/ModularAvatarParameters.cs | 1 - .../nadena.dev.modular-avatar.core.asmdef | 10 ++++++-- 54 files changed, 47 insertions(+), 131 deletions(-) delete mode 100644 Packages/nadena.dev.modular-avatar/Editor/Menu/ActionProcessing.meta diff --git a/Assets/_ModularAvatar/EditModeTests/AnimateAddedBones/AnimateAddedBones.cs b/Assets/_ModularAvatar/EditModeTests/AnimateAddedBones/AnimateAddedBones.cs index ae884368..9fcbb999 100644 --- a/Assets/_ModularAvatar/EditModeTests/AnimateAddedBones/AnimateAddedBones.cs +++ b/Assets/_ModularAvatar/EditModeTests/AnimateAddedBones/AnimateAddedBones.cs @@ -1,10 +1,7 @@ -using System.Linq; -using nadena.dev.modular_avatar.core.editor; +using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEditor; -using UnityEditor.Animations; using UnityEngine; -using VRC.SDK3.Avatars.Components; namespace modular_avatar_tests.AnimateAddedBones { diff --git a/Assets/_ModularAvatar/EditModeTests/BoneProxyTest.cs b/Assets/_ModularAvatar/EditModeTests/BoneProxyTest.cs index 02c31814..e5948737 100644 --- a/Assets/_ModularAvatar/EditModeTests/BoneProxyTest.cs +++ b/Assets/_ModularAvatar/EditModeTests/BoneProxyTest.cs @@ -1,7 +1,6 @@ using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; -using NUnit.Framework.Internal; using UnityEngine; namespace modular_avatar_tests diff --git a/Assets/_ModularAvatar/EditModeTests/DirectBlendTreeParameters/DirectBlendTreeParameters.cs b/Assets/_ModularAvatar/EditModeTests/DirectBlendTreeParameters/DirectBlendTreeParameters.cs index a93e8396..260d96f6 100644 --- a/Assets/_ModularAvatar/EditModeTests/DirectBlendTreeParameters/DirectBlendTreeParameters.cs +++ b/Assets/_ModularAvatar/EditModeTests/DirectBlendTreeParameters/DirectBlendTreeParameters.cs @@ -1,8 +1,6 @@ using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; -using UnityEditor; using UnityEditor.Animations; -using UnityEngine; namespace modular_avatar_tests.DirectBlendTreeParameters { diff --git a/Assets/_ModularAvatar/EditModeTests/GameObjectGC/GameObjectGC.cs b/Assets/_ModularAvatar/EditModeTests/GameObjectGC/GameObjectGC.cs index 18cb685e..4e36c2d3 100644 --- a/Assets/_ModularAvatar/EditModeTests/GameObjectGC/GameObjectGC.cs +++ b/Assets/_ModularAvatar/EditModeTests/GameObjectGC/GameObjectGC.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using modular_avatar_tests; +using modular_avatar_tests; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEngine; diff --git a/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MergeArmatureTests.cs b/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MergeArmatureTests.cs index a3e758f3..c47b9af9 100644 --- a/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MergeArmatureTests.cs +++ b/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MergeArmatureTests.cs @@ -1,10 +1,7 @@ -using System.Collections; -using System.Collections.Generic; -using modular_avatar_tests; +using modular_avatar_tests; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEngine; -using VRC.SDK3.Avatars.Components; public class MergeArmatureTests : TestBase { diff --git a/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MultiLevelMergeTest.cs b/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MultiLevelMergeTest.cs index b90257fa..3e7d6224 100644 --- a/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MultiLevelMergeTest.cs +++ b/Assets/_ModularAvatar/EditModeTests/MergeArmatureTests/MultiLevelMergeTest.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Runtime.CompilerServices; +using System.Linq; using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; diff --git a/Assets/_ModularAvatar/EditModeTests/PathMappingTest.cs b/Assets/_ModularAvatar/EditModeTests/PathMappingTest.cs index 0fd03202..8791cf87 100644 --- a/Assets/_ModularAvatar/EditModeTests/PathMappingTest.cs +++ b/Assets/_ModularAvatar/EditModeTests/PathMappingTest.cs @@ -1,11 +1,6 @@ -using System.Collections; -using System.Collections.Generic; -using System.IO; -using nadena.dev.modular_avatar.core.editor; +using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEngine; -using UnityEngine.TestTools; -using VRC.SDK3.Avatars.Components; namespace modular_avatar_tests { diff --git a/Assets/_ModularAvatar/EditModeTests/RenameParametersTests/RenameParametersTests.cs b/Assets/_ModularAvatar/EditModeTests/RenameParametersTests/RenameParametersTests.cs index 63504853..c37374a1 100644 --- a/Assets/_ModularAvatar/EditModeTests/RenameParametersTests/RenameParametersTests.cs +++ b/Assets/_ModularAvatar/EditModeTests/RenameParametersTests/RenameParametersTests.cs @@ -1,8 +1,6 @@ using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; -using UnityEditor; -using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; diff --git a/Assets/_ModularAvatar/EditModeTests/ReplaceObject/ReplaceObjectTests.cs b/Assets/_ModularAvatar/EditModeTests/ReplaceObject/ReplaceObjectTests.cs index bec921a5..c094cb75 100644 --- a/Assets/_ModularAvatar/EditModeTests/ReplaceObject/ReplaceObjectTests.cs +++ b/Assets/_ModularAvatar/EditModeTests/ReplaceObject/ReplaceObjectTests.cs @@ -3,7 +3,6 @@ using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using nadena.dev.modular_avatar.editor.ErrorReporting; using NUnit.Framework; -using UnityEditor.VersionControl; using UnityEngine; using VRC.SDK3.Avatars.Components; diff --git a/Assets/_ModularAvatar/EditModeTests/SerializationSweepTest.cs b/Assets/_ModularAvatar/EditModeTests/SerializationSweepTest.cs index 3196af7f..89de1b87 100644 --- a/Assets/_ModularAvatar/EditModeTests/SerializationSweepTest.cs +++ b/Assets/_ModularAvatar/EditModeTests/SerializationSweepTest.cs @@ -1,6 +1,5 @@ using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; -using PlasticGui.WorkspaceWindow.QueryViews.Branches; using UnityEditor; using UnityEngine; using VRC.SDK3.Avatars.Components; diff --git a/Assets/_ModularAvatar/EditModeTests/SimpleArmatureToggle/SimpleArmatureToggle.cs b/Assets/_ModularAvatar/EditModeTests/SimpleArmatureToggle/SimpleArmatureToggle.cs index d0ce1b81..526f8fe1 100644 --- a/Assets/_ModularAvatar/EditModeTests/SimpleArmatureToggle/SimpleArmatureToggle.cs +++ b/Assets/_ModularAvatar/EditModeTests/SimpleArmatureToggle/SimpleArmatureToggle.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using nadena.dev.modular_avatar.core; +using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEditor; diff --git a/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs b/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs index ae1f49d7..3ae66d9d 100644 --- a/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs +++ b/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs @@ -7,7 +7,6 @@ using nadena.dev.modular_avatar.core.editor.menu; using nadena.dev.modular_avatar.core.menu; using NUnit.Framework; using UnityEditor; -using UnityEditor.VersionControl; using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs index 1345f85f..02f4b71a 100644 --- a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs +++ b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs @@ -7,11 +7,9 @@ using System.Text; using System.Text.RegularExpressions; using UnityEditor; using UnityEditor.UIElements; -using UnityEditor.VersionControl; using UnityEngine; using UnityEngine.UIElements; using VRC.PackageManagement.Core.Types.Packages; -using YamlDotNet.Serialization.NodeTypeResolvers; namespace VRC.PackageManagement.PackageMaker { diff --git a/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs index 37059fda..9dc34aa9 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs @@ -24,8 +24,6 @@ using UnityEditor; using UnityEngine; -using UnityEngine.SceneManagement; -using VRC.SDK3.Avatars.Components; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs index ba6963de..2fdb3204 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/BlendshapeSyncAnimationProcessor.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using nadena.dev.modular_avatar.editor.ErrorReporting; using UnityEditor; using UnityEditor.Animations; diff --git a/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs b/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs index 5bb8d476..76f9c922 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs @@ -1,8 +1,5 @@ -using System.Text; -using UnityEditor; +using UnityEditor; using UnityEngine; -using VRC.Core; -using VRC.SDK3.Avatars.ScriptableObjects; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ComponentValidation.cs b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ComponentValidation.cs index 51a1710f..14a96734 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ComponentValidation.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ComponentValidation.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.menu; -using NUnit.Framework; using UnityEngine; -using VRC.SDK3.Avatars.Components; namespace nadena.dev.modular_avatar.editor.ErrorReporting { diff --git a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorElement.cs b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorElement.cs index 3913c802..045d4fe1 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorElement.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorElement.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using nadena.dev.modular_avatar.core.editor; using UnityEditor; using UnityEngine; diff --git a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs index eb7884ec..78e6ff84 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.InteropServices; using nadena.dev.modular_avatar.core; using Newtonsoft.Json; using UnityEngine; using VRC.SDK3.Avatars.Components; using UnityEditor; using UnityEngine.SceneManagement; -using UnityEngine.Serialization; using Object = UnityEngine.Object; namespace nadena.dev.modular_avatar.editor.ErrorReporting diff --git a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/SelectionButton.cs b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/SelectionButton.cs index 942e1e4c..83440205 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/SelectionButton.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/SelectionButton.cs @@ -1,5 +1,4 @@ using UnityEditor; -using UnityEngine; using UnityEngine.UIElements; namespace nadena.dev.modular_avatar.editor.ErrorReporting diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs index 25d38a35..76543d6b 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvatarParametersEditor.cs @@ -5,7 +5,6 @@ using System.Linq; using UnityEditor; using UnityEditorInternal; using UnityEngine; -using UnityEngine.Serialization; using static nadena.dev.modular_avatar.core.editor.Localization; using Debug = System.Diagnostics.Debug; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs index e693f936..acc8d2f9 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSelectTreeView.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; -using UnityEditor.Animations; using UnityEditor.IMGUI.Controls; -using UnityEditor.PackageManager.UI; using UnityEngine; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs index 40613dc7..06de3fcb 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/BlendshapeSyncEditor.cs @@ -1,13 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Runtime.InteropServices; using UnityEditor; using UnityEditorInternal; using UnityEngine; -using UnityEngine.PlayerLoop; -using VRC.Core; using static nadena.dev.modular_avatar.core.editor.Localization; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs index bfa98c5e..85b6ed55 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/FirstPersonVisibleEditor.cs @@ -1,6 +1,4 @@ -using System; -using UnityEditor; -using UnityEngine; +using UnityEditor; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs index f51f825f..65cbef3c 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/InspectorCommon.cs @@ -1,7 +1,6 @@ using UnityEditor; using UnityEditor.Experimental.SceneManagement; using UnityEngine; -using UnityEngine.SocialPlatforms; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAAssetBundleEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAAssetBundleEditor.cs index 9f55071d..e8240023 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAAssetBundleEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MAAssetBundleEditor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; -using UnityEditor.Animations; using UnityEngine; using VRC.SDK3.Avatars.ScriptableObjects; using Object = UnityEngine.Object; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MAMenuItemInspector.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MAMenuItemInspector.cs index 80cbeeca..4bb4aaae 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MAMenuItemInspector.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MAMenuItemInspector.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using nadena.dev.modular_avatar.core.editor.menu; -using UnityEditor; -using UnityEngine; -using VRC.Core; -using VRC.SDK3.Avatars.ScriptableObjects; +using UnityEditor; using static nadena.dev.modular_avatar.core.editor.Localization; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuInstallerEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuInstallerEditor.cs index 331dd3c0..90f8fcd7 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuInstallerEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuInstallerEditor.cs @@ -10,7 +10,6 @@ using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; using static nadena.dev.modular_avatar.core.editor.Localization; using static nadena.dev.modular_avatar.core.editor.Util; -using Object = UnityEngine.Object; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuItemGUI.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuItemGUI.cs index 4c38696d..bbf6875e 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuItemGUI.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuItemGUI.cs @@ -4,7 +4,6 @@ using System.Runtime.Serialization; using nadena.dev.modular_avatar.core.menu; using UnityEditor; using UnityEngine; -using UnityEngine.PlayerLoop; using VRC.SDK3.Avatars.ScriptableObjects; using static nadena.dev.modular_avatar.core.editor.Localization; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/ParameterField.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/ParameterField.cs index 5a809a59..5da54a84 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/ParameterField.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/ParameterField.cs @@ -4,7 +4,6 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; using VRC.SDK3.Avatars.Components; -using Object = UnityEngine.Object; using static nadena.dev.modular_avatar.core.editor.Localization; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs index 4801a352..3d7c0bf1 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeAnimationEditor.cs @@ -1,5 +1,4 @@ using UnityEditor; -using UnityEngine.UIElements; using static nadena.dev.modular_avatar.core.editor.Localization; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs index cbe591b9..8fa73517 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MergeArmatureEditor.cs @@ -1,5 +1,4 @@ -using System; -using UnityEditor; +using UnityEditor; using UnityEngine; using static nadena.dev.modular_avatar.core.editor.Localization; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MeshSettingsEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MeshSettingsEditor.cs index 3301eb68..a4c18a92 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MeshSettingsEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MeshSettingsEditor.cs @@ -1,5 +1,4 @@ -using System; -using UnityEditor; +using UnityEditor; using UnityEngine; using static nadena.dev.modular_avatar.core.editor.Localization; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Menu/ActionProcessing.meta b/Packages/nadena.dev.modular-avatar/Editor/Menu/ActionProcessing.meta deleted file mode 100644 index 12ce6c0f..00000000 --- a/Packages/nadena.dev.modular-avatar/Editor/Menu/ActionProcessing.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1cf0a36e200446cb099ec448b446495 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/nadena.dev.modular-avatar/Editor/Menu/MenuExtractor.cs b/Packages/nadena.dev.modular-avatar/Editor/Menu/MenuExtractor.cs index 0347b1dc..f223faed 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Menu/MenuExtractor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Menu/MenuExtractor.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using System.Linq; -using nadena.dev.modular_avatar.core.menu; +using System.Linq; using UnityEditor; using UnityEngine; using VRC.SDK3.Avatars.Components; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Menu/VirtualMenu.cs b/Packages/nadena.dev.modular-avatar/Editor/Menu/VirtualMenu.cs index addb3afb..7505fed0 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Menu/VirtualMenu.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Menu/VirtualMenu.cs @@ -5,7 +5,6 @@ using System.Linq; using JetBrains.Annotations; using nadena.dev.modular_avatar.core.menu; using nadena.dev.modular_avatar.editor.ErrorReporting; -using UnityEditor; using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs index 9a4918e1..973bf2b2 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs @@ -1,14 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.InteropServices; using nadena.dev.modular_avatar.core.editor.menu; -using nadena.dev.modular_avatar.editor.ErrorReporting; using UnityEditor; using UnityEngine; using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; -using Object = UnityEngine.Object; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs index 56a6798d..6c4ab9ac 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.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,7 +22,6 @@ * SOFTWARE. */ -using System; using System.Collections.Generic; using nadena.dev.modular_avatar.editor.ErrorReporting; using UnityEditor; diff --git a/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs b/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs index 0466ca57..e3116003 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MeshRetargeter.cs @@ -26,9 +26,7 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; using nadena.dev.modular_avatar.editor.ErrorReporting; -using UnityEditor; using UnityEngine; -using VRC.SDKBase.Editor.BuildPipeline; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs b/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs index 02b63753..36c6b778 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ModularAvatarSettings.cs @@ -23,7 +23,6 @@ */ using UnityEditor; -using UnityEngine; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs b/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs index a8b1e8db..fccb1d21 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/ParameterPolicy.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using UnityEditor.Animations; diff --git a/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs b/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs index 9bf32a51..f791e185 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/PathMappings.cs @@ -24,11 +24,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using NUnit.Framework; -using Serilog.Sinks.File; using UnityEditor; using UnityEngine; -using VRC.SDKBase.Editor.BuildPipeline; namespace nadena.dev.modular_avatar.core.editor { diff --git a/Packages/nadena.dev.modular-avatar/Editor/RemapAnimationPass.cs b/Packages/nadena.dev.modular-avatar/Editor/RemapAnimationPass.cs index 689cc5b3..bde77eb0 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/RemapAnimationPass.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/RemapAnimationPass.cs @@ -1,6 +1,5 @@ using nadena.dev.modular_avatar.editor.ErrorReporting; using UnityEditor; -using UnityEditor.Animations; using UnityEngine; using VRC.SDK3.Avatars.Components; diff --git a/Packages/nadena.dev.modular-avatar/Editor/Util.cs b/Packages/nadena.dev.modular-avatar/Editor/Util.cs index 341cf76c..de386645 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Util.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Util.cs @@ -24,7 +24,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; using JetBrains.Annotations; using UnityEditor; diff --git a/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs index bfe5a322..d1b525cc 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Unity.Collections; -using UnityEditor; using UnityEngine; namespace nadena.dev.modular_avatar.core.editor diff --git a/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef b/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef index da2f7ae5..172b2d69 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef +++ b/Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef @@ -1,17 +1,30 @@ { "name": "nadena.dev.modular-avatar.core.editor", "references": [ - "GUID:fc900867c0f47cd49b6e2ae4ef907300", - "GUID:5718fb738711cd34ea54e9553040911d", - "GUID:3456780c4fb2d324ab9c633d6f1b0ddb" + "GUID:fc900867c0f47cd49b6e2ae4ef907300", + "GUID:5718fb738711cd34ea54e9553040911d", + "GUID:3456780c4fb2d324ab9c633d6f1b0ddb" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "Newtonsoft.Json.dll", + "System.Collections.Immutable.dll", + "VRCSDKBase.dll", + "VRCSDKBase-Editor.dll", + "VRCSDK3A.dll", + "VRCSDK3A-Editor.dll", + "VRC.Dynamics.dll", + "VRC.SDK3.Dynamics.Contact.dll", + "VRC.SDK3.Dynamics.Contact.Editor.dll", + "VRC.SDK3.Dynamics.PhysBone.dll", + "VRC.SDK3.Dynamics.PhysBone.Editor.dll", + "VRCCore-Editor.dll" + ], "autoReferenced": false, "defineConstraints": [], "versionDefines": [], diff --git a/Packages/nadena.dev.modular-avatar/Runtime/Activator.cs b/Packages/nadena.dev.modular-avatar/Runtime/Activator.cs index 793fb5bd..ad253d01 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/Activator.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/Activator.cs @@ -1,11 +1,9 @@ #if UNITY_EDITOR -using System; using UnityEditor; using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; -using VRC.Core; using VRC.SDK3.Avatars.Components; namespace nadena.dev.modular_avatar.core diff --git a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs index 181a6af0..d8c395ec 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using nadena.dev.modular_avatar.core.menu; +using nadena.dev.modular_avatar.core.menu; using UnityEngine; -using VRC.SDK3.Avatars.ScriptableObjects; namespace nadena.dev.modular_avatar.core { diff --git a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs index 14af6464..1615119e 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs @@ -1,5 +1,4 @@ using UnityEngine; -using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.ScriptableObjects; namespace nadena.dev.modular_avatar.core diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs index 343dab84..6bd98f3e 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs @@ -1,8 +1,5 @@ -using System.Collections.Generic; -using nadena.dev.modular_avatar.core.menu; +using nadena.dev.modular_avatar.core.menu; using UnityEngine; -using VRC.SDK3.Avatars.ScriptableObjects; -using VRC.SDKBase; namespace nadena.dev.modular_avatar.core { diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs index 42bec423..1cb8b8fb 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs @@ -1,8 +1,5 @@ -using System.Collections.Generic; -using System.Linq; -using nadena.dev.modular_avatar.core.menu; +using nadena.dev.modular_avatar.core.menu; using UnityEngine; -using UnityEngine.Serialization; using VRC.SDK3.Avatars.ScriptableObjects; namespace nadena.dev.modular_avatar.core diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs index 222dfe35..a15e68e1 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using UnityEngine.Serialization; namespace nadena.dev.modular_avatar.core { diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs index dfc9030b..aab67f07 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using VRC.SDK3.Avatars.ScriptableObjects; namespace nadena.dev.modular_avatar.core { diff --git a/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef b/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef index 9de4b1f9..c9ce0f1b 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef +++ b/Packages/nadena.dev.modular-avatar/Runtime/nadena.dev.modular-avatar.core.asmdef @@ -4,8 +4,14 @@ "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "VRCSDKBase.dll", + "VRCSDK3A.dll", + "VRC.Dynamics.dll", + "VRC.SDK3.Dynamics.Contact.dll", + "VRC.SDK3.Dynamics.PhysBone.dll" + ], "autoReferenced": true, "defineConstraints": [], "versionDefines": [],