Merge pull request #54 from brunomikoski/bugfix/fix-settings-creation

Bugfix/fix settings creation

Author: brunomikoski

CHANGELOG.MD

@@ -4,6 +4,12 @@ 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).
 
+## [1.4.1]
+### Changed
+- Fixed issue when using the Create Settings menu
+- Added automatically open of the selected collectable when using the goto button on the CollectableProperty Drawer
+- Added type specific GetEnumerator for the Collection
+
 ## [1.4.0]
 ### Added
 - Added quick access to the .Values from the collection, to be used without code generation, you can now use `CustomCollection.Values` to gett all your items
@@ -185,10 +191,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - First initial working version 
 
 ### [Unreleased]
-- Added automatically open of the selected collectable   when using the goto button on the CollectableProperty Drawer
-- Added type specific GetEnumerator for the Collection
 
 
+[1.4.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.4.1
+[1.4.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.4.0
 [1.3.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.2
 [1.3.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.1
 [1.3.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.0

Scripts/Editor/Utils/CollectionUtility.cs

@@ -25,10 +25,15 @@ private static void CreateNewItem()
         [MenuItem("Assets/Create/ScriptableObject Collection/Create Settings", false, 200)]
         private static void CreateSettings()
         {
-            ScriptableObjectCollectionSettings.LoadOrCreateInstance<ScriptableObjectCollection>();
+            ScriptableObjectCollectionSettings.LoadOrCreateInstance<ScriptableObjectCollectionSettings>();
         }
-        
-        
+
+        [MenuItem("Assets/Create/ScriptableObject Collection/Create Settings", true, 200)]
+        private static bool CreateSettings_Validation()
+        {
+            return !ScriptableObjectCollectionSettings.Exist();
+        }
+
         private static int GetHasCount(Object[] objects)
         {
             int hasValue = 0;

Scripts/Runtime/ResourceScriptableObjectSingleton.cs

@@ -18,16 +18,40 @@ public static T Instance
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         public static T LoadOrCreateInstance<T>() where T : ScriptableObject
+        {
+            if (!TryToLoadInstance(out T resultInstance))
+            {
+#if UNITY_EDITOR
+                resultInstance = CreateInstance<T>();
+
+                AssetDatabaseUtils.CreatePathIfDontExist("Assets/Resources");
+                UnityEditor.AssetDatabase.CreateAsset(resultInstance, $"Assets/Resources/{typeof(T).Name}.asset");
+                UnityEditor.AssetDatabase.SaveAssets();
+                UnityEditor.AssetDatabase.Refresh();
+                return resultInstance;
+#endif         
+                return null;
+            }
+
+            return resultInstance;
+        }
+
+        public static bool Exist()
+        {
+            return TryToLoadInstance<T>(out _);
+        }
+
+        private static bool TryToLoadInstance<T>(out T result) where T : ScriptableObject
         {
             T newInstance = Resources.Load<T>(typeof(T).Name);
 
             if (newInstance != null)
-                return newInstance;
+            {
+                result = newInstance;
+                return true;
+            }
 
 #if UNITY_EDITOR
-            if (Application.isPlaying)
-                return null;
-            
             string registryGUID = UnityEditor.AssetDatabase.FindAssets($"t:{typeof(T).Name}")
                 .FirstOrDefault();
 
@@ -38,19 +62,14 @@ public static T LoadOrCreateInstance<T>() where T : ScriptableObject
             }
 
             if (newInstance != null)
-                return newInstance ;
-            
-            newInstance = CreateInstance<T>();
-
-            AssetDatabaseUtils.CreatePathIfDontExist("Assets/Resources");
-            UnityEditor.AssetDatabase.CreateAsset(newInstance, $"Assets/Resources/{typeof(T).Name}.asset");
-            UnityEditor.AssetDatabase.SaveAssets();
-            UnityEditor.AssetDatabase.Refresh();
-            return newInstance;
+            {
+                result = newInstance;
+                return true;
+            }
 #endif
-#pragma warning disable CS0162
-            return null;
-#pragma warning restore CS0162
+            result = null;
+            return false;
         }
+        
     }
 }

Scripts/Runtime/ScriptableObjectCollectionSettings.cs

@@ -167,5 +167,6 @@ private CollectionToSettings GetOrCreateSettingsForCollection(ScriptableObjectCo
             return settings;
         }
 
+        
     }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "unity": "2018.4",
   "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
   "keywords": [