Merge pull request #171 from brunomikoski/feature/more-fixes

Feature/more fixes

Author: brunomikoski

CHANGELOG.MD

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+[Unreleased]
+## Changed
+ - Fixed issue when creating multiple items without renaming it would cause a null reference.
+ - Removed Synchronize Assets button from the Collection Editor, this is already happening multiple times
+ - Renamed Generator button to Run Generator instead of Generate Items since was misleading
 
 ## [2.4.0] - 24/05/2025
 ## Changed
@@ -712,4 +717,4 @@ public bool IsValidConsumable(Consumable consumable)
 [1.1.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.1.1
 [1.1.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.1.0
 [1.0.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.0.1
-[1.0.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.0.0
+[1.0.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.0.0

Editor/UXML/CollectionCustomEditorTreeAsset.uxml

@@ -27,8 +27,7 @@
             </ui:VisualElement>
             <ui:VisualElement style="flex-grow: 1; flex-direction: row; height: 26px; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0;">
                 <ui:Button text="Generate Static File" parse-escape-sequences="true" display-tooltip-when-elided="true" tooltip="Uses Code Generation to generate the Static File to access collection items by code." name="generate-static-file-button" style="flex-grow: 1; padding-right: 0; padding-left: -2px; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-bottom: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 4px; border-top-left-radius: 0; border-top-right-radius: 0;" />
-                <ui:Button text="Generate Items" parse-escape-sequences="true" display-tooltip-when-elided="true" tooltip="Uses Code Generation to generate the Static File to access collection items by code." name="generate-auto-items" style="flex-grow: 1; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0;" />
-                <ui:Button text="Synchronize Assets" parse-escape-sequences="true" display-tooltip-when-elided="true" tooltip="Check for invalid references and reload found items into the collection" name="synchronize-items-button" style="flex-grow: 1; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 2px; padding-bottom: 0; padding-left: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 0;" />
+                <ui:Button text="Run Generator" parse-escape-sequences="true" display-tooltip-when-elided="true" tooltip="Generate Items based on the current Generator Implementation" name="generate-auto-items" style="flex-grow: 1; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0;" />
             </ui:VisualElement>
         </ui:Instance>
         <ui:Instance template="GroupBoxVisualElement" name="GroupBoxVisualElement">

Scripts/Editor/CustomEditors/CollectionCustomEditor.cs

@@ -154,10 +154,6 @@ public override VisualElement CreateInspectorGUI()
             removeSelectedItemsButton.RegisterCallback<MouseUpEvent>(OnClickRemoveSelectedItems);
             removeSelectedItemsButton.SetEnabled(DisplayRemoveButton);
 
-            Button synchronizeAssetsButton = root.Q<Button>("synchronize-items-button");
-            synchronizeAssetsButton.clickable.activators.Clear();
-            synchronizeAssetsButton.RegisterCallback<MouseUpEvent>(OnClickToSynchronizeAssets);
-
             generateStaticFileButton = root.Q<Button>("generate-static-file-button");
             generateStaticFileButton.clickable.activators.Clear();
             generateStaticFileButton.RegisterCallback<MouseUpEvent>(OnClickGenerateStaticFile);
@@ -424,12 +420,6 @@ private void OnNamespaceTextFieldChanged(ChangeEvent<string> evt)
             SOCSettings.Instance.SetNamespaceForCollection(collection, trimmed);
         }
 
-        private void OnClickToSynchronizeAssets(MouseUpEvent evt)
-        {
-            collection.RefreshCollection();
-            ReloadFilteredItems();
-        }
-
         private void OnClickGenerateItems(MouseUpEvent evt)
         {
             CollectionGenerators.RunGenerator(generatorType, collection);
@@ -1095,4 +1085,4 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
             }
         }
     }
-}
+}

Scripts/Runtime/Core/ScriptableObjectCollection.cs

@@ -138,19 +138,20 @@ public ScriptableObject AddNew(Type itemType, string assetName = "")
                 itemName = $"{itemType.Name}";
             }
 
-            newItem.name = AssetDatabase.GenerateUniqueAssetPath(itemName);
+            string uniqueAssetPath = AssetDatabase.GenerateUniqueAssetPath(Path.Combine(parentFolderPath, itemName + ".asset"));
+            string uniqueName = Path.GetFileNameWithoutExtension(uniqueAssetPath);
+            
+            newItem.name = uniqueName;
 
-            if(itemName.IsReservedKeyword())
+            if (itemName.IsReservedKeyword())
                 Debug.LogError($"{itemName} is a reserved keyword name, will cause issues with code generation, please rename it");
 
-            string newFileName = Path.Combine(parentFolderPath, newItem.name + ".asset");
-
             ISOCItem socItem = newItem as ISOCItem;
             socItem.GenerateNewGUID();
 
             this.Add(newItem);
 
-            AssetDatabase.CreateAsset(newItem, newFileName);
+            AssetDatabase.CreateAsset(newItem, uniqueAssetPath);
             ObjectUtility.SetDirty(this);
 
             SerializedObject serializedObject = new SerializedObject(this);
@@ -392,8 +393,8 @@ public void RefreshCollection()
             if (itemsFromOtherCollections.Any())
             {
                 int result = EditorUtility.DisplayDialogComplex("Items from another collections",
-                    $"The following items {string.Join(",", itemsFromOtherCollections.Select(o => o.name).ToArray())} belong to other collections, should I move to the appropriated folder?",
-                    "Move to the assigned collection", $"Assign it to this collection ", "Do nothing");
+                    $"The following items {string.Join(",", itemsFromOtherCollections.Select(o => o.name).ToArray())} belong to other collection, what you want to do?",
+                    "Move to the assigned collection", $"Assign it the parent collection ", "Do nothing");
 
                 if (result == 0)
                 {