Bump HarmonyX to 2.5.2

TODO add font to legacy bundles

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -24,10 +24,8 @@ body:
         - BepInEx IL2CPP
         - BepInEx 6.X Mono
         - BepInEx 5.X Mono
-        - MelonLoader 0.4+ IL2CPP
-        - MelonLoader 0.4+ Mono
-        - MelonLoader 0.3 IL2CPP
-        - MelonLoader 0.3 Mono
+        - MelonLoader IL2CPP
+        - MelonLoader Mono
         - Standalone IL2CPP
         - Standalone Mono
     validations:

.github/workflows/dotnet.yml

@@ -79,22 +79,6 @@ jobs:
           name: UnityExplorer.MelonLoader.Mono
           path: ./Release/UnityExplorer.MelonLoader.Mono/*
       
-      # MelonLoader 0.3.0 Il2Cpp
-      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Cpp
-      
-      - uses: actions/upload-artifact@v2
-        with:
-          name: UnityExplorer.MelonLoader_Legacy.Il2Cpp
-          path: ./Release/UnityExplorer.MelonLoader_Legacy.Il2Cpp/*
-      
-      # MelonLoader 0.3.0 Mono
-      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Mono
-      
-      - uses: actions/upload-artifact@v2
-        with:
-          name: UnityExplorer.MelonLoader_Legacy.Mono
-          path: ./Release/UnityExplorer.MelonLoader_Legacy.Mono/*
-      
       # Standalone Il2Cpp
       - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Cpp
       

README.md

@@ -33,7 +33,6 @@
 | Release | IL2CPP | Mono |
 | ------- | ------ | ---- |
 | ML 0.4+ | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
-| ML 0.3 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Mono.zip) | 
 
 1. Take the `UnityExplorer.ML.[version].dll` file and put it in the `Mods\` folder created by MelonLoader.
 

src/Core/Input/CursorUnlocker.cs

@@ -1,4 +1,5 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -6,8 +7,6 @@ using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
 using UnityExplorer.UI;
-using BF = System.Reflection.BindingFlags;
-
 
 namespace UnityExplorer.Core.Input
 {
@@ -149,18 +148,97 @@ namespace UnityExplorer.Core.Input
 
         // Patches
 
-        private static void SetupPatches()
+        public static void SetupPatches()
         {
             try
             {
-                ExplorerCore.Loader.SetupCursorPatches();
+                PrefixPropertySetter(typeof(Cursor),
+                    "lockState",
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_lockState))));
+
+                PrefixPropertySetter(typeof(Cursor),
+                    "visible",
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_visible))));
+
+                PrefixPropertySetter(typeof(EventSystem),
+                    "current",
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_EventSystem_set_current))));
+
+                PrefixMethod(typeof(EventSystem),
+                    "SetSelectedGameObject",
+                    // some games use a modified version of uGUI that includes this extra int argument on this method.
+                    new Type[] { typeof(GameObject), typeof(BaseEventData), typeof(int) },
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_EventSystem_SetSelectedGameObject))),
+                    // most games use these arguments, we'll use them as our "backup".
+                    new Type[] { typeof(GameObject), typeof(BaseEventData) });
+
+                //// Not sure if this one is needed.
+                //PrefixMethod(typeof(PointerInputModule),
+                //    "ClearSelection",
+                //    new Type[0],
+                //    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_PointerInputModule_ClearSelection))));
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
+            }
+        }
+
+        private static void PrefixMethod(Type type, string method, Type[] arguments, HarmonyMethod prefix, Type[] backupArgs = null)
+        {
+            try
+            {
+                var methodInfo = type.GetMethod(method, ReflectionUtility.FLAGS, null, arguments, null);
+                if (methodInfo == null)
+                {
+                    if (backupArgs != null)
+                        methodInfo = type.GetMethod(method, ReflectionUtility.FLAGS, null, backupArgs, null);
+                    
+                    if (methodInfo == null)
+                        throw new MissingMethodException($"Could not find method for patching - '{type.FullName}.{method}'!");
+                }
+
+                var processor = ExplorerCore.Harmony.CreateProcessor(methodInfo);
+                processor.AddPrefix(prefix);
+                processor.Patch();
             }
             catch (Exception e)
             {
-                ExplorerCore.Log($"Exception setting up Cursor patches: {e.GetType()}, {e.Message}");
+                ExplorerCore.LogWarning($"Unable to patch {type.Name}.{method}: {e.Message}");
             }
         }
 
+        private static void PrefixPropertySetter(Type type, string property, HarmonyMethod prefix)
+        {
+            try
+            {
+                var processor = ExplorerCore.Harmony.CreateProcessor(type.GetProperty(property, ReflectionUtility.FLAGS).GetSetMethod());
+                processor.AddPrefix(prefix);
+                processor.Patch();
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"Unable to patch {type.Name}.set_{property}: {e.Message}");
+            }
+        }
+
+        // Prevent setting non-UnityExplorer objects as selected when menu is open
+
+        public static bool Prefix_EventSystem_SetSelectedGameObject(GameObject __0)
+        {
+            if (!UIManager.ShowMenu || !UIManager.CanvasRoot)
+                return true;
+
+            return __0 && __0.transform.root.gameObject.GetInstanceID() == UIManager.CanvasRoot.GetInstanceID();
+        }
+
+        //public static bool Prefix_PointerInputModule_ClearSelection()
+        //{
+        //    return !(UIManager.ShowMenu && UIManager.CanvasRoot);
+        //}
+
+        // Force EventSystem.current to be UnityExplorer's when menu is open
+
         public static void Prefix_EventSystem_set_current(ref EventSystem value)
         {
             if (!settingEventSystem && value)

src/Core/Runtime/Il2Cpp/AssetBundle.cs

@@ -32,16 +32,6 @@ namespace UnityExplorer
             return new AssetBundle(ptr);
         }
 
-        // static void UnloadAllAssetBundles(bool unloadAllObjects);
-
-        internal delegate void d_UnloadAllAssetBundles(bool unloadAllObjects);
-
-        public static void UnloadAllAssetBundles(bool unloadAllObjects)
-        {
-            var iCall = ICallManager.GetICall<d_UnloadAllAssetBundles>("UnityEngine.AssetBundle::UnloadAllAssetBundles");
-            iCall.Invoke(unloadAllObjects);
-        }
-
         // ~~~~~~~~~~~~ Instance ~~~~~~~~~~~~
 
         private readonly IntPtr m_bundlePtr = IntPtr.Zero;
@@ -78,7 +68,8 @@ namespace UnityExplorer
             return new UnityEngine.Object(ptr).TryCast<T>();
         }
 
-        // public extern void Unload(bool unloadAllLoadedObjects);
+        // Unload(bool unloadAllLoadedObjects);
+
         internal delegate void d_Unload(IntPtr _this, bool unloadAllLoadedObjects);
 
         public void Unload(bool unloadAssets = true)

src/Core/Runtime/Il2Cpp/ICallManager.cs

@@ -7,7 +7,6 @@ using System.Runtime.InteropServices;
 
 namespace UnityExplorer.Core.Runtime.Il2Cpp
 {
-    [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "External methods")]
     public static class ICallManager
     {
         [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]

src/Core/Runtime/Il2Cpp/Il2CppCoroutine.cs

@@ -6,8 +6,8 @@ using System.Linq;
 using UnhollowerBaseLib;
 using UnityEngine;
 
-// CREDIT HerpDerpenstine
-// https://github.com/LavaGang/MelonLoader/blob/master/MelonLoader.Support.Il2Cpp/MelonCoroutines.cs
+// Credit to HerpDerpenstine and knah
+// https://github.com/LavaGang/MelonLoader/blob/master/SM_Il2Cpp/Coroutines.cs
 
 namespace UnityExplorer.Core.Runtime.Il2Cpp
 {

src/Core/Runtime/Il2Cpp/Il2CppProvider.cs

@@ -73,6 +73,7 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             return ScriptableObject.CreateInstance(Il2CppType.From(type));
         }
 
+        // Pretty disgusting but couldn't figure out a cleaner way yet unfortunately
         public override void GraphicRaycast(GraphicRaycaster raycaster, PointerEventData data, List<RaycastResult> list)
         {
             var il2cppList = new Il2CppSystem.Collections.Generic.List<RaycastResult>();
@@ -117,22 +118,17 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             if (!scene.isLoaded)
                 return new GameObject[0];
 
-            int handle = scene.handle;
-
-            if (handle == -1)
+            if (scene.handle == -1)
                 return new GameObject[0];
 
-            int count = GetRootCount(handle);
+            int count = GetRootCount(scene.handle);
 
             if (count < 1)
                 return new GameObject[0];
 
             var list = new Il2CppSystem.Collections.Generic.List<GameObject>(count);
-
             var iCall = ICallManager.GetICall<d_GetRootGameObjects>("UnityEngine.SceneManagement.Scene::GetRootGameObjectsInternal");
-
-            iCall.Invoke(handle, list.Pointer);
-
+            iCall.Invoke(scene.handle, list.Pointer);
             return list.ToArray();
         }
 

src/Core/Runtime/Il2Cpp/Il2CppTextureUtil.cs

@@ -38,19 +38,6 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             return new Il2CppStructArray<byte>(ptr);
         }
 
-        // bool ImageConversion.LoadImage(this Texture2D tex, byte[] data, bool markNonReadable);
-
-        internal delegate bool d_LoadImage(IntPtr tex, IntPtr data, bool markNonReadable);
-
-        public override bool LoadImage(Texture2D tex, byte[] data, bool markNonReadable)
-        {
-            var il2cppArray = (Il2CppStructArray<byte>)data;
-
-            var iCall = ICallManager.GetICall<d_LoadImage>("UnityEngine.ImageConversion::LoadImage");
-
-            return iCall.Invoke(tex.Pointer, il2cppArray.Pointer, markNonReadable);
-        }
-
         // Sprite Sprite.Create
 
         public override Sprite CreateSprite(Texture2D texture)

src/Core/Runtime/Mono/MonoProvider.cs

@@ -10,6 +10,7 @@ using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
+using UnityExplorer;
 
 namespace UnityExplorer.Core.Runtime.Mono
 {
@@ -18,7 +19,6 @@ namespace UnityExplorer.Core.Runtime.Mono
         public override void Initialize()
         {
             ExplorerCore.Context = RuntimeContext.Mono;
-            //Reflection = new MonoReflection();
             TextureUtil = new MonoTextureUtil();
         }
 
@@ -28,60 +28,35 @@ namespace UnityExplorer.Core.Runtime.Mono
         }
 
         private void Application_logMessageReceived(string condition, string stackTrace, LogType type)
-        {
-            ExplorerCore.LogUnity(condition, type);
-        }
+             => ExplorerCore.LogUnity(condition, type);
 
-        public override void StartCoroutine(IEnumerator routine)
-        {
-            ExplorerBehaviour.Instance.StartCoroutine(routine);
-        }
+        public override void StartCoroutine(IEnumerator routine) 
+            => ExplorerBehaviour.Instance.StartCoroutine(routine);
 
         public override void Update()
         {
-
         }
 
-        public override T AddComponent<T>(GameObject obj, Type type)
-        {
-            return (T)obj.AddComponent(type);
-        }
+        public override T AddComponent<T>(GameObject obj, Type type) 
+            => (T)obj.AddComponent(type);
 
-        public override ScriptableObject CreateScriptable(Type type)
-        {
-            return ScriptableObject.CreateInstance(type);
-        }
+        public override ScriptableObject CreateScriptable(Type type) 
+            => ScriptableObject.CreateInstance(type);
 
         public override void GraphicRaycast(GraphicRaycaster raycaster, PointerEventData data, List<RaycastResult> list)
-        {
-            raycaster.Raycast(data, list);
-        }
+            => raycaster.Raycast(data, list);
 
-        public override string LayerToName(int layer)
+        public override string LayerToName(int layer) 
             => LayerMask.LayerToName(layer);
 
-        public override UnityEngine.Object[] FindObjectsOfTypeAll(Type type)
+        public override UnityEngine.Object[] FindObjectsOfTypeAll(Type type) 
             => Resources.FindObjectsOfTypeAll(type);
 
-        //private static readonly FieldInfo fi_Scene_handle = typeof(Scene).GetField("m_Handle", ReflectionUtility.AllFlags);
+        public override GameObject[] GetRootGameObjects(Scene scene) 
+            => scene.isLoaded ? scene.GetRootGameObjects() : new GameObject[0];
 
-        //public override int GetSceneHandle(Scene scene)
-        //{
-        //    return (int)fi_Scene_handle.GetValue(scene);
-        //}
-
-        public override GameObject[] GetRootGameObjects(Scene scene)
-        {
-            if (!scene.isLoaded)
-                return new GameObject[0];
-
-            return scene.GetRootGameObjects();
-        }
-
-        public override int GetRootCount(Scene scene)
-        {
-            return scene.rootCount;
-        }
+        public override int GetRootCount(Scene scene) 
+            => scene.rootCount;
 
         public override void SetColorBlock(Selectable selectable, Color? normal = null, Color? highlighted = null, Color? pressed = null,
             Color? disabled = null)
@@ -103,59 +78,42 @@ namespace UnityExplorer.Core.Runtime.Mono
             SetColorBlock(selectable, colors);
         }
 
-        public override void SetColorBlock(Selectable selectable, ColorBlock colors)
-        {
-            selectable.colors = colors;
-        }
+        public override void SetColorBlock(Selectable selectable, ColorBlock colors) 
+            => selectable.colors = colors;
     }
 }
 
 public static class MonoExtensions
 {
+    // Helpers to use the same style of AddListener that IL2CPP uses.
+
     public static void AddListener(this UnityEvent _event, Action listener)
-    {
-        _event.AddListener(new UnityAction(listener));
-    }
+        => _event.AddListener(new UnityAction(listener));
 
     public static void AddListener<T>(this UnityEvent<T> _event, Action<T> listener)
-    {
-        _event.AddListener(new UnityAction<T>(listener));
-    }
+        => _event.AddListener(new UnityAction<T>(listener));
 
     public static void RemoveListener(this UnityEvent _event, Action listener)
-    {
-        _event.RemoveListener(new UnityAction(listener));
-    }
+        => _event.RemoveListener(new UnityAction(listener));
 
     public static void RemoveListener<T>(this UnityEvent<T> _event, Action<T> listener)
-    {
-        _event.RemoveListener(new UnityAction<T>(listener));
-    }
+        => _event.RemoveListener(new UnityAction<T>(listener));
 
-    public static void Clear(this StringBuilder sb)
-    {
-        sb.Remove(0, sb.Length);
-    }
+    // Doesn't exist in NET 3.5
 
-    private static PropertyInfo pi_childControlHeight;
+    public static void Clear(this StringBuilder sb) 
+        => sb.Remove(0, sb.Length);
+
+    // These properties don't exist in some earlier games, so null check before trying to set them.
 
     public static void SetChildControlHeight(this HorizontalOrVerticalLayoutGroup group, bool value)
-    {
-        if (pi_childControlHeight == null)
-            pi_childControlHeight = group.GetType().GetProperty("childControlHeight");
+        => ReflectionUtility.GetPropertyInfo(typeof(HorizontalOrVerticalLayoutGroup), "childControlHeight")
+            ?.SetValue(group, value, null);
 
-        pi_childControlHeight?.SetValue(group, value, null);
-    }
-
-    private static PropertyInfo pi_childControlWidth;
 
     public static void SetChildControlWidth(this HorizontalOrVerticalLayoutGroup group, bool value)
-    {
-        if (pi_childControlWidth == null)
-            pi_childControlWidth = group.GetType().GetProperty("childControlWidth");
-
-        pi_childControlWidth?.SetValue(group, value, null);
-    }
+        => ReflectionUtility.GetPropertyInfo(typeof(HorizontalOrVerticalLayoutGroup), "childControlWidth")
+            ?.SetValue(group, value, null);
 }
 
 #endif

src/Core/Runtime/Mono/MonoTextureUtil.cs

@@ -12,41 +12,28 @@ namespace UnityExplorer.Core.Runtime.Mono
     public class MonoTextureUtil : TextureUtilProvider
     {
         public override void Blit(Texture2D tex, RenderTexture rt)
-        {
-            Graphics.Blit(tex, rt);
-        }
+            => Graphics.Blit(tex, rt);
 
         public override Sprite CreateSprite(Texture2D texture)
-        {
-            return Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
-        }
+            => Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
 
-        public override bool LoadImage(Texture2D tex, byte[] data, bool markNonReadable)
-        {
-            return tex.LoadImage(data, markNonReadable);
-        }
+        //public override bool LoadImage(Texture2D tex, byte[] data, bool markNonReadable)
+        //    => tex.LoadImage(data, markNonReadable);
 
         public override Texture2D NewTexture2D(int width, int height)
-        {
-            return new Texture2D(width, height);
-        }
+            => new Texture2D(width, height);
 
         public override byte[] EncodeToPNG(Texture2D tex)
-        {
-            return EncodeToPNGSafe(tex);
-        }
+            => EncodeToPNGSafe(tex);
 
         private static MethodInfo EncodeToPNGMethod => m_encodeToPNGMethod ?? GetEncodeToPNGMethod();
         private static MethodInfo m_encodeToPNGMethod;
 
         public static byte[] EncodeToPNGSafe(Texture2D tex)
         {
-            var method = EncodeToPNGMethod;
-
-            if (method.IsStatic)
-                return (byte[])method.Invoke(null, new object[] { tex });
-            else
-                return (byte[])method.Invoke(tex, ArgumentUtility.EmptyArgs);
+            return EncodeToPNGMethod.IsStatic
+                    ? (byte[])EncodeToPNGMethod.Invoke(null, new object[] { tex })
+                    : (byte[])EncodeToPNGMethod.Invoke(tex, ArgumentUtility.EmptyArgs);
         }
 
         private static MethodInfo GetEncodeToPNGMethod()

src/Core/Runtime/RuntimeProvider.cs

@@ -40,8 +40,6 @@ namespace UnityExplorer
 
         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;
@@ -54,8 +52,6 @@ namespace UnityExplorer
 
         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);

src/Core/Runtime/TextureUtilProvider.cs

@@ -22,7 +22,7 @@ namespace UnityExplorer.Core.Runtime
 
         public abstract void Blit(Texture2D tex, RenderTexture rt);
 
-        public abstract bool LoadImage(Texture2D tex, byte[] data, bool markNonReadable);
+        //public abstract bool LoadImage(Texture2D tex, byte[] data, bool markNonReadable);
 
         public abstract Sprite CreateSprite(Texture2D texture);
 
@@ -43,27 +43,22 @@ namespace UnityExplorer.Core.Runtime
             }
         }
 
-        public static bool LoadImage(Texture2D tex, string filePath, bool markNonReadable)
-        {
-            if (!File.Exists(filePath))
-                return false;
-
-            return Instance.LoadImage(tex, File.ReadAllBytes(filePath), markNonReadable);
-        }
+        //public static bool LoadImage(Texture2D tex, string filePath, bool markNonReadable)
+        //{
+        //    if (!File.Exists(filePath))
+        //        return false;
+        //
+        //    return Instance.LoadImage(tex, File.ReadAllBytes(filePath), markNonReadable);
+        //}
 
         public static Texture2D Copy(Texture2D orig, Rect rect)
         {
-            Color[] pixels;
-
             if (!IsReadable(orig))
                 orig = ForceReadTexture(orig);
 
-            pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
-
+            Color[] pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
             Texture2D newTex = Instance.NewTexture2D((int)rect.width, (int)rect.height);
-
             newTex.SetPixels(pixels);
-
             return newTex;
         }
 
@@ -92,7 +87,7 @@ namespace UnityExplorer.Core.Runtime
             }
             catch (Exception e)
             {
-                ExplorerCore.Log("Exception on ForceReadTexture: " + e.ToString());
+                ExplorerCore.Log($"Exception on ForceReadTexture: {e.ToString()}");
                 return default;
             }
         }
@@ -103,13 +98,11 @@ namespace UnityExplorer.Core.Runtime
                 Directory.CreateDirectory(dir);
 
             byte[] data;
-            string savepath = dir + @"\" + name + ".png";
+            string savepath = $@"{dir}\{name}.png";
 
             // Make sure we can EncodeToPNG it.
             if (tex.format != TextureFormat.ARGB32 || !IsReadable(tex))
-            {
                 tex = ForceReadTexture(tex);
-            }
 
             if (isDTXnmNormal)
             {
@@ -120,13 +113,9 @@ namespace UnityExplorer.Core.Runtime
             data = Instance.EncodeToPNG(tex);
 
             if (data == null || !data.Any())
-            {
                 ExplorerCore.LogWarning("Couldn't get any data for the texture!");
-            }
             else
-            {
                 File.WriteAllBytes(savepath, data);
-            }
         }
 
         // Converts DTXnm-format Normal Map to RGBA-format Normal Map.

src/Core/Tests/TestClass.cs

@@ -14,112 +14,31 @@ using UnhollowerBaseLib;
 
 namespace UnityExplorer.Tests
 {
-    public class TestIndexer : IList<int>
-    {
-        private readonly List<int> list = new List<int>() { 1, 2, 3, 4, 5 };
-
-        public int Count => list.Count;
-        public bool IsReadOnly => false;
-
-        int IList<int>.this[int index]
-        {
-            get => list[index];
-            set => list[index] = value;
-        }
-
-        public int IndexOf(int item) => list.IndexOf(item);
-        public bool Contains(int item) => list.Contains(item);
-
-        public void Add(int item) => list.Add(item);
-        public void Insert(int index, int item) => list.Insert(index, item);
-
-        public bool Remove(int item) => list.Remove(item);
-        public void RemoveAt(int index) => list.RemoveAt(index);
-
-        public void Clear() => list.Clear();
-
-        public void CopyTo(int[] array, int arrayIndex) => list.CopyTo(array, arrayIndex);
-
-        public IEnumerator<int> GetEnumerator() => list.GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => list.GetEnumerator();
-    }
-
     public static class TestClass
     {
-        public static readonly TestIndexer AAAAATest = new TestIndexer();
-
-        public static void ATestMethod(string s, float f, Vector3 vector, DateTime date, Quaternion quater, bool b, CameraClearFlags enumvalue)
+        static TestClass()
         {
-            ExplorerCore.Log($"{s}, {f}, {vector.ToString()}, {date}, {quater.eulerAngles.ToString()}, {b}, {enumvalue}");
+            Init_Mono();
+#if CPP
+            Init_IL2CPP();
+#endif
         }
 
-        public static List<int> AWritableList = new List<int> { 1, 2, 3, 4, 5 };
-        public static Dictionary<string, int> AWritableDict = new Dictionary<string, int> { { "one", 1 }, { "two", 2 } };
-
-        public static IEnumerable ANestedList = new List<List<List<string>>>
-        {
-            new List<List<string>>
-            {
-                new List<string>
-                {
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                    "one",
-                    "two",
-                },
-                new List<string>
-                {
-                    "three",
-                    "four",
-                }
-            },
-            new List<List<string>>
-            {
-                new List<string>
-                {
-                    "five"
-                }
-            }
-        };
-
-        public static IDictionary ARandomDictionary = new Dictionary<object, object>
-        {
-            { 1, 2 },
-            { "one", "two" },
-            { true, false },
-            { new Vector3(0,1,2), new Vector3(1,2,3) },
-            { CameraClearFlags.Depth, CameraClearFlags.Color },
-            { "################################################\r\n##########", null },
-            { "subdict", new Dictionary<object,object> { { "key", "value" } } }
-        };
-
-        public static Hashtable TestHashtable = new Hashtable
-        {
-            { "one", "value" },
-            { "two", "value" },
-            { "three", "value" },
-        };
-
-        public const int ConstantInt = 5;
-
-        public static Color AColor = Color.magenta;
-        public static Color32 AColor32 = Color.red;
-
+        // Test enumerables
+        public static List<object> ListOfInts;
+        public static List<List<List<string>>> NestedList;
+        public static IDictionary MixedDictionary;
+        public static Hashtable Hashtable;
         public static byte[] ByteArray = new byte[16];
-        public static string LongString = new string('#', 10000);
-        public static List<string> BigList = new List<string>(10000);
+        public static List<short> ABigList = new List<short>(10000);
+
+        // Test const behaviour (should be a readonly field)
+        public const int ConstantInt5 = 5;
+
+        // Testing other InteractiveValues
+        public static Color Color = Color.magenta;
+        public static Color32 Color32 = Color.red;
+        public static string ALongString = new string('#', 10000);
 
         public static List<object> RandomList
         {
@@ -133,25 +52,7 @@ namespace UnityExplorer.Tests
             }
         }
 
-        private static void TestGeneric<T>()
-        {
-            ExplorerCore.Log("Test1 " + typeof(T).FullName);
-        }
-
-        private static void TestGenericClass<T>() where T : class
-        {
-            ExplorerCore.Log("Test2 " + typeof(T).FullName);
-        }
-
-        private static void TestComponent<T>() where T : Component
-        {
-            ExplorerCore.Log("Test3 " + typeof(T).FullName);
-        }
-
-        private static void TestStruct<T>() where T : struct
-        {
-            ExplorerCore.Log("Test3 " + typeof(T).FullName);
-        }
+        // Test methods
 
         private static object GetRandomObject()
         {
@@ -165,109 +66,133 @@ namespace UnityExplorer.Tests
                 case 2: return true;
                 case 3: return "hello";
                 case 4: return 50.5f;
-                case 5: return UnityEngine.CameraClearFlags.Color;
-                case 6: return new List<string> { "sub list", "lol" };
+                case 5: return CameraClearFlags.Color;
+                case 6: return new List<string> { "one", "two" };
             }
 
             return ret;
         }
 
+        public static void TestComponent<T>() where T : Component
+        {
+            ExplorerCore.Log($"Test3 {typeof(T).FullName}");
+        }
+
+        public static void TestArgumentParse(string s, int i, Color color, CameraClearFlags flags, Vector3 vector, Quaternion quaternion)
+        {
+            ExplorerCore.Log($"{s}, {i}, {color.ToString()}, {flags}, {vector.ToString()}, {quaternion.ToString()}");
+        }
+
+        private static void Init_Mono()
+        {
+            ExplorerCore.Log($"1: Basic list");
+            ListOfInts = new List<object> { 1, 2, 3, 4, 5 };
+
+            ExplorerCore.Log($"2: Nested list");
+            NestedList = new List<List<List<string>>>
+            {
+                new List<List<string>> {
+                    new List<string> { "1", "2", "3" },
+                    new List<string> { "4", "5", "6" },
+                },
+                new List<List<string>>
+                {
+                    new List<string> { "7", "8", "9" }
+                }
+            };
+
+            ExplorerCore.Log($"3: Dictionary");
+            MixedDictionary = new Dictionary<object, object>
+            {
+                { 1, 2 },
+                { "one", "two" },
+                { true, false },
+                { new Vector3(0,1,2), new Vector3(1,2,3) },
+                { CameraClearFlags.Depth, CameraClearFlags.Color },
+                { "################################################\r\n##########", null },
+                { "subdict", new Dictionary<object,object> { { "key", "value" } } }
+            };
+
+            ExplorerCore.Log($"4: Hashtable");
+            Hashtable = new Hashtable { { "One", 1 }, { "Two", 2 } };
+
+            ExplorerCore.Log($"5: Big list");
+            for (int i = 0; i < ABigList.Capacity; i++)
+                ABigList[i] = (short)UnityEngine.Random.Range(0, short.MaxValue);
+
+            ExplorerCore.Log("Finished TestClass Init_Mono");
+        }
+
 #if CPP
-
-        public static Il2CppSystem.Collections.IList IL2CPP_IList;
         public static Il2CppSystem.Collections.Generic.List<string> IL2CPP_ListString;
-        public static Il2CppSystem.Collections.Generic.HashSet<string> IL2CPP_HashSet;
-
-        public static Il2CppSystem.Collections.Generic.Dictionary<string, string> IL2CPP_Dict;
-        public static Il2CppSystem.Collections.Hashtable IL2CPP_HashTable;
-        public static Il2CppSystem.Collections.IDictionary IL2CPP_IDict;
-
-        public static string IL2CPP_systemString = "Test";
-        public static Il2CppSystem.Object IL2CPP_objectString = "string boxed as cpp object";
-        public static Il2CppSystem.String IL2CPP_il2cppString = "string boxed as cpp string";
-        public static string nullString = null;
-
         public static List<Il2CppSystem.Object> IL2CPP_listOfBoxedObjects;
         public static Il2CppStructArray<int> IL2CPP_structArray;
-        public static Il2CppStringArray IL2CPP_stringArray;
         public static Il2CppReferenceArray<Il2CppSystem.Object> IL2CPP_ReferenceArray;
+        public static Il2CppSystem.Collections.IDictionary IL2CPP_IDict;
+        public static Il2CppSystem.Collections.IList IL2CPP_IList;
+        public static Dictionary<Il2CppSystem.String, Il2CppSystem.Object> CppBoxedDict;
 
+        public static Il2CppSystem.Collections.Generic.HashSet<string> IL2CPP_HashSet;
+        public static Il2CppSystem.Collections.Generic.Dictionary<string, string> IL2CPP_Dict;
+        public static Il2CppSystem.Collections.Hashtable IL2CPP_HashTable;
         public static Il2CppSystem.Object cppBoxedInt;
         public static Il2CppSystem.Int32 cppInt;
         public static Il2CppSystem.Decimal cppDecimal;
         public static Il2CppSystem.Object cppDecimalBoxed;
         public static Il2CppSystem.Object cppVector3Boxed;
+        public static string IL2CPP_systemString = "Test";
+        public static Il2CppSystem.Object IL2CPP_objectString = "string boxed as cpp object";
+        public static Il2CppSystem.String IL2CPP_il2cppString = "string boxed as cpp string";
+        public static string nullString = null;
 
-        public static Il2CppSystem.Object RandomBoxedColor
+        private static void Init_IL2CPP()
         {
-            get
-            {
-                int ran = UnityEngine.Random.Range(0, 3);
-                switch (ran)
-                {
-                    case 1: return new Color32().BoxIl2CppObject();
-                    case 2: return Color.magenta.BoxIl2CppObject();
-                    default:
-                        return null;
-                }
-            }
-        }
-
-        public static Il2CppSystem.Collections.Hashtable cppHashset;
-
-        public static Dictionary<Il2CppSystem.String, Il2CppSystem.Object> CppBoxedDict;
-
-#endif
-
-        static TestClass()
-        {
-            for (int i = 0; i < BigList.Capacity; i++)
-                BigList.Add(i.ToString());
-
-#if CPP
+            ExplorerCore.Log($"IL2CPP 1: Il2Cpp Dictionary<string, string>");
             IL2CPP_Dict = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
             IL2CPP_Dict.Add("key1", "value1");
             IL2CPP_Dict.Add("key2", "value2");
             IL2CPP_Dict.Add("key3", "value3");
 
+            ExplorerCore.Log($"IL2CPP 2: Il2Cpp Hashtable");
             IL2CPP_HashTable = new Il2CppSystem.Collections.Hashtable();
             IL2CPP_HashTable.Add("key1", "value1");
             IL2CPP_HashTable.Add("key2", "value2");
             IL2CPP_HashTable.Add("key3", "value3");
 
+            ExplorerCore.Log($"IL2CPP 3: Il2Cpp IDictionary");
             var dict2 = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
             dict2.Add("key1", "value1");
             IL2CPP_IDict = dict2.TryCast<Il2CppSystem.Collections.IDictionary>();
 
+            ExplorerCore.Log($"IL2CPP 4: Il2Cpp List of Il2Cpp Object");
             var list = new Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object>(5);
             list.Add("one");
             list.Add("two");
             IL2CPP_IList = list.TryCast<Il2CppSystem.Collections.IList>();
 
+            ExplorerCore.Log($"IL2CPP 5: Il2Cpp List of strings");
             IL2CPP_ListString = new Il2CppSystem.Collections.Generic.List<string>();
             IL2CPP_ListString.Add("hello,");
             IL2CPP_ListString.Add("world!");
 
+            ExplorerCore.Log($"IL2CPP 6: Il2Cpp HashSet of strings");
             IL2CPP_HashSet = new Il2CppSystem.Collections.Generic.HashSet<string>();
             IL2CPP_HashSet.Add("one");
             IL2CPP_HashSet.Add("two");
 
+            ExplorerCore.Log($"IL2CPP 7: Dictionary of Il2Cpp String and Il2Cpp Object");
             CppBoxedDict = new Dictionary<Il2CppSystem.String, Il2CppSystem.Object>();
             CppBoxedDict.Add("1", new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject());
             CppBoxedDict.Add("2", new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject());
             CppBoxedDict.Add("3", new Il2CppSystem.Int32 { m_value = 3 }.BoxIl2CppObject());
             CppBoxedDict.Add("4", new Il2CppSystem.Int32 { m_value = 4 }.BoxIl2CppObject());
 
-            cppDecimal = new Il2CppSystem.Decimal(1f);
-            cppDecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject();
-            cppVector3Boxed = Vector3.down.BoxIl2CppObject();
-
-
+            ExplorerCore.Log($"IL2CPP 8: List of boxed Il2Cpp Objects");
             IL2CPP_listOfBoxedObjects = new List<Il2CppSystem.Object>();
             IL2CPP_listOfBoxedObjects.Add((Il2CppSystem.String)"boxedString");
             IL2CPP_listOfBoxedObjects.Add(new Il2CppSystem.Int32 { m_value = 5 }.BoxIl2CppObject());
             IL2CPP_listOfBoxedObjects.Add(Color.red.BoxIl2CppObject());
-
+            // boxed enum test
             try
             {
                 var cppType = Il2CppType.Of<CameraClearFlags>();
@@ -283,9 +208,10 @@ namespace UnityExplorer.Tests
             }
             catch (Exception ex)
             {
-                ExplorerCore.LogWarning($"Test fail: {ex}");
+                ExplorerCore.LogWarning($"Boxed enum test fail: {ex}");
             }
 
+            ExplorerCore.Log($"IL2CPP 9: Il2Cpp struct array of ints");
             IL2CPP_structArray = new UnhollowerBaseLib.Il2CppStructArray<int>(5);
             IL2CPP_structArray[0] = 0;
             IL2CPP_structArray[1] = 1;
@@ -293,24 +219,21 @@ namespace UnityExplorer.Tests
             IL2CPP_structArray[3] = 3;
             IL2CPP_structArray[4] = 4;
 
-            IL2CPP_stringArray = new UnhollowerBaseLib.Il2CppStringArray(2);
-            IL2CPP_stringArray[0] = "hello, ";
-            IL2CPP_stringArray[1] = "world!";
-
+            ExplorerCore.Log($"IL2CPP 10: Il2Cpp reference array of boxed objects");
             IL2CPP_ReferenceArray = new UnhollowerBaseLib.Il2CppReferenceArray<Il2CppSystem.Object>(3);
             IL2CPP_ReferenceArray[0] = new Il2CppSystem.Int32 { m_value = 5 }.BoxIl2CppObject();
             IL2CPP_ReferenceArray[1] = null;
             IL2CPP_ReferenceArray[2] = (Il2CppSystem.String)"whats up";
 
+            ExplorerCore.Log($"IL2CPP 11: Misc il2cpp members");
             cppBoxedInt = new Il2CppSystem.Int32() { m_value = 5 }.BoxIl2CppObject();
             cppInt = new Il2CppSystem.Int32 { m_value = 420 };
+            cppDecimal = new Il2CppSystem.Decimal(1f);
+            cppDecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject();
+            cppVector3Boxed = Vector3.down.BoxIl2CppObject();
 
-            cppHashset = new Il2CppSystem.Collections.Hashtable();
-            cppHashset.Add("key1", "itemOne");
-            cppHashset.Add("key2", "itemTwo");
-            cppHashset.Add("key3", "itemThree");
-
-#endif
+            ExplorerCore.Log($"Finished Init_Il2Cpp");
         }
+#endif
     }
 }

src/Core/Utility/MiscUtility.cs

@@ -13,7 +13,7 @@ namespace UnityExplorer
         /// </summary>
         public static bool ContainsIgnoreCase(this string _this, string s)
         {
-            return ParseUtility.en_US.CompareInfo.IndexOf(_this, s, CompareOptions.IgnoreCase) >= 0;
+            return CultureInfo.CurrentCulture.CompareInfo.IndexOf(_this, s, CompareOptions.IgnoreCase) >= 0;
         }
 
         /// <summary>

src/Core/Utility/ParseUtility.cs

@@ -10,8 +10,6 @@ namespace UnityExplorer
 {
     public static class ParseUtility
     {
-        public static CultureInfo en_US = new CultureInfo("en-US");
-
         private static readonly HashSet<Type> nonPrimitiveTypes = new HashSet<Type>
         {
             typeof(string),
@@ -19,20 +17,18 @@ namespace UnityExplorer
             typeof(DateTime),
         };
 
-        public const string NUMBER_FORMAT = "0.####";
+        // Helper for formatting float/double/decimal numbers to maximum of 4 decimal points.
+        // And also for formatting a sequence of those numbers, ie a Vector3, Color etc
 
+        public static readonly string NumberFormatString = $"0.####";
         private static readonly Dictionary<int, string> numSequenceStrings = new Dictionary<int, string>();
 
-        // Helper for formatting float/double/decimal numbers to maximum of 4 decimal points.
         public static string FormatDecimalSequence(params object[] numbers)
         {
             if (numbers.Length <= 0)
                 return null;
 
-            int count = numbers.Length;
-            var formatString = GetSequenceFormatString(count);
-
-            return string.Format(en_US, formatString, numbers);
+            return string.Format(CultureInfo.CurrentCulture, GetSequenceFormatString(numbers.Length), numbers);
         }
 
         public static string GetSequenceFormatString(int count)
@@ -46,19 +42,19 @@ namespace UnityExplorer
             string[] strings = new string[count];
 
             for (int i = 0; i < count; i++)
-                strings[i] = $"{{{i}:{NUMBER_FORMAT}}}";
+                strings[i] = $"{{{i}:{NumberFormatString}}}";
 
-            string s = string.Join(", ", strings);
-
-            numSequenceStrings.Add(count, s);
-            return s;
+            string ret = string.Join(" ", strings);
+            numSequenceStrings.Add(count, ret);
+            return ret;
         }
 
+        // Main parsing API
+
         public static bool CanParse(Type type)
         {
-            if (string.IsNullOrEmpty(type.FullName))
-                return false;
-            return type.IsPrimitive || type.IsEnum || nonPrimitiveTypes.Contains(type) || customTypes.ContainsKey(type.FullName);
+            return !string.IsNullOrEmpty(type?.FullName)
+                && (type.IsPrimitive || type.IsEnum || nonPrimitiveTypes.Contains(type) || customTypes.ContainsKey(type.FullName));
         }
 
         public static bool TryParse(string input, Type type, out object obj, out Exception parseException)
@@ -143,7 +139,7 @@ namespace UnityExplorer
                 else if (formattedTypes.Contains(type))
                 {
                     return ReflectionUtility.GetMethodInfo(type, "ToString", new Type[] { typeof(string), typeof(IFormatProvider) })
-                            .Invoke(obj, new object[] { NUMBER_FORMAT, en_US })
+                            .Invoke(obj, new object[] { NumberFormatString, CultureInfo.CurrentCulture })
                             as string;
                 }
                 else
@@ -166,9 +162,7 @@ namespace UnityExplorer
                 try
                 {
                     if (type.IsEnum)
-                    {
                         typeInputExamples.Add(type.AssemblyQualifiedName, Enum.GetNames(type).First());
-                    }
                     else
                     {
                         var instance = Activator.CreateInstance(type);
@@ -222,10 +216,10 @@ namespace UnityExplorer
         {
             Vector2 vector = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            vector.x = float.Parse(split[0].Trim(), en_US);
-            vector.y = float.Parse(split[1].Trim(), en_US);
+            vector.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            vector.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
 
             return vector;
         }
@@ -244,11 +238,11 @@ namespace UnityExplorer
         {
             Vector3 vector = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            vector.x = float.Parse(split[0].Trim(), en_US);
-            vector.y = float.Parse(split[1].Trim(), en_US);
-            vector.z = float.Parse(split[2].Trim(), en_US);
+            vector.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            vector.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+            vector.z = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
 
             return vector;
         }
@@ -267,12 +261,12 @@ namespace UnityExplorer
         {
             Vector4 vector = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            vector.x = float.Parse(split[0].Trim(), en_US);
-            vector.y = float.Parse(split[1].Trim(), en_US);
-            vector.z = float.Parse(split[2].Trim(), en_US);
-            vector.w = float.Parse(split[3].Trim(), en_US);
+            vector.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            vector.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+            vector.z = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
+            vector.w = float.Parse(split[3].Trim(), CultureInfo.CurrentCulture);
 
             return vector;
         }
@@ -291,22 +285,22 @@ namespace UnityExplorer
         {
             Vector3 vector = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
             if (split.Length == 4)
             {
                 Quaternion quat = default;
-                quat.x = float.Parse(split[0].Trim(), en_US);
-                quat.y = float.Parse(split[1].Trim(), en_US);
-                quat.z = float.Parse(split[2].Trim(), en_US);
-                quat.w = float.Parse(split[3].Trim(), en_US);
+                quat.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+                quat.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+                quat.z = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
+                quat.w = float.Parse(split[3].Trim(), CultureInfo.CurrentCulture);
                 return quat;
             }
             else
             {
-                vector.x = float.Parse(split[0].Trim(), en_US);
-                vector.y = float.Parse(split[1].Trim(), en_US);
-                vector.z = float.Parse(split[2].Trim(), en_US);
+                vector.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+                vector.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+                vector.z = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
                 return Quaternion.Euler(vector);
             }
         }
@@ -327,12 +321,12 @@ namespace UnityExplorer
         {
             Rect rect = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            rect.x = float.Parse(split[0].Trim(), en_US);
-            rect.y = float.Parse(split[1].Trim(), en_US);
-            rect.width = float.Parse(split[2].Trim(), en_US);
-            rect.height = float.Parse(split[3].Trim(), en_US);
+            rect.x = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            rect.y = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+            rect.width = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
+            rect.height = float.Parse(split[3].Trim(), CultureInfo.CurrentCulture);
 
             return rect;
         }
@@ -351,13 +345,13 @@ namespace UnityExplorer
         {
             Color color = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            color.r = float.Parse(split[0].Trim(), en_US);
-            color.g = float.Parse(split[1].Trim(), en_US);
-            color.b = float.Parse(split[2].Trim(), en_US);
+            color.r = float.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            color.g = float.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+            color.b = float.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
             if (split.Length > 3)
-                color.a = float.Parse(split[3].Trim(), en_US);
+                color.a = float.Parse(split[3].Trim(), CultureInfo.CurrentCulture);
             else
                 color.a = 1;
 
@@ -378,13 +372,13 @@ namespace UnityExplorer
         {
             Color32 color = default;
 
-            var split = input.Split(',');
+            var split = input.Split(' ');
 
-            color.r = byte.Parse(split[0].Trim(), en_US);
-            color.g = byte.Parse(split[1].Trim(), en_US);
-            color.b = byte.Parse(split[2].Trim(), en_US);
+            color.r = byte.Parse(split[0].Trim(), CultureInfo.CurrentCulture);
+            color.g = byte.Parse(split[1].Trim(), CultureInfo.CurrentCulture);
+            color.b = byte.Parse(split[2].Trim(), CultureInfo.CurrentCulture);
             if (split.Length > 3)
-                color.a = byte.Parse(split[3].Trim(), en_US);
+                color.a = byte.Parse(split[3].Trim(), CultureInfo.CurrentCulture);
             else
                 color.a = 255;
 
@@ -397,7 +391,7 @@ namespace UnityExplorer
                 return null;
 
             // ints, this is fine
-            return $"{color.r}, {color.g}, {color.b}, {color.a}";
+            return $"{color.r} {color.g} {color.b} {color.a}";
         }
 
         // Layermask (Int32)

src/ExplorerCore.cs

@@ -20,13 +20,15 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.1.11";
+        public const string VERSION = "4.2.0";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
         public static IExplorerLoader Loader { get; private set; }
         public static RuntimeContext Context { get; internal set; }
 
+        public static HarmonyLib.Harmony Harmony { get; } = new HarmonyLib.Harmony(GUID);
+
         /// <summary>
         /// Initialize UnityExplorer with the provided Loader implementation.
         /// </summary>

src/Loader/BepInEx/ExplorerBepInPlugin.cs

@@ -51,8 +51,7 @@ namespace UnityExplorer
         public Action<object> OnLogWarning => LogSource.LogWarning;
         public Action<object> OnLogError => LogSource.LogError;
 
-        // Init common to Mono and Il2Cpp
-        internal void UniversalInit()
+        private void Init()
         {
             Instance = this;
             _configHandler = new BepInExConfigHandler();
@@ -62,57 +61,15 @@ namespace UnityExplorer
 #if MONO // Mono
         internal void Awake()
         {
-            UniversalInit();
+            Init();
         }
 
 #else   // Il2Cpp
         public override void Load()
         {
-            UniversalInit();
+            Init();
         }
 #endif
-
-        public void SetupCursorPatches()
-        {
-            try
-            {
-                this.HarmonyInstance.PatchAll();
-            }
-            catch (Exception ex)
-            {
-                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
-            }
-        }
-
-        [HarmonyPatch(typeof(EventSystem), "current", MethodType.Setter)]
-        public class PATCH_EventSystem_current
-        {
-            [HarmonyPrefix]
-            public static void Prefix_EventSystem_set_current(ref EventSystem value)
-            {
-                CursorUnlocker.Prefix_EventSystem_set_current(ref value);
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), "lockState", MethodType.Setter)]
-        public class PATCH_Cursor_lockState
-        {
-            [HarmonyPrefix]
-            public static void Prefix_set_lockState(ref CursorLockMode value)
-            {
-                CursorUnlocker.Prefix_set_lockState(ref value);
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), "visible", MethodType.Setter)]
-        public class PATCH_Cursor_visible
-        {
-            [HarmonyPrefix]
-            public static void Prefix_set_visible(ref bool value)
-            {
-                CursorUnlocker.Prefix_set_visible(ref value);
-            }
-        }
     }
 }
 #endif

src/Loader/IExplorerLoader.cs

@@ -15,7 +15,5 @@ namespace UnityExplorer
         Action<object> OnLogMessage { get; }
         Action<object> OnLogWarning { get; }
         Action<object> OnLogError { get; }
-
-        void SetupCursorPatches();
     }
 }

src/Loader/ML/ExplorerMelonMod.cs

@@ -1,86 +0,0 @@
-#if ML
-using System;
-using System.IO;
-using MelonLoader;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityExplorer;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
-using UnityExplorer.Core.Input;
-using UnityExplorer.Loader.ML;
-#if ML_LEGACY
-using Harmony;
-#else
-using HarmonyLib;
-[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
-#endif
-
-[assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
-[assembly: MelonGame(null, null)]
-[assembly: MelonColor(ConsoleColor.DarkCyan)]
-
-namespace UnityExplorer
-{
-    public class ExplorerMelonMod : MelonMod, IExplorerLoader
-    {
-        public static ExplorerMelonMod Instance;
-
-        public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
-
-        public ConfigHandler ConfigHandler => _configHandler;
-        public MelonLoaderConfigHandler _configHandler;
-
-        public Action<object> OnLogMessage => MelonLogger.Msg;
-        public Action<object> OnLogWarning => MelonLogger.Warning;
-        public Action<object> OnLogError   => MelonLogger.Error;
-
-        public override void OnApplicationStart()
-        {
-            Instance = this;
-            _configHandler = new MelonLoaderConfigHandler();
-
-            ExplorerCore.Init(this);
-        }
-
-        public void SetupCursorPatches()
-        {
-            try
-            {
-                PrefixProperty(typeof(Cursor),
-                "lockState",
-                new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_lockState))));
-
-                PrefixProperty(typeof(Cursor),
-                    "visible",
-                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_visible))));
-
-                PrefixProperty(typeof(EventSystem),
-                    "current",
-                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_EventSystem_set_current))));
-            }
-            catch (Exception ex)
-            {
-                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
-            }
-        }
-
-        private void PrefixProperty(Type type, string property, HarmonyMethod prefix)
-        {
-            try
-            {
-                var prop = type.GetProperty(property);
-#if ML_LEGACY
-                this.Harmony.Patch(prop.GetSetMethod(), prefix: prefix);
-#else
-                HarmonyInstance.Patch(prop.GetSetMethod(), prefix: prefix);
-#endif
-            }
-            catch (Exception e)
-            {
-                ExplorerCore.Log($"Unable to patch {type.Name}.set_{property}: {e.Message}");
-            }
-        }
-    }
-}
-#endif

src/Loader/ML/MelonLoaderConfigHandler.cs

@@ -1,206 +0,0 @@
-#if ML
-
-#if !ML_LEGACY // ML 0.3.1+ config handler
-
-using MelonLoader;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
-
-namespace UnityExplorer.Loader.ML
-{
-    public class MelonLoaderConfigHandler : ConfigHandler
-    {
-        internal const string CTG_NAME = "UnityExplorer";
-
-        internal MelonPreferences_Category prefCategory;
-
-        public override void Init()
-        {
-            prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings", false, true);
-        }
-
-        public override void LoadConfig()
-        {
-            foreach (var entry in ConfigManager.ConfigElements)
-            {
-                var key = entry.Key;
-                if (prefCategory.GetEntry(key) is MelonPreferences_Entry)
-                {
-                    var config = entry.Value;
-                    config.BoxedValue = config.GetLoaderConfigValue();
-                }
-            }
-        }
-
-        public override void RegisterConfigElement<T>(ConfigElement<T> config)
-        {
-            var entry = prefCategory.CreateEntry(config.Name, config.Value, null, config.Description, config.IsInternal, false);
-            
-            entry.OnValueChangedUntyped += () => 
-            {
-                if ((entry.Value == null && config.Value == null) || config.Value.Equals(entry.Value))
-                    return;
-
-                config.Value = entry.Value;
-            };
-        }
-
-        public override void SetConfigValue<T>(ConfigElement<T> config, T value)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-            { 
-                entry.Value = value;
-                //entry.Save();
-            }
-        }
-
-        public override T GetConfigValue<T>(ConfigElement<T> config)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-                return entry.Value;
-
-            return default;
-        }
-
-        public override void OnAnyConfigChanged()
-        {
-        }
-
-        public override void SaveConfig()
-        {
-            MelonPreferences.Save();
-        }
-    }
-}
-
-#else // ML 0.3.0 config handler
-
-using MelonLoader;
-using MelonLoader.Tomlyn.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
-
-namespace UnityExplorer.Loader.ML
-{
-    public class MelonLoaderConfigHandler : ConfigHandler
-    {
-        internal const string CTG_NAME = "UnityExplorer";
-
-        internal MelonPreferences_Category prefCategory;
-
-        public override void Init()
-        {
-            prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings");
-
-            try { MelonPreferences.Mapper.RegisterMapper(KeycodeReader, KeycodeWriter); } catch { }
-            try { MelonPreferences.Mapper.RegisterMapper(AnchorReader, AnchorWriter); } catch { }
-        }
-
-        public override void LoadConfig()
-        {
-            foreach (var entry in ConfigManager.ConfigElements)
-            {
-                var key = entry.Key;
-                if (prefCategory.GetEntry(key) is MelonPreferences_Entry)
-                {
-                    var config = entry.Value;
-                    config.BoxedValue = config.GetLoaderConfigValue();
-                }
-            }
-        }
-
-        public override void RegisterConfigElement<T>(ConfigElement<T> config)
-        {
-            var entry = prefCategory.CreateEntry(config.Name, config.Value, null, config.IsInternal) as MelonPreferences_Entry<T>;
-
-            entry.OnValueChangedUntyped += () =>
-            {
-                if ((entry.Value == null && config.Value == null) || config.Value.Equals(entry.Value))
-                    return;
-
-                config.Value = entry.Value;
-            };
-        }
-
-        public override void SetConfigValue<T>(ConfigElement<T> config, T value)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-            {
-                entry.Value = value;
-                entry.Save();
-            }
-        }
-
-        public override T GetConfigValue<T>(ConfigElement<T> config)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-                return entry.Value;
-
-            return default;
-        }
-
-        public override void OnAnyConfigChanged()
-        {
-        }
-
-        public override void SaveConfig()
-        {
-            MelonPreferences.Save();
-        }
-
-        // Enum config handlers
-
-        public static KeyCode KeycodeReader(TomlObject value)
-        {
-            try
-            {
-                KeyCode kc = (KeyCode)Enum.Parse(typeof(KeyCode), (value as TomlString).Value);
-
-                if (kc == default)
-                    throw new Exception();
-
-                return kc;
-            }
-            catch
-            {
-                return KeyCode.F7;
-            }
-        }
-
-        public static TomlObject KeycodeWriter(KeyCode value)
-        {
-            return MelonPreferences.Mapper.ToToml(value.ToString());
-        }
-
-        public static UI.UIManager.VerticalAnchor AnchorReader(TomlObject value)
-        {
-            try
-            {
-                return (UI.UIManager.VerticalAnchor)Enum.Parse(typeof(UI.UIManager.VerticalAnchor), (value as TomlString).Value);
-            }
-            catch
-            {
-                return UI.UIManager.VerticalAnchor.Top;
-            }
-        }
-
-        public static TomlObject AnchorWriter(UI.UIManager.VerticalAnchor anchor)
-        {
-            return MelonPreferences.Mapper.ToToml(anchor.ToString());
-        }
-    }
-}
-
-#endif
-
-#endif

src/Loader/MelonLoader/ExplorerMelonMod.cs

@@ -0,0 +1,43 @@
+#if ML
+using System;
+using System.IO;
+using MelonLoader;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityExplorer;
+using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Input;
+using UnityExplorer.Loader.ML;
+using HarmonyLib;
+[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
+
+[assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
+[assembly: MelonGame(null, null)]
+[assembly: MelonColor(ConsoleColor.DarkCyan)]
+
+namespace UnityExplorer
+{
+    public class ExplorerMelonMod : MelonMod, IExplorerLoader
+    {
+        public static ExplorerMelonMod Instance;
+
+        public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
+
+        public ConfigHandler ConfigHandler => _configHandler;
+        public MelonLoaderConfigHandler _configHandler;
+
+        public Action<object> OnLogMessage => MelonLogger.Msg;
+        public Action<object> OnLogWarning => MelonLogger.Warning;
+        public Action<object> OnLogError   => MelonLogger.Error;
+
+        public override void OnApplicationStart()
+        {
+            Instance = this;
+            _configHandler = new MelonLoaderConfigHandler();
+
+            ExplorerCore.Init(this);
+        }
+    }
+}
+#endif

src/Loader/MelonLoader/MelonLoaderConfigHandler.cs

@@ -0,0 +1,77 @@
+#if ML
+using MelonLoader;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
+
+namespace UnityExplorer.Loader.ML
+{
+    public class MelonLoaderConfigHandler : ConfigHandler
+    {
+        internal const string CTG_NAME = "UnityExplorer";
+
+        internal MelonPreferences_Category prefCategory;
+
+        public override void Init()
+        {
+            prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings", false, true);
+        }
+
+        public override void LoadConfig()
+        {
+            foreach (var entry in ConfigManager.ConfigElements)
+            {
+                var key = entry.Key;
+                if (prefCategory.GetEntry(key) is MelonPreferences_Entry)
+                {
+                    var config = entry.Value;
+                    config.BoxedValue = config.GetLoaderConfigValue();
+                }
+            }
+        }
+
+        public override void RegisterConfigElement<T>(ConfigElement<T> config)
+        {
+            var entry = prefCategory.CreateEntry(config.Name, config.Value, null, config.Description, config.IsInternal, false);
+            
+            entry.OnValueChangedUntyped += () => 
+            {
+                if ((entry.Value == null && config.Value == null) || config.Value.Equals(entry.Value))
+                    return;
+
+                config.Value = entry.Value;
+            };
+        }
+
+        public override void SetConfigValue<T>(ConfigElement<T> config, T value)
+        {
+            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
+            { 
+                entry.Value = value;
+                //entry.Save();
+            }
+        }
+
+        public override T GetConfigValue<T>(ConfigElement<T> config)
+        {
+            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
+                return entry.Value;
+
+            return default;
+        }
+
+        public override void OnAnyConfigChanged()
+        {
+        }
+
+        public override void SaveConfig()
+        {
+            MelonPreferences.Save();
+        }
+    }
+}
+#endif

src/Loader/Standalone/ExplorerStandalone.cs

@@ -21,8 +21,7 @@ namespace UnityExplorer
         /// Call this to initialize UnityExplorer without adding a log listener.
         /// </summary>
         /// <returns>The new (or active, if one exists) instance of ExplorerStandalone.</returns>
-        public static ExplorerStandalone CreateInstance()
-            => CreateInstance(null);
+        public static ExplorerStandalone CreateInstance() => CreateInstance(null);
 
         /// <summary>
         /// Call this to initialize UnityExplorer and add a listener for UnityExplorer's log messages.
@@ -34,7 +33,8 @@ namespace UnityExplorer
             if (Instance != null)
                 return Instance;
 
-            OnLog += logListener;
+            if (logListener != null)
+                OnLog += logListener;
 
             var instance = new ExplorerStandalone();
             instance.Init();
@@ -48,9 +48,6 @@ namespace UnityExplorer
         /// </summary>
         public static event Action<string, LogType> OnLog;
 
-        public Harmony HarmonyInstance => s_harmony;
-        public static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
-
         public ConfigHandler ConfigHandler => _configHandler;
         private StandaloneConfigHandler _configHandler;
 
@@ -58,19 +55,7 @@ namespace UnityExplorer
         {
             get
             {
-                if (s_explorerFolder == null)
-                {
-                    s_explorerFolder = 
-                        Path.Combine(
-                            Path.GetDirectoryName(
-                                Uri.UnescapeDataString(new Uri(Assembly.GetExecutingAssembly().CodeBase)
-                                .AbsolutePath)), 
-                        "UnityExplorer");
-
-                    if (!Directory.Exists(s_explorerFolder))
-                        Directory.CreateDirectory(s_explorerFolder);
-                }
-
+                CheckExplorerFolder();
                 return s_explorerFolder;
             }
         }
@@ -88,45 +73,18 @@ namespace UnityExplorer
             ExplorerCore.Init(this);
         }
 
-        public void SetupCursorPatches()
+        private void CheckExplorerFolder()
         {
-            try
+            if (s_explorerFolder == null)
             {
-                this.HarmonyInstance.PatchAll();
-            }
-            catch (Exception ex)
-            {
-                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
-            }
-        }
+                s_explorerFolder =
+                    Path.Combine(
+                        Path.GetDirectoryName(
+                            Uri.UnescapeDataString(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath)),
+                        "UnityExplorer");
 
-        [HarmonyPatch(typeof(EventSystem), "current", MethodType.Setter)]
-        public class PATCH_EventSystem_current
-        {
-            [HarmonyPrefix]
-            public static void Prefix_EventSystem_set_current(ref EventSystem value)
-            {
-                CursorUnlocker.Prefix_EventSystem_set_current(ref value);
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), "lockState", MethodType.Setter)]
-        public class PATCH_Cursor_lockState
-        {
-            [HarmonyPrefix]
-            public static void Prefix_set_lockState(ref CursorLockMode value)
-            {
-                CursorUnlocker.Prefix_set_lockState(ref value);
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), "visible", MethodType.Setter)]
-        public class PATCH_Cursor_visible
-        {
-            [HarmonyPrefix]
-            public static void Prefix_set_visible(ref bool value)
-            {
-                CursorUnlocker.Prefix_set_visible(ref value);
+                if (!Directory.Exists(s_explorerFolder))
+                    Directory.CreateDirectory(s_explorerFolder);
             }
         }
     }

src/UI/Panels/UIPanel.cs

@@ -209,6 +209,10 @@ namespace UnityExplorer.UI.Panels
             {
                 ExplorerCore.LogWarning("Invalid or corrupt panel save data! Restoring to default.");
                 SetTransformDefaults();
+                UIManager.Initializing = false;
+                DoSaveToConfigElement();
+                ConfigManager.InternalHandler.SaveConfig();
+                UIManager.Initializing = true;
             }
         }
 
@@ -335,7 +339,7 @@ namespace UnityExplorer.UI.Panels
             if (!rect)
                 throw new ArgumentNullException("rect");
 
-            return string.Format(ParseUtility.en_US, "{0},{1},{2},{3}", new object[]
+            return string.Format(CultureInfo.InvariantCulture, "{0},{1},{2},{3}", new object[]
             {
                 rect.anchorMin.x,
                 rect.anchorMin.y,
@@ -349,16 +353,20 @@ namespace UnityExplorer.UI.Panels
             if (string.IsNullOrEmpty(stringAnchors))
                 throw new ArgumentNullException("stringAnchors");
 
+            if (stringAnchors.Contains(" "))
+                // outdated save data, not worth recovering just reset it.
+                throw new Exception("invalid save data, resetting.");
+
             var split = stringAnchors.Split(',');
 
             if (split.Length != 4)
                 throw new Exception($"stringAnchors split is unexpected length: {split.Length}");
 
             Vector4 anchors;
-            anchors.x = float.Parse(split[0], ParseUtility.en_US);
-            anchors.y = float.Parse(split[1], ParseUtility.en_US);
-            anchors.z = float.Parse(split[2], ParseUtility.en_US);
-            anchors.w = float.Parse(split[3], ParseUtility.en_US);
+            anchors.x = float.Parse(split[0], CultureInfo.InvariantCulture);
+            anchors.y = float.Parse(split[1], CultureInfo.InvariantCulture);
+            anchors.z = float.Parse(split[2], CultureInfo.InvariantCulture);
+            anchors.w = float.Parse(split[3], CultureInfo.InvariantCulture);
 
             panel.anchorMin = new Vector2(anchors.x, anchors.y);
             panel.anchorMax = new Vector2(anchors.z, anchors.w);
@@ -369,7 +377,7 @@ namespace UnityExplorer.UI.Panels
             if (!rect)
                 throw new ArgumentNullException("rect");
 
-            return string.Format(ParseUtility.en_US, "{0},{1}", new object[]
+            return string.Format(CultureInfo.InvariantCulture, "{0},{1}", new object[]
             {
                 rect.localPosition.x, rect.localPosition.y
             });
@@ -377,14 +385,21 @@ namespace UnityExplorer.UI.Panels
 
         internal static void SetPositionFromString(this RectTransform rect, string stringPosition)
         {
+            if (string.IsNullOrEmpty(stringPosition))
+                throw new ArgumentNullException(stringPosition);
+
+            if (stringPosition.Contains(" "))
+                // outdated save data, not worth recovering just reset it.
+                throw new Exception("invalid save data, resetting.");
+
             var split = stringPosition.Split(',');
 
             if (split.Length != 2)
                 throw new Exception($"stringPosition split is unexpected length: {split.Length}");
 
             Vector3 vector = rect.localPosition;
-            vector.x = float.Parse(split[0], ParseUtility.en_US);
-            vector.y = float.Parse(split[1], ParseUtility.en_US);
+            vector.x = float.Parse(split[0], CultureInfo.InvariantCulture);
+            vector.y = float.Parse(split[1], CultureInfo.InvariantCulture);
             rect.localPosition = vector;
         }
     }

src/UI/UIFactory.cs

@@ -16,12 +16,6 @@ namespace UnityExplorer.UI
         internal static Vector2 _largeElementSize = new Vector2(100, 30);
         internal static Vector2 _smallElementSize = new Vector2(25, 25);
         internal static Color _defaultTextColor = Color.white;
-        internal static Font _defaultFont;
-
-        public static void Init()
-        {
-            _defaultFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
-        }
 
         public static GameObject CreateUIObject(string name, GameObject parent, Vector2 size = default)
         {
@@ -48,7 +42,7 @@ namespace UnityExplorer.UI
         internal static void SetDefaultTextValues(Text text)
         {
             text.color = _defaultTextColor;
-            text.font = _defaultFont;
+            text.font = UIManager.DefaultFont;
             text.fontSize = 14;
         }
 

src/UI/UIManager.cs

@@ -36,7 +36,7 @@ namespace UnityExplorer.UI
             Bottom
         }
 
-        public static bool Initializing { get; private set; } = true;
+        public static bool Initializing { get; internal set; } = true;
 
         private static readonly Dictionary<Panels, UIPanel> UIPanels = new Dictionary<Panels, UIPanel>();
 
@@ -52,6 +52,7 @@ namespace UnityExplorer.UI
         internal static GameObject PanelHolder { get; private set; }
 
         internal static Font ConsoleFont { get; private set; }
+        internal static Font DefaultFont { get; private set; }
         internal static Shader BackupShader { get; private set; }
 
         public static RectTransform NavBarRect;
@@ -92,8 +93,6 @@ namespace UnityExplorer.UI
         {
             LoadBundle();
 
-            UIFactory.Init();
-
             CreateRootCanvas();
 
             // Global UI Pool Holder
@@ -423,11 +422,11 @@ namespace UnityExplorer.UI
                 int minor = int.Parse(split[1]);
 
                 // Use appropriate AssetBundle for Unity version
-                // >= 2017.3
-                if (major > 2017 || (major == 2017 && minor >= 3))
+                // >= 2017
+                if (major >= 2017)
                     bundle = LoadBundle("modern");
-                // 5.6.0 to 2017.3
-                else if (major == 2017 || (major == 5 && minor >= 6))
+                // 5.6.0 to <2017
+                else if (major == 5 && minor >= 6)
                     bundle = LoadBundle("legacy.5.6");
                 // < 5.6.0
                 else
@@ -452,11 +451,15 @@ namespace UnityExplorer.UI
             {
                 ExplorerCore.LogWarning("Could not load the ExplorerUI Bundle!");
                 ConsoleFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
+                DefaultFont = ConsoleFont;
                 return;
             }
 
-            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
+            // Bundle loaded
+            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
+            DefaultFont = bundle.LoadAsset<Font>("arial");
 
+            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
             // Fix for games which don't ship with 'UI/Default' shader.
             if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
             {
@@ -466,7 +469,6 @@ namespace UnityExplorer.UI
             else
                 BackupShader = Graphic.defaultGraphicMaterial.shader;
 
-            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
         }
 
         private static byte[] ReadFully(Stream input)

src/UnityExplorer.csproj

@@ -93,24 +93,6 @@
     <IsCpp>true</IsCpp>
     <IsStandalone>true</IsStandalone>
   </PropertyGroup>
-  <!-- ML 0.3.0 CPP -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_MLLegacy_Cpp|AnyCPU'">
-    <OutputPath>..\Release\UnityExplorer.MelonLoader_Legacy.Il2Cpp\</OutputPath>
-    <DefineConstants>CPP,ML,ML_LEGACY</DefineConstants>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <AssemblyName>UnityExplorer.MLLEGACY.IL2CPP</AssemblyName>
-    <IsCpp>true</IsCpp>
-    <IsMelonLoaderLegacy>true</IsMelonLoaderLegacy>
-  </PropertyGroup>
-  <!-- ML 0.3.0 Mono -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_MLLegacy_Mono|AnyCPU'">
-    <OutputPath>..\Release\UnityExplorer.MelonLoader_Legacy.Mono\</OutputPath>
-    <DefineConstants>MONO,ML,ML_LEGACY</DefineConstants>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <AssemblyName>UnityExplorer.MLLEGACY.Mono</AssemblyName>
-    <IsCpp>false</IsCpp>
-    <IsMelonLoaderLegacy>true</IsMelonLoaderLegacy>
-  </PropertyGroup>
   <!-- Global refs, Mono and Il2Cpp -->
   <ItemGroup>
     <Reference Include="System" />
@@ -135,17 +117,10 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <!-- MelonLoader Legacy refs -->
-  <ItemGroup Condition="'$(IsMelonLoaderLegacy)'=='true'">
-    <Reference Include="MelonLoader">
-      <HintPath>..\lib\MelonLoader_Legacy\MelonLoader.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <!-- BepInEx universal refs -->
   <ItemGroup Condition="'$(IsBepInEx)'=='true'">
     <Reference Include="0Harmony">
-      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <HintPath>packages\HarmonyX.2.5.2\lib\net35\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -181,7 +156,7 @@
   <!-- Standalone refs -->
   <ItemGroup Condition="'$(IsStandalone)'=='true'">
     <Reference Include="0Harmony">
-      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <HintPath>packages\HarmonyX.2.5.2\lib\net35\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -323,13 +298,13 @@
     <Compile Include="Core\Tests\TestClass.cs" />
     <Compile Include="Core\Utility\UnityHelpers.cs" />
     <Compile Include="ExplorerCore.cs" />
-    <Compile Include="Loader\BIE\BepInExConfigHandler.cs" />
-    <Compile Include="Loader\BIE\ExplorerBepInPlugin.cs" />
+    <Compile Include="Loader\BepInEx\BepInExConfigHandler.cs" />
+    <Compile Include="Loader\BepInEx\ExplorerBepInPlugin.cs" />
     <Compile Include="Loader\IExplorerLoader.cs" />
-    <Compile Include="Loader\ML\ExplorerMelonMod.cs" />
-    <Compile Include="Loader\ML\MelonLoaderConfigHandler.cs" />
-    <Compile Include="Loader\STANDALONE\ExplorerStandalone.cs" />
-    <Compile Include="Loader\STANDALONE\StandaloneConfigHandler.cs" />
+    <Compile Include="Loader\MelonLoader\ExplorerMelonMod.cs" />
+    <Compile Include="Loader\MelonLoader\MelonLoaderConfigHandler.cs" />
+    <Compile Include="Loader\Standalone\ExplorerStandalone.cs" />
+    <Compile Include="Loader\Standalone\StandaloneConfigHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\Models\UIBehaviourModel.cs" />
     <Compile Include="UI\Models\UIModel.cs" />

src/UnityExplorer.sln

@@ -16,8 +16,6 @@ Global
 		Release_BIE6_Mono|Any CPU = Release_BIE6_Mono|Any CPU
 		Release_ML_Cpp|Any CPU = Release_ML_Cpp|Any CPU
 		Release_ML_Mono|Any CPU = Release_ML_Mono|Any CPU
-		Release_MLLegacy_Cpp|Any CPU = Release_MLLegacy_Cpp|Any CPU
-		Release_MLLegacy_Mono|Any CPU = Release_MLLegacy_Mono|Any CPU
 		Release_STANDALONE_Cpp|Any CPU = Release_STANDALONE_Cpp|Any CPU
 		Release_STANDALONE_Mono|Any CPU = Release_STANDALONE_Mono|Any CPU
 	EndGlobalSection
@@ -32,10 +30,6 @@ Global
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Cpp|Any CPU.Build.0 = Release|Any CPU
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Mono|Any CPU.ActiveCfg = Release|Any CPU
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Mono|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_MLLegacy_Cpp|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_MLLegacy_Cpp|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_MLLegacy_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_MLLegacy_Mono|Any CPU.Build.0 = Release|Any CPU
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = Release|Any CPU
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Cpp|Any CPU.Build.0 = Release|Any CPU
 		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = Release|Any CPU
@@ -50,10 +44,6 @@ Global
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_ML_Cpp|Any CPU.Build.0 = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_ML_Mono|Any CPU.ActiveCfg = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_ML_Mono|Any CPU.Build.0 = Release|Any CPU
-		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_MLLegacy_Cpp|Any CPU.ActiveCfg = Release|Any CPU
-		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_MLLegacy_Cpp|Any CPU.Build.0 = Release|Any CPU
-		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_MLLegacy_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_MLLegacy_Mono|Any CPU.Build.0 = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_STANDALONE_Cpp|Any CPU.Build.0 = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,10 +58,6 @@ Global
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Cpp|Any CPU.Build.0 = Release_ML_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.ActiveCfg = Release_ML_Mono|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.Build.0 = Release_ML_Mono|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_MLLegacy_Cpp|Any CPU.ActiveCfg = Release_MLLegacy_Cpp|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_MLLegacy_Cpp|Any CPU.Build.0 = Release_MLLegacy_Cpp|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_MLLegacy_Mono|Any CPU.ActiveCfg = Release_MLLegacy_Mono|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_MLLegacy_Mono|Any CPU.Build.0 = Release_MLLegacy_Mono|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = Release_STANDALONE_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.Build.0 = Release_STANDALONE_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = Release_STANDALONE_Mono|Any CPU

src/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HarmonyX" version="2.4.2" targetFramework="net35" />
+  <package id="HarmonyX" version="2.5.2" targetFramework="net35" />
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.18.2" targetFramework="net35" />
   <package id="ini-parser" version="2.5.2" targetFramework="net35" />
   <package id="Mono.Cecil" version="0.10.4" targetFramework="net35" />