Prevent crash when expression menus, expression parameters, and the FX layer are null.

Author: Auros

Editor/FlareAvatarContext.cs

@@ -5,6 +5,7 @@
 using nadena.dev.ndmf;
 using Sucrose;
 using Sucrose.Animation;
+using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
@@ -49,8 +50,32 @@ public SucroseContainer GetSucrose(BuildContext build)
             if (_container is not null)
                 return _container;
 
-            var fx = build.AvatarDescriptor.baseAnimationLayers.First(l => l.type is VRCAvatarDescriptor.AnimLayerType.FX);
-            _container = new SucroseContainer((fx.animatorController as AnimatorController)!);
+            VRCAvatarDescriptor.CustomAnimLayer? fx = null;
+            var layers = build.AvatarDescriptor.baseAnimationLayers;
+            for (int i = 0; i < layers.Length; i++)
+            {
+                var layer = layers[i];
+                if (layer.type is not VRCAvatarDescriptor.AnimLayerType.FX)
+                    continue;
+
+                layer.isDefault = false;
+                if (!layer.animatorController)
+                {
+                    var controller = new AnimatorController
+                    {
+                        name = "[Flare] FX"
+                    };
+                    AssetDatabase.AddObjectToAsset(controller, build.AssetContainer);
+                    layers[i].animatorController = controller;
+                }
+                fx = layers[i];
+                break;
+            }
+
+            if (fx is null)
+                throw new InvalidOperationException("Cannot find FX layer");
+            
+            _container = new SucroseContainer((fx.Value.animatorController as AnimatorController)!);
 
             if (_container.LayerCount is 0)
                 _container.NewLayer().WithName("Base Layer").WithWeight(1f);

Editor/Passes/MenuizationPass.cs

@@ -23,6 +23,18 @@ protected override void Execute(BuildContext context)
             var descriptor = context.AvatarDescriptor;
             var expressions = descriptor.expressionsMenu;
 
+            // If for a reason we have no controls, don't generate any menus.
+            if (flare.ControlContexts.Count == 0)
+                return;
+            
+            if (expressions == null)
+            {
+                expressions = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
+                expressions.controls = new List<VRCExpressionsMenu.Control>(8);
+                AssetDatabase.AddObjectToAsset(expressions, context.AssetContainer);
+                descriptor.expressionsMenu = expressions;
+            }
+
             foreach (var ctx in flare.ControlContexts)
             {
                 if (ctx.Control.Type is not ControlType.Menu)
@@ -105,10 +117,10 @@ private static void ShrinkAndNestFolderization(VRCExpressionsMenu menu, Object c
                 if (control.type is VRCExpressionsMenu.Control.ControlType.SubMenu && control.subMenu != null)
                     ShrinkAndNestFolderization(control.subMenu, container);
 
-            if (8 >= menu.controls.Count)
+            if (VRCExpressionsMenu.MAX_CONTROLS >= menu.controls.Count)
                 return;
 
-            while (menu.controls.Count > 8)
+            while (menu.controls.Count > VRCExpressionsMenu.MAX_CONTROLS)
             {
                 var more = menu.controls.FirstOrDefault(
                     c => c.type is VRCExpressionsMenu.Control.ControlType.SubMenu && c.name == _subId

Editor/Passes/ParameterGenerationPass.cs

@@ -17,7 +17,7 @@ protected override void Execute(BuildContext context)
             var vrcParams = descriptor.expressionParameters;
 
             // If persistent, copy to avoid messing with the original.
-            if (!EditorUtility.IsPersistent(vrcParams))
+            if (!EditorUtility.IsPersistent(vrcParams) || vrcParams == null)
                 return;
 
             var newParams = ScriptableObject.CreateInstance<VRCExpressionParameters>();

Editor/Passes/ParametrizationPass.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using Flare.Models;
 using nadena.dev.ndmf;
+using UnityEditor;
+using UnityEngine;
 using VRC.SDK3.Avatars.ScriptableObjects;
 
 namespace Flare.Editor.Passes
@@ -36,6 +38,14 @@ protected override void Execute(BuildContext context)
                 };
             });
 
+            if (vrcParams == null)
+            {
+                vrcParams = ScriptableObject.CreateInstance<VRCExpressionParameters>();
+                vrcParams.parameters = Array.Empty<VRCExpressionParameters.Parameter>();
+                AssetDatabase.AddObjectToAsset(vrcParams, context.AssetContainer);
+                descriptor.expressionParameters = vrcParams;
+            }
+            
             vrcParams.parameters = vrcParams.parameters.Concat(flareParameters).ToArray();
         }
     }