Bump version

src/Core/Input/InputSystem.cs

@@ -12,6 +12,8 @@ namespace UnityExplorer.Core.Input
     {
         public InputSystem()
         {
+            SetupSupportedDevices();
+
             m_kbCurrentProp = TKeyboard.GetProperty("current");
             m_kbIndexer = TKeyboard.GetProperty("Item", new Type[] { TKey });
 
@@ -32,7 +34,37 @@ namespace UnityExplorer.Core.Input
                                       .GetMethod("ReadValue");
         }
 
-        #region reflection cache
+        internal static void SetupSupportedDevices()
+        {
+            try
+            {
+                // typeof(InputSystem)
+                Type TInputSystem = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputSystem");
+                // InputSystem.settings
+                var settings = TInputSystem.GetProperty("settings", BindingFlags.Public | BindingFlags.Static).GetValue(null, null);
+                // typeof(InputSettings)
+                Type TSettings = settings.GetActualType();
+                // InputSettings.supportedDevices
+                PropertyInfo supportedProp = TSettings.GetProperty("supportedDevices", BindingFlags.Public | BindingFlags.Instance);
+                var supportedDevices = supportedProp.GetValue(settings, null);
+                // An empty supportedDevices list means all devices are supported.
+#if CPP
+                // weird hack for il2cpp, use the implicit operator and cast Il2CppStringArray to ReadOnlyArray<string>
+                var args = new object[] { new UnhollowerBaseLib.Il2CppStringArray(0) };
+                var method = supportedDevices.GetActualType().GetMethod("op_Implicit", BindingFlags.Static | BindingFlags.Public);
+                supportedProp.SetValue(settings, method.Invoke(null, args), null);
+#else
+                supportedProp.SetValue(settings, Activator.CreateInstance(supportedDevices.GetActualType(), new object[] { new string[0] }), null);
+#endif
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception setting up InputSystem.settings.supportedDevices list!");
+                ExplorerCore.Log(ex);
+            }
+        }
+
+#region reflection cache
 
         public static Type TKeyboard => m_tKeyboard ?? (m_tKeyboard = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.Keyboard"));
         private static Type m_tKeyboard;
@@ -73,7 +105,7 @@ namespace UnityExplorer.Core.Input
         private static object m_scrollInfo;
         private static PropertyInfo m_scrollDeltaProp;
 
-        #endregion
+#endregion
 
         public Vector2 MousePosition
         {
@@ -138,6 +170,8 @@ namespace UnityExplorer.Core.Input
 
         public bool GetMouseButtonDown(int btn)
         {
+            if (CurrentMouse == null)
+                return false;
             switch (btn)
             {
                 case 0: return (bool)m_btnWasPressedProp.GetValue(LeftMouseButton, null);
@@ -149,6 +183,8 @@ namespace UnityExplorer.Core.Input
 
         public bool GetMouseButton(int btn)
         {
+            if (CurrentMouse == null)
+                return false;
             switch (btn)
             {
                 case 0: return (bool)m_btnIsPressedProp.GetValue(LeftMouseButton, null);

src/ExplorerCore.cs

@@ -20,7 +20,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.1.9";
+        public const string VERSION = "4.1.11";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -47,10 +47,9 @@ namespace UnityExplorer
                 Directory.CreateDirectory(Loader.ExplorerFolder);
 
             ConfigManager.Init(Loader.ConfigHandler);
-
             ReflectionUtility.Init();
-
             RuntimeProvider.Init();
+            
             SceneHandler.Init();
             InputManager.Init();
 

src/ObjectExplorer/SceneExplorer.cs

@@ -114,7 +114,7 @@ namespace UnityExplorer.ObjectExplorer
                 refreshRow.SetActive(!scene.IsValid());
         }
 
-        private void SceneHandler_OnLoadedScenesChanged(ReadOnlyCollection<Scene> loadedScenes)
+        private void SceneHandler_OnLoadedScenesChanged(List<Scene> loadedScenes)
         {
             PopulateSceneDropdown();
         }
@@ -126,6 +126,9 @@ namespace UnityExplorer.ObjectExplorer
 
             foreach (var scene in SceneHandler.LoadedScenes)
             {
+                if (sceneToDropdownOption.ContainsKey(scene))
+                    continue;
+
                 string name = scene.name?.Trim();
 
                 if (!scene.IsValid())

src/ObjectExplorer/SceneHandler.cs

@@ -29,14 +29,12 @@ namespace UnityExplorer.ObjectExplorer
         /// <summary>
         /// The GameObjects in the currently inspected scene.
         /// </summary>
-        public static ReadOnlyCollection<GameObject> CurrentRootObjects => new ReadOnlyCollection<GameObject>(rootObjects);
-        private static GameObject[] rootObjects = new GameObject[0];
+        public static GameObject[] CurrentRootObjects { get; private set; } = new GameObject[0];
 
         /// <summary>
         /// All currently loaded Scenes.
         /// </summary>
-        public static ReadOnlyCollection<Scene> LoadedScenes => new ReadOnlyCollection<Scene>(allLoadedScenes);
-        private static readonly List<Scene> allLoadedScenes = new List<Scene>();
+        public static List<Scene> LoadedScenes { get; private set; } = new List<Scene>();
         private static HashSet<Scene> previousLoadedScenes;
 
         /// <summary>
@@ -59,7 +57,7 @@ namespace UnityExplorer.ObjectExplorer
         /// <summary>
         /// Invoked whenever the list of currently loaded Scenes changes. The argument contains all loaded scenes after the change.
         /// </summary>
-        public static event Action<ReadOnlyCollection<Scene>> OnLoadedScenesChanged;
+        public static event Action<List<Scene>> OnLoadedScenesChanged;
 
         /// <summary>
         /// Equivalent to <see cref="SceneManager.sceneCount"/> + 2, to include 'DontDestroyOnLoad' and the 'None' scene.
@@ -115,7 +113,7 @@ namespace UnityExplorer.ObjectExplorer
             int confirmedCount = 2;
             bool inspectedExists = SelectedScene == DontDestroyScene || (SelectedScene.HasValue && SelectedScene.Value == default);
 
-            allLoadedScenes.Clear();
+            LoadedScenes.Clear();
 
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
@@ -131,30 +129,26 @@ namespace UnityExplorer.ObjectExplorer
                 if (!inspectedExists && scene == SelectedScene)
                     inspectedExists = true;
 
-                allLoadedScenes.Add(scene);
+                LoadedScenes.Add(scene);
             }
 
-            bool anyChange = confirmedCount != allLoadedScenes.Count;
+            bool anyChange = confirmedCount != LoadedScenes.Count;
 
-            allLoadedScenes.Add(DontDestroyScene);
-            allLoadedScenes.Add(default);
-            previousLoadedScenes = new HashSet<Scene>(allLoadedScenes);
+            LoadedScenes.Add(DontDestroyScene);
+            LoadedScenes.Add(default);
+            previousLoadedScenes = new HashSet<Scene>(LoadedScenes);
 
             // Default to first scene if none selected or previous selection no longer exists.
             if (!inspectedExists)
-            {
-                SelectedScene = allLoadedScenes.First();
-            }
+                SelectedScene = LoadedScenes.First();
 
             // Notify on the list changing at all
             if (anyChange)
-            {
                 OnLoadedScenesChanged?.Invoke(LoadedScenes);
-            }
 
             // Finally, update the root objects list.
             if (SelectedScene != null && ((Scene)SelectedScene).IsValid())
-                rootObjects = RuntimeProvider.Instance.GetRootGameObjects((Scene)SelectedScene);
+                CurrentRootObjects = RuntimeProvider.Instance.GetRootGameObjects((Scene)SelectedScene);
             else
             {
                 var allObjects = RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(GameObject));
@@ -165,7 +159,7 @@ namespace UnityExplorer.ObjectExplorer
                     if (go.transform.parent == null && !go.scene.IsValid())
                         objects.Add(go);
                 }
-                rootObjects = objects.ToArray();
+                CurrentRootObjects = objects.ToArray();
             }
         }
     }

src/UI/UIManager.cs

@@ -414,33 +414,29 @@ namespace UnityExplorer.UI
 
         private static void LoadBundle()
         {
-            AssetBundle bundle = null;
+            AssetBundle bundle;
             try
             {
-                // Get the Unity version (without the 'f' suffix).
-                // I'm not sure if Unity always includes the 'f' suffix.
-                int len;
-                if (Application.unityVersion.Contains("f"))
-                    len = Application.unityVersion.LastIndexOf("f");
-                else
-                    len = Application.unityVersion.Length;
-                Version version = new Version(Application.unityVersion.Substring(0, len));
+                // Get the Major and Minor of the Unity version
+                var split = Application.unityVersion.Split('.');
+                int major = int.Parse(split[0]);
+                int minor = int.Parse(split[1]);
 
                 // Use appropriate AssetBundle for Unity version
                 // >= 2017.3
-                if (version.Major > 2017 || (version.Major == 2017 && version.Minor >= 3))
+                if (major > 2017 || (major == 2017 && minor >= 3))
                     bundle = LoadBundle("modern");
                 // 5.6.0 to 2017.3
-                else if (version.Major == 2017 || (version.Major == 5 && version.Minor >= 6))
+                else if (major == 2017 || (major == 5 && minor >= 6))
                     bundle = LoadBundle("legacy.5.6");
                 // < 5.6.0
                 else
                     bundle = LoadBundle("legacy");      
             }
-            catch (Exception ex)
+            catch
             {
-                ExplorerCore.LogWarning($"Exception loading Explorer AssetBundle!");
-                ExplorerCore.Log(ex);
+                ExplorerCore.LogWarning($"Exception parsing Unity version, falling back to old AssetBundle load method...");
+                bundle = LoadBundle("modern") ?? LoadBundle("legacy.5.6") ?? LoadBundle("legacy");
             }
 
             AssetBundle LoadBundle(string id)