Merge pull request #55 from FreezyExp/feature/fixes

Feature/fixes

Author: brunomikoski

Scripts/Editor/CreateCollectionWizzard.cs

@@ -264,6 +264,12 @@ private void CreateIndirectAccess()
                 CodeGenerationUtility.AppendLine(writer, 0,
                     $"#endif");
 
+                CodeGenerationUtility.AppendLine(writer, indentation,
+                    $"public {collectableName}IndirectReference() {{}}");
+                
+                CodeGenerationUtility.AppendLine(writer, indentation,
+                    $"public {collectableName}IndirectReference({collectableName} collectableScriptableObject) : base(collectableScriptableObject) {{}}");
+
                 indentation--;
                 CodeGenerationUtility.AppendFooter(writer, ref indentation, TargetNameSpace);
             }

Scripts/Editor/Utils/CollectionUtility.cs

@@ -25,7 +25,7 @@ private static void CreateNewItem()
         [MenuItem("Assets/Create/ScriptableObject Collection/Create Settings", false, 200)]
         private static void CreateSettings()
         {
-            ScriptableObjectCollectionSettings.LoadOrCreateInstance<ScriptableObjectCollectionSettings>();
+            ScriptableObjectCollectionSettings.LoadOrCreateInstance();
         }
 
         [MenuItem("Assets/Create/ScriptableObject Collection/Create Settings", true, 200)]

Scripts/Runtime/CollectableIndirectReference.cs

@@ -8,23 +8,32 @@ public abstract class CollectableIndirectReference
     {
         [SerializeField]
         protected string collectableGUID;
-
+        
         [SerializeField]
         protected string collectionGUID;
-    }                                                                      
-    
+    }
+
     [Serializable]
     public abstract class CollectableIndirectReference<TObject> : CollectableIndirectReference
         where TObject : CollectableScriptableObject
     {
         [NonSerialized]
         private TObject cachedRef;
+        
+        /// <summary>
+        /// Alternative to [XmlIgnore] [JsonIgnore]
+        /// </summary>
+        /// <returns>false, because of a circular reference and the SO is not serializable</returns>
+        public bool ShouldSerializeRef() => false;
+
         public TObject Ref
         {
             get
             {
                 if (cachedRef != null)
+                {
                     return cachedRef;
+                }
 
                 if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUID,
                     out ScriptableObjectCollection<TObject> collection))
@@ -38,6 +47,33 @@ public TObject Ref
 
                 return cachedRef;
             }
+            set => FromCollectable(value);
+        }
+
+        /// <summary>
+        /// Used for serializing, as the protected fields only work for Unity's serializer
+        /// </summary>
+        public string PairedGUID
+        {
+            get => collectionGUID + ":" + collectableGUID;
+            set
+            {
+                var split = value.Split(':');
+                if (split.Length == 2)
+                {
+                    collectionGUID = split[0];
+                    collectableGUID = split[1];
+                }
+            }
+        }
+
+        public CollectableIndirectReference()
+        {
+        }
+
+        public CollectableIndirectReference(TObject collectableScriptableObject)
+        {
+            FromCollectable(collectableScriptableObject);
         }
 
         public void FromCollectable(CollectableScriptableObject collectableScriptableObject)

Scripts/Runtime/CollectableScriptableObject.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace BrunoMikoski.ScriptableObjectCollections

Scripts/Runtime/CollectionsRegistry.cs

@@ -15,7 +15,7 @@ public class CollectionsRegistry : ResourceScriptableObjectSingleton<Collections
 
         public void UsedOnlyForAOTCodeGeneration()
         {
-            LoadOrCreateInstance<CollectionsRegistry>();
+            LoadOrCreateInstance();
             // Include an exception so we can be sure to know if this method is ever called.
             throw new InvalidOperationException("This method is used for AOT code generation only. Do not call it at runtime.");
         }

Scripts/Runtime/ResourceScriptableObjectSingleton.cs

@@ -11,13 +11,13 @@ public static T Instance
             get
             {
                 if (instance == null)
-                    instance = LoadOrCreateInstance<T>();
+                    instance = LoadOrCreateInstance();
                 return instance;
             }
         }
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-        public static T LoadOrCreateInstance<T>() where T : ScriptableObject
+        public static T LoadOrCreateInstance()
         {
             if (!TryToLoadInstance(out T resultInstance))
             {

Scripts/Runtime/ScriptableObjectCollection.cs

@@ -401,7 +401,7 @@ public static ScriptableObjectCollection<ObjectType> Values
             set => base[index] = value;
         }
 
-        public IEnumerator<ObjectType> GetEnumerator()
+        public new IEnumerator<ObjectType> GetEnumerator()
         {
             using (IEnumerator<CollectableScriptableObject> itemEnum = base.GetEnumerator())
             {