aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-09-27 16:00:59 +0200
committerLinnea Gräf <nea@nea.moe>2025-09-27 16:01:05 +0200
commit4bfe8900c21c911d87a4d2f312c317cc19a72c30 (patch)
tree5193d94a749d13903ebd3f224738e2ed2218c75e /src/main/java
parent02ee2c825a313a6bc5069ca7178e6e3385367062 (diff)
downloadFirmament-4bfe8900c21c911d87a4d2f312c317cc19a72c30.tar.gz
Firmament-4bfe8900c21c911d87a4d2f312c317cc19a72c30.tar.bz2
Firmament-4bfe8900c21c911d87a4d2f312c317cc19a72c30.zip
fix: revert cursor saving changes
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/moe/nea/firmament/mixins/SaveCursorPositionPatch.java46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/SaveCursorPositionPatch.java b/src/main/java/moe/nea/firmament/mixins/SaveCursorPositionPatch.java
index fd3adca..334463b 100644
--- a/src/main/java/moe/nea/firmament/mixins/SaveCursorPositionPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/SaveCursorPositionPatch.java
@@ -14,27 +14,27 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Mouse.class)
public class SaveCursorPositionPatch {
- @Shadow
- private double x;
-
- @Shadow
- private double y;
-
- @Inject(method = "lockCursor", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/Mouse;cursorLocked:Z"))
- public void onLockCursor(CallbackInfo ci) {
- SaveCursorPosition.saveCursorOriginal(x, y);
- }
-
- @Inject(method = "lockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getHandle()J"))
- public void onLockCursorAfter(CallbackInfo ci) {
- SaveCursorPosition.saveCursorMiddle(x, y);
- }
-
- @Inject(method = "unlockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getHandle()J"))
- public void onUnlockCursor(CallbackInfo ci) {
- Pair<Double, Double> cursorPosition = SaveCursorPosition.loadCursor(this.x, this.y);
- if (cursorPosition == null) return;
- this.x = cursorPosition.getFirst();
- this.y = cursorPosition.getSecond();
- }
+ @Shadow
+ private double x;
+
+ @Shadow
+ private double y;
+
+ @Inject(method = "lockCursor", at = @At(value = "HEAD"))
+ public void onLockCursor(CallbackInfo ci) {
+ SaveCursorPosition.saveCursorOriginal(x, y);
+ }
+
+ @Inject(method = "lockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getHandle()J"))
+ public void onLockCursorAfter(CallbackInfo ci) {
+ SaveCursorPosition.saveCursorMiddle(x, y);
+ }
+
+ @Inject(method = "unlockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getHandle()J"))
+ public void onUnlockCursor(CallbackInfo ci) {
+ Pair<Double, Double> cursorPosition = SaveCursorPosition.loadCursor(this.x, this.y);
+ if (cursorPosition == null) return;
+ this.x = cursorPosition.getFirst();
+ this.y = cursorPosition.getSecond();
+ }
}