From 4bfe8900c21c911d87a4d2f312c317cc19a72c30 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Sat, 27 Sep 2025 16:00:59 +0200
Subject: fix: revert cursor saving changes

---
 .../firmament/mixins/SaveCursorPositionPatch.java  | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/main/java')

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();
+	}
 }
-- 
cgit