Build Hotfix

A simple Hotfix to make the system runs on Build

Author: AnderSystems

Editor/KeyDrawer.cs

@@ -15,6 +15,8 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         // Set the position to draw fields
         Rect keyCodeRect = new Rect(position.x, position.y, position.width / 2 - 20, EditorGUIUtility.singleLineHeight);
+        //Rect mouseButtonRect = new Rect(position.x + position.width / 4 - 20, position.y, position.width / 4 - 20, EditorGUIUtility.singleLineHeight);
+
         Rect buttonRect = new Rect(position.x + position.width / 2 - 1, position.y, (position.width / 2) - 26, EditorGUIUtility.singleLineHeight);
         Rect cancelButtonRect = new Rect(position.x + position.width - 28, position.y, 20, EditorGUIUtility.singleLineHeight);
 
@@ -23,6 +25,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         // Draw the fields
         EditorGUI.PropertyField(keyCodeRect, property.FindPropertyRelative("keyCode"), new GUIContent("Key"));
+        //EditorGUI.PropertyField(mouseButtonRect, property.FindPropertyRelative("mouseButton"), new GUIContent("Mouse"));
 
         // Draw Bind Button
         bool isBinding = currentBindingProperty == propertyPath;
@@ -34,6 +37,32 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                 currentBindingProperty = null;
                 Event.current.Use();
             }
+            else
+            {
+                if (Event.current.type == EventType.MouseDown)
+                {
+                    if (Event.current.button == 0)
+                    {
+                        property.FindPropertyRelative("keyCode").intValue = (int)KeyCode.Mouse0;
+                        currentBindingProperty = null;
+                        Event.current.Use();
+                    }
+
+                    if (Event.current.button == 1)
+                    {
+                        property.FindPropertyRelative("keyCode").intValue = (int)KeyCode.Mouse1;
+                        currentBindingProperty = null;
+                        Event.current.Use();
+                    }
+
+                    if (Event.current.button == 2)
+                    {
+                        property.FindPropertyRelative("keyCode").intValue = (int)KeyCode.Mouse2;
+                        currentBindingProperty = null;
+                        Event.current.Use();
+                    }
+                }
+            }
             isBinding = GUI.Toggle(buttonRect, isBinding, "Press key to bind", GUI.skin.button);
         }
         else

Runtime/InputSystem.cs

@@ -1,5 +1,7 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
+using System.Linq;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -263,7 +265,7 @@ public static button SearchButton(string name)
         button r = null;
         for (int i = 0; i < main.settings.m_Inputs.Buttons.Length; i++)
         {
-            if (main.settings.m_Inputs.Buttons[i].m_name == name)
+            if (main.settings.m_Inputs.Buttons[i].m_name.ToLower() == name.ToLower())
             {
                 r = main.settings.m_Inputs.Buttons[i];
                 break;
@@ -299,6 +301,10 @@ public static bool GetButton(string name)
     }
     public static bool GetButtonDown(string name)
     {
+        if (string.IsNullOrEmpty(name))
+        {
+            return false;
+        }
         return SearchButton(name).isDown;
     }
     public static bool GetButtonUp(string name)
@@ -309,10 +315,90 @@ public static Vector2 GetAxis(string name)
     {
         return SearchAxis(name).value;
     }
+    public static string GetButtonName(string name)
+    {
+        string r = "<h1>[" + GetButtonNameRaw(name) + "]</h1>";
+
+        if (r == "<h1>[Mouse0]</h1>")
+        {
+            r = "<h1>[LMB]</h1>";
+        }
+
+        if (r == "<h1>[Mouse1]</h1>")
+        {
+            r = "<h1>[RMB]</h1>";
+        }
+
+        if (r == "<h1>[Mouse2]</h1>")
+        {
+            r = "<h1>[Scroll Button]</h1>";
+        }
+
+        return r;
+    }
+    public static string GetButtonNameRaw(string name)
+    {
+        return SearchButton(name).keys[0].keyCode.ToString();
+    }
+
+
+    public void SetButtonNames()
+    {
+        //Set Button Names
+        for (int i = 0; i < settings.m_Inputs.Buttons.Length; i++)
+        {
+            if (string.IsNullOrEmpty(settings.m_Inputs.Buttons[i].Name))
+            {
+                settings.m_Inputs.Buttons[i].m_name = settings.m_Inputs.Buttons[i].keys[0].keyCode.ToString();
+            }
+            else
+            {
+                settings.m_Inputs.Buttons[i].m_name = settings.m_Inputs.Buttons[i].Name;
+            }
+        }
+    }
+    public void SetAxisNames()
+    {
+        //Set Axis Names
+        for (int i = 0; i < settings.m_Inputs.Axis.Length; i++)
+        {
+            if (string.IsNullOrEmpty(settings.m_Inputs.Axis[i].Name))
+            {
+                settings.m_Inputs.Axis[i].m_name = settings.m_Inputs.Axis[i].type.ToString();
+            }
+            else
+            {
+                settings.m_Inputs.Axis[i].m_name = settings.m_Inputs.Axis[i].Name;
+            }
+        }
+    }
 
     //Mono
+    public void Awake()
+    {
+        Debug.Log("InputSettings: " + settings.name);
+        DontDestroyOnLoad(gameObject);
+    }
+    private void Start()
+    {
+        SetButtonNames();
+        SetAxisNames();
+    }
     private void Update()
     {
+        DebugVar.Log("Current InputSystem", settings.name, this);
+        DebugVar.Log("Current InputSystem Axis", settings.m_Inputs.Axis.Length, this);
+
+        string axisBtns = "";
+        for (int i = 0; i < settings.m_Inputs.Axis.Length; i++)
+        {
+            axisBtns += settings.m_Inputs.Axis[i].m_name + "\n";
+        }
+        DebugVar.Log("Current InputSystem Axis", settings.m_Inputs.Axis.Length + "\n" + axisBtns, this);
+
+        DebugVar.Log("Current InputSystem Btns", settings.m_Inputs.Buttons.Length, this);
+
+
         //Update Buttons
         for (int i = 0; i < settings.m_Inputs.Buttons.Length; i++)
         {
@@ -326,6 +412,7 @@ private void Update()
         }
     }
 
+
     public void OnValidate()
     {
         if (!settings)
@@ -338,32 +425,8 @@ public void OnValidate()
             {
                 inputs = settings.m_Inputs;
             }
-
-            //Set Button Names
-            for (int i = 0; i < settings.m_Inputs.Buttons.Length; i++)
-            {
-                if (string.IsNullOrEmpty(settings.m_Inputs.Buttons[i].Name))
-                {
-                    settings.m_Inputs.Buttons[i].m_name = settings.m_Inputs.Buttons[i].keys[0].keyCode.ToString();
-                }
-                else
-                {
-                    settings.m_Inputs.Buttons[i].m_name = settings.m_Inputs.Buttons[i].Name;
-                }
-            }
-
-            //Set Axis Names
-            for (int i = 0; i < settings.m_Inputs.Axis.Length; i++)
-            {
-                if (string.IsNullOrEmpty(settings.m_Inputs.Axis[i].Name))
-                {
-                    settings.m_Inputs.Axis[i].m_name = settings.m_Inputs.Axis[i].type.ToString();
-                }
-                else
-                {
-                    settings.m_Inputs.Axis[i].m_name = settings.m_Inputs.Axis[i].Name;
-                }
-            }
+            SetButtonNames();
+            SetAxisNames();
         }
     }
 }