Merge pull request #162 from brunomikoski/feature/unity-6-support

Feature/unity 6 support

Author: brunomikoski

Scripts/Editor/Core/EditorBehaviour.cs

@@ -12,7 +12,7 @@ static EditorBehaviour()
 
         private static void OnPlayModeStateChanged(PlayModeStateChange playModeStateChange)
         {
-            if (playModeStateChange == PlayModeStateChange.EnteredPlayMode)
+            if (playModeStateChange == PlayModeStateChange.ExitingEditMode)
             {                
                 CollectionsRegistry.Instance.RemoveNonAutomaticallyInitializedCollections();
             }

Scripts/Editor/Core/SOCSettings.cs

@@ -262,10 +262,8 @@ public CollectionSettings GetOrCreateCollectionSettings(ScriptableObjectCollecti
             string path = AssetDatabase.GetAssetPath(collection);
             AssetImporter importer = AssetImporter.GetAtPath(path);
 
-            string collectionSettingsData = importer.userData;
-
             CollectionSettings collectionSetting;
-            if (string.IsNullOrEmpty(collectionSettingsData))
+            if (importer == null || string.IsNullOrEmpty(importer.userData))
             {
                 collectionSetting = new CollectionSettings(collection);
             }
@@ -302,4 +300,4 @@ public void SaveCollectionSettings(ScriptableObjectCollection collection, bool f
             settings.Save();
         }
     }
-}
+}

Scripts/Editor/CustomEditors/CollectionCustomEditor.cs

@@ -823,6 +823,57 @@ private void ShowOptionsForIndex(MouseUpEvent evt, int targetIndex)
                 }
             );
 
+
+            List<ScriptableObjectCollection> possibleAnotherCollections = GetPossibleAnotherCollections();
+
+            if (possibleAnotherCollections.Count > 0)
+            {
+                foreach (ScriptableObjectCollection scriptableObjectCollection in possibleAnotherCollections)
+                {
+                    if (scriptableObjectCollection == collection)
+                        continue;
+
+                    menu.AddItem(
+                        new GUIContent($"Move to {(AssetDatabase.GetAssetPath(scriptableObject).Replace("/","\\").Replace("Assets", "").Replace(".asset", ""))}"),
+                        false,
+                        () =>
+                        {
+                            if (selectedItemsCount > 0)
+                            {
+                                if (!EditorUtility.DisplayDialog($"Move {collectionItemListView.selectedIndices.Count()} Items",
+                                        $"Are you sure you want to move {collectionItemListView.selectedIndices.Count()} items, from {AssetDatabase.GetAssetPath(collection)} to {AssetDatabase.GetAssetPath(scriptableObject)}", "Yes", "No"))
+                                {
+                                    return;
+                                }
+
+                                List<ScriptableObject> moveItems =
+                                    new List<ScriptableObject>();
+                                foreach (int selectedIndex in collectionItemListView.selectedIndices)
+                                {
+                                    moveItems.Add(filteredItems[selectedIndex]);
+                                }
+
+                                foreach (ScriptableObject item in moveItems)
+                                {
+                                    MoveItem(item, scriptableObjectCollection);
+                                }
+
+                            }
+                            else
+                            {
+                                if (!EditorUtility.DisplayDialog($"Move Item",
+                                        $"Are you sure you want to move {filteredItems[^1].name}, from {AssetDatabase.GetAssetPath(collection)} to {AssetDatabase.GetAssetPath(scriptableObject)}", "Yes", "No"))
+                                {
+                                    return;
+                                }
+
+                                MoveItem(filteredItems[targetIndex], scriptableObjectCollection);
+                            }
+                        }
+                    );
+                }
+            }
+
             menu.AddSeparator("");
             menu.AddItem(
                 new GUIContent("Select Asset"),
@@ -840,9 +891,41 @@ private void ShowOptionsForIndex(MouseUpEvent evt, int targetIndex)
                 }
             );
 
+            if (selectedItemsCount == 1)
+            {
+                menu.AddItem(
+                    new GUIContent("Rename Asset"),
+                    false,
+                    () =>
+                    {
+                        RenameItemAtIndex(collectionItemListView.selectedIndices.First());
+                    }
+                );
+            }
+
             menu.ShowAsContext();
         }
 
+        private void MoveItem(ScriptableObject item, ScriptableObjectCollection targetCollection)
+        {
+            Undo.RecordObject(collection, "Move Item");
+            Undo.RecordObject(targetCollection, "Move Item");
+
+            collection.Remove(item);
+            targetCollection.Add(item);
+
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+
+            ReloadFilteredItems();
+        }
+
+        private List<ScriptableObjectCollection> GetPossibleAnotherCollections()
+        {
+            CollectionsRegistry.Instance.TryGetCollectionsOfItemType(collection.GetItemType(), out List<ScriptableObjectCollection> collections);
+            return collections;
+        }
+
         private void SelectItemAtIndex(params int[] index)
         {
             Object[] selectedObjects = new Object[index.Length];
@@ -885,7 +968,7 @@ private void RenameItemAtIndex(MouseDownEvent evt, int targetIndex)
 
         private void RenameItemAtIndex(int targetIndex)
         {
-            ClearCurrentRenamingItem();
+            ClearCurrentRenamingItem(false);
 
             Undo.RecordObject(filteredItems[targetIndex], "Rename Item");
             VisualElement targetElement = collectionItemListView.GetRootElementForIndex(targetIndex);
@@ -895,19 +978,24 @@ private void RenameItemAtIndex(int targetIndex)
             currentRenamingLabel.style.display = DisplayStyle.None;
 
             currentRenamingTextField = targetElement.Q<TextField>();
-            currentRenamingTextField.RegisterCallback<FocusOutEvent>(OnRenamingAssetLostFocus);
-            currentRenamingTextField.RegisterValueChangedCallback(_ => OnFinishRenamingItem(targetIndex));
 
             currentRenamingTextField.SetValueWithoutNotify(currentRenamingLabel.text);
             currentRenamingTextField.style.display = DisplayStyle.Flex;
             currentRenamingTextField.SelectAll();
             currentRenamingTextField.Focus();
             collectionItemListView.ClearSelection();
+
+            currentRenamingTextField.schedule.Execute(() =>
+            {
+                currentRenamingTextField.SelectAll();
+                currentRenamingTextField.RegisterCallback<FocusOutEvent>(OnRenamingAssetLostFocus);
+                currentRenamingTextField.RegisterValueChangedCallback(_ => OnFinishRenamingItem(targetIndex));
+            }).ExecuteLater(0);
         }
 
         private void OnRenamingAssetLostFocus(FocusOutEvent evt)
         {
-            ClearCurrentRenamingItem();
+            ClearCurrentRenamingItem(false);
         }
 
         private void OnFinishRenamingItem(int targetIndex)
@@ -929,18 +1017,22 @@ private void OnFinishRenamingItem(int targetIndex)
                 AssetDatabase.SaveAssetIfDirty(asset);
             }
 
-            ClearCurrentRenamingItem();
+            ClearCurrentRenamingItem(true);
         }
 
-        private void ClearCurrentRenamingItem()
+        private void ClearCurrentRenamingItem(bool renamedSuccessfully)
         {
             if (currentRenamingTextField == null)
                 return;
 
+            currentRenamingTextField.UnregisterCallback<FocusOutEvent>(OnRenamingAssetLostFocus);
             currentRenamingTextField.style.display = DisplayStyle.None;
             currentRenamingLabel.style.display = DisplayStyle.Flex;
-            currentRenamingLabel.text = currentRenamingTextField.text;
-            currentRenamingTextField.SetValueWithoutNotify("");
+            if (renamedSuccessfully)
+            {
+                currentRenamingLabel.text = currentRenamingTextField.text;
+                currentRenamingTextField.SetValueWithoutNotify("");
+            }
             currentRenamingLabel = null;
             currentRenamingTextField = null;
         }

Scripts/Editor/PropertyDrawers/CollectionItemPickerPropertyDrawer.cs

@@ -265,6 +265,8 @@ private void Initialize(SerializedProperty property)
             if (initializedPropertiesPaths.Contains(property.propertyPath))
                 return;
 
+            ValidateIndirectReferencesInProperty(property);
+
             Type arrayOrListType = fieldInfo.FieldType.GetArrayOrListType();
             Type itemType = arrayOrListType ?? fieldInfo.FieldType;
 
@@ -297,5 +299,46 @@ private void Initialize(SerializedProperty property)
             labelStyle = assetLabelStyle;
             initializedPropertiesPaths.Add(property.propertyPath);
         }
+
+        private void ValidateIndirectReferencesInProperty(SerializedProperty property)
+        {
+            SerializedProperty indirectReferencesProperty = property.FindPropertyRelative(ITEMS_PROPERTY_NAME);
+
+            bool changed = false;
+            for (int i = indirectReferencesProperty.arraySize - 1; i >= 0; i--)
+            {
+                SerializedProperty elementProperty = indirectReferencesProperty.GetArrayElementAtIndex(i);
+
+                long collectionGUIDValueA = elementProperty.FindPropertyRelative(COLLECTION_GUID_VALUE_A).longValue;
+                long collectionGUIDValueB = elementProperty.FindPropertyRelative(COLLECTION_GUID_VALUE_B).longValue;
+                LongGuid collectionGUID = new(collectionGUIDValueA, collectionGUIDValueB);
+
+                long itemGUIDValueA = elementProperty.FindPropertyRelative(COLLECTION_ITEM_GUID_VALUE_A).longValue;
+                long itemGUIDValueB = elementProperty.FindPropertyRelative(COLLECTION_ITEM_GUID_VALUE_B).longValue;
+                LongGuid itemGUID = new(itemGUIDValueA, itemGUIDValueB);
+
+                bool validReference = false;
+                if(CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUID, out ScriptableObjectCollection collection))
+                {
+                    if (collection.TryGetItemByGUID(itemGUID, out _))
+                    {
+                        validReference = true;
+                    }
+                }
+
+                if (!validReference)
+                {
+                    indirectReferencesProperty.DeleteArrayElementAtIndex(i);
+                    changed = true;
+                }
+            }
+
+            if (changed)
+            {
+                indirectReferencesProperty.serializedObject.ApplyModifiedProperties();
+            }
+        }
+
+
     }
 }

Scripts/Runtime/Core/CollectionItemIndirectReference.cs

@@ -85,7 +85,7 @@ public TObject Ref
 
         private bool TryResolveReference(out TObject result)
         {
-            if (CollectionsRegistry.Instance.TryGetCollectionByGUID(CollectionGUID, out ScriptableObjectCollection<TObject> collection))
+            if (CollectionsRegistry.Instance.TryGetCollectionByGUID(CollectionGUID, out ScriptableObjectCollection collection))
             {
                 if (collection.TryGetItemByGUID(CollectionItemGUID, out ScriptableObject item))
                 {
@@ -103,8 +103,13 @@ private bool TryResolveReference(out TObject result)
 
                         if (!string.IsNullOrEmpty(itemLastKnownName))
                         {
-                            if(collection.TryGetItemByName(itemLastKnownName, out result))
+                            if(collection.TryGetItemByName(itemLastKnownName, out ScriptableObject possibleResult))
                             {
+                                result = possibleResult as TObject;
+                                if (result == null)
+                                {
+                                    return false;
+                                }
                                 SetCollectionItem(result);
                                 return true;
                             }
@@ -148,4 +153,4 @@ public void SetCollection(ScriptableObjectCollection targetCollection)
             collectionLastKnowName = targetCollection.name;
         }
     }
-}
+}

Scripts/Runtime/Core/CollectionItemPicker.cs

@@ -33,7 +33,14 @@ public List<TItemType> Items
 
                     for (int i = 0; i < indirectReferences.Count; i++)
                     {
-                        cachedItems.Add(indirectReferences[i].Ref);
+                        CollectionItemIndirectReference<TItemType> collectionItemIndirectReference = indirectReferences[i];
+                        if (!collectionItemIndirectReference.IsValid() || collectionItemIndirectReference.Ref == null)
+                        {
+                            indirectReferences.RemoveAt(i);
+                            continue;
+                        }
+
+                        cachedItems.Add(collectionItemIndirectReference.Ref);
                     }
 
                     isDirty = false;