gg.easy.airship 0.1.2168 → 0.1.2170

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -285,7 +285,7 @@ namespace Editor.Accessories.Clothing {
             var buildOutputFile = $"bundles/gear/{airId}_{AirshipPlatformUtil.GetStringName(platform)}.bundle";
             var sourceFolderPath = Path.GetRelativePath(".", Directory.GetParent(AssetDatabase.GetAssetPath(manifest))!.FullName);
 
-            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds();
+            List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds(false);
 
             var assetGuids = AssetDatabase.FindAssets("*", new string[] {sourceFolderPath}).ToList();
             var assetPaths = assetGuids

package/Editor/AirshipComponentDropdown.cs

@@ -176,7 +176,7 @@ public class AirshipComponentDropdown : AdvancedDropdown {
         foreach (var binaryFile in binaryFiles) {
             if (binaryFile.m_metadata == null) continue;
             
-            var airshipComponentMenu = binaryFile.m_metadata.GetDecorators().Find(f => f.name == "AirshipComponentMenu");
+            var airshipComponentMenu = binaryFile.m_metadata.decorators.Find(f => f.name == "AirshipComponentMenu");
             if (airshipComponentMenu != null && airshipComponentMenu.parameters[0].TryGetString(out var customPath)) {
                 if (customPath == "") continue; // ignore empty names :)
                 

package/Editor/AirshipComponentEditor.cs

@@ -218,6 +218,30 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         var metadata = serializedObject.FindProperty("metadata");
         
+        var originalMetadata = binding.script.m_metadata;
+        
+        var originalDecorators = originalMetadata.decorators;
+        var serializedDecorators = binding.metadata.decorators;
+        
+        if (serializedDecorators.Count != originalDecorators.Count) {
+            return true;
+        }
+        
+        foreach (var serializedDecorator in serializedDecorators)
+        {
+            var decoratorName = serializedDecorator.name;
+            var originalDecorator = originalDecorators.Find(d => d.name == decoratorName);
+            
+            if (originalDecorator == null) {
+                return true;
+            }
+
+            var serializedParameters = serializedDecorator.parameters;
+            if (serializedParameters.Count != originalDecorator.parameters.Count) {
+                return true;
+            }
+        }
+        
         var metadataProperties = metadata.FindPropertyRelative("properties");
         var originalMetadataProperties = binding.script.m_metadata?.properties;
 

package/Editor/Artifacts/AirshipReconciliationService.cs

@@ -125,6 +125,7 @@ namespace Airship.Editor {
 
             if (scriptMetadata == null) return false;
             componentMetadata.name = scriptMetadata.name;
+            componentMetadata.decorators = new List<LuauMetadataDecoratorElement>(scriptMetadata.decorators);
             
             // Add missing properties
             foreach (var scriptProperty in scriptMetadata.properties) {
@@ -193,10 +194,108 @@ namespace Airship.Editor {
                 }
             }
 #endif
+            
+            // Add required components
+            var requireComponents = scriptMetadata.FindClassDecorators("RequireComponent");
+            foreach (var requireComponent in requireComponents) {
+               var parameter = requireComponent.parameters.FirstOrDefault();
+               if (parameter == null) continue;
+               
+               var requiredComponentTypeName = parameter.value?.ToString();
+               if (string.IsNullOrEmpty(requiredComponentTypeName)) continue;
+               
+               var gameObject = component.gameObject;
+               if (gameObject == null) continue;
+               
+               var parameterType = parameter.type;
+               
+               switch (parameterType)
+               {
+                   case "object":
+                   {
+                       EnsureUnityComponent(gameObject, requiredComponentTypeName);
+                       break;
+                   }
+                   case "AirshipBehaviour":
+                   {
+                       EnsureAirshipComponent(gameObject, requiredComponentTypeName, component.context);
+                       break;
+                   }
+               }
+            }
+            
             // component.componentHash = component.script.sourceFileHash;
             return true;
         }
+
+        /// <summary>
+        /// Ensures that a Unity component is present on the GameObject, adding it if necessary
+        /// </summary>
+        /// <param name="gameObject">The GameObject to check</param>
+        /// <param name="componentTypeName">The name of the Unity component type</param>
+        private static void EnsureUnityComponent(GameObject gameObject, string componentTypeName) {
+            try {
+                var componentType = GetComponentTypeByName(componentTypeName);
+                if (componentType == null) {
+                    Debug.LogWarning($"[RequireComponent] Could not find Unity component type: {componentTypeName}.", gameObject);
+                    return;
+                }
+                
+                var existingComponent = gameObject.GetComponent(componentType);
+                if (existingComponent != null) {
+                    return;
+                }
+                
+                gameObject.AddComponent(componentType);
+#if AIRSHIP_DEBUG
+                Debug.Log($"[RequireComponent] Added Unity component '{componentTypeName}' to GameObject '{gameObject.name}'", gameObject);
+#endif
+            }
+            catch (Exception ex) {
+                Debug.LogException(ex);
+            }
+        }
+
+        /// <summary>
+        /// Ensures that an AirshipComponent is present on the GameObject, adding it if necessary
+        /// </summary>
+        /// <param name="gameObject">The GameObject to check</param>
+        /// <param name="componentTypeName">The name of the AirshipComponent type</param>
+        /// <param name="context">The Luau context to use when creating the component</param>
+        private static void EnsureAirshipComponent(GameObject gameObject, string componentTypeName, LuauContext context) {
+            try {
+                var existingComponents = gameObject.GetComponents<AirshipComponent>();
+                foreach (var existingComponent in existingComponents) {
+                    if (existingComponent.script == null || existingComponent.script.m_metadata == null) continue;
+
+                    if (existingComponent.script.m_metadata.name != componentTypeName) continue;
+
+                    return;
+                }
+                
+                var buildInfo = AirshipBuildInfo.Instance;
+                if (buildInfo == null || !buildInfo.HasAirshipBehaviourClass(componentTypeName)) {
+                    Debug.LogWarning($"[RequireComponent] AirshipComponent '{componentTypeName}' not found in build info", gameObject);
+                    return;
+                }
+                
+                var scriptPath = buildInfo.GetScriptPath(componentTypeName);
+                AirshipComponent.Create(gameObject, $"Assets/{scriptPath}", context);
+                
+#if AIRSHIP_DEBUG
+                Debug.Log($"[RequireComponent] Added AirshipComponent '{componentTypeName}' to GameObject '{gameObject.name}'", gameObject);
+#endif
+            }
+            catch (Exception ex) {
+                Debug.LogException(ex);
+            }
+        }
         
+        private static Type GetComponentTypeByName(string name) {
+            var types = TypeCache.GetTypesDerivedFrom<Component>();
+            return types.FirstOrDefault(type => type.Name == name);
+        }
+
         /// <summary>
         /// Reconciles all queued components for the given script
         /// </summary>
@@ -381,4 +480,4 @@ namespace Airship.Editor {
         }
     }
 }
-#endif
+#endif