gg.easy.airship 0.1.2099 → 0.1.2101

package/Editor/Accessories/AccessoryCollectionEditorTools.cs

@@ -8,49 +8,49 @@ using Code.Player.Accessories;
 public class AccessoryCollectionTools {
     private const SelectionMode AssetModeMask = SelectionMode.Assets | SelectionMode.TopLevel | SelectionMode.DeepAssets;
     private static List<string> processedPaths = new List<string>();
-    private static Material defaultMat; 
-
-    [MenuItem("Airship/Avatar/Fill All Avatar Accessories")]
-    private static void FillAvatarCollection() {
-        Debug.Log("Grabbing all avatar accessories");
-        string folderPath = Application.dataPath + "/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems";
-        string allItemsPath
-            = "Assets/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems/EntireAvatarCollection.asset";
-        
-        AvatarAccessoryCollection allAccessories = AssetDatabase.LoadAssetAtPath<AvatarAccessoryCollection>(allItemsPath);
-
-        //Compile accessories
-        List<AccessoryComponent> accs = new List<AccessoryComponent>();
-        int count = 0;
-        GetAccessoriesInFolder(ref count, folderPath, "prefab", (relativePath)=>{
-                var go = AssetDatabase.LoadAssetAtPath<GameObject>(relativePath);
-                if(go != null){
-                    var acc = go.GetComponent<AccessoryComponent>();
-                    if (acc != null && acc.enabled) {
-                        //Debug.Log("Found Accessory: " + relativePath);
-                        accs.Add(acc);
-                    }
-                }
-        });
-        allAccessories.accessories = accs.ToArray();
-
-        //Compile faces
-        List<AccessoryFace> faces = new List<AccessoryFace>();
-        count = 0;
-        GetAccessoriesInFolder(ref count, folderPath, "asset", (relativePath)=>{
-                var face = AssetDatabase.LoadAssetAtPath<AccessoryFace>(relativePath);
-                if (face != null) {
-                    //Debug.Log("Found Face: " + relativePath);
-                    faces.Add(face);
-                }
-        });
-        allAccessories.faces = faces.ToArray();
-
-        //Save
-        EditorUtility.SetDirty(allAccessories);
-        AssetDatabase.SaveAssets();
-        AssetDatabase.Refresh();
-    }
+    // private static Material defaultMat;
+
+    // [MenuItem("Airship/Avatar/Fill All Avatar Accessories")]
+    // private static void FillAvatarCollection() {
+    //     Debug.Log("Grabbing all avatar accessories");
+    //     string folderPath = Application.dataPath + "/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems";
+    //     string allItemsPath
+    //         = "Assets/AirshipPackages/@Easy/Core/Prefabs/Accessories/AvatarItems/EntireAvatarCollection.asset";
+    //
+    //     AvatarAccessoryCollection allAccessories = AssetDatabase.LoadAssetAtPath<AvatarAccessoryCollection>(allItemsPath);
+    //
+    //     //Compile accessories
+    //     List<AccessoryComponent> accs = new List<AccessoryComponent>();
+    //     int count = 0;
+    //     GetAccessoriesInFolder(ref count, folderPath, "prefab", (relativePath)=>{
+    //             var go = AssetDatabase.LoadAssetAtPath<GameObject>(relativePath);
+    //             if(go != null){
+    //                 var acc = go.GetComponent<AccessoryComponent>();
+    //                 if (acc != null && acc.enabled) {
+    //                     //Debug.Log("Found Accessory: " + relativePath);
+    //                     accs.Add(acc);
+    //                 }
+    //             }
+    //     });
+    //     allAccessories.accessories = accs.ToArray();
+    //
+    //     //Compile faces
+    //     List<AccessoryFace> faces = new List<AccessoryFace>();
+    //     count = 0;
+    //     GetAccessoriesInFolder(ref count, folderPath, "asset", (relativePath)=>{
+    //             var face = AssetDatabase.LoadAssetAtPath<AccessoryFace>(relativePath);
+    //             if (face != null) {
+    //                 //Debug.Log("Found Face: " + relativePath);
+    //                 faces.Add(face);
+    //             }
+    //     });
+    //     allAccessories.faces = faces.ToArray();
+    //
+    //     //Save
+    //     EditorUtility.SetDirty(allAccessories);
+    //     AssetDatabase.SaveAssets();
+    //     AssetDatabase.Refresh();
+    // }
 
     private static void GetAccessoriesInFolder(ref int count, string folderPath, string filetype, Action<string> packCallback) {
         if (!Directory.Exists(folderPath)) {
@@ -77,59 +77,59 @@ public class AccessoryCollectionTools {
         }
     }
 
-    [MenuItem("Assets/Create/Airship/Accessories/Generate Materials In Folder")]
-    static void GenerateMaterialsInFolder(){
-        var processedFiles = new Dictionary<string, Material>();
-        foreach (var obj in Selection.objects) {
-            string selectionPath = AssetDatabase.GetAssetPath(obj); // relative path
-            if (Directory.Exists(selectionPath)) {
-                //This is a folder
-                foreach(var file in Directory.GetFiles(selectionPath)){
-                    //Debug.Log("Found File: " + file);
-                    if(Path.GetExtension(file) != ".png"){
-                        continue;
-                    }
-                    var fileKey = Path.GetFileName(file).Split('_')[0];
-                    if(!processedFiles.ContainsKey(fileKey)){
-                        Debug.Log("Grabbing texture files for: " + fileKey);
-
-                        //Get all the textures we need
-                        //Debug.Log("Getting diffuse texture: " + Path.Combine(selectionPath,fileKey + "_Albedo.png"));
-                        var textureDiffuse = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Albedo.png"), typeof(Texture2D));
-                        var textureMetal = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Metalness.png"), typeof(Texture2D));
-                        var textureNormal = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Normals.png"), typeof(Texture2D));
-                        
-                        //Create the material and assign the textures
-                        var newMaterial = new Material(Shader.Find("Universal Render Pipeline/Lit"));
-                        if(textureDiffuse)
-                            newMaterial.SetTexture("_BaseMap", textureDiffuse);
-                        if(textureNormal)
-                            newMaterial.SetTexture("_BumpMap", textureNormal);
-                        if(textureMetal)
-                            newMaterial.SetTexture("_MetallicGlossMap", textureMetal);
-
-                        //Save the Material into the folder
-                        AssetDatabase.CreateAsset(newMaterial, Path.Combine(selectionPath, fileKey+".mat"));
-
-
-                        processedFiles.Add(fileKey, newMaterial);
-                    }
-                }
-            }
-        }
-    }
-
-    [MenuItem("Assets/Create/Airship/Accessories/Generate Materials In Folder", true)]
-    private static bool ValidateGenerateMaterialsInFolder(){
-        foreach (var obj in Selection.objects) {
-            string selectionPath = AssetDatabase.GetAssetPath(obj); // relative path
-            if (Directory.Exists(selectionPath)) {
-                //This is a folder
-                return true;
-            }
-        }
-        return false;
-    }
+    // [MenuItem("Assets/Create/Airship/Accessories/Generate Materials In Folder")]
+    // static void GenerateMaterialsInFolder() {
+    //     var processedFiles = new Dictionary<string, Material>();
+    //     foreach (var obj in Selection.objects) {
+    //         string selectionPath = AssetDatabase.GetAssetPath(obj); // relative path
+    //         if (Directory.Exists(selectionPath)) {
+    //             //This is a folder
+    //             foreach(var file in Directory.GetFiles(selectionPath)){
+    //                 //Debug.Log("Found File: " + file);
+    //                 if(Path.GetExtension(file) != ".png"){
+    //                     continue;
+    //                 }
+    //                 var fileKey = Path.GetFileName(file).Split('_')[0];
+    //                 if(!processedFiles.ContainsKey(fileKey)){
+    //                     Debug.Log("Grabbing texture files for: " + fileKey);
+    //
+    //                     //Get all the textures we need
+    //                     //Debug.Log("Getting diffuse texture: " + Path.Combine(selectionPath,fileKey + "_Albedo.png"));
+    //                     var textureDiffuse = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Albedo.png"), typeof(Texture2D));
+    //                     var textureMetal = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Metalness.png"), typeof(Texture2D));
+    //                     var textureNormal = (Texture2D)AssetDatabase.LoadAssetAtPath(Path.Combine(selectionPath,fileKey + "_Normals.png"), typeof(Texture2D));
+    //
+    //                     //Create the material and assign the textures
+    //                     var newMaterial = new Material(Shader.Find("Universal Render Pipeline/Lit"));
+    //                     if(textureDiffuse)
+    //                         newMaterial.SetTexture("_BaseMap", textureDiffuse);
+    //                     if(textureNormal)
+    //                         newMaterial.SetTexture("_BumpMap", textureNormal);
+    //                     if(textureMetal)
+    //                         newMaterial.SetTexture("_MetallicGlossMap", textureMetal);
+    //
+    //                     //Save the Material into the folder
+    //                     AssetDatabase.CreateAsset(newMaterial, Path.Combine(selectionPath, fileKey+".mat"));
+    //
+    //
+    //                     processedFiles.Add(fileKey, newMaterial);
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }
+
+    // [MenuItem("Assets/Create/Airship/Accessories/Generate Materials In Folder", true)]
+    // private static bool ValidateGenerateMaterialsInFolder() {
+    //     foreach (var obj in Selection.objects) {
+    //         string selectionPath = AssetDatabase.GetAssetPath(obj); // relative path
+    //         if (Directory.Exists(selectionPath)) {
+    //             //This is a folder
+    //             return true;
+    //         }
+    //     }
+    //     return false;
+    // }
 
 
     [MenuItem("Airship/Avatar/Create Outfit Accessories from Mesh %f8", true)]
@@ -138,74 +138,77 @@ public class AccessoryCollectionTools {
         return Selection.GetFiltered<GameObject>(AssetModeMask).Length > 0;
     }
 
-    [MenuItem("Airship/Avatar/Create Outfit Accessories from Mesh %f8")]
-    [MenuItem("Assets/Create/Airship/Accessories/Create Outfit Accessories from Mesh")]
-    static void CreateAccFromMesh(){
-        processedPaths.Clear();
-        defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials/MaterialLibrary/Clay.mat");
-        var objects = Selection.GetFiltered<GameObject>(AssetModeMask);
-        foreach(var obj in objects){
-            Debug.Log("Unpacking: " + obj.name);
-            var renderers = obj.GetComponentsInChildren<Renderer>();
-            if(renderers.Length > 0){
-                UnpackRenderers(obj, renderers);
-            }
-        }
-    }
+    // [MenuItem("Airship/Avatar/Create Outfit Accessories from Mesh %f8")]
+    // [MenuItem("Assets/Create/Airship/Accessories/Create Outfit Accessories from Mesh")]
+    // static void CreateAccFromMesh(){
+    //     processedPaths.Clear();
+    //     defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials/MaterialLibrary/Clay.mat");
+    //     var objects = Selection.GetFiltered<GameObject>(AssetModeMask);
+    //     foreach(var obj in objects){
+    //         Debug.Log("Unpacking: " + obj.name);
+    //         var renderers = obj.GetComponentsInChildren<Renderer>();
+    //         if(renderers.Length > 0){
+    //             UnpackRenderers(obj, renderers);
+    //         }
+    //     }
+    // }
 
     [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8", true)]
     [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh", true)]
-    private static bool ValidateCreateSingleAccFromMesh(){
+    private static bool ValidateCreateSingleAccFromMesh() {
         return Selection.GetFiltered<GameObject>(AssetModeMask).Length == 1;
     }
 
     [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8")]
     [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh")]
-    static void CreateSingleAccFromMesh(){
+    static void CreateSingleAccFromMesh() {
         processedPaths.Clear();
-        defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials//MaterialLibrary/Organic/Clay.mat");
+        // defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials//MaterialLibrary/Organic/Clay.mat");
         UnpackSingleObject(Selection.GetFiltered<GameObject>(AssetModeMask)[0]);
     }
 
     private static void UnpackSingleObject(GameObject rootGo){
         string rootPath = AssetDatabase.GetAssetPath(rootGo.GetInstanceID());
         string fileName = Path.GetFileNameWithoutExtension(rootPath);
-        string accPrefabPath = Path.Combine(Path.GetDirectoryName(rootPath), fileName+".prefab");
+        string accPrefabPath = Path.Combine(Path.GetDirectoryName(rootPath), fileName + ".prefab");
 
         if (File.Exists(accPrefabPath)) {
-            var acceptsOverwrite = EditorUtility.DisplayDialog(fileName+".prefab already exists. Do you want to replace it?",
+            var acceptsOverwrite = EditorUtility.DisplayDialog(fileName + ".prefab already exists. Do you want to replace it?",
                 "A prefab already exists with this name. Replacing it will overwrite the existing prefab. This can't be undone.", "Replace", "Cancel");
             if (!acceptsOverwrite) {
                 return;
             }
         }
         
-        //Load the mesh into a prefab
-        var accInstance = (GameObject)PrefabUtility.InstantiatePrefab(rootGo);
-        accInstance.name = rootGo.name; // Remove (Clone)
-        PrefabUtility.UnpackPrefabInstance(accInstance, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
-        var accComponent = accInstance.AddComponent<AccessoryComponent>();
-        accComponent.skinnedToCharacter = accInstance.GetComponentInChildren<SkinnedMeshRenderer>() != null;
+        // Load the mesh into a prefab
+        var go = (GameObject)PrefabUtility.InstantiatePrefab(rootGo);
+        go.name = rootGo.name; // Remove (Clone)
+        go.transform.localScale = Vector3.one;
+        go.transform.localPosition = Vector3.zero;
+        // go.transform.localRotation = Quaternion.identity;
+        PrefabUtility.UnpackPrefabInstance(go, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
+        var accComponent = go.AddComponent<AccessoryComponent>();
+        accComponent.skinnedToCharacter = go.GetComponentInChildren<SkinnedMeshRenderer>() != null;
         // Always default to right hand for reliability
         var slot = AccessorySlot.RightHand; // GetSlot(accInstance.name, accComponent.skinnedToCharacter);
         accComponent.accessorySlot = slot;
-        
-        foreach(var ren in accInstance.GetComponentsInChildren<Renderer>()){
-            if(!ren){
+
+        foreach (var ren in go.GetComponentsInChildren<Renderer>()) {
+            if (!ren) {
                 continue;
             }
             //Assign a default material
-            var materials = ren.sharedMaterials;
-            for(int i=0; i<ren.sharedMaterials.Length; i++){
-                materials[i] = defaultMat;
-            }
-            ren.sharedMaterials = materials;
-            ren.gameObject.AddComponent<MaterialColorURP>();
+            // var materials = ren.sharedMaterials;
+            // for (int i = 0; i < ren.sharedMaterials.Length; i++){
+            //     materials[i] = defaultMat;
+            // }
+            // ren.sharedMaterials = materials;
+            // ren.gameObject.AddComponent<MaterialColorURP>();
         }
-        
+
         //Save the prefab
-        PrefabUtility.SaveAsPrefabAsset(accInstance, accPrefabPath);
-        GameObject.DestroyImmediate(accInstance);
+        PrefabUtility.SaveAsPrefabAsset(go, accPrefabPath);
+        GameObject.DestroyImmediate(go);
 
         EditorUtility.DisplayDialog("Accessory Created", $"Created accessory {fileName}\nUsing slot: {slot}", "OK");
     }
@@ -250,13 +253,13 @@ public class AccessoryCollectionTools {
                 continue;
             }
             //Assign a default material
-            Debug.Log("Using mat: " + defaultMat.name);
-            var materials = ren.sharedMaterials;
-            for(int i=0; i<ren.sharedMaterials.Length; i++){
-                materials[i] = defaultMat;
-            }
-            ren.sharedMaterials = materials;
-            ren.gameObject.AddComponent<MaterialColorURP>();
+            // Debug.Log("Using mat: " + defaultMat.name);
+            // var materials = ren.sharedMaterials;
+            // for(int i=0; i<ren.sharedMaterials.Length; i++){
+            //     materials[i] = defaultMat;
+            // }
+            // ren.sharedMaterials = materials;
+            // ren.gameObject.AddComponent<MaterialColorURP>();
 
             //Asssing the accessory
             var acc = ren.gameObject.AddComponent<AccessoryComponent>();
@@ -298,7 +301,7 @@ public class AccessoryCollectionTools {
         }
 
         //Load the accessories into the avatar collection to show in the avatar editor
-        FillAvatarCollection();
+        // FillAvatarCollection();
 
         //Save changes
         AssetDatabase.SaveAssets();

package/Editor/Accessories/AccessoryComponentEditor.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Code.Player.Accessories;
 using Code.Platform.Server;
 using Code.Platform.Shared;
-using Editor.Auth;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Diagnostics;

package/Editor/Accessories/AccessoryEditorWindow.cs

@@ -223,7 +223,10 @@ namespace Editor.Accessories {
                 DestroyImmediate(_editingAccessoryComponent.gameObject);
                 _editingAccessoryComponent = null;
             }
-            _selectedItemLabel.text = "No selected item";
+
+            if (_selectedItemLabel != null) {
+                _selectedItemLabel.text = "No selected item";
+            }
         }
 
         private void BuildScene(AccessoryComponent accessoryComponent, bool forceRedraw = false) {

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -84,6 +84,8 @@ namespace Editor.Accessories.Clothing {
                 }
             }
 
+            if (!CreateAssetBundles.PrePublishChecks()) return;
+
 
             // Create Class ID's for each gear piece
             foreach (var gear in manifest.gearList) {

package/Editor/AirshipComponentEditor.cs

@@ -382,11 +382,16 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         var propNameDisplay = ObjectNames.NicifyVariableName(propName.stringValue);
         var decoratorDictionary = GetDecorators(bindingProp);
-        var guiContent = new GUIContent(propNameDisplay, GetTooltip("", decoratorDictionary));
+
+        var documentation = bindingProp.Documentation;
+        var tooltip = GetTooltip(documentation?.Tooltip ?? "", decoratorDictionary);
+        
+        
+        var guiContent = new GUIContent(propNameDisplay, tooltip);
         
         var arrayElementType = LuauMetadataPropertySerializer.GetAirshipComponentPropertyTypeFromString(
             items.FindPropertyRelative("type").stringValue, 
-            HasDecorator(decorators, "int")
+            false
         );
         
         // Loop over styling decorators to display them in same order they were passed in
@@ -1083,7 +1088,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         {
             case "Header":
                 EditorGUILayout.Space();
-                EditorGUILayout.LabelField((String) parameters[0].value, EditorStyles.boldLabel);
+                var guiStyle = EditorStyles.boldLabel;
+                guiStyle.richText = true;
+                EditorGUILayout.LabelField((String) parameters[0].value, guiStyle);
                 return;
             case "Spacing":
                 if (parameters.Count == 0)

package/Editor/GameConfig/GameConfigEditor.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Editor.Auth;
+using Code.Authentication;
 using JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine;

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -326,6 +326,8 @@ namespace Editor.Packages {
                 yield break;
             }
             
+            Debug.Log("Starting deploy of " + packageDoc.id + "...");
+            
             List<string> possibleKeys;
             if (currentEnvironment == "Staging") {
                 possibleKeys = new List<string> { AuthConfig.instance.stagingApiKey, InternalHttpManager.editorAuthToken };
@@ -367,8 +369,6 @@ namespace Editor.Packages {
                     continue;
                 }
 
-                Debug.Log("Deployment: ");
-                Debug.Log(req.downloadHandler.text);
                 deploymentDto = JsonUtility.FromJson<DeploymentDto>(req.downloadHandler.text);
                 break;
             }

package/Editor/Publish/Deploy.cs

@@ -6,10 +6,10 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Airship.Editor;
+using Code.Authentication;
 using Code.Bootstrap;
 using Code.Http.Internal;
 using Code.Platform.Shared;
-using Editor.Auth;
 using Editor.Packages;
 using Luau;
 using Proyecto26;

package/Editor/Publish/PublishTargetWindow.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Editor.Auth;
+using Code.Authentication;
 using UnityEditor;
 using UnityEngine;
 

package/Editor/Toolbar/EditorToolbar.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
+using Code.Authentication;
 using Code.Http.Internal;
-using Editor.Auth;
 using Editor.Packages;
 using ParrelSync;
 using UnityEditor;