From 299ebc243dd5049cb360aaa3098824ed3a140fad Mon Sep 17 00:00:00 2001 From: Pazaz Date: Sun, 19 Jun 2022 20:03:02 -0400 Subject: [PATCH] Allow camera zooming by default without it in json Also had to add an extra check if json isn't loaded --- client/src/main/java/rt4/GlobalConfig.java | 2 ++ client/src/main/java/rt4/GlobalJsonConfig.java | 3 ++- client/src/main/java/rt4/JavaMouseWheel.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/rt4/GlobalConfig.java b/client/src/main/java/rt4/GlobalConfig.java index 133af50..165c476 100644 --- a/client/src/main/java/rt4/GlobalConfig.java +++ b/client/src/main/java/rt4/GlobalConfig.java @@ -51,6 +51,8 @@ public class GlobalConfig { public static boolean USE_SHIFT_CLICK = true; public static boolean USE_TWEENING = true; public static boolean BILINEAR_MINIMAP = true; + public static boolean MOUSEWHEEL_ZOOM = true; public static int JS5_RESPONSE_TIMEOUT = 5000; + } diff --git a/client/src/main/java/rt4/GlobalJsonConfig.java b/client/src/main/java/rt4/GlobalJsonConfig.java index 61474cb..133c118 100644 --- a/client/src/main/java/rt4/GlobalJsonConfig.java +++ b/client/src/main/java/rt4/GlobalJsonConfig.java @@ -25,5 +25,6 @@ public class GlobalJsonConfig { int server_port; int wl_port; int js5_port; - boolean mouseWheelZoom; + boolean mouseWheelZoom = GlobalConfig.MOUSEWHEEL_ZOOM; + } diff --git a/client/src/main/java/rt4/JavaMouseWheel.java b/client/src/main/java/rt4/JavaMouseWheel.java index 42b4709..4fb1f92 100644 --- a/client/src/main/java/rt4/JavaMouseWheel.java +++ b/client/src/main/java/rt4/JavaMouseWheel.java @@ -37,7 +37,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen this.anInt4233 += arg0.getWheelRotation(); int diff = this.anInt4233 - previous; - if (GlobalJsonConfig.instance.mouseWheelZoom && Keyboard.instance.isShiftPressed()) { + if (((GlobalJsonConfig.instance != null && GlobalJsonConfig.instance.mouseWheelZoom) || (GlobalJsonConfig.instance == null && GlobalConfig.MOUSEWHEEL_ZOOM)) && Keyboard.instance.isShiftPressed()) { Camera.ZOOM = clamp(200, 1200, Camera.ZOOM + (diff >= 0 ? 50: -50)); } }