From 22d968248606902e6585e30b7773c572f1bf0924 Mon Sep 17 00:00:00 2001 From: isXander Date: Tue, 18 Jun 2024 00:37:01 +0100 Subject: [PATCH] Fix missing import on 1.20.1 --- .gitignore | 1 + .../isxander/zoomify/mixins/zoom/MouseMixin.java | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2f31456..d329d24 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build /.idea .gradle !.gitkeep +.kotlin diff --git a/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java b/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java index ded94aa..a1621b5 100644 --- a/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java +++ b/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java @@ -8,6 +8,7 @@ import net.minecraft.client.MouseHandler; import net.minecraft.util.Mth; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; @@ -16,8 +17,8 @@ @Mixin(MouseHandler.class) public class MouseMixin { - /*? if <=1.20.1 {*//* - @Shadow + /*? if <=1.20.1 {*/ + /*@Shadow private double accumulatedScroll; *//*?}*/ @@ -25,14 +26,14 @@ public class MouseMixin { method = "onScroll", /*? if >1.20.1 {*/ at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isSpectator()Z"), - /*?} else {*//* - at = @At(value = "FIELD", target = "Lnet/minecraft/client/MouseHandler;accumulatedScroll:D", ordinal = 7), + /*?} else {*/ + /*at = @At(value = "FIELD", target = "Lnet/minecraft/client/MouseHandler;accumulatedScroll:D", ordinal = 7), *//*?}*/ cancellable = true ) private void scrollStepCounter(CallbackInfo ci /*? if >1.20.1 {*/, @Local(ordinal = 1) int scrollY /*?}*/) { - /*? if <=1.20.1 {*//* - double scrollY = accumulatedScroll; + /*? if <=1.20.1 {*/ + /*double scrollY = accumulatedScroll; *//*?}*/ if (ZoomifySettings.Companion.getScrollZoom().get()