Catch error if invalid keybind is present

(invalid keys will now be logged in the logger)
Schyvun · Mar 4, 2021 · 64e3310 · 64e3310
1 parent 108ca7d
commit 64e3310
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 7 deletions.
diff --git a/src/Data.cs b/src/Data.cs
@@ -14,5 +14,16 @@ public class Settings
         public string save_triggers = "[6]";
         public float timerAnchorX = 0.15f;
         public float timerAnchorY = 0.2f;
+
+        public void LogBindErrors()
+        {
+            StringInputManager.LogBindErors(new string[] {
+                reload_settings,
+                set_start,
+                set_end,
+                load_triggers,
+                save_triggers
+            });
+        }
     }
 }
diff --git a/src/FrameCount.cs b/src/FrameCount.cs
@@ -49,12 +49,12 @@ public void OnDestroy()
         public void Update()
         {
             var updateTimer = false;
-            if (Input.GetKeyDown(HKTimer.instance.settings.pause))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.pause))
             {
                 timerActive ^= true;
                 HKTimer.instance.targetManager.OnTimerPauseManual();
             }
-            if (Input.GetKeyDown(HKTimer.instance.settings.reset))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.reset))
             {
                 time = TimeSpan.Zero;
                 timerActive = false;

diff --git a/src/HKTimer.cs b/src/HKTimer.cs
@@ -55,6 +55,7 @@ public void ReloadSettings()
             {
                 Modding.Logger.Log("[HKTimer] Reading settings from " + path);
                 this.settings = JsonUtility.FromJson<Settings>(File.ReadAllText(path));
+                this.settings.LogBindErrors();
             }
             // Reload text positions
             frameCount.ShowDisplay();
@@ -77,7 +78,7 @@ public void Start()
 
         public void Update()
         {
-            if (Input.GetKeyDown(HKTimer.instance.settings.reload_settings))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.reload_settings))
             {
                 Modding.Logger.Log("[HKTimer] Reloading settings");
                 HKTimer.instance.ReloadSettings();

diff --git a/src/StringInputManager.cs b/src/StringInputManager.cs
@@ -0,0 +1,33 @@
+using UnityEngine;
+
+namespace HKTimer {
+    public class StringInputManager
+    {
+        public static void LogBindErors(string[] keys)
+        {
+            foreach(var s in keys)
+            {
+                try
+                {
+                    if(s != null) Input.GetKeyDown(s);
+                }
+                catch
+                {
+                    Modding.Logger.LogError("Invalid key code '" + s + "'");
+                }
+            }
+        }
+
+        public static bool GetKeyDown(string key)
+        {
+            try
+            {
+                return key != null && Input.GetKeyDown(key);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/TargetManager.cs b/src/TargetManager.cs
@@ -172,7 +172,7 @@ public void Start()
 
         public void Update()
         {
-            if (Input.GetKeyDown(HKTimer.instance.settings.set_start))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.set_start))
             {
                 this.start?.Destroy();
                 this.start = new CollisionTrigger()
@@ -187,7 +187,7 @@ public void Update()
                 this.pb = TimeSpan.Zero;
                 this.pbDisplay.text = this.PbText();
             }
-            if (Input.GetKeyDown(HKTimer.instance.settings.set_end))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.set_end))
             {
                 this.end?.Destroy();
                 this.end = new CollisionTrigger()
@@ -202,11 +202,11 @@ public void Update()
                 this.pb = TimeSpan.Zero;
                 this.pbDisplay.text = this.PbText();
             }
-            if (Input.GetKeyDown(HKTimer.instance.settings.load_triggers))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.load_triggers))
             {
                 LoadTriggers();
             }
-            if (Input.GetKeyDown(HKTimer.instance.settings.save_triggers))
+            if (StringInputManager.GetKeyDown(HKTimer.instance.settings.save_triggers))
             {
                 SaveTriggers();
             }