From a6f8645c685c95d87459c0bb78cf08255572c150 Mon Sep 17 00:00:00 2001 From: Hedzer Kuijlman Date: Tue, 20 May 2025 12:01:59 +0200 Subject: [PATCH] Added toggleable scrollToZoom --- README.md | 4 ++++ .../wtf/hak/survivalfabric/config/client/ClientConfig.java | 1 + .../java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 12778da..ba7de1a 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,10 @@ DISCLAIMER: this is NOT perfect and still needs to be reworked, I'm just too laz - Integer - [x] Zoom - [x] Configurable + - Smooth zoom + - Initial zoom value + - Zoom step value + - Scroll to zoom further # To-do diff --git a/src/client/java/wtf/hak/survivalfabric/config/client/ClientConfig.java b/src/client/java/wtf/hak/survivalfabric/config/client/ClientConfig.java index faf6ee0..c4ae18f 100644 --- a/src/client/java/wtf/hak/survivalfabric/config/client/ClientConfig.java +++ b/src/client/java/wtf/hak/survivalfabric/config/client/ClientConfig.java @@ -15,5 +15,6 @@ public class ClientConfig { public int blockEntityRange = 512; public boolean smoothCamera = true; public float initialZoom = 20f; + public boolean scrollToZoom = true; public float zoomStep = 2.5f; } diff --git a/src/client/java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java b/src/client/java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java index 283de8e..2f6074a 100644 --- a/src/client/java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java +++ b/src/client/java/wtf/hak/survivalfabric/mixin/client/MouseMixin.java @@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import wtf.hak.survivalfabric.features.Zoom; +import static wtf.hak.survivalfabric.config.client.ClientConfigManager.getConfig; + @Mixin(Mouse.class) public class MouseMixin { @@ -16,7 +18,7 @@ public class MouseMixin { */ @Inject(method = "onMouseScroll", at = @At("HEAD"), cancellable = true) private void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) { - if (Zoom.isZooming()) { + if (Zoom.isZooming() && getConfig().scrollToZoom) { if (MinecraftClient.getInstance().player != null) { if (vertical > 0) Zoom.modifyStep(-1);