npm - gg.easy.airship - Versions diffs - 0.1.2105 → 0.1.2107 - Mend

gg.easy.airship 0.1.2105 → 0.1.2107

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (90) hide show

package/AuthenticationForUnity/Runtime/Browser/AndroidBrowser.cs ADDED Viewed

@@ -0,0 +1,85 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+namespace Cdm.Authentication.Browser {
+    /// <summary>
+    /// OAuth 2.0 verification browser that runs a local server and waits for a call with
+    /// the authorization verification code.
+    /// </summary>
+    public class AndroidBrowser : IBrowser {
+        private string _prefix;
+        public AndroidBrowser(string prefix) {
+            _prefix = prefix;
+        }
+        private TaskCompletionSource<BrowserResult> _taskCompletionSource;
+        /// <summary>
+        /// Gets or sets the close page response. This HTML response is shown to the user after redirection is done.
+        /// </summary>
+        public string closePageResponse { get; set; } =
+            "<html><body><b>DONE!</b><br>(You can close this tab/window now)</body></html>";
+        public async Task<BrowserResult> StartAsync(string loginUrl, string redirectUrl, CancellationToken cancellationToken = default) {
+            _taskCompletionSource = new TaskCompletionSource<BrowserResult>();
+            cancellationToken.Register(() => {
+                _taskCompletionSource?.TrySetCanceled();
+            });
+            using var httpListener = new HttpListener();
+            try {
+                var prefix = _prefix;
+                prefix = AddForwardSlashIfNecessary(prefix);
+                httpListener.Prefixes.Add(prefix);
+                if (httpListener.IsListening) {
+                    httpListener.Stop();
+                }
+                httpListener.Start();
+                httpListener.BeginGetContext(IncomingHttpRequest, httpListener);
+                Application.OpenURL(loginUrl);
+                return await _taskCompletionSource.Task;
+            } finally {
+                httpListener.Stop();
+            }
+        }
+        private void IncomingHttpRequest(IAsyncResult result) {
+            var httpListener = (HttpListener)result.AsyncState;
+            var httpContext = httpListener.EndGetContext(result);
+            var httpRequest = httpContext.Request;
+            // Build a response to send an "ok" back to the browser for the user to see.
+            var httpResponse = httpContext.Response;
+            var buffer = System.Text.Encoding.UTF8.GetBytes(closePageResponse);
+            // Send the output to the client browser.
+            httpResponse.ContentLength64 = buffer.Length;
+            var output = httpResponse.OutputStream;
+            output.Write(buffer, 0, buffer.Length);
+            output.Close();
+            _taskCompletionSource.SetResult(new BrowserResult(BrowserStatus.Success, httpRequest.Url.ToString()));
+        }
+        /// <summary>
+        /// Prefixes must end in a forward slash ("/")
+        /// </summary>
+        /// <see href="https://learn.microsoft.com/en-us/dotnet/api/system.net.httplistener?view=net-7.0#remarks" />
+        private string AddForwardSlashIfNecessary(string url) {
+            string forwardSlash = "/";
+            if (!url.EndsWith(forwardSlash)) {
+                url += forwardSlash;
+            }
+            return url;
+        }
+    }
+}

package/AuthenticationForUnity/Runtime/Browser/AndroidBrowser.cs.meta ADDED Viewed

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8f64d370a4f941beaf2c599b91c73adc
+timeCreated: 1741806451

package/Editor/Accessories/AccessoryEditorWindow.cs CHANGED Viewed

@@ -46,7 +46,7 @@ namespace Editor.Accessories {
         private static void Log(string message){
             #if AIRSHIP_INTERNAL
-            Debug.Log("AccEditor: " + message);
+            // Debug.Log("AccEditor: " + message);
             #endif
         }

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs CHANGED Viewed

@@ -109,21 +109,28 @@ namespace Editor.Accessories.Clothing {
                 (string category, string subcategory) = GetGearCategory(gear);
                 // Create a new class id
-                var req = UnityWebRequest.PostWwwForm($"{AirshipPlatformUrl.contentService}/gear/resource-id/{easyOrgId}",
-                    JsonUtility.ToJson(new GearCreateRequest() {
-                        name = gear.name,
-                        imageId = "c0e07e88-09d4-4962-b42d-7794a7ad4cb2",
-                        description = "Clothing",
-                        gear = new GearCreateRequest() {
-                            airAssets = new string[]{},
-                            category = category,
-                            subcategory = subcategory
-                        }
-                    }));
+                var data = JsonUtility.ToJson(new GearCreateRequest() {
+                    name = gear.name,
+                    imageId = "64351892-40d4-409b-ab3a-501818213b50",
+                    description = "Clothing",
+                    airAssets = new string[] { },
+                    category = category,
+                    subcategory = subcategory,
+                });
+                var req = UnityWebRequest.Post($"{AirshipPlatformUrl.contentService}/gear/resource-id/{easyOrgId}", data, "application/json");
                 req.SetRequestHeader("Authorization", "Bearer " + InternalHttpManager.editorAuthToken);
                 req.SetRequestHeader("x-airship-ignore-rate-limit", "true");
                 await req.SendWebRequest();
+                if (req.result != UnityWebRequest.Result.Success) {
+                    Debug.Log("Post request: " + data);
+                    Debug.LogError("Failed to create gear class: " + req.downloadHandler.text);
+                    return;
+                }
                 Debug.Log("Create classId response: " + req.downloadHandler.text);
+                var createResponse = JsonUtility.FromJson<GearCreateResponse>(req.downloadHandler.text);
+                gear.classId = createResponse.classId;
+                EditorUtility.SetDirty(gear);
+                AssetDatabase.SaveAssets();
             }
             string airId = manifest.airId;

package/Editor/AirshipComponentEditor.cs CHANGED Viewed

@@ -31,7 +31,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     public void OnEnable() {
         var comp = (Component)serializedObject.targetObject;
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         var metadataProperties = metadata.FindPropertyRelative("properties");
         for (var i = 0; i < metadataProperties.arraySize; i++) {
             var serializedProperty = metadataProperties.GetArrayElementAtIndex(i);
@@ -49,18 +49,18 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         AirshipComponent binding = (AirshipComponent)target;
-        if (binding.scriptFile == null && !string.IsNullOrEmpty(binding.m_fileFullPath)) {
-            // Debug.Log("Setting Script File from Path: " + binding.m_fileFullPath);
-            // binding.SetScriptFromPath(binding.m_fileFullPath, LuauContext.Game);
-            if (binding.scriptFile == null) {
-                Debug.LogWarning($"Failed to load script asset: {binding.m_fileFullPath}");
-                EditorGUILayout.HelpBox("Missing reference. This is likely from renaming a script.\n\nOld path: " + binding.m_fileFullPath.Replace("Assets/Bundles/", ""), MessageType.Warning);
+        if (binding.script == null && !string.IsNullOrEmpty(binding.scriptPath)) {
+            // Debug.Log("Setting Script File from Path: " + binding.scriptPath);
+            // binding.SetScriptFromPath(binding.scriptPath, LuauContext.Game);
+            if (binding.script == null) {
+                Debug.LogWarning($"Failed to load script asset: {binding.scriptPath}");
+                EditorGUILayout.HelpBox("Missing reference. This is likely from renaming a script.\n\nOld path: " + binding.scriptPath.Replace("Assets/Bundles/", ""), MessageType.Warning);
             }
         }
         DrawScriptBindingProperties(binding);
-        if (binding.scriptFile != null && binding.scriptFile.m_metadata != null) {
+        if (binding.script != null && binding.script.m_metadata != null) {
             if (ShouldReconcile(binding)) {
                 binding.ReconcileMetadata();
                 serializedObject.ApplyModifiedProperties();
@@ -70,8 +70,8 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             CheckDefaults(binding);
         }
-        if (binding.scriptFile != null) {
-            var metadata = serializedObject.FindProperty("m_metadata");
+        if (binding.script != null) {
+            var metadata = serializedObject.FindProperty("metadata");
             var metadataName = metadata.FindPropertyRelative("name");
             if (!string.IsNullOrEmpty(metadataName.stringValue)) {
                 DrawBinaryFileMetadata(binding, metadata);
@@ -87,6 +87,10 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 EditorGUILayout.LabelField("Component Id", binding.GetAirshipComponentId().ToString());
             }
             EditorGUILayout.EndHorizontal();
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField("Context", binding.context.ToString());
+            EditorGUILayout.EndHorizontal();
         }
 #endif
@@ -155,10 +159,10 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     }
     private void CheckDefaults(AirshipComponent binding) {
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         var metadataProperties = metadata.FindPropertyRelative("properties");
-        var originalMetadataProperties = binding.scriptFile.m_metadata.properties;
+        var originalMetadataProperties = binding.script.m_metadata.properties;
         var setDefault = false;
@@ -201,12 +205,12 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     }
     private bool ShouldReconcile(AirshipComponent binding) {
-        if (binding.m_metadata == null || binding.scriptFile.m_metadata == null) return false;
+        if (binding.metadata == null || binding.script.m_metadata == null) return false;
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         var metadataProperties = metadata.FindPropertyRelative("properties");
-        var originalMetadataProperties = binding.scriptFile.m_metadata?.properties;
+        var originalMetadataProperties = binding.script.m_metadata?.properties;
         if (metadataProperties.arraySize != originalMetadataProperties.Count) {
             return true;
@@ -282,27 +286,27 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawScriptBindingProperties(AirshipComponent binding) {
         EditorGUILayout.Space(5);
-        var script = binding.scriptFile;
-        var scriptPath = serializedObject.FindProperty("m_fileFullPath");
+        var script = binding.script;
+        var scriptPath = serializedObject.FindProperty("scriptPath");
         var content = new GUIContent {
             text = "Script",
             tooltip = scriptPath.stringValue,
         };
-        if (binding.scriptFile != null && (binding.m_metadata != null || Application.isPlaying)) {
+        if (script != null && (binding.metadata != null || Application.isPlaying)) {
             GUI.enabled = false;
         }
         var newScript = EditorGUILayout.ObjectField(content, script, typeof(AirshipScript), true);
         if (newScript != script) {
-            binding.scriptFile = (AirshipScript)newScript;
-            scriptPath.stringValue = newScript == null ? "" : ((AirshipScript)newScript).assetPath;
+            binding.script = (AirshipScript)newScript;
+            scriptPath.stringValue = newScript == null ? "" : binding.script.m_path;
             serializedObject.ApplyModifiedProperties();
         }
         GUI.enabled = true;
-        if (newScript == null) {
+        if (newScript == null && !Application.isPlaying) {
             EditorGUILayout.Space(5);
             var rect = GUILayoutUtility.GetLastRect();
@@ -312,8 +316,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             EditorGUILayout.BeginHorizontal();
             if (GUILayout.Button("Select Airship Component", style)) {
-                AirshipComponentDropdown dd = new AirshipComponentDropdown(new AdvancedDropdownState(), (binaryFile) => {
-                    binding.SetScript(binaryFile, Application.isPlaying);
+                AirshipComponentDropdown dd = new AirshipComponentDropdown(new AdvancedDropdownState(), (airshipScript) => {
+                    binding.script = airshipScript;
+                    binding.scriptPath = airshipScript.m_path;
                     serializedObject.ApplyModifiedProperties();
                     EditorUtility.SetDirty(serializedObject.targetObject);
                 });
@@ -333,11 +338,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         var propertyList = new List<SerializedProperty>();
         var indexDictionary = new Dictionary<string, int>();
-        if (binding.scriptFile.m_metadata != null) {
+        if (binding.script.m_metadata != null) {
             for (var i = 0; i < metadataProperties.arraySize; i++) {
                 var property = metadataProperties.GetArrayElementAtIndex(i);
                 propertyList.Add(property);
-                indexDictionary.Add(binding.scriptFile.m_metadata.properties[i].name, i);
+                indexDictionary.Add(binding.script.m_metadata.properties[i].name, i);
             }
         }
@@ -348,7 +353,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         );
         foreach (var prop in propertyList) {
-            DrawCustomProperty(binding.GetInstanceID(), binding.scriptFile.m_metadata, prop);
+            DrawCustomProperty(binding.GetInstanceID(), binding.script.m_metadata, prop);
         }
     }
@@ -532,13 +537,13 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                                     var scriptPath = buildInfo.GetScriptPathByTypeName(typeName);
                                     switch (draggedObject) {
-                                        case AirshipComponent component when scriptPath != null && buildInfo.Inherits(component.scriptFile, scriptPath):
+                                        case AirshipComponent component when scriptPath != null && buildInfo.Inherits(component.script, scriptPath):
                                             objRef = component;
                                             break;
                                         case AirshipComponent:
                                             continue;
                                         case GameObject go: {
-                                            var firstMatchingComponent = go.GetComponents<AirshipComponent>().FirstOrDefault(f => buildInfo.Inherits(f.scriptFile, scriptPath));
+                                            var firstMatchingComponent = go.GetComponents<AirshipComponent>().FirstOrDefault(f => buildInfo.Inherits(f.script, scriptPath));
                                             if (firstMatchingComponent != null) {
                                                 objRef = firstMatchingComponent;
                                             }

package/Editor/AirshipComponents/AirshipComponentHeaderHandler.cs CHANGED Viewed

@@ -21,8 +21,7 @@ public class AirshipComponentHeaderHandler {
             if (inspectorMode == InspectorMode.Debug) return;
             var component = editorAndHeader.editor.target as Component;
-            if (component is not AirshipComponent binding || binding.scriptFile == null ||
-                !binding.scriptFile.airshipBehaviour) continue;
+            if (component is not AirshipComponent binding || binding.script == null || !binding.script.airshipBehaviour) continue;
             if(onGUIHandler.Method is { Name: "DrawWrappedHeaderGUI" }) continue;

package/Editor/AirshipComponents/AirshipComponentHeaderWrapper.cs CHANGED Viewed

@@ -15,7 +15,7 @@ internal static class AirshipComponentHeader {
     private static readonly GUIContent label = new GUIContent("");
     internal static float AfterComponentHeader(AirshipComponent component, Rect headerRect, bool isHeaderSelected) {
-        var scriptFile = component.scriptFile;
+        var scriptFile = component.script;
         var metadata = scriptFile.m_metadata;
         if (metadata == null) return 0f;
@@ -69,25 +69,23 @@ internal class AirshipComponentHeaderWrapper {
     }
     public void DrawWrappedHeaderGUI() {
-        if (component == null || component.scriptFile == null || !component.scriptFile.airshipBehaviour) {
+        if (component == null || component.script == null || !component.script.airshipBehaviour) {
             RemoveOverrideHeader();
             return;
         }
         Rect headerRect = headerElement.contentRect;
-        bool HeaderIsSelected = headerElement.focusController.focusedElement == headerElement;
+        bool headerIsSelected = headerElement.focusController.focusedElement == headerElement;
         unityOnGUIHandler.Invoke();
-        if (component.m_metadata.name != "") {
-            AirshipComponentHeader.AfterComponentHeader(component, headerRect, HeaderIsSelected);
+        if (component.metadata.name != "") {
+            AirshipComponentHeader.AfterComponentHeader(component, headerRect, headerIsSelected);
         }
     }
-    private void RemoveOverrideHeader()
-    {
-        if(headerElement is null)
-        {
+    private void RemoveOverrideHeader() {
+        if (headerElement is null) {
             return;
         }

package/Editor/AirshipScriptGUI.cs CHANGED Viewed

@@ -10,6 +10,10 @@ using Object = UnityEngine.Object;
 namespace Code.Luau {
     public static class AirshipScriptGUI {
         internal delegate Object AirshipBehaviourValidator(Object[] references, SerializedProperty property);
+        private static bool IsBindableAsComponent(AirshipComponent component, AirshipScript file) {
+            return file.assetPath == component.script.assetPath;
+        }
         private static Object Validate(Object[] references, AirshipScript script, AirshipComponent binding) {
             if (references.Length <= 0) return null;
@@ -21,13 +25,13 @@ namespace Code.Luau {
                 references = gameObject.GetComponents(typeof(AirshipComponent));
                 foreach (var reference in references) {
                     if (reference != null && reference is AirshipComponent bindingComponent &&
-                        (bindingComponent.IsBindableAsComponent(script) ||
+                        (IsBindableAsComponent(bindingComponent, script) ||
                          buildInfo.ComponentIsValidInheritance(bindingComponent, script))) {
                         return reference;
                     }
                 }
             }
-            else if (objectReference is AirshipComponent otherBinding && (otherBinding.IsBindableAsComponent(script) || buildInfo.ComponentIsValidInheritance(otherBinding, script))) {
+            else if (objectReference is AirshipComponent otherBinding && (IsBindableAsComponent(otherBinding, script) || buildInfo.ComponentIsValidInheritance(otherBinding, script))) {
                 return otherBinding;
             }
@@ -130,8 +134,7 @@ namespace Code.Luau {
                                 },
                                 item => {
                                     var itemScriptBinding = item.ToObject<AirshipComponent>();
-                                    return itemScriptBinding != null &&
-                                           itemScriptBinding.IsBindableAsComponent(script);
+                                    return itemScriptBinding != null && IsBindableAsComponent(itemScriptBinding, script);
                                 }, null, script.m_metadata?.displayName ?? "AirshipBehaviour");
                             view.SetSearchText($"h:t:ScriptBinding"); // #m_fileFullPath={script.m_path}
@@ -168,7 +171,7 @@ namespace Code.Luau {
                 case EventType.Repaint: {
                     var temp = EditorGUIUtility.ObjectContent(obj, typeof(AirshipComponent));
-                    var scriptInfo = airshipComponent && airshipComponent.scriptFile ? airshipComponent.scriptFile : script;
+                    var scriptInfo = airshipComponent && airshipComponent.script ? airshipComponent.script : script;
                     var displayName = scriptInfo.m_metadata != null && !string.IsNullOrEmpty(scriptInfo.m_metadata.displayName)
                         ? scriptInfo.m_metadata.displayName

package/Editor/BinaryFileDragDrop.cs CHANGED Viewed

@@ -3,38 +3,29 @@ using Luau;
 using UnityEditor;
 using UnityEngine;
-namespace Editor
-{
-    public static class BinaryFileDragDrop
-    {
+namespace Editor {
+    public static class BinaryFileDragDrop {
         [InitializeOnLoadMethod]
-        private static void OnLoad()
-        {
+        private static void OnLoad() {
             DragAndDrop.AddDropHandler(OnInspectorDrop);
             DragAndDrop.AddDropHandler(OnHierarchyDrop);
             DragAndDrop.AddDropHandler(OnSceneDrop);
         }
-        private static bool IsDraggingBinaryFile()
-        {
-            foreach (var obj in DragAndDrop.objectReferences)
-            {
-                if (obj is AirshipScript)
-                {
+        private static bool IsDraggingBinaryFile() {
+            foreach (var obj in DragAndDrop.objectReferences) {
+                if (obj is AirshipScript) {
                     return true;
                 }
             }
             return false;
         }
-        private static Dictionary<string, AirshipScript> GetDraggedBinaryFiles()
-        {
+        private static Dictionary<string, AirshipScript> GetDraggedBinaryFiles() {
             var binaryFiles = new Dictionary<string, AirshipScript>();
-            for (var i = 0; i < DragAndDrop.objectReferences.Length; i++)
-            {
+            for (var i = 0; i < DragAndDrop.objectReferences.Length; i++) {
                 var obj = DragAndDrop.objectReferences[i];
-                if (obj is AirshipScript binaryFile)
-                {
+                if (obj is AirshipScript binaryFile) {
                     var path = DragAndDrop.paths[i];
                     binaryFiles[path] = binaryFile;
                 }
@@ -43,27 +34,22 @@ namespace Editor
             return binaryFiles;
         }
-        private static DragAndDropVisualMode OnSceneDrop(object dropUpon, Vector3 worldPos, Vector2 viewportPos, Transform parent, bool perform)
-        {
-            if (!perform)
-            {
+        private static DragAndDropVisualMode OnSceneDrop(object dropUpon, Vector3 worldPos, Vector2 viewportPos, Transform parent, bool perform) {
+            if (!perform) {
                 return IsDraggingBinaryFile() && dropUpon != null ? DragAndDropVisualMode.Move : DragAndDropVisualMode.None;
             }
             GameObject go = null;
-            if (dropUpon is GameObject gameObj)
-            {
+            if (dropUpon is GameObject gameObj) {
                 go = gameObj;
             }
-            if (go == null)
-            {
+            if (go == null) {
                 return DragAndDropVisualMode.None;
             }
             var binaryFiles = GetDraggedBinaryFiles();
-            if (binaryFiles.Count == 0)
-            {
+            if (binaryFiles.Count == 0) {
                 return DragAndDropVisualMode.None;
             }
@@ -72,42 +58,34 @@ namespace Editor
             return DragAndDropVisualMode.Move;
         }
-        private static DragAndDropVisualMode OnHierarchyDrop(int instanceId, HierarchyDropFlags dropMode, Transform parent, bool perform)
-        {
-            if (!perform)
-            {
+        private static DragAndDropVisualMode OnHierarchyDrop(int instanceId, HierarchyDropFlags dropMode, Transform parent, bool perform) {
+            if (!perform) {
                 return IsDraggingBinaryFile() && dropMode == HierarchyDropFlags.DropUpon ? DragAndDropVisualMode.Move : DragAndDropVisualMode.None;
             }
-            if (dropMode != HierarchyDropFlags.DropUpon)
-            {
+            if (dropMode != HierarchyDropFlags.DropUpon) {
                 return DragAndDropVisualMode.None;
             }
             // Grab the game object:
             GameObject go = null;
-            if (instanceId != 0)
-            {
+            if (instanceId != 0) {
                 var target = EditorUtility.InstanceIDToObject(instanceId);
-                if (target is GameObject gameObj)
-                {
+                if (target is GameObject gameObj) {
                     go = gameObj;
                 }
             }
-            else if (parent != null)
-            {
+            else if (parent != null) {
                 // If instanceId is 0, then we're dragging into a prefab and need to use the 'parent' transform:
                 go = parent.gameObject;
             }
-            if (go == null)
-            {
+            if (go == null) {
                 return DragAndDropVisualMode.None;
             }
             var binaryFiles = GetDraggedBinaryFiles();
-            if (binaryFiles.Count == 0)
-            {
+            if (binaryFiles.Count == 0) {
                 return DragAndDropVisualMode.None;
             }
@@ -116,27 +94,22 @@ namespace Editor
             return DragAndDropVisualMode.Move;
         }
-        private static DragAndDropVisualMode OnInspectorDrop(object[] targets, bool perform)
-        {
+        private static DragAndDropVisualMode OnInspectorDrop(object[] targets, bool perform) {
             // If hovering, just quickly check if any of the grabbed items are a BinaryFile:
-            if (!perform)
-            {
+            if (!perform) {
                 return IsDraggingBinaryFile() ? DragAndDropVisualMode.Move : DragAndDropVisualMode.None;
             }
             // Collect all dragged binary files:
             var binaryFiles = GetDraggedBinaryFiles();
-            if (binaryFiles.Count == 0)
-            {
+            if (binaryFiles.Count == 0) {
                 return DragAndDropVisualMode.None;
             }
             // Add the script bindings into the given targets:
-            foreach (var target in targets)
-            {
-                if (target is GameObject go)
-                {
+            foreach (var target in targets) {
+                if (target is GameObject go) {
                     AddAllScriptBindings(go, binaryFiles);
                 }
             }
@@ -144,30 +117,25 @@ namespace Editor
             return DragAndDropVisualMode.Move;
         }
-        private static void AddAllScriptBindings(GameObject target, Dictionary<string, AirshipScript> binaryFiles)
-        {
-            foreach (var pair in binaryFiles)
-            {
+        private static void AddAllScriptBindings(GameObject target, Dictionary<string, AirshipScript> binaryFiles) {
+            foreach (var pair in binaryFiles) {
                 AddScriptBinding(target, pair.Value, pair.Key);
             }
         }
-        private static void AddScriptBinding(GameObject target, AirshipScript airshipScript, string path)
-        {
+        private static void AddScriptBinding(GameObject target, AirshipScript airshipScript, string path) {
             if (HasScriptBinding(target, path)) return;
-            var scriptBinding = target.AddComponent<AirshipComponent>();
-            scriptBinding.SetScript(airshipScript);
-            EditorUtility.SetDirty(scriptBinding);
+            var component = target.AddComponent<AirshipComponent>();
+            component.script = airshipScript;
+            component.scriptPath = airshipScript.m_path;
+            EditorUtility.SetDirty(component);
         }
-        private static bool HasScriptBinding(GameObject target, string path)
-        {
-            var scriptBindings = target.GetComponents<AirshipComponent>();
-            foreach (var binding in scriptBindings)
-            {
-                if (binding.m_fileFullPath == path)
-                {
+        private static bool HasScriptBinding(GameObject target, string path) {
+            var components = target.GetComponents<AirshipComponent>();
+            foreach (var component in components) {
+                if (component.scriptPath == path) {
                     return true;
                 }
             }