Add aggressive mouse unlock option using WaitForEndOfFrame

README.md

@@ -6,7 +6,7 @@
   An in-game explorer and a suite of debugging tools for <a href="https://docs.unity3d.com/Manual/IL2CPP.html">IL2CPP</a> and <b>Mono</b> Unity games, to aid with modding development.
 </p>
 
-## Releases [![](https://img.shields.io/github/release/sinai-dev/Explorer.svg?label=release%20notes)](../../releases/latest) [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/total.svg)](../../releases) [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/latest/total.svg)](../../releases/latest)
+## Releases [![](https://img.shields.io/github/release/sinai-dev/UnityExplorer.svg?label=release%20notes)](../../releases/latest) [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/total.svg)](../../releases) [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/latest/total.svg)](../../releases/latest)
 
 | Mod Loader  | IL2CPP | Mono |
 | ----------- | ------ | ---- |

src/Core/CSharp/ScriptInteraction.cs

@@ -20,7 +20,7 @@ namespace UnityExplorer.Core.CSharp
 
         public static void StartCoroutine(IEnumerator ienumerator)
         {
-            RuntimeProvider.Instance.StartConsoleCoroutine(ienumerator);
+            RuntimeProvider.Instance.StartCoroutine(ienumerator);
         }
 
         public static void AddUsing(string directive)

src/Core/Config/ConfigManager.cs

@@ -17,18 +17,20 @@ namespace UnityExplorer.Core.Config
         // See the UnityExplorer.Loader namespace for the implementations.
         public static ConfigHandler Handler { get; private set; }
 
-        public static ConfigElement<KeyCode> Main_Menu_Toggle;
-        public static ConfigElement<bool>    Force_Unlock_Mouse;
-        public static ConfigElement<int>     Default_Page_Limit;
-        public static ConfigElement<string>  Default_Output_Path;
-        public static ConfigElement<bool>    Log_Unity_Debug;
-        public static ConfigElement<bool>    Hide_On_Startup;
+        public static ConfigElement<KeyCode>    Main_Menu_Toggle;
+        public static ConfigElement<bool>       Force_Unlock_Mouse;
+        public static ConfigElement<bool>       Aggressive_Force_Unlock;
+        public static ConfigElement<MenuPages>  Default_Tab;
+        public static ConfigElement<int>        Default_Page_Limit;
+        public static ConfigElement<string>     Default_Output_Path;
+        public static ConfigElement<bool>       Log_Unity_Debug;
+        public static ConfigElement<bool>       Hide_On_Startup;
+        public static ConfigElement<float>      Startup_Delay_Time;
 
-        public static ConfigElement<string>  Last_Window_Anchors;
-        public static ConfigElement<string>  Last_Window_Position;
-        public static ConfigElement<int>     Last_Active_Tab;
-        public static ConfigElement<bool>    Last_DebugConsole_State;
-        public static ConfigElement<bool>    Last_SceneExplorer_State;
+        public static ConfigElement<string>     Last_Window_Anchors;
+        public static ConfigElement<string>     Last_Window_Position;
+        public static ConfigElement<bool>       Last_DebugConsole_State;
+        public static ConfigElement<bool>       Last_SceneExplorer_State;
 
         internal static readonly Dictionary<string, IConfigElement> ConfigElements = new Dictionary<string, IConfigElement>();
 
@@ -44,7 +46,6 @@ namespace UnityExplorer.Core.Config
             SceneExplorer.OnToggleShow += SceneExplorer_OnToggleShow;
             PanelDragger.OnFinishResize += PanelDragger_OnFinishResize;
             PanelDragger.OnFinishDrag += PanelDragger_OnFinishDrag;
-            MainMenu.OnActiveTabChanged += MainMenu_OnActiveTabChanged;
             DebugConsole.OnToggleShow += DebugConsole_OnToggleShow;
 
             InitConsoleCallback();
@@ -66,6 +67,10 @@ namespace UnityExplorer.Core.Config
                 "Should UnityExplorer be hidden on startup?",
                 false);
 
+            Default_Tab = new ConfigElement<MenuPages>("Default Tab",
+                "The default menu page when starting the game.",
+                MenuPages.Home);
+
             Log_Unity_Debug = new ConfigElement<bool>("Log Unity Debug",
                 "Should UnityEngine.Debug.Log messages be printed to UnityExplorer's log?",
                 false);
@@ -74,6 +79,10 @@ namespace UnityExplorer.Core.Config
                 "Force the Cursor to be unlocked (visible) when the UnityExplorer menu is open.",
                 true);
 
+            Aggressive_Force_Unlock = new ConfigElement<bool>("Aggressive Mouse Unlock",
+                "Use WaitForEndOfFrame to aggressively force the Mouse to be unlocked (requires game restart).",
+                false);
+
             Default_Page_Limit = new ConfigElement<int>("Default Page Limit",
                 "The default maximum number of elements per 'page' in UnityExplorer.",
                 25);
@@ -82,6 +91,10 @@ namespace UnityExplorer.Core.Config
                 "The default output path when exporting things from UnityExplorer.",
                 Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Output"));
 
+            Startup_Delay_Time = new ConfigElement<float>("Startup Delay Time",
+                "The delay on startup before the UI is created.",
+                1f);
+
             // Internal configs
 
             Last_Window_Anchors = new ConfigElement<string>("Last_Window_Anchors",
@@ -94,11 +107,6 @@ namespace UnityExplorer.Core.Config
                 DEFAULT_WINDOW_POSITION,
                 true);
 
-            Last_Active_Tab = new ConfigElement<int>("Last_Active_Tab",
-                "For internal use, the last active tab index.",
-                0,
-                true);
-
             Last_DebugConsole_State = new ConfigElement<bool>("Last_DebugConsole_State",
                 "For internal use, the collapsed state of the Debug Console.",
                 true,
@@ -115,6 +123,7 @@ namespace UnityExplorer.Core.Config
         private static void PanelDragger_OnFinishResize(RectTransform rect)
         {
             Last_Window_Anchors.Value = rect.RectAnchorsToString();
+            PanelDragger_OnFinishDrag(rect);
         }
 
         private static void PanelDragger_OnFinishDrag(RectTransform rect)
@@ -122,11 +131,6 @@ namespace UnityExplorer.Core.Config
             Last_Window_Position.Value = rect.RectPositionToString();
         }
 
-        private static void MainMenu_OnActiveTabChanged(int page)
-        {
-            Last_Active_Tab.Value = page;
-        }
-
         private static void DebugConsole_OnToggleShow(bool showing)
         {
             Last_DebugConsole_State.Value = showing;

src/Core/Input/CursorUnlocker.cs

@@ -7,6 +7,7 @@ using BF = System.Reflection.BindingFlags;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core;
 using UnityExplorer.UI;
+using System.Collections;
 #if ML
 using Harmony;
 #else
@@ -48,6 +49,36 @@ namespace UnityExplorer.Core.Input
 
             Unlock = ConfigManager.Force_Unlock_Mouse.Value;
             ConfigManager.Force_Unlock_Mouse.OnValueChanged += (bool val) => { Unlock = val; };
+
+            if (ConfigManager.Aggressive_Force_Unlock.Value)
+                SetupAggressiveUnlock();
+        }
+
+        public static void SetupAggressiveUnlock()
+        {
+            try
+            {
+                RuntimeProvider.Instance.StartCoroutine(AggressiveUnlockCoroutine());
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception setting up Camera.onPostRender callback: {ex}");
+            }
+        }
+
+        private static readonly WaitForEndOfFrame _waitForEndOfFrame = new WaitForEndOfFrame();
+
+        private static IEnumerator AggressiveUnlockCoroutine()
+        {
+            while (true)
+            {
+                ExplorerCore.Log("Yielding end of frame");
+                yield return _waitForEndOfFrame;
+                ExplorerCore.Log("Yielded");
+
+                if (UIManager.ShowMenu)
+                    UpdateCursorControl();
+            }
         }
 
         public static void UpdateCursorControl()
@@ -89,34 +120,29 @@ namespace UnityExplorer.Core.Input
 
         public static void SetEventSystem()
         {
-            // not overriding EventSystem for new InputSystem, dont seem to need to.
             if (InputManager.CurrentType == InputType.InputSystem)
                 return;
 
-            // Disable current event system object
-            if (m_lastEventSystem || EventSystem.current)
+            if (EventSystem.current && EventSystem.current != UIManager.EventSys)
             {
-                if (!m_lastEventSystem)
-                    m_lastEventSystem = EventSystem.current;
-
+                m_lastEventSystem = EventSystem.current;
                 m_lastEventSystem.enabled = false;
             }
 
             // Set to our current system
             m_settingEventSystem = true;
-            EventSystem.current = UIManager.EventSys;
             UIManager.EventSys.enabled = true;
+            EventSystem.current = UIManager.EventSys;
             InputManager.ActivateUIModule();
             m_settingEventSystem = false;
         }
 
         public static void ReleaseEventSystem()
         {
-            // not overriding EventSystem for new InputSystem, dont seem to need to.
             if (InputManager.CurrentType == InputType.InputSystem)
                 return;
 
-            if (m_lastEventSystem)
+            if (m_lastEventSystem && m_lastEventSystem.gameObject.activeSelf)
             {
                 m_lastEventSystem.enabled = true;
 
@@ -153,13 +179,16 @@ namespace UnityExplorer.Core.Input
 
         public static void Prefix_EventSystem_set_current(ref EventSystem value)
         {
-            if (!m_settingEventSystem)
+            if (!m_settingEventSystem && value != UIManager.EventSys)
             {
                 m_lastEventSystem = value;
                 m_lastInputModule = value?.currentInputModule;
 
                 if (ShouldActuallyUnlock)
+                {
                     value = UIManager.EventSys;
+                    value.enabled = true;
+                }
             }
         }
 
@@ -189,4 +218,4 @@ namespace UnityExplorer.Core.Input
             }
         }
     }
-}
+}

src/Core/Input/IHandleInput.cs

@@ -18,4 +18,4 @@ namespace UnityExplorer.Core.Input
         void AddUIInputModule();
         void ActivateModule();
     }
-}
+}

src/Core/Input/InputSystem.cs

@@ -6,9 +6,7 @@ using UnityEngine.EventSystems;
 using UnityExplorer.UI;
 using System.Collections.Generic;
 using UnityExplorer.UI.Inspectors;
-#if CPP
-using UnhollowerRuntimeLib;
-#endif
+using System.Linq;
 
 namespace UnityExplorer.Core.Input
 {
@@ -87,16 +85,28 @@ namespace UnityExplorer.Core.Input
         }
 
         internal static Dictionary<KeyCode, object> ActualKeyDict = new Dictionary<KeyCode, object>();
+        internal static Dictionary<string, string> enumNameFixes = new Dictionary<string, string>
+        {
+            { "Control", "Ctrl" },
+            { "Return", "Enter" },
+            { "Alpha", "Digit" },
+            { "Keypad", "Numpad" },
+            { "Numlock", "NumLock" },
+            { "Print", "PrintScreen" },
+            { "BackQuote", "Backquote" }
+        };
 
         internal object GetActualKey(KeyCode key)
         {
             if (!ActualKeyDict.ContainsKey(key))
             {
                 var s = key.ToString();
-                if (s.Contains("Control"))
-                    s = s.Replace("Control", "Ctrl");
-                else if (s.Contains("Return"))
-                    s = "Enter";
+                try
+                {
+                    if (enumNameFixes.First(it => s.Contains(it.Key)) is KeyValuePair<string, string> entry)
+                        s = s.Replace(entry.Key, entry.Value);
+                }
+                catch { }
 
                 var parsed = Enum.Parse(TKey, s);
                 var actualKey = m_kbIndexer.GetValue(CurrentKeyboard, new object[] { parsed });
@@ -152,17 +162,15 @@ namespace UnityExplorer.Core.Input
             }
 
             var assetType = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionAsset");
-#if CPP
-                m_newInputModule = UIManager.CanvasRoot.AddComponent(Il2CppType.From(TInputSystemUIInputModule)).TryCast<BaseInputModule>();
-                var asset = ScriptableObject.CreateInstance(Il2CppType.From(assetType));
-#else
-            m_newInputModule = (BaseInputModule)UIManager.CanvasRoot.AddComponent(TInputSystemUIInputModule);
-            var asset = ScriptableObject.CreateInstance(assetType);
-#endif
+            m_newInputModule = RuntimeProvider.Instance.AddComponent<BaseInputModule>(UIManager.CanvasRoot, TInputSystemUIInputModule);
+            var asset = RuntimeProvider.Instance.CreateScriptable(assetType)
+                .Cast(assetType);
+
             inputExtensions = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionSetupExtensions");
 
             var addMap = inputExtensions.GetMethod("AddActionMap", new Type[] { assetType, typeof(string) });
-            var map = addMap.Invoke(null, new object[] { asset, "UI" });
+            var map = addMap.Invoke(null, new object[] { asset, "UI" })
+                .Cast(ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionMap"));
 
             CreateAction(map, "point", new[] { "<Mouse>/position" }, "point");
             CreateAction(map, "click", new[] { "<Mouse>/leftButton" }, "leftClick");
@@ -180,23 +188,25 @@ namespace UnityExplorer.Core.Input
 
         private void CreateAction(object map, string actionName, string[] bindings, string propertyName)
         {
+            var inputActionType = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputAction");
             var addAction = inputExtensions.GetMethod("AddAction");
-            var pointAction = addAction.Invoke(null, new object[] { map, actionName, default, null, null, null, null, null });
+            var action = addAction.Invoke(null, new object[] { map, actionName, default, null, null, null, null, null })
+                .Cast(inputActionType);
 
-            var inputActionType = pointAction.GetType();
             var addBinding = inputExtensions.GetMethod("AddBinding",
                 new Type[] { inputActionType, typeof(string), typeof(string), typeof(string), typeof(string) });
 
             foreach (string binding in bindings)
-                addBinding.Invoke(null, new object[] { pointAction, binding, null, null, null });
+                addBinding.Invoke(null, new object[] { action.Cast(inputActionType), binding, null, null, null });
 
-            var inputRef = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionReference")
-                            .GetMethod("Create")
-                            .Invoke(null, new object[] { pointAction });
+            var refType = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionReference");
+            var inputRef = refType.GetMethod("Create")
+                            .Invoke(null, new object[] { action })
+                            .Cast(refType);
 
             TInputSystemUIInputModule
                 .GetProperty(propertyName)
-                .SetValue(m_newInputModule, inputRef, null);
+                .SetValue(m_newInputModule.Cast(TInputSystemUIInputModule), inputRef, null);
         }
 
         public void ActivateModule()
@@ -205,4 +215,4 @@ namespace UnityExplorer.Core.Input
             UI_Enable.Invoke(UI_ActionMap, new object[0]);
         }
     }
-}
+}

src/Core/Input/LegacyInput.cs

@@ -54,4 +54,4 @@ namespace UnityExplorer.Core.Input
             m_inputModule.ActivateModule();
         }
     }
-}
+}

src/Core/Input/NoInput.cs

@@ -19,4 +19,4 @@ namespace UnityExplorer.Core.Input
         public void ActivateModule() { }
         public void AddUIInputModule() { }
     }
-}
+}

src/Core/ReflectionUtility.cs

@@ -43,6 +43,9 @@ namespace UnityExplorer
         public static object Cast(this object obj, Type castTo)
             => ReflectionProvider.Instance.Cast(obj, castTo);
 
+        public static T TryCast<T>(this object obj)
+            => ReflectionProvider.Instance.TryCast<T>(obj);
+
         /// <summary>
         /// Check if the provided Type is assignable to IEnumerable.
         /// </summary>
@@ -189,6 +192,51 @@ namespace UnityExplorer
             return s_cachedPropInfos[type][propertyName];
         }
 
+        internal static Dictionary<Type, Dictionary<string, MethodInfo>> s_cachedMethodInfos = new Dictionary<Type, Dictionary<string, MethodInfo>>();
+
+        public static MethodInfo GetMethodInfo(Type type, string methodName, Type[] argumentTypes)
+        {
+            if (!s_cachedMethodInfos.ContainsKey(type))
+                s_cachedMethodInfos.Add(type, new Dictionary<string, MethodInfo>());
+
+            var sig = methodName;
+
+            if (argumentTypes != null)
+            {
+                sig += "(";
+                for (int i = 0; i < argumentTypes.Length; i++)
+                {
+                    if (i > 0)
+                        sig += ",";
+                    sig += argumentTypes[i].FullName;
+                }
+                sig += ")";
+            }
+
+            try
+            {
+                if (!s_cachedMethodInfos[type].ContainsKey(sig))
+                {
+                    if (argumentTypes != null)
+                        s_cachedMethodInfos[type].Add(sig, type.GetMethod(methodName, AllFlags, null, argumentTypes, null));
+                    else
+                        s_cachedMethodInfos[type].Add(sig, type.GetMethod(methodName, AllFlags));
+                }
+
+                return s_cachedMethodInfos[type][sig];
+            }
+            catch (AmbiguousMatchException)
+            {
+                ExplorerCore.LogWarning($"AmbiguousMatchException trying to get method '{sig}'");
+                return null;
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.LogWarning($"{e.GetType()} trying to get method '{sig}': {e.Message}\r\n{e.StackTrace}");
+                return null;
+            }
+        }
+
         /// <summary>
         /// Helper to display a simple "{ExceptionType}: {Message}" of the exception, and optionally use the inner-most exception.
         /// </summary>
@@ -201,10 +249,9 @@ namespace UnityExplorer
             {
                 while (e.InnerException != null)
                 {
-#if CPP
                     if (e.InnerException is System.Runtime.CompilerServices.RuntimeWrappedException)
                         break;
-#endif
+
                     e = e.InnerException;
                 }
             }

src/Core/Runtime/Il2Cpp/Il2CppProvider.cs

@@ -50,12 +50,47 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             ExplorerCore.Log(condition, type, true);
         }
 
-        public override void StartConsoleCoroutine(IEnumerator routine)
+        public override void StartCoroutine(IEnumerator routine)
         {
             Il2CppCoroutine.Start(routine);
         }
 
-        // Unity API Handlers
+        public override void Update()
+        {
+            Il2CppCoroutine.Process();
+        }
+
+        public override T AddComponent<T>(GameObject obj, Type type)
+        {
+            return obj.AddComponent(Il2CppType.From(type)).TryCast<T>();
+        }
+
+        public override ScriptableObject CreateScriptable(Type type)
+        {
+            return ScriptableObject.CreateInstance(Il2CppType.From(type));
+        }
+
+        public override void GraphicRaycast(GraphicRaycaster raycaster, PointerEventData data, List<RaycastResult> list)
+        {
+            var il2cppList = new Il2CppSystem.Collections.Generic.List<RaycastResult>();
+
+            raycaster.Raycast(data, il2cppList);
+
+            if (il2cppList.Count > 0)
+                list.AddRange(il2cppList.ToArray());
+        }
+
+        public override bool IsReferenceEqual(object a, object b)
+        {
+            if (a.TryCast<UnityEngine.Object>() is UnityEngine.Object ua)
+            {
+                var ub = b.TryCast<UnityEngine.Object>();
+                if (ub && ua.m_CachedPtr == ub.m_CachedPtr)
+                    return true;
+            }
+
+            return base.IsReferenceEqual(a, b);
+        }
 
         // LayerMask.LayerToName
 
@@ -125,42 +160,115 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
                    .Invoke(handle);
         }
 
-        internal static bool? s_doPropertiesExist;
+        internal static bool triedToGetColorBlockProps;
+        internal static PropertyInfo _normalColorProp;
+        internal static PropertyInfo _highlightColorProp;
+        internal static PropertyInfo _pressedColorProp;
+        internal static PropertyInfo _disabledColorProp;
 
-        public override ColorBlock SetColorBlock(ColorBlock colors, Color? normal = null, Color? highlighted = null, Color? pressed = null)
+        public override void SetColorBlock(Selectable selectable, Color? normal = null, Color? highlighted = null, Color? pressed = null, 
+            Color? disabled = null)
         {
-            if (s_doPropertiesExist == null)
-            {
-                var prop = ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "normalColor") as PropertyInfo;
-                s_doPropertiesExist = prop != null && prop.CanWrite;
-            }
+            var colors = selectable.colors;
 
             colors.colorMultiplier = 1;
 
             object boxed = (object)colors;
 
-            if (s_doPropertiesExist == true)
+            if (!triedToGetColorBlockProps)
             {
-                if (normal != null)
-                    ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "normalColor").SetValue(boxed, (Color)normal);
-                if (pressed != null)
-                    ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "pressedColor").SetValue(boxed, (Color)pressed);
-                if (highlighted != null)
-                    ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "highlightedColor").SetValue(boxed, (Color)highlighted);
+                triedToGetColorBlockProps = true;
+
+                if (ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "normalColor") is PropertyInfo norm && norm.CanWrite)
+                    _normalColorProp = norm;
+                if (ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "highlightedColor") is PropertyInfo high && high.CanWrite)
+                    _highlightColorProp = high;
+                if (ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "pressedColor") is PropertyInfo pres && pres.CanWrite)
+                    _pressedColorProp = pres;
+                if (ReflectionUtility.GetPropertyInfo(typeof(ColorBlock), "disabledColor") is PropertyInfo disa && disa.CanWrite)
+                    _disabledColorProp = disa;
             }
-            else if (s_doPropertiesExist == false)
+
+            try
             {
                 if (normal != null)
-                    ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_NormalColor").SetValue(boxed, (Color)normal);
-                if (pressed != null)
-                    ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_PressedColor").SetValue(boxed, (Color)pressed);
+                {
+                    if (_normalColorProp != null)
+                        _normalColorProp.SetValue(boxed, (Color)normal);
+                    else if (ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_NormalColor") is FieldInfo fi)
+                        fi.SetValue(boxed, (Color)normal);
+                }
+
                 if (highlighted != null)
-                    ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_HighlightedColor").SetValue(boxed, (Color)highlighted);
+                {
+                    if (_highlightColorProp != null)
+                        _highlightColorProp.SetValue(boxed, (Color)highlighted);
+                    else if (ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_HighlightedColor") is FieldInfo fi)
+                        fi.SetValue(boxed, (Color)highlighted);
+                }
+
+                if (pressed != null)
+                {
+                    if (_pressedColorProp != null)
+                        _pressedColorProp.SetValue(boxed, (Color)pressed);
+                    else if (ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_PressedColor") is FieldInfo fi)
+                        fi.SetValue(boxed, (Color)pressed);
+                }
+
+                if (disabled != null)
+                {
+                    if (_disabledColorProp != null)
+                        _disabledColorProp.SetValue(boxed, (Color)disabled);
+                    else if (ReflectionUtility.GetFieldInfo(typeof(ColorBlock), "m_DisabledColor") is FieldInfo fi)
+                        fi.SetValue(boxed, (Color)disabled);
+                }
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log(ex);
             }
 
             colors = (ColorBlock)boxed;
 
-            return colors;
+            SetColorBlock(selectable, colors);
+        }
+
+        public override void SetColorBlock(Selectable selectable, ColorBlock _colorBlock)
+        {
+            try
+            {
+                selectable = selectable.TryCast<Selectable>();
+
+                ReflectionUtility.GetPropertyInfo(typeof(Selectable), "m_Colors")
+                    .SetValue(selectable, _colorBlock, null);
+
+                ReflectionUtility.GetMethodInfo(typeof(Selectable), "OnSetProperty", new Type[0])
+                    .Invoke(selectable, new object[0]);
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log(ex);
+            }
+        }
+
+        public override void FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances)
+        {
+            PropertyInfo pi;
+            foreach (var name in possibleNames)
+            {
+                pi = type.GetProperty(name, flags);
+                if (pi != null)
+                {
+                    var instance = pi.GetValue(null, null);
+                    if (instance != null)
+                    {
+                        instances.Add(instance);
+                        return;
+                    }
+                }
+            }
+
+            base.FindSingleton(possibleNames, type, flags, instances);
         }
     }
 }

src/Core/Runtime/Il2Cpp/Il2CppReflection.cs

@@ -32,6 +32,43 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             return Il2CppCast(obj, castTo);
         }
 
+        public override T TryCast<T>(object obj)
+        {
+            try
+            {
+                return (T)Il2CppCast(obj, typeof(T));
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
+        public override void BoxStringToType(ref object value, Type castTo)
+        {
+            if (castTo == typeof(Il2CppSystem.String))
+                value = (Il2CppSystem.String)(value as string);
+            else
+                value = (Il2CppSystem.Object)(value as string);
+        }
+
+        public override string UnboxString(object value)
+        {
+            if (value is string s)
+                return s;
+
+            s = null;
+            // strings boxed as Il2CppSystem.Objects can behave weirdly.
+            // GetActualType will find they are a string, but if its boxed
+            // then we need to unbox it like this...
+            if (value is Il2CppSystem.Object cppObject)
+                s = cppObject.ToString();
+            else if (value is Il2CppSystem.String cppString)
+                s = cppString;
+
+            return s;
+        }
+
         public override string ProcessTypeNameInString(Type type, string theString, ref string typeName)
         {
             if (!Il2CppTypeNotNull(type))
@@ -322,12 +359,110 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             return false;
         }
 
-        public override void BoxStringToType(ref object value, Type castTo)
+        internal static readonly Dictionary<Type, MethodInfo> s_getEnumeratorMethods = new Dictionary<Type, MethodInfo>();
+
+        internal static readonly Dictionary<Type, EnumeratorInfo> s_enumeratorInfos = new Dictionary<Type, EnumeratorInfo>();
+
+        internal class EnumeratorInfo
         {
-            if (castTo == typeof(Il2CppSystem.String))
-                value = (Il2CppSystem.String)(value as string);
+            internal MethodInfo moveNext;
+            internal PropertyInfo current;
+        }
+
+        public override IEnumerable EnumerateEnumerable(object value)
+        {
+            if (value == null)
+                return null;
+
+            var cppEnumerable = (value as Il2CppSystem.Object)?.TryCast<Il2CppSystem.Collections.IEnumerable>();
+            if (cppEnumerable != null)
+            {
+                var type = value.GetType();
+                if (!s_getEnumeratorMethods.ContainsKey(type))
+                    s_getEnumeratorMethods.Add(type, type.GetMethod("GetEnumerator"));
+
+                var enumerator = s_getEnumeratorMethods[type].Invoke(value, null);
+                var enumeratorType = enumerator.GetType();
+
+                if (!s_enumeratorInfos.ContainsKey(enumeratorType))
+                {
+                    s_enumeratorInfos.Add(enumeratorType, new EnumeratorInfo
+                    {
+                        current = enumeratorType.GetProperty("Current"),
+                        moveNext = enumeratorType.GetMethod("MoveNext"),
+                    });
+                }
+                var info = s_enumeratorInfos[enumeratorType];
+
+                // iterate
+                var list = new List<object>();
+                while ((bool)info.moveNext.Invoke(enumerator, null))
+                    list.Add(info.current.GetValue(enumerator));
+
+                return list;
+            }
+
+            return null;
+        }
+
+        public override IDictionary EnumerateDictionary(object value, Type typeOfKeys, Type typeOfValues)
+        {
+            var valueType = ReflectionUtility.GetActualType(value);
+
+            var keyList = new List<object>();
+            var valueList = new List<object>();
+
+            var hashtable = value.Cast(typeof(Il2CppSystem.Collections.Hashtable)) as Il2CppSystem.Collections.Hashtable;
+
+            if (hashtable != null)
+            {
+                EnumerateCppHashtable(hashtable, keyList, valueList);
+            }
             else
-                value = (Il2CppSystem.Object)(value as string);
+            {
+                var keys = valueType.GetProperty("Keys").GetValue(value, null);
+                var values = valueType.GetProperty("Values").GetValue(value, null);
+
+                EnumerateCppIDictionary(keys, keyList);
+                EnumerateCppIDictionary(values, valueList);
+            }
+
+            var dict = Activator.CreateInstance(typeof(Dictionary<,>)
+                                .MakeGenericType(typeOfKeys, typeOfValues))
+                                as IDictionary;
+
+            for (int i = 0; i < keyList.Count; i++)
+                dict.Add(keyList[i], valueList[i]);
+
+            return dict;
+        }
+
+        private void EnumerateCppIDictionary(object collection, List<object> list)
+        {
+            // invoke GetEnumerator
+            var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);
+            // get the type of it
+            var enumeratorType = enumerator.GetType();
+            // reflect MoveNext and Current
+            var moveNext = enumeratorType.GetMethod("MoveNext");
+            var current = enumeratorType.GetProperty("Current");
+            // iterate
+            while ((bool)moveNext.Invoke(enumerator, null))
+            {
+                list.Add(current.GetValue(enumerator, null));
+            }
+        }
+
+        private void EnumerateCppHashtable(Il2CppSystem.Collections.Hashtable hashtable, List<object> keys, List<object> values)
+        {
+            for (int i = 0; i < hashtable.buckets.Count; i++)
+            {
+                var bucket = hashtable.buckets[i];
+                if (bucket == null || bucket.key == null)
+                    continue;
+                keys.Add(bucket.key);
+                values.Add(bucket.val);
+            }
         }
 
         // ~~~~~~~~~~ not used ~~~~~~~~~~~~

src/Core/Runtime/Mono/DummyBehaviour.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 
-namespace UnityExplorer.Core.CSharp
+namespace UnityExplorer.Core.Runtime.Mono
 {
     public class DummyBehaviour : MonoBehaviour
     {

src/Core/Runtime/Mono/MonoProvider.cs

@@ -7,6 +7,7 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExplorer.Core;
@@ -20,6 +21,8 @@ namespace UnityExplorer.Core.Runtime.Mono
         {
             Reflection = new MonoReflection();
             TextureUtil = new MonoTextureUtil();
+
+            DummyBehaviour.Setup();
         }
 
         public override void SetupEvents()
@@ -32,11 +35,31 @@ namespace UnityExplorer.Core.Runtime.Mono
             ExplorerCore.Log(condition, type, true);
         }
 
-        public override void StartConsoleCoroutine(IEnumerator routine)
+        public override void StartCoroutine(IEnumerator routine)
         {
             DummyBehaviour.Instance.StartCoroutine(routine);
         }
 
+        public override void Update()
+        {
+
+        }
+
+        public override T AddComponent<T>(GameObject obj, Type type)
+        {
+            return (T)obj.AddComponent(type);
+        }
+
+        public override ScriptableObject CreateScriptable(Type type)
+        {
+            return ScriptableObject.CreateInstance(type);
+        }
+
+        public override void GraphicRaycast(GraphicRaycaster raycaster, PointerEventData data, List<RaycastResult> list)
+        {
+            raycaster.Raycast(data, list);
+        }
+
         public override string LayerToName(int layer)
             => LayerMask.LayerToName(layer);
 
@@ -63,8 +86,11 @@ namespace UnityExplorer.Core.Runtime.Mono
             return scene.rootCount;
         }
 
-        public override ColorBlock SetColorBlock(ColorBlock colors, Color? normal = null, Color? highlighted = null, Color? pressed = null)
+        public override void SetColorBlock(Selectable selectable, Color? normal = null, Color? highlighted = null, Color? pressed = null,
+            Color? disabled = null)
         {
+            var colors = selectable.colors;
+
             if (normal != null)
                 colors.normalColor = (Color)normal;
 
@@ -74,7 +100,15 @@ namespace UnityExplorer.Core.Runtime.Mono
             if (pressed != null)
                 colors.pressedColor = (Color)pressed;
 
-            return colors;
+            if (disabled != null)
+                colors.disabledColor = (Color)disabled;
+
+            SetColorBlock(selectable, colors);
+        }
+
+        public override void SetColorBlock(Selectable selectable, ColorBlock colors)
+        {
+            selectable.colors = colors;
         }
     }
 }

src/Core/Runtime/Mono/MonoReflection.cs

@@ -12,6 +12,18 @@ namespace UnityExplorer.Core.Runtime.Mono
         public override object Cast(object obj, Type castTo)
             => obj;
 
+        public override T TryCast<T>(object obj)
+        {
+            try
+            {
+                return (T)obj;
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
         // Vanilla GetType is fine for mono
         public override Type GetActualType(object obj)
             => obj.GetType();

src/Core/Runtime/ReflectionProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,6 +19,8 @@ namespace UnityExplorer.Core.Runtime
 
         public abstract object Cast(object obj, Type castTo);
 
+        public abstract T TryCast<T>(object obj);
+
         public abstract bool IsAssignableFrom(Type toAssignTo, Type toAssignFrom);
 
         public abstract bool IsReflectionSupported(Type type);
@@ -27,5 +30,13 @@ namespace UnityExplorer.Core.Runtime
         public abstract bool LoadModule(string module);
 
         public abstract void BoxStringToType(ref object _string, Type castTo);
+
+        public virtual string UnboxString(object value) => (string)value;
+
+        public virtual IDictionary EnumerateDictionary(object value, Type typeOfKeys, Type typeOfValues)
+            => null;
+
+        public virtual IEnumerable EnumerateEnumerable(object value)
+            => null;
     }
 }

src/Core/Runtime/RuntimeProvider.cs

@@ -2,16 +2,17 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
+using UnityExplorer.Core.Runtime;
 
-namespace UnityExplorer.Core.Runtime
+// Intentionally project-wide namespace so that its always easily accessible.
+namespace UnityExplorer
 {
-    // Work in progress, this will be used to replace all the "if CPP / if MONO" 
-    // pre-processor directives all over the codebase.
-
     public abstract class RuntimeProvider
     {
         public static RuntimeProvider Instance;
@@ -28,30 +29,61 @@ namespace UnityExplorer.Core.Runtime
 
         public static void Init() =>
 #if CPP
-            Instance = new Il2Cpp.Il2CppProvider();
+            Instance = new Core.Runtime.Il2Cpp.Il2CppProvider();
 #else
-            Instance = new Mono.MonoProvider();
+            Instance = new Core.Runtime.Mono.MonoProvider();
 #endif
 
-
         public abstract void Initialize();
 
         public abstract void SetupEvents();
 
-        public abstract void StartConsoleCoroutine(IEnumerator routine);
+        public abstract void StartCoroutine(IEnumerator routine);
+
+        public abstract void Update();
+
+        public virtual bool IsReferenceEqual(object a, object b) => ReferenceEquals(a, b);
 
         // Unity API handlers
 
+        public abstract T AddComponent<T>(GameObject obj, Type type) where T : Component;
+
+        public abstract ScriptableObject CreateScriptable(Type type);
+
         public abstract string LayerToName(int layer);
 
         public abstract UnityEngine.Object[] FindObjectsOfTypeAll(Type type);
 
+        public abstract void GraphicRaycast(GraphicRaycaster raycaster, PointerEventData data, List<RaycastResult> list);
+
         public abstract int GetSceneHandle(Scene scene);
 
         public abstract GameObject[] GetRootGameObjects(Scene scene);
 
         public abstract int GetRootCount(Scene scene);
 
-        public abstract ColorBlock SetColorBlock(ColorBlock colors, Color? normal = null, Color? highlighted = null, Color? pressed = null);
+        public abstract void SetColorBlock(Selectable selectable, ColorBlock colors);
+
+        public abstract void SetColorBlock(Selectable selectable, Color? normal = null, Color? highlighted = null, Color? pressed = null,
+            Color? disabled = null);
+
+        public virtual void FindSingleton(string[] s_instanceNames, Type type, BindingFlags flags, List<object> instances)
+        {
+            // Look for a typical Instance backing field.
+            FieldInfo fi;
+            foreach (var name in s_instanceNames)
+            {
+                fi = type.GetField(name, flags);
+                if (fi != null)
+                {
+                    var instance = fi.GetValue(null);
+                    if (instance != null)
+                    {
+                        instances.Add(instance);
+                        return;
+                    }
+                }
+            }
+        }
     }
 }

src/Core/Search/SearchProvider.cs

@@ -67,38 +67,8 @@ namespace UnityExplorer.Core.Search
                     {
                         if (!string.IsNullOrEmpty(nameFilter) && !type.FullName.ToLower().Contains(nameFilter))
                             continue;
-#if CPP
-                        // Only look for Properties in IL2CPP, not for Mono.
-                        PropertyInfo pi;
-                        foreach (var name in s_instanceNames)
-                        {
-                            pi = type.GetProperty(name, flags);
-                            if (pi != null)
-                            {
-                                var instance = pi.GetValue(null, null);
-                                if (instance != null)
-                                {
-                                    instances.Add(instance);
-                                    continue;
-                                }
-                            }
-                        }
-#endif
-                        // Look for a typical Instance backing field.
-                        FieldInfo fi;
-                        foreach (var name in s_instanceNames)
-                        {
-                            fi = type.GetField(name, flags);
-                            if (fi != null)
-                            {
-                                var instance = fi.GetValue(null);
-                                if (instance != null)
-                                {
-                                    instances.Add(instance);
-                                    break;
-                                }
-                            }
-                        }
+
+                        RuntimeProvider.Instance.FindSingleton(s_instanceNames, type, flags, instances);
                     }
                     catch { }
                 }
@@ -175,15 +145,9 @@ namespace UnityExplorer.Core.Search
 
                 if (canGetGameObject)
                 {
-#if MONO
-                    var go = context == SearchContext.GameObject
-                            ? obj as GameObject
-                            : (obj as Component).gameObject;
-#else
                     var go = context == SearchContext.GameObject
                             ? obj.TryCast<GameObject>()
                             : obj.TryCast<Component>().gameObject;
-#endif
 
                     // scene check
                     if (sceneFilter != SceneFilter.Any)

src/Core/TestClass.cs

@@ -16,6 +16,7 @@ namespace UnityExplorer
         public static string nullString = null;
 
         public static Il2CppSystem.Collections.Hashtable testHashset;
+        public static Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object> testList;
 
         static TestClass()
         {
@@ -23,6 +24,12 @@ namespace UnityExplorer
             testHashset.Add("key1", "itemOne");
             testHashset.Add("key2", "itemTwo");
             testHashset.Add("key3", "itemThree");
+
+            testList = new Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object>(3);
+            testList.Add("One");
+            testList.Add("Two");
+            testList.Add("Three");
+            //testIList = list.TryCast<Il2CppSystem.Collections.IList>();
         }
 #endif
     }

src/ExplorerCore.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.IO;
 using UnityEngine;
 using UnityExplorer.Core.Config;
@@ -13,7 +14,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.3.8";
+        public const string VERSION = "3.3.13";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -44,15 +45,31 @@ namespace UnityExplorer
 
             InputManager.Init();
 
-            UIManager.Init();
-
             Log($"{NAME} {VERSION} initialized.");
 
+            RuntimeProvider.Instance.StartCoroutine(SetupCoroutine());
+        }
+
+        // Do a delayed setup so that objects aren't destroyed instantly.
+        // This can happen for a multitude of reasons.
+        // Default delay is 1 second which is usually enough.
+        private static IEnumerator SetupCoroutine()
+        {
+            float f = Time.realtimeSinceStartup;
+            float delay = ConfigManager.Startup_Delay_Time.Value;
+            while (Time.realtimeSinceStartup - f < delay)
+                yield return null;
+
+            Log($"Creating UI, after delay of {delay} second(s).");
+            UIManager.Init();
+
             //InspectorManager.Instance.Inspect(typeof(TestClass));
         }
 
         public static void Update()
         {
+            RuntimeProvider.Instance.Update();
+
             UIManager.Update();
         }
 

src/Loader/BIE/BepInExConfigHandler.cs

@@ -21,7 +21,11 @@ namespace UnityExplorer.Loader.BIE
 
         public override void RegisterConfigElement<T>(ConfigElement<T> config)
         {
-            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, config.Description);
+            object[] tags = null;
+            if (config.IsInternal)
+                tags = new[] { "Advanced" };
+
+            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, new ConfigDescription(config.Description, null, tags));
 
             entry.SettingChanged += (object o, EventArgs e) => 
             {

src/Loader/ML/ExplorerMelonMod.cs

@@ -13,6 +13,7 @@ using UnityExplorer.Loader.ML;
 
 [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
 [assembly: MelonGame(null, null)]
+//[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
 
 namespace UnityExplorer
 {

src/Loader/ML/MelonLoaderConfigHandler.cs

@@ -21,11 +21,9 @@ namespace UnityExplorer.Loader.ML
         {
             prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings");
 
-            try
-            {
-                MelonPreferences.Mapper.RegisterMapper(KeycodeReader, KeycodeWriter);
-            }
-            catch { }
+            // temporary until melonloader 0.3.1 released
+            try { MelonPreferences.Mapper.RegisterMapper(KeycodeReader, KeycodeWriter); } catch { }
+            try { MelonPreferences.Mapper.RegisterMapper(MenuPagesReader, MenuPagesWriter); } catch { }
         }
 
         public override void LoadConfig()
@@ -80,6 +78,8 @@ namespace UnityExplorer.Loader.ML
             MelonPreferences.Save();
         }
 
+        // TEMPORARY - JUST REQUIRED UNTIL ML 0.3.1 RELEASED
+
         public static KeyCode KeycodeReader(TomlObject value)
         {
             try
@@ -101,6 +101,28 @@ namespace UnityExplorer.Loader.ML
         {
             return MelonPreferences.Mapper.ToToml(value.ToString());
         }
+
+        public static UI.Main.MenuPages MenuPagesReader(TomlObject value)
+        {
+            try
+            {
+                var kc = (UI.Main.MenuPages)Enum.Parse(typeof(UI.Main.MenuPages), (value as TomlString).Value);
+
+                if (kc == default)
+                    throw new Exception();
+
+                return kc;
+            }
+            catch
+            {
+                return UI.Main.MenuPages.Home;
+            }
+        }
+
+        public static TomlObject MenuPagesWriter(UI.Main.MenuPages value)
+        {
+            return MelonPreferences.Mapper.ToToml(value.ToString());
+        }
     }
 }
 

src/UI/CacheObject/CacheMember.cs

@@ -319,15 +319,13 @@ namespace UnityExplorer.UI.CacheObject
                     default, new Color(1, 1, 1, 0));
                 UIFactory.SetLayoutElement(evalGroupObj, minHeight: 25, flexibleHeight: 0, flexibleWidth: 5000);
 
-                var colors = new ColorBlock();
-                colors = RuntimeProvider.Instance.SetColorBlock(colors, new Color(0.4f, 0.4f, 0.4f),
-                    new Color(0.4f, 0.7f, 0.4f), new Color(0.3f, 0.3f, 0.3f));
-
                 var evalButton = UIFactory.CreateButton(evalGroupObj, 
                     "EvalButton", 
                     $"Evaluate ({ParamCount})",
-                    null,
-                    colors);
+                    null);
+
+                RuntimeProvider.Instance.SetColorBlock(evalButton, new Color(0.4f, 0.4f, 0.4f),
+                    new Color(0.4f, 0.7f, 0.4f), new Color(0.3f, 0.3f, 0.3f));
 
                 UIFactory.SetLayoutElement(evalButton.gameObject, minWidth: 100, minHeight: 22, flexibleWidth: 0);
 
@@ -345,7 +343,7 @@ namespace UnityExplorer.UI.CacheObject
                         argsHolder.SetActive(true);
                         m_isEvaluating = true;
                         evalText.text = "Evaluate";
-                        evalButton.colors = RuntimeProvider.Instance.SetColorBlock(evalButton.colors, new Color(0.3f, 0.6f, 0.3f));
+                        RuntimeProvider.Instance.SetColorBlock(evalButton, new Color(0.3f, 0.6f, 0.3f));
 
                         cancelButton.gameObject.SetActive(true);
                     }
@@ -365,18 +363,17 @@ namespace UnityExplorer.UI.CacheObject
                     m_isEvaluating = false;
 
                     evalText.text = $"Evaluate ({ParamCount})";
-                    evalButton.colors = RuntimeProvider.Instance.SetColorBlock(evalButton.colors, new Color(0.4f, 0.4f, 0.4f));
+                    RuntimeProvider.Instance.SetColorBlock(evalButton, new Color(0.4f, 0.4f, 0.4f));
                 });
             }
             else if (this is CacheMethod)
             {
                 // simple method evaluate button
 
-                var colors = new ColorBlock();
-                colors = RuntimeProvider.Instance.SetColorBlock(colors, new Color(0.4f, 0.4f, 0.4f),
+                var evalButton = UIFactory.CreateButton(m_rightGroup, "EvalButton", "Evaluate", () => { (this as CacheMethod).Evaluate(); });
+                RuntimeProvider.Instance.SetColorBlock(evalButton, new Color(0.4f, 0.4f, 0.4f),
                     new Color(0.4f, 0.7f, 0.4f), new Color(0.3f, 0.3f, 0.3f));
 
-                var evalButton = UIFactory.CreateButton(m_rightGroup, "EvalButton", "Evaluate", () => { (this as CacheMethod).Evaluate(); }, colors);
                 UIFactory.SetLayoutElement(evalButton.gameObject, minWidth: 100, minHeight: 22, flexibleWidth: 0);
             }
         }

src/UI/CacheObject/CachePaired.cs

@@ -56,8 +56,12 @@ namespace UnityExplorer.UI.CacheObject
 
             var rowObj = UIFactory.CreateHorizontalGroup(m_mainContent, "PairedGroup", false, false, true, true, 0, new Vector4(0,0,5,2),
                 bgColor);
-            
-            var indexLabel = UIFactory.CreateLabel(rowObj, "IndexLabel", $"{this.PairType} {this.Index}:", TextAnchor.MiddleLeft);
+
+            string lbl = $"{this.PairType}";
+            if (this.PairType == PairTypes.Key)
+                lbl = $"[{Index}] {lbl}";
+
+            var indexLabel = UIFactory.CreateLabel(rowObj, "IndexLabel", lbl, TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(indexLabel.gameObject, minWidth: 80, flexibleWidth: 30, minHeight: 25);
 
             IValue.m_mainContentParent = rowObj;

src/UI/Inspectors/GameObjects/ChildList.cs

@@ -168,15 +168,13 @@ namespace UnityExplorer.UI.Inspectors.GameObjects
             s_childListToggles.Add(toggle);
             toggle.onValueChanged.AddListener((bool val) => { OnToggleClicked(thisIndex, val); });
 
-            ColorBlock mainColors = new ColorBlock();
-            mainColors = RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
-                new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
-
             var mainBtn = UIFactory.CreateButton(btnGroupObj, 
                 "MainButton",
                 "", 
-                () => { OnChildListObjectClicked(thisIndex); },
-                mainColors);
+                () => { OnChildListObjectClicked(thisIndex); });
+
+            RuntimeProvider.Instance.SetColorBlock(mainBtn, new Color(0.07f, 0.07f, 0.07f),
+                new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
 
             UIFactory.SetLayoutElement(mainBtn.gameObject, minHeight: 25, flexibleHeight: 0, minWidth: 25, flexibleWidth: 9999);
 

src/UI/Inspectors/GameObjects/ComponentList.cs

@@ -78,11 +78,7 @@ namespace UnityExplorer.UI.Inspectors.GameObjects
                     text.text = SignatureHighlighter.ParseFullSyntax(ReflectionUtility.GetActualType(comp), true);
 
                     var toggle = s_compToggles[i];
-#if CPP
                     if (comp.TryCast<Behaviour>() is Behaviour behaviour)
-#else
-                    if (comp is Behaviour behaviour)
-#endif
                     {
                         if (!toggle.gameObject.activeSelf)
                             toggle.gameObject.SetActive(true);
@@ -109,19 +105,13 @@ namespace UnityExplorer.UI.Inspectors.GameObjects
         internal static void OnCompToggleClicked(int index, bool value)
         {
             var comp = s_compShortlist[index];
-#if CPP
             comp.TryCast<Behaviour>().enabled = value;
-#else
-            (comp as Behaviour).enabled = value;
-#endif
         }
 
         internal static void OnCompListObjectClicked(int index)
         {
             if (index >= s_compShortlist.Count || !s_compShortlist[index])
-            {
                 return;
-            }
 
             InspectorManager.Instance.Inspect(s_compShortlist[index]);
         }
@@ -175,15 +165,13 @@ namespace UnityExplorer.UI.Inspectors.GameObjects
 
             // Main component button
 
-            ColorBlock mainColors = new ColorBlock();
-            mainColors = RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
-                new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
-
             var mainBtn = UIFactory.CreateButton(groupObj, 
                 "MainButton", 
                 "",
-                () => { OnCompListObjectClicked(thisIndex); },
-                mainColors);
+                () => { OnCompListObjectClicked(thisIndex); });
+
+            RuntimeProvider.Instance.SetColorBlock(mainBtn, new Color(0.07f, 0.07f, 0.07f),
+                new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
 
             UIFactory.SetLayoutElement(mainBtn.gameObject, minHeight: 25, flexibleHeight: 0, minWidth: 25, flexibleWidth: 999);
 

src/UI/Inspectors/GameObjects/GameObjectControls.cs

@@ -408,7 +408,7 @@ namespace UnityExplorer.UI.Inspectors.GameObjects
             var sliderObj = UIFactory.CreateSlider(rowObject, "VectorSlider", out Slider slider);
             UIFactory.SetLayoutElement(sliderObj, minHeight: 20, flexibleHeight: 0, minWidth: 200, flexibleWidth: 9000);
             sliderObj.transform.Find("Fill Area").gameObject.SetActive(false);
-            slider.colors = RuntimeProvider.Instance.SetColorBlock(slider.colors, new Color(0.65f, 0.65f, 0.65f));
+            RuntimeProvider.Instance.SetColorBlock(slider, new Color(0.65f, 0.65f, 0.65f));
             slider.minValue = -2;
             slider.maxValue = 2;
             slider.value = 0;

src/UI/Inspectors/InspectUnderMouse.cs

@@ -203,11 +203,6 @@ namespace UnityExplorer.UI.Main.Home
                 position = mousePos
             };
 
-#if MONO
-            var list = new List<RaycastResult>();
-#else
-            var list = new Il2CppSystem.Collections.Generic.List<RaycastResult>();
-#endif
             //ExplorerCore.Log("~~~~~~~~~ begin raycast ~~~~~~~~");
             GameObject hitObject = null;
             int highestLayer = int.MinValue;
@@ -215,7 +210,10 @@ namespace UnityExplorer.UI.Main.Home
             int highestDepth = int.MinValue;
             foreach (var gr in graphicRaycasters)
             {
-                gr.Raycast(ped, list);
+                var list = new List<RaycastResult>();
+                RuntimeProvider.Instance.GraphicRaycast(gr, ped, list);
+
+                //gr.Raycast(ped, list);
 
                 if (list.Count > 0)
                 {
@@ -290,8 +288,6 @@ namespace UnityExplorer.UI.Main.Home
             _wasDisabledGraphics.Clear();
         }
 
-        #region UI
-
         internal static Text s_objNameLabel;
         internal static Text s_objPathLabel;
         internal static Text s_mousePosLabel;
@@ -328,7 +324,5 @@ namespace UnityExplorer.UI.Main.Home
 
             s_UIContent.SetActive(false);
         }
-
-        #endregion
     }
 }

src/UI/Inspectors/InspectorManager.cs

@@ -54,21 +54,11 @@ namespace UnityExplorer.UI.Inspectors
             // check if currently inspecting this object
             foreach (InspectorBase tab in m_currentInspectors)
             {
-                if (ReferenceEquals(obj, tab.Target))
+                if (RuntimeProvider.Instance.IsReferenceEqual(obj, tab.Target))
                 {
                     SetInspectorTab(tab);
                     return;
                 }
-#if CPP
-                else if (unityObj && tab.Target is UnityEngine.Object uTabObj)
-                {
-                    if (unityObj.m_CachedPtr == uTabObj.m_CachedPtr)
-                    {
-                        SetInspectorTab(tab);
-                        return;
-                    }
-                }
-#endif
             }
 
             InspectorBase inspector;
@@ -140,12 +130,12 @@ namespace UnityExplorer.UI.Inspectors
         public void OnSetInspectorTab(InspectorBase inspector)
         {
             Color activeColor = new Color(0, 0.25f, 0, 1);
-            inspector.m_tabButton.colors = RuntimeProvider.Instance.SetColorBlock(inspector.m_tabButton.colors, activeColor, activeColor);
+            RuntimeProvider.Instance.SetColorBlock(inspector.m_tabButton, activeColor, activeColor);
         }
 
         public void OnUnsetInspectorTab()
         {
-            m_activeInspector.m_tabButton.colors = RuntimeProvider.Instance.SetColorBlock(m_activeInspector.m_tabButton.colors, 
+            RuntimeProvider.Instance.SetColorBlock(m_activeInspector.m_tabButton, 
                 new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.1f, 0.3f, 0.1f, 1));
         }
 

src/UI/Inspectors/Reflection/InstanceInspector.cs

@@ -30,12 +30,12 @@ namespace UnityExplorer.UI.Inspectors.Reflection
         internal void OnScopeFilterClicked(MemberScopes type, Button button)
         {
             if (m_lastActiveScopeButton)
-                m_lastActiveScopeButton.colors = RuntimeProvider.Instance.SetColorBlock(m_lastActiveScopeButton.colors, new Color(0.2f, 0.2f, 0.2f));
+                RuntimeProvider.Instance.SetColorBlock(m_lastActiveScopeButton, new Color(0.2f, 0.2f, 0.2f));
 
             m_scopeFilter = type;
             m_lastActiveScopeButton = button;
 
-            m_lastActiveScopeButton.colors = RuntimeProvider.Instance.SetColorBlock(m_lastActiveScopeButton.colors, new Color(0.2f, 0.6f, 0.2f));
+            RuntimeProvider.Instance.SetColorBlock(m_lastActiveScopeButton, new Color(0.2f, 0.6f, 0.2f));
 
             FilterMembers(null, true);
             m_sliderScroller.m_slider.value = 1f;
@@ -240,11 +240,11 @@ namespace UnityExplorer.UI.Inspectors.Reflection
 
             btn.onClick.AddListener(() => { OnScopeFilterClicked(type, btn); });
 
-            btn.colors = RuntimeProvider.Instance.SetColorBlock(btn.colors, highlighted: new Color(0.3f, 0.7f, 0.3f));
+            RuntimeProvider.Instance.SetColorBlock(btn, highlighted: new Color(0.3f, 0.7f, 0.3f));
 
             if (setEnabled)
             {
-                btn.colors = RuntimeProvider.Instance.SetColorBlock(btn.colors, new Color(0.2f, 0.6f, 0.2f));
+                RuntimeProvider.Instance.SetColorBlock(btn, new Color(0.2f, 0.6f, 0.2f));
                 m_scopeFilter = type;
                 m_lastActiveScopeButton = btn;
             }

src/UI/Inspectors/Reflection/ReflectionInspector.cs

@@ -241,12 +241,12 @@ namespace UnityExplorer.UI.Inspectors.Reflection
         internal void OnMemberFilterClicked(MemberTypes type, Button button)
         {
             if (m_lastActiveMemButton)
-                m_lastActiveMemButton.colors = RuntimeProvider.Instance.SetColorBlock(m_lastActiveMemButton.colors, new Color(0.2f, 0.2f, 0.2f));
+                RuntimeProvider.Instance.SetColorBlock(m_lastActiveMemButton, new Color(0.2f, 0.2f, 0.2f));
 
             m_memberFilter = type;
             m_lastActiveMemButton = button;
 
-            m_lastActiveMemButton.colors = RuntimeProvider.Instance.SetColorBlock(m_lastActiveMemButton.colors, new Color(0.2f, 0.6f, 0.2f));
+            RuntimeProvider.Instance.SetColorBlock(m_lastActiveMemButton, new Color(0.2f, 0.6f, 0.2f));
 
             FilterMembers(null, true);
             m_sliderScroller.m_slider.value = 1f;
@@ -461,11 +461,11 @@ namespace UnityExplorer.UI.Inspectors.Reflection
             UIFactory.SetLayoutElement(btn.gameObject, minHeight: 25, minWidth: 70);
             btn.onClick.AddListener(() => { OnMemberFilterClicked(type, btn); });
 
-            btn.colors = RuntimeProvider.Instance.SetColorBlock(btn.colors, highlighted: new Color(0.3f, 0.7f, 0.3f));
+            RuntimeProvider.Instance.SetColorBlock(btn, highlighted: new Color(0.3f, 0.7f, 0.3f));
 
             if (setEnabled)
             {
-                btn.colors = RuntimeProvider.Instance.SetColorBlock(btn.colors, new Color(0.2f, 0.6f, 0.2f));
+                RuntimeProvider.Instance.SetColorBlock(btn, new Color(0.2f, 0.6f, 0.2f));
                 m_memberFilter = type;
                 m_lastActiveMemButton = btn;
             }

src/UI/InteractiveValues/InteractiveDictionary.cs

@@ -13,7 +13,9 @@ using UnityExplorer.UI.CacheObject;
 using UnityExplorer.Core;
 using UnityExplorer.UI.Utility;
 #if CPP
-using CppDictionary = Il2CppSystem.Collections.IDictionary;
+using AltIDictionary = Il2CppSystem.Collections.IDictionary;
+#else
+using AltIDictionary = System.Collections.IDictionary;
 #endif
 
 namespace UnityExplorer.UI.InteractiveValues
@@ -48,11 +50,7 @@ namespace UnityExplorer.UI.InteractiveValues
         }
 
         internal IDictionary RefIDictionary;
-#if CPP
-        internal CppDictionary RefCppDictionary;
-#else
-        internal IDictionary RefCppDictionary = null;
-#endif
+        internal AltIDictionary RefAltIDictionary;
         internal Type m_typeOfKeys;
         internal Type m_typeofValues;
 
@@ -73,10 +71,11 @@ namespace UnityExplorer.UI.InteractiveValues
         {
             RefIDictionary = Value as IDictionary;
 
-#if CPP
-            try { RefCppDictionary = (Value as Il2CppSystem.Object).TryCast<CppDictionary>(); }
-            catch { }
-#endif
+            if (RefIDictionary == null)
+            {
+                try { RefAltIDictionary = Value.TryCast<AltIDictionary>(); }
+                catch { }
+            }
 
             if (m_subContentParent.activeSelf)
             {
@@ -129,10 +128,8 @@ namespace UnityExplorer.UI.InteractiveValues
                 m_entries.Clear();
             }
 
-#if CPP
             if (RefIDictionary == null && Value != null)
-                RefIDictionary = EnumerateWithReflection();
-#endif
+                RefIDictionary = RuntimeProvider.Instance.Reflection.EnumerateDictionary(Value, m_typeOfKeys, m_typeofValues);
 
             if (RefIDictionary != null)
             {
@@ -212,82 +209,11 @@ namespace UnityExplorer.UI.InteractiveValues
             RefreshDisplay();
         }
 
-#region CPP fixes
-#if CPP
-        // temp fix for Il2Cpp IDictionary until interfaces are fixed
-
-        private IDictionary EnumerateWithReflection()
-        {
-            var valueType = ReflectionUtility.GetActualType(Value);
-
-            var keyList = new List<object>();
-            var valueList = new List<object>();
-
-            var hashtable = Value.Cast(typeof(Il2CppSystem.Collections.Hashtable)) as Il2CppSystem.Collections.Hashtable;
-
-            if (hashtable != null)
-            {
-                EnumerateCppHashtable(hashtable, keyList, valueList);
-            }
-            else
-            {
-                var keys = valueType.GetProperty("Keys").GetValue(Value, null);
-                var values = valueType.GetProperty("Values").GetValue(Value, null);
-
-                EnumerateCppIDictionary(keys, keyList);
-                EnumerateCppIDictionary(values, valueList);
-            }
-
-            var dict = Activator.CreateInstance(typeof(Dictionary<,>)
-                                .MakeGenericType(m_typeOfKeys, m_typeofValues))
-                                as IDictionary;
-
-            for (int i = 0; i < keyList.Count; i++)
-                dict.Add(keyList[i], valueList[i]);
-
-            return dict;
-        }
-
-        private void EnumerateCppIDictionary(object collection, List<object> list)
-        {
-            // invoke GetEnumerator
-            var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);
-            // get the type of it
-            var enumeratorType = enumerator.GetType();
-            // reflect MoveNext and Current
-            var moveNext = enumeratorType.GetMethod("MoveNext");
-            var current = enumeratorType.GetProperty("Current");
-            // iterate
-            while ((bool)moveNext.Invoke(enumerator, null))
-            {
-                list.Add(current.GetValue(enumerator, null));
-            }
-        }
-
-        private void EnumerateCppHashtable(Il2CppSystem.Collections.Hashtable hashtable, List<object> keys, List<object> values)
-        {
-            for (int i = 0; i < hashtable.buckets.Count; i++)
-            {
-                var bucket = hashtable.buckets[i];
-                if (bucket == null || bucket.key == null)
-                    continue;
-                keys.Add(bucket.key);
-                values.Add(bucket.val);
-            }
-        }
-#endif
-
-        #endregion
-
-        #region UI CONSTRUCTION
-
         internal GameObject m_listContent;
         internal LayoutElement m_listLayout;
 
         internal PageHandler m_pageHandler;
 
-        //internal List<GameObject> m_rowHolders = new List<GameObject>();
-
         public override void ConstructUI(GameObject parent, GameObject subGroup)
         {
             base.ConstructUI(parent, subGroup);
@@ -317,7 +243,5 @@ namespace UnityExplorer.UI.InteractiveValues
             contentFitter.horizontalFit = ContentSizeFitter.FitMode.Unconstrained;
             contentFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
         }
-
-#endregion
     }
 }

src/UI/InteractiveValues/InteractiveEnumerable.cs

@@ -39,11 +39,6 @@ namespace UnityExplorer.UI.InteractiveValues
 
         internal IEnumerable RefIEnumerable;
         internal IList RefIList;
-//#if CPP
-//        internal object CppICollection;
-//#else
-//        internal object CppICollection = null;
-//#endif
 
         internal readonly Type m_baseEntryType;
 
@@ -56,18 +51,6 @@ namespace UnityExplorer.UI.InteractiveValues
             RefIEnumerable = Value as IEnumerable;
             RefIList = Value as IList;
 
-//#if CPP
-//            if (Value != null && RefIList == null)
-//            {
-//                try 
-//                {
-//                    var type = typeof(Il2CppSystem.Collections.ICollection).MakeGenericType(this.m_baseEntryType);
-//                    CppICollection = (Value as Il2CppSystem.Object).Cast(type);
-//                }
-//                catch { }
-//            }
-//#endif
-
             if (m_subContentParent.activeSelf)
             {
                 GetCacheEntries();
@@ -96,8 +79,8 @@ namespace UnityExplorer.UI.InteractiveValues
             if (Value != null)
             {
                 string count = "?";
-                if (m_recacheWanted && RefIList != null)// || CppICollection != null))
-                    count = RefIList.Count.ToString();// ?? CppICollection.Count.ToString();
+                if (m_recacheWanted && RefIList != null)
+                    count = RefIList.Count.ToString();
                 else if (!m_recacheWanted)
                     count = m_entries.Count.ToString();
 
@@ -121,10 +104,8 @@ namespace UnityExplorer.UI.InteractiveValues
                 m_entries.Clear();
             }
 
-#if CPP
             if (RefIEnumerable == null && Value != null)
-                RefIEnumerable = EnumerateWithReflection();
-#endif
+                RefIEnumerable = RuntimeProvider.Instance.Reflection.EnumerateEnumerable(Value);
 
             if (RefIEnumerable != null)
             {
@@ -188,62 +169,6 @@ namespace UnityExplorer.UI.InteractiveValues
             RefreshDisplay();
         }
 
-#region CPP Helpers
-
-#if CPP
-        // some temp fixes for Il2Cpp IEnumerables until interfaces are fixed
-
-        internal static readonly Dictionary<Type, MethodInfo> s_getEnumeratorMethods = new Dictionary<Type, MethodInfo>();
-
-        internal static readonly Dictionary<Type, EnumeratorInfo> s_enumeratorInfos = new Dictionary<Type, EnumeratorInfo>();
-        
-        internal class EnumeratorInfo
-        {
-            internal MethodInfo moveNext;
-            internal PropertyInfo current;
-        }
-
-        private IEnumerable EnumerateWithReflection()
-        {
-            if (Value == null) 
-                return null;
-
-            // new test
-            var CppEnumerable = (Value as Il2CppSystem.Object)?.TryCast<Il2CppSystem.Collections.IEnumerable>();
-            if (CppEnumerable != null)
-            {
-                var type = Value.GetType();
-                if (!s_getEnumeratorMethods.ContainsKey(type))
-                    s_getEnumeratorMethods.Add(type, type.GetMethod("GetEnumerator"));
-                
-                var enumerator = s_getEnumeratorMethods[type].Invoke(Value, null);
-                var enumeratorType = enumerator.GetType();
-
-                if (!s_enumeratorInfos.ContainsKey(enumeratorType))
-                {
-                    s_enumeratorInfos.Add(enumeratorType, new EnumeratorInfo
-                    {
-                        current = enumeratorType.GetProperty("Current"),
-                        moveNext = enumeratorType.GetMethod("MoveNext"),
-                    });
-                }
-                var info = s_enumeratorInfos[enumeratorType];
-
-                // iterate
-                var list = new List<object>();
-                while ((bool)info.moveNext.Invoke(enumerator, null))
-                    list.Add(info.current.GetValue(enumerator));
-
-                return list;
-            }
-
-            return null;
-        }
-#endif
-
-#endregion
-
-#region UI CONSTRUCTION
 
         internal GameObject m_listContent;
         internal LayoutElement m_listLayout;
@@ -278,7 +203,5 @@ namespace UnityExplorer.UI.InteractiveValues
             contentFitter.horizontalFit = ContentSizeFitter.FitMode.Unconstrained;
             contentFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
         }
-
-#endregion
     }
 }

src/UI/InteractiveValues/InteractiveFloatStruct.cs

@@ -61,6 +61,9 @@ namespace UnityExplorer.UI.InteractiveValues
             if (!type.IsValueType)
                 return false;
 
+            if (string.IsNullOrEmpty(type.AssemblyQualifiedName))
+                return false;
+
             if (_typeSupportCache.TryGetValue(type.AssemblyQualifiedName, out bool ret))
                 return ret;
 

src/UI/InteractiveValues/InteractiveString.cs

@@ -24,13 +24,8 @@ namespace UnityExplorer.UI.InteractiveValues
 
         public override void OnValueUpdated()
         {
-#if CPP
-            // strings boxed as Il2CppSystem.Objects can behave weirdly.
-            // GetActualType will find they are a string, but if its boxed
-            // then we need to unbox it like this...
-            if (!(Value is string) && Value is Il2CppSystem.Object cppobj)
-                Value = cppobj.ToString();
-#endif
+            if (!(Value is string) && Value != null)
+                Value = RuntimeProvider.Instance.Reflection.UnboxString(Value);
 
             base.OnValueUpdated();
         }

src/UI/Main/BaseMenuPage.cs

@@ -7,9 +7,19 @@ using UnityEngine.UI;
 
 namespace UnityExplorer.UI.Main
 {
+    public enum MenuPages
+    {
+        Home,
+        Search,
+        CSConsole,
+        Options
+    }
+
     public abstract class BaseMenuPage
     {
         public abstract string Name { get; }
+        public abstract MenuPages Type { get; }
+        public bool WasDisabled { get; internal set; }
 
         public GameObject Content;
         public Button RefNavbarButton { get; set; }
@@ -20,7 +30,6 @@ namespace UnityExplorer.UI.Main
             set => Content?.SetActive(true);
         }
 
-
         public abstract bool Init();
         public abstract void Update();
     }

src/UI/Main/CSConsole/AutoCompleter.cs

@@ -271,12 +271,10 @@ namespace UnityExplorer.UI.Main.CSConsole
             mainGroup.childForceExpandHeight = false;
             mainGroup.childForceExpandWidth = true;
 
-            ColorBlock btnColors = new ColorBlock();
-            RuntimeProvider.Instance.SetColorBlock(btnColors, new Color(0, 0, 0, 0), highlighted: new Color(0.2f, 0.2f, 0.2f, 1.0f));
-
             for (int i = 0; i < MAX_LABELS; i++)
             {
-                var btn = UIFactory.CreateButton(content, "AutoCompleteButton", "", null, btnColors);
+                var btn = UIFactory.CreateButton(content, "AutoCompleteButton", "", null);
+                RuntimeProvider.Instance.SetColorBlock(btn, new Color(0, 0, 0, 0), highlighted: new Color(0.2f, 0.2f, 0.2f, 1.0f));
 
                 var nav = btn.navigation;
                 nav.mode = Navigation.Mode.Vertical;

src/UI/Main/CSConsole/CSharpConsole.cs

@@ -13,15 +13,13 @@ using UnityExplorer.UI.Main.CSConsole;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Unity;
 using UnityExplorer.UI.Utility;
-#if CPP
-using UnityExplorer.Core.Runtime.Il2Cpp;
-#endif
 
 namespace UnityExplorer.UI.Main.CSConsole
 {
     public class CSharpConsole : BaseMenuPage
     {
         public override string Name => "C# Console";
+        public override MenuPages Type => MenuPages.CSConsole;
 
         public static CSharpConsole Instance { get; private set; }
 
@@ -53,9 +51,6 @@ namespace UnityExplorer.UI.Main.CSConsole
                 InitConsole();
 
                 AutoCompleter.Init();
-#if MONO
-                DummyBehaviour.Setup();
-#endif
 
                 ResetConsole(false);
                 // Make sure compiler is supported on this platform
@@ -102,9 +97,6 @@ namespace UnityExplorer.UI.Main.CSConsole
             UpdateConsole();
 
             AutoCompleter.Update();
-#if CPP
-            Il2CppCoroutine.Process();
-#endif
         }
 
         public void AddUsing(string asm)

src/UI/Main/Home/HomePage.cs

@@ -13,6 +13,8 @@ namespace UnityExplorer.UI.Main.Home
 
         public static HomePage Instance { get; internal set; }
 
+        public override MenuPages Type => MenuPages.Home;
+
         public override bool Init()
         {
             Instance = this;

src/UI/Main/Home/SceneExplorer.cs

@@ -522,15 +522,13 @@ namespace UnityExplorer.UI.Main.Home
             m_shortListToggles.Add(toggle);
             toggle.onValueChanged.AddListener((bool val) => { OnToggleClicked(thisIndex, val); });
 
-            ColorBlock mainColors = new ColorBlock();
-            mainColors = RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.1f, 0.1f, 0.1f), 
-                new Color(0.2f, 0.2f, 0.2f), new Color(0.05f, 0.05f, 0.05f));
-
             var mainButton = UIFactory.CreateButton(btnGroupObj, 
                 "MainButton", 
                 "",
-                () => { SceneListObjectClicked(thisIndex); },
-                mainColors);
+                () => { SceneListObjectClicked(thisIndex); });
+
+            RuntimeProvider.Instance.SetColorBlock(mainButton, new Color(0.1f, 0.1f, 0.1f),
+                new Color(0.2f, 0.2f, 0.2f), new Color(0.05f, 0.05f, 0.05f));
 
             UIFactory.SetLayoutElement(mainButton.gameObject, minHeight: 25, minWidth: 230);
 
@@ -539,15 +537,13 @@ namespace UnityExplorer.UI.Main.Home
             mainText.horizontalOverflow = HorizontalWrapMode.Overflow;
             m_shortListTexts.Add(mainText);
 
-            ColorBlock inspectColors = new ColorBlock();
-            inspectColors = RuntimeProvider.Instance.SetColorBlock(inspectColors, new Color(0.15f, 0.15f, 0.15f),
-                new Color(0.2f, 0.2f, 0.2f), new Color(0.1f, 0.1f, 0.1f));
-
             var inspectButton = UIFactory.CreateButton(btnGroupObj, 
                 "InspectButton", 
                 "Inspect",
-                () => { InspectorManager.Instance.Inspect(m_shortList[thisIndex]); },
-                inspectColors);
+                () => { InspectorManager.Instance.Inspect(m_shortList[thisIndex]); });
+
+            RuntimeProvider.Instance.SetColorBlock(inspectButton, new Color(0.15f, 0.15f, 0.15f),
+                new Color(0.2f, 0.2f, 0.2f), new Color(0.1f, 0.1f, 0.1f));
 
             UIFactory.SetLayoutElement(inspectButton.gameObject, minWidth: 60, minHeight: 25);
         }

src/UI/Main/MainMenu.cs

@@ -26,7 +26,7 @@ namespace UnityExplorer.UI.Main
         public readonly List<BaseMenuPage> Pages = new List<BaseMenuPage>();
         private BaseMenuPage m_activePage;
 
-        public static Action<int> OnActiveTabChanged;
+        public static Action<MenuPages> OnActiveTabChanged;
 
         // Navbar buttons
         private Button m_lastNavButtonPressed;
@@ -38,8 +38,6 @@ namespace UnityExplorer.UI.Main
         internal bool pageLayoutInit;
         internal int layoutInitIndex;
 
-        private int origDesiredPage = -1;
-
         public static void Create()
         {
             if (Instance != null)
@@ -67,6 +65,7 @@ namespace UnityExplorer.UI.Main
 
                 if (!page.Init())
                 {
+                    page.WasDisabled = true;
                     // page init failed.
                     Pages.RemoveAt(i);
                     i--;
@@ -88,9 +87,6 @@ namespace UnityExplorer.UI.Main
         {
             if (!pageLayoutInit)
             {
-                if (origDesiredPage == -1)
-                    origDesiredPage = ConfigManager.Last_Active_Tab?.Value ?? 0;
-
                 if (layoutInitIndex < Pages.Count)
                 {
                     SetPage(Pages[layoutInitIndex]);
@@ -100,7 +96,8 @@ namespace UnityExplorer.UI.Main
                 {
                     pageLayoutInit = true;
                     MainPanel.transform.position = initPos;
-                    SetPage(Pages[origDesiredPage]);
+
+                    SetPage(ConfigManager.Default_Tab.Value);
                 }
                 return;
             }
@@ -108,9 +105,17 @@ namespace UnityExplorer.UI.Main
             m_activePage?.Update();
         }
 
+        public void SetPage(MenuPages page)
+        {
+            var pageObj = Pages.Find(it => it.Type == page);
+            if (pageObj == null || pageObj.WasDisabled)
+                return;
+            SetPage(pageObj);
+        }
+
         public void SetPage(BaseMenuPage page)
         {
-            if (page == null || m_activePage == page)
+            if (page == null || m_activePage == page || page.WasDisabled)
                 return;
 
             m_activePage?.Content?.SetActive(false);
@@ -131,17 +136,17 @@ namespace UnityExplorer.UI.Main
 
             m_lastNavButtonPressed = button;
 
-            OnActiveTabChanged?.Invoke(Pages.IndexOf(m_activePage));
+            OnActiveTabChanged?.Invoke(m_activePage.Type);
         }
 
         internal void SetButtonActiveColors(Button button)
         {
-            button.colors = RuntimeProvider.Instance.SetColorBlock(button.colors, m_navButtonSelected);
+            RuntimeProvider.Instance.SetColorBlock(button, m_navButtonSelected);
         }
 
         internal void SetButtonInactiveColors(Button button)
         {
-            button.colors = RuntimeProvider.Instance.SetColorBlock(button.colors, m_navButtonNormal);
+            RuntimeProvider.Instance.SetColorBlock(button, m_navButtonNormal);
         }
 
         #region UI Construction
@@ -179,15 +184,13 @@ namespace UnityExplorer.UI.Main
 
             // Hide button
 
-            ColorBlock colorBlock = new ColorBlock();
-            colorBlock = RuntimeProvider.Instance.SetColorBlock(colorBlock, new Color(65f / 255f, 23f / 255f, 23f / 255f),
-                new Color(35f / 255f, 10f / 255f, 10f / 255f), new Color(156f / 255f, 0f, 0f));
-
             var hideButton = UIFactory.CreateButton(titleBar, 
                 "HideButton", 
                 $"Hide ({ConfigManager.Main_Menu_Toggle.Value})", 
-                () => { UIManager.ShowMenu = false; },
-                colorBlock);
+                () => { UIManager.ShowMenu = false; }); 
+            
+            RuntimeProvider.Instance.SetColorBlock(hideButton, new Color(65f / 255f, 23f / 255f, 23f / 255f),
+                 new Color(35f / 255f, 10f / 255f, 10f / 255f), new Color(156f / 255f, 0f, 0f));
 
             UIFactory.SetLayoutElement(hideButton.gameObject, minWidth: 90, flexibleWidth: 0);
 
@@ -208,16 +211,14 @@ namespace UnityExplorer.UI.Main
             GameObject navbarObj = UIFactory.CreateHorizontalGroup(content, "MainNavBar", true, true, true, true, 5);
             UIFactory.SetLayoutElement(navbarObj, minHeight: 25, flexibleHeight: 0);
 
-            ColorBlock colorBlock = new ColorBlock();
-            colorBlock = RuntimeProvider.Instance.SetColorBlock(colorBlock, m_navButtonNormal, m_navButtonHighlight, m_navButtonSelected);
-
             foreach (var page in Pages)
             {
                 Button btn = UIFactory.CreateButton(navbarObj, 
                     $"Button_{page.Name}",
                     page.Name,
-                    () => { SetPage(page); },
-                    colorBlock);
+                    () => { SetPage(page); });
+
+                RuntimeProvider.Instance.SetColorBlock(btn, m_navButtonNormal, m_navButtonHighlight, m_navButtonSelected);
 
                 page.RefNavbarButton = btn;
             }

src/UI/Main/Options/OptionsPage.cs

@@ -12,6 +12,7 @@ namespace UnityExplorer.UI.Main.Options
     public class OptionsPage : BaseMenuPage
     {
         public override string Name => "Options";
+        public override MenuPages Type => MenuPages.Options;
 
         internal static readonly List<CacheConfigEntry> _cachedConfigEntries = new List<CacheConfigEntry>();
 

src/UI/Main/Search/SearchPage.cs

@@ -17,6 +17,7 @@ namespace UnityExplorer.UI.Main.Search
     public class SearchPage : BaseMenuPage
     {
         public override string Name => "Search";
+        public override MenuPages Type => MenuPages.Search;
 
         public static SearchPage Instance;
 
@@ -260,7 +261,7 @@ namespace UnityExplorer.UI.Main.Search
 
             m_selectedContextButton = button;
 
-            m_selectedContextButton.colors = RuntimeProvider.Instance.SetColorBlock(m_selectedContextButton.colors, 
+            RuntimeProvider.Instance.SetColorBlock(m_selectedContextButton, 
                 new Color(0.35f, 0.7f, 0.35f), new Color(0.35f, 0.7f, 0.35f));
 
             m_context = context;
@@ -438,15 +439,13 @@ namespace UnityExplorer.UI.Main.Search
             UIFactory.SetLayoutElement(btnGroupObj, flexibleWidth: 320, minHeight: 25, flexibleHeight: 0);
             btnGroupObj.AddComponent<Mask>();
 
-            var mainColors = new ColorBlock();
-            RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.1f, 0.1f, 0.1f),
-                new Color(0.2f, 0.2f, 0.2f), new Color(0.05f, 0.05f, 0.05f));
-
             var mainButton = UIFactory.CreateButton(btnGroupObj, 
                 "ResultButton",
                 "", 
-                () => { OnResultClicked(thisIndex); },
-                mainColors);
+                () => { OnResultClicked(thisIndex); });
+
+            RuntimeProvider.Instance.SetColorBlock(mainButton, new Color(0.1f, 0.1f, 0.1f),
+                new Color(0.2f, 0.2f, 0.2f), new Color(0.05f, 0.05f, 0.05f));
 
             UIFactory.SetLayoutElement(mainButton.gameObject, minHeight: 25, flexibleHeight: 0, minWidth: 320, flexibleWidth: 0);
 

src/UI/UIFactory.cs

@@ -52,7 +52,7 @@ namespace UnityExplorer.UI
 
         internal static void SetDefaultSelectableColors(Selectable selectable)
         {
-            selectable.colors = RuntimeProvider.Instance.SetColorBlock(selectable.colors, new Color(0.2f, 0.2f, 0.2f), 
+            RuntimeProvider.Instance.SetColorBlock(selectable, new Color(0.2f, 0.2f, 0.2f),
                 new Color(0.3f, 0.3f, 0.3f), new Color(0.15f, 0.15f, 0.15f));
 
             // Deselect all Buttons after they are clicked.
@@ -60,19 +60,6 @@ namespace UnityExplorer.UI
                 button.onClick.AddListener(() => { button.OnDeselect(null); });
         }
 
-        //public static void SetColorBlockValues(ref this ColorBlock colorBlock, Color? normal = null, Color? highlighted = null, 
-        //    Color? pressed = null)
-        //{
-        //    if (normal != null)
-        //        colorBlock.normalColor = (Color)normal;
-
-        //    if (highlighted != null)
-        //        colorBlock.highlightedColor = (Color)highlighted;
-
-        //    if (pressed != null)
-        //        colorBlock.pressedColor = (Color)pressed;
-        //}
-
         /// <summary>
         /// Get and/or Add a LayoutElement component to the GameObject, and set any of the values on it.
         /// </summary>
@@ -276,10 +263,12 @@ namespace UnityExplorer.UI
         {
             var colors = new ColorBlock();
             normalColor = normalColor ?? new Color(0.25f, 0.25f, 0.25f);
-            colors = RuntimeProvider.Instance.SetColorBlock(colors, normalColor, new Color(0.4f, 0.4f, 0.4f),
-                new Color(0.15f, 0.15f, 0.15f));
 
-            return CreateButton(parent, name, text, onClick, colors);
+            var btn = CreateButton(parent, name, text, onClick, colors);
+
+            RuntimeProvider.Instance.SetColorBlock(btn, normalColor, new Color(0.4f, 0.4f, 0.4f), new Color(0.15f, 0.15f, 0.15f));
+
+            return btn;
         }
 
         public static Button CreateButton(GameObject parent, string name, string text, Action onClick, ColorBlock colors)
@@ -296,7 +285,7 @@ namespace UnityExplorer.UI
             SetDefaultSelectableColors(button);
 
             colors.colorMultiplier = 1;
-            button.colors = colors;
+            RuntimeProvider.Instance.SetColorBlock(button, colors);
 
             Text textComp = textObj.AddComponent<Text>();
             textComp.text = text;
@@ -364,7 +353,7 @@ namespace UnityExplorer.UI
             slider.targetGraphic = handleImage;
             slider.direction = Slider.Direction.LeftToRight;
 
-            slider.colors = RuntimeProvider.Instance.SetColorBlock(slider.colors, new Color(0.4f, 0.4f, 0.4f), 
+            RuntimeProvider.Instance.SetColorBlock(slider, new Color(0.4f, 0.4f, 0.4f),
                 new Color(0.55f, 0.55f, 0.55f), new Color(0.3f, 0.3f, 0.3f));
 
             return sliderObj;
@@ -504,7 +493,7 @@ namespace UnityExplorer.UI
             mainInput.transition = Selectable.Transition.ColorTint;
             mainInput.targetGraphic = mainImage;
 
-            mainInput.colors = RuntimeProvider.Instance.SetColorBlock(mainInput.colors, new Color(1, 1, 1, 1),
+            RuntimeProvider.Instance.SetColorBlock(mainInput, new Color(1, 1, 1, 1),
                 new Color(0.95f, 0.95f, 0.95f, 1.0f), new Color(0.78f, 0.78f, 0.78f, 1.0f));
 
             SetLayoutGroup<VerticalLayoutGroup>(mainObj, true, true, true, true);
@@ -609,7 +598,7 @@ namespace UnityExplorer.UI
             Toggle itemToggle = itemObj.AddComponent<Toggle>();
             itemToggle.targetGraphic = itemBgImage;
             itemToggle.isOn = true;
-            itemToggle.colors = RuntimeProvider.Instance.SetColorBlock(itemToggle.colors, 
+            RuntimeProvider.Instance.SetColorBlock(itemToggle, 
                 new Color(0.35f, 0.35f, 0.35f, 1.0f), new Color(0.25f, 0.45f, 0.25f, 1.0f));
 
             itemToggle.onValueChanged.AddListener((bool val) => { itemToggle.OnDeselect(null); });

src/UnityExplorer.csproj

@@ -219,7 +219,7 @@
     <Compile Include="Core\Config\ConfigManager.cs" />
     <Compile Include="Core\Config\IConfigElement.cs" />
     <Compile Include="Core\Config\ConfigHandler.cs" />
-    <Compile Include="Core\CSharp\DummyBehaviour.cs" />
+    <Compile Include="Core\Runtime\Mono\DummyBehaviour.cs" />
     <Compile Include="Core\CSharp\ScriptEvaluator.cs" />
     <Compile Include="Core\CSharp\ScriptInteraction.cs" />
     <Compile Include="Core\CSharp\Suggestion.cs" />