From e154e82fdb4924d479f6108ebf1a1338bea3c599 Mon Sep 17 00:00:00 2001
From: ceikry <ironceikry@gmail.com>
Date: Sun, 19 Jun 2022 12:20:03 -0500
Subject: [PATCH] Put scrollwheel zoom behind a config option

---
 client/config.json                             | 9 +++++----
 client/src/main/java/rt4/GlobalJsonConfig.java | 1 +
 client/src/main/java/rt4/JavaMouseWheel.java   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/config.json b/client/config.json
index 2f79e76..38fac21 100644
--- a/client/config.json
+++ b/client/config.json
@@ -1,8 +1,9 @@
 {
-    "ip_management": "test.2009scape.org",
-    "ip_address": "test.2009scape.org",
+    "ip_management": "localhost",
+    "ip_address": "localhost",
     "world": 1,
     "server_port": 43594,
-    "wl_port": 5555,
-    "js5_port": 43593
+    "wl_port": 43595,
+    "js5_port": 43595,
+    "mouseWheelZoom": true
 }
\ No newline at end of file
diff --git a/client/src/main/java/rt4/GlobalJsonConfig.java b/client/src/main/java/rt4/GlobalJsonConfig.java
index 70b8437..61474cb 100644
--- a/client/src/main/java/rt4/GlobalJsonConfig.java
+++ b/client/src/main/java/rt4/GlobalJsonConfig.java
@@ -25,4 +25,5 @@ public class GlobalJsonConfig {
     int server_port;
     int wl_port;
     int js5_port;
+    boolean mouseWheelZoom;
 }
diff --git a/client/src/main/java/rt4/JavaMouseWheel.java b/client/src/main/java/rt4/JavaMouseWheel.java
index 5a8478b..42b4709 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 (Keyboard.instance.isShiftPressed()) {
+		if (GlobalJsonConfig.instance.mouseWheelZoom && Keyboard.instance.isShiftPressed()) {
 			Camera.ZOOM = clamp(200, 1200, Camera.ZOOM + (diff >= 0 ? 50: -50));
 		}
 	}