Reflection fixes

Assets/RicUtils/Editor/CustomEditor/AvailableScriptableObjectCustomEditor.cs

@@ -1,6 +1,8 @@
 using RicUtils.ScriptableObjects;
+using RicUtils.Utilities;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEditor;
 using UnityEngine;
 
@@ -75,7 +77,7 @@ public override void OnInspectorGUI()
                     {
                         items.RemoveAt(j);
                     }
-                    availableScriptableObjectType.GetMethod("SetItems", System.Reflection.BindingFlags.NonPublic).Invoke(availableScriptableObject, new object[] { items });
+                    availableScriptableObjectType.GetRecursiveMethod("SetItems", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(availableScriptableObject, new object[] { items });
 
                     EditorUtility.SetDirty(availableScriptableObject);
                     AssetDatabase.SaveAssets();

Assets/RicUtils/Editor/Templates/Script-NewAvailableScriptableObject.cs.txt

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using RicUtils;
+using RicUtils.ScriptableObjects;
 
     #ROOTNAMESPACEBEGIN#
 public class #SCRIPTNAME# : AvailableScriptableObject<#SCRIPTABLEOBJECT#>

Assets/RicUtils/Editor/Templates/Script-NewGenericEditorWindow.cs.txt

@@ -2,11 +2,13 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using RicUtils;
-using RicUtils.Editor;
+using RicUtils.Editor.Windows;
+using UnityEditor;
 
     #ROOTNAMESPACEBEGIN#
 public class #SCRIPTNAME# : GenericEditorWindow<#SCRIPTABLEOBJECT#, #AVAILABLESCRIPTABLEOBJECT#>
 {
+    [MenuItem("Window/RicUtil Windows/#SCRIPTNAME#")]
 	public static #SCRIPTNAME# ShowWindow()
     {
         return GetWindow<#SCRIPTNAME#>();
@@ -21,5 +23,10 @@ public class #SCRIPTNAME# : GenericEditorWindow<#SCRIPTABLEOBJECT#, #AVAILABLESC
     {
 
     }
+
+    protected override void LoadScriptableObject(#SCRIPTABLEOBJECT# so, bool isNull)
+    {
+
+    }
 }
 #ROOTNAMESPACEEND#

Assets/RicUtils/Editor/Templates/Script-NewGenericScriptableObject.cs.txt

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using RicUtils;
+using RicUtils.ScriptableObjects;
 
     #ROOTNAMESPACEBEGIN#
 public class #SCRIPTNAME# : GenericScriptableObject

Assets/RicUtils/Editor/Toolbar/CreateAvailableScriptableObjects.cs

@@ -24,7 +24,7 @@ public static void CreateAvailableScripts()
                 {
                     available = ScriptableObject.CreateInstance(keyValuePair.AvailableScriptableObjectType);
                     var items = (IList)System.Activator.CreateInstance(typeof(List<>).MakeGenericType(keyValuePair.CustomScriptableObjectType));
-                    keyValuePair.AvailableScriptableObjectType.GetMethod("SetItems", System.Reflection.BindingFlags.NonPublic).Invoke(available, new object[] { items });
+                    keyValuePair.AvailableScriptableObjectType.GetRecursiveMethod("SetItems", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).Invoke(available, new object[] { items });
 
                     AssetDatabase.CreateAsset(available, path);
 

Assets/RicUtils/Editor/Utilities/GenericScriptableObjectProcessing.cs

@@ -32,7 +32,7 @@ public static AssetDeleteResult OnWillDeleteAsset(string AssetPath, RemoveAssetO
                         items.Add(item);
                     }
                     items.Remove(temp);
-                    availableScriptableObjectType.GetMethod("SetItems", BindingFlags.NonPublic).Invoke(availableScriptableObject, new object[] { items });
+                    availableScriptableObjectType.GetRecursiveMethod("SetItems", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(availableScriptableObject, new object[] { items });
 
                     EditorUtility.SetDirty(availableScriptableObject);
 

Assets/RicUtils/Editor/Utilities/ToolUtilities.cs

@@ -1,5 +1,6 @@
 using RicUtils.Editor.Settings;
 using RicUtils.ScriptableObjects;
+using RicUtils.Utilities;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -81,8 +82,8 @@ private static bool OpenScriptableObjectFile(GenericScriptableObject so)
                     }
                     var temp = showWindow.Invoke(null, null);
                     var data = System.Convert.ChangeType(temp, keyValuePair.EditorType);
-                    keyValuePair.EditorType.GetField("scriptableObject").SetValue(data, so);
-                    keyValuePair.EditorType.GetMethod("LoadScriptableObject").Invoke(data, new object[] { so, so == null });
+                    keyValuePair.EditorType.GetRecursiveField("scriptableObject", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance).SetValue(data, so);
+                    keyValuePair.EditorType.GetRecursiveMethod("LoadScriptableObjectInternal", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(data, new object[] { so });
                     return true;
                 }
             }

Assets/RicUtils/Editor/Windows/GenericEditorWindow.cs

@@ -25,7 +25,7 @@ private void OnGUI()
         {
             EditorGUIHelper.DrawObjectField(ref scriptableObject, "Scriptable Object", () =>
             {
-                LoadScriptableObjectInternal(scriptableObject, scriptableObject == null);
+                LoadScriptableObjectInternal(scriptableObject);
             });
 
             DrawIDInput(ref spawnableId);
@@ -42,14 +42,14 @@ protected virtual void OnEnable()
             serializedObject = new SerializedObject(this);
         }
 
-        protected void DrawIDInput(ref string id)
+        private void DrawIDInput(ref string id)
         {
             GUI.enabled = scriptableObject == null;
             EditorGUIHelper.DrawStringInput(ref id, "ID");
             GUI.enabled = true;
         }
 
-        protected void DrawSaveDeleteButtons(bool checkExists = true)
+        private void DrawSaveDeleteButtons(bool checkExists = true)
         {
             EditorGUIHelper.DrawSeparator();
             List<CompleteCriteria> criteria = new List<CompleteCriteria>(GetInbuiltCompleteCriteria());
@@ -118,7 +118,7 @@ protected void DrawSaveDeleteButtons(bool checkExists = true)
                 AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(scriptableObject));
 
                 scriptableObject = null;
-                LoadScriptableObjectInternal(scriptableObject, true);
+                LoadScriptableObjectInternal(scriptableObject);
             }
             EditorGUI.EndDisabledGroup();
         }
@@ -151,8 +151,9 @@ private void SaveAsset(T asset, string saveName)
                 AssetDatabase.CreateAsset(asset, $"{SavePath}/{saveName}.asset");
         }
 
-        private void LoadScriptableObjectInternal(T so, bool isNull)
+        private void LoadScriptableObjectInternal(T so)
         {
+            bool isNull = so == null;
             if (isNull)
             {
                 spawnableId = "";

Assets/RicUtils/Runtime/Scripts/Utilities/ReflectionUtilities.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+
+namespace RicUtils.Utilities
+{
+    public static class ReflectionUtilities
+    {
+        public static IEnumerable<MethodInfo> GetRecursiveMethods(this Type type, BindingFlags bindingFlags)
+        {
+            IEnumerable<MethodInfo> methods = type.GetMethods(bindingFlags);
+
+            if (type.BaseType != null)
+            {
+                methods = methods.Concat(type.BaseType.GetRecursiveMethods(bindingFlags));
+            }
+
+            return methods;
+        }
+
+        public static MethodInfo GetRecursiveMethod(this Type type, string name, BindingFlags bindingFlags)
+        {
+            var method = type.GetMethod(name, bindingFlags);
+
+            if (method == null && type.BaseType != null)
+            {
+                method = type.BaseType.GetRecursiveMethod(name, bindingFlags);
+            }
+
+            return method;
+        }
+
+        public static IEnumerable<FieldInfo> GetRecursiveFields(this Type type, BindingFlags bindingFlags)
+        {
+            IEnumerable<FieldInfo> methods = type.GetFields(bindingFlags);
+
+            if (type.BaseType != null)
+            {
+                methods = methods.Concat(type.BaseType.GetRecursiveFields(bindingFlags));
+            }
+
+            return methods;
+        }
+
+        public static FieldInfo GetRecursiveField(this Type type, string name, BindingFlags bindingFlags)
+        {
+            var method = type.GetField(name, bindingFlags);
+
+            if (method == null && type.BaseType != null)
+            {
+                method = type.BaseType.GetRecursiveField(name, bindingFlags);
+            }
+
+            return method;
+        }
+    }
+}