Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixes #157 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EnnuiL merged 3 commits into from
Oct 5, 2025
Merged

Fixes #157 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67a8acf
Fixes #157
JTK222 Oct 5, 2025
5d07a19
Removes unused imports
JTK222 Oct 5, 2025
2843558
Fixed incorrect intends and accidental space within else...
JTK222 Oct 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions mod_fabric/src/main/java/io/github/ennuil/ok_zoomer/mixin/fabric/MouseHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package io.github.ennuil.ok_zoomer.mixin.fabric;

import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.ref.LocalDoubleRef;
import io.github.ennuil.ok_zoomer.zoom.Zoom;
import net.minecraft.client.MouseHandler;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -27,20 +29,24 @@ private void captureMouseSensitivity(double movementTime, CallbackInfo ci, @Loca
CURSOR_SENSITIVITY.set(f);
}

@Inject(
@WrapOperation(
method = "turnPlayer",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"
)
)
private void applyZoomChanges(double movementTime, CallbackInfo ci, @Local(ordinal = 1) LocalDoubleRef i, @Local(ordinal = 2) LocalDoubleRef j) {
private void applyZoomChanges(LocalPlayer instance, double x, double y, Operation<Void> original, double movementTime){
if (Zoom.isModifierActive()) {
double f = CURSOR_SENSITIVITY.get();
double zoomDivisor = Zoom.isZooming() ? Zoom.getZoomDivisor() : 1.0;
double transitionDivisor = Zoom.getTransitionMode().getInternalMultiplier();
i.set(Zoom.getMouseModifier().applyXModifier(i.get(), f, movementTime, zoomDivisor, transitionDivisor));
j.set(Zoom.getMouseModifier().applyYModifier(j.get(), f, movementTime, zoomDivisor, transitionDivisor));
original.call(instance,
Zoom.getMouseModifier().applyXModifier(x, f, movementTime, zoomDivisor, transitionDivisor),
Zoom.getMouseModifier().applyYModifier(y, f, movementTime, zoomDivisor, transitionDivisor)
);
} else {
original.call(instance, x, y);
}
CURSOR_SENSITIVITY.remove();
}
Expand Down
19 changes: 12 additions & 7 deletions mod_norge/src/main/java/io/github/ennuil/ok_zoomer/mixin/norge/MouseHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
package io.github.ennuil.ok_zoomer.mixin.norge;

import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.ref.LocalDoubleRef;
import io.github.ennuil.ok_zoomer.zoom.Zoom;
import net.minecraft.client.MouseHandler;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(MouseHandler.class)
public abstract class MouseHandlerMixin {
@Inject(

@WrapOperation(
method = "turnPlayer",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"
)
)
public void applyZoomChanges(double movementTime, CallbackInfo ci, @Local(ordinal = 4) LocalDoubleRef d0, @Local(ordinal = 5) LocalDoubleRef d1, @Local(ordinal = 3) double d4) {
private void applyZoomChanges(LocalPlayer instance, double x, double y, Operation<Void> original, double movementTime, @Local(ordinal = 3) double cursorSpeed){
if (Zoom.isModifierActive()) {
double zoomDivisor = Zoom.isZooming() ? Zoom.getZoomDivisor() : 1.0;
double transitionDivisor = Zoom.getTransitionMode().getInternalMultiplier();
d0.set(Zoom.getMouseModifier().applyXModifier(d0.get(), d4, movementTime, zoomDivisor, transitionDivisor));
d1.set(Zoom.getMouseModifier().applyYModifier(d1.get(), d4, movementTime, zoomDivisor, transitionDivisor));
original.call(instance,
Zoom.getMouseModifier().applyXModifier(x, cursorSpeed, movementTime, zoomDivisor, transitionDivisor),
Zoom.getMouseModifier().applyYModifier(y, cursorSpeed, movementTime, zoomDivisor, transitionDivisor)
);
} else {
original.call(instance, x, y);
}
}
}