Fix input issues

Author: sinai-dev

src/Input/InputManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UniverseLib.UI;
@@ -34,6 +35,20 @@ private static void InitHandler()
             // First, just try to use the legacy input, see if its working.
             // The InputSystem package may be present but not actually activated, so we can find out this way.
 
+            // With BepInEx Il2CppInterop, for some reason InputLegacyModule may be loaded but our ReflectionUtility doesn't cache it?
+            // No idea why or what is happening but this solves it for now.
+            if (ReflectionUtility.GetTypeByName("UnityEngine.Input") == null)
+            {
+                foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    if (asm.FullName.Contains("UnityEngine.InputLegacyModule"))
+                    {
+                        ReflectionUtility.CacheTypes(asm);
+                        break;
+                    }
+                } 
+            }
+
             if (LegacyInput.TInput != null)
             {
                 try
@@ -47,7 +62,7 @@ private static void InitHandler()
                     Universe.Log("Initialized Legacy Input support");
                     return;
                 }
-                catch
+                catch 
                 {
                     // It's not working, we'll fall back to InputSystem.
                 }

src/Input/InputSystem.cs

@@ -279,15 +279,16 @@ public static object KeyCodeToKeyEnum(KeyCode key)
                     if (keycodeToKeyFixes.First(it => s.Contains(it.Key)) is KeyValuePair<string, string> entry)
                         s = s.Replace(entry.Key, entry.Value);
                 }
-                catch { }
+                catch { /* suppressed */ }
 
                 try
                 {
                     object parsed = Enum.Parse(TKey, s);
                     KeyCodeToKeyEnumDict.Add(key, parsed);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    Universe.Log(ex);
                     KeyCodeToKeyEnumDict.Add(key, default);
                 }
             }
@@ -301,9 +302,10 @@ public bool GetKeyDown(KeyCode key)
         {
             try
             {
-                return (bool)p_btnWasPressed.GetValue(KeyCodeToActualKey(key), null);
+                object actual = KeyCodeToActualKey(key);
+                return (bool)p_btnWasPressed.GetValue(actual, null);
             }
-            catch
+            catch 
             {
                 return false;
             }
@@ -411,7 +413,10 @@ public void ActivateModule()
                 {
                     MethodInfo assignDefaultMethod = newInput.GetType()
                         .GetMethod("AssignDefaultActions");
-                    assignDefaultMethod.Invoke(newInput.TryCast(assignDefaultMethod.DeclaringType), new object[0]);
+                    if (assignDefaultMethod != null)
+                        assignDefaultMethod.Invoke(newInput.TryCast(assignDefaultMethod.DeclaringType), new object[0]);
+                    else
+                        Universe.Log("AssignDefaultActions method is null!");
                 }
             }
             catch (Exception ex)

src/Reflection/Il2CppReflection.cs

@@ -640,12 +640,13 @@ internal bool DoLoadModule(string fullPath)
 
             try
             {
+                //Universe.Log($"Loading assembly '{Path.GetFileName(fullPath)}'");
                 Assembly.LoadFile(fullPath);
                 return true;
             }
-            catch //(Exception e)
+            catch
             {
-                //UniverseLib.LogWarning($"Failed loading module '{Path.GetFileName(fullPath)}'! {e.ReflectionExToString()}");
+                //Universe.LogWarning($"Failed loading module '{Path.GetFileName(fullPath)}'! {e.ReflectionExToString()}");
                 return false;
             }
         }

src/Reflection/ReflectionUtility.cs

@@ -114,7 +114,7 @@ static void ForceLoadManagedAssemblies()
             }
         }
 
-        static void CacheTypes(Assembly asm)
+        internal static void CacheTypes(Assembly asm)
         {
             foreach (Type type in asm.GetTypes())
             {
@@ -159,6 +159,10 @@ internal virtual Type Internal_GetTypeByName(string fullName)
                 return shorthand;
 
             AllTypes.TryGetValue(fullName, out Type type);
+
+            if (type == null)
+                type = Type.GetType(fullName);
+
             return type;
         }
 

src/Runtime/Il2Cpp/Il2CppManagedEnumerator.cs

@@ -42,8 +42,16 @@ static Il2CppManagedEnumerator()
                 // This method is just obsoleted in BepInEx's branch, but still works.
 
                 // ClassInjector.RegisterTypeInIl2CppWithInterfaces(typeof(Il2CppManagedEnumerator), true, typeof(Il2CppIEnumerator));
+#if UNHOLLOWER
                 AccessTools.Method(typeof(ClassInjector), "RegisterTypeInIl2CppWithInterfaces", new Type[] { typeof(Type), typeof(bool), typeof(Type[]) })
                     .Invoke(null, new object[] { typeof(Il2CppManagedEnumerator), true, new[] { typeof(Il2CppSystem.Collections.IEnumerator) } });
+#else
+                ClassInjector.RegisterTypeInIl2Cpp<Il2CppManagedEnumerator>(new RegisterTypeOptions
+                {
+                    Interfaces = new[] { typeof(Il2CppIEnumerator) }
+                });
+#endif
+
             }
             catch (System.Exception ex)
             {

src/Universe.cs

@@ -32,7 +32,7 @@ public enum GlobalState
         }
 
         public const string NAME = "UniverseLib";
-        public const string VERSION = "1.5.0";
+        public const string VERSION = "1.5.1";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.universelib";