Improved type lookup

Author: DerKekser

Assets/Kekser/SaveSystem/Attributes/LoadAttribute.cs

@@ -3,7 +3,7 @@
 namespace Kekser.SaveSystem.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class LoadAttribute : Attribute
+    public class LoadAttribute : SaveSystemAttribute
     {
 
     }

Assets/Kekser/SaveSystem/Attributes/SavableAttribute.cs

@@ -3,7 +3,7 @@
 namespace Kekser.SaveSystem.Attributes
 {
     [AttributeUsage(AttributeTargets.Field)]
-    public class SavableAttribute : Attribute
+    public class SavableAttribute : SaveSystemAttribute
     {
 
     }

Assets/Kekser/SaveSystem/Attributes/SaveAttribute.cs

@@ -3,7 +3,7 @@
 namespace Kekser.SaveSystem.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class SaveAttribute : Attribute
+    public class SaveAttribute : SaveSystemAttribute
     {
 
     }

Assets/Kekser/SaveSystem/Attributes/SaveAttributeManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using Kekser.SaveSystem.Data;
 using UnityEngine;
 
@@ -55,13 +54,16 @@ public static void CacheTypes()
             if (_prefabRegistry == null)
                 throw new Exception("PrefabRegistry not found! Save/Load system will not work!");
 
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            string definedIn = typeof(SaveSystemAttribute).Assembly.GetName().Name;
+
             Dictionary<Type, FieldInfo[]> checkedFields = new Dictionary<Type, FieldInfo[]>();
             Dictionary<Type, MethodInfo[]> checkedMethods = new Dictionary<Type, MethodInfo[]>();
 
-            foreach (Assembly assembly in assemblies)
+            foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
-                if (Regex.IsMatch(assembly.FullName, AssembliesToIgnoreRegex))
+                if (assembly.GlobalAssemblyCache 
+                    || assembly.GetName().Name != definedIn 
+                    && assembly.GetReferencedAssemblies().All(assemblyName => assemblyName.Name != definedIn))
                     continue;
 
                 Type[] types = assembly.GetTypes();

Assets/Kekser/SaveSystem/Attributes/SaveSystemAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Kekser.SaveSystem.Attributes
+{
+    public abstract class SaveSystemAttribute : Attribute
+    {
+        
+    }
+}

Assets/Kekser/SaveSystem/Attributes/SaveSystemAttribute.cs.meta

@@ -2,7 +2,7 @@
     "name": "com.kekser.savesystem",
     "displayName": "SaveSystem",
     "author": { "name": "Kekser", "url": "https://github.com/DerKekser" },
-    "version": "1.1.2",
+    "version": "1.1.3",
     "unity": "2020.3",
     "description": "A save system for unity.",
     "keywords": [ "save", "load" ],