From 1c26eeed5ed3019988f6eba6976c066659cd5139 Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Sat, 15 Feb 2025 22:20:29 +0100
Subject: [PATCH] fix: catch errors in camera thread

- Solves camera movement breaking entirely when encountering an error
---
 .../client/MidnightControlsClient.java               | 12 ++++++++----
 gradle.properties                                    |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
index c6128f5..a762646 100644
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
@@ -87,11 +87,15 @@ public class MidnightControlsClient extends MidnightControls {
         Timer timer = new Timer();
         timer.scheduleAtFixedRate(new TimerTask() {
             public void run() { // TODO: Add a try/catch here after the alpha testing period
-                if (lateInitDone && client.isRunning()) {
-                    if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
-                        input.tickCameraStick();
-                        input.updateCamera();
+                try {
+                    if (lateInitDone && client.isRunning()) {
+                        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
+                            input.tickCameraStick();
+                            input.updateCamera();
+                        }
                     }
+                } catch (Exception | Error e) {
+                    MidnightControls.logger.error("Exception encountered in camera loop: ",e);
                 }
             }
         }, delay, period);
diff --git a/gradle.properties b/gradle.properties
index b9285e2..3db6ea0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,14 +8,14 @@ yarn_mappings=1.21.4+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightcontrols
-mod_version=1.10.3
+mod_version=1.10.4
 maven_group=eu.midnightdust
 release_type=beta
 modrinth_id = bXX9h73M
 curseforge_id = 621768
 # Configure the IDs here after creating the projects on the websites
 
-midnightlib_version=1.6.6
+midnightlib_version=1.6.8+1.21.4
 
 fabric_loader_version=0.16.9
 fabric_api_version=0.110.5+1.21.4