(1.8.9) "fix" raw mouse input option

- by delegating to glfw since we now depend on it anyway

Author: moehreag

1.8.9/build.gradle.kts

@@ -58,6 +58,8 @@ dependencies {
 	implementation(include("org.slf4j:slf4j-api:1.7.36")!!)
 	localRuntime("org.slf4j:slf4j-jdk14:1.7.36")
 
+	compileOnly("org.lwjgl:lwjgl-glfw:${lwjglVersion}")
+
 	modCompileOnly("io.github.moehreag:legacy-lwjgl3:${project.property("legacy_lwgjl3")}") {
 		exclude(group = "org.lwjgl", module = "lwjgl-glfw")
 		exclude(group = "org.lwjgl", module = "lwjgl-openal")
@@ -105,7 +107,10 @@ tasks.processResources {
 }
 
 tasks.runClient {
-	jvmArgs("-Dfabric.dli.main=net.fabricmc.loader.impl.launch.knot.KnotClient")
+	if (project.property("native_glfw") == "true") {
+		val glfwPath = project.properties.getOrDefault("native_glfw_path", "/usr/lib/libglfw.so")
+		jvmArgs("-Dorg.lwjgl.glfw.libname=$glfwPath")
+	}
 	classpath(sourceSets.getByName("test").runtimeClasspath)
 }
 

1.8.9/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java

@@ -34,10 +34,13 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
 import io.github.axolotlclient.CommonOptions;
 import io.github.axolotlclient.config.screen.CreditsScreen;
+import io.github.axolotlclient.modules.Module;
+import io.github.axolotlclient.util.GLFWUtil;
 import io.github.axolotlclient.util.options.ForceableBooleanOption;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
+import org.lwjgl.glfw.GLFW;
 
 public class AxolotlClientConfig {
 
@@ -65,7 +68,8 @@ public class AxolotlClientConfig {
 
 	public final ColorOption loadingScreenColor = new ColorOption("loadingBgColor", new Color(-1));
 	public final BooleanOption nightMode = new BooleanOption("nightMode", false);
-	public final BooleanOption rawMouseInput = new BooleanOption("rawMouseInput", false);
+	public final BooleanOption rawMouseInput = new BooleanOption("rawMouseInput", false, v ->
+		GLFWUtil.runUsingGlfwHandle(h -> GLFW.glfwSetInputMode(h, GLFW.GLFW_RAW_MOUSE_MOTION, v ? 1 : 0)));
 
 	public final BooleanOption enableCustomOutlines = new BooleanOption("enabled", false);
 	public final ColorOption outlineColor = new ColorOption("color", Color.parse("#DD000000"));
@@ -116,6 +120,12 @@ public void init() {
 		general.add(nightMode);
 		general.add(customWindowTitle);
 		general.add(rawMouseInput);
+		AxolotlClient.modules.add(new Module() {
+			@Override
+			public void lateInit() {
+				GLFWUtil.runUsingGlfwHandle(h -> GLFW.glfwSetInputMode(h, GLFW.GLFW_RAW_MOUSE_MOTION, rawMouseInput.get() ? 1 : 0));
+			}
+		});
 		general.add(openCredits);
 		general.add(debugLogOutput);
 		general.add(CommonOptions.datetimeFormat);

1.8.9/src/main/java/io/github/axolotlclient/mixin/GameRendererMixin.java

@@ -43,7 +43,6 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.living.player.LocalClientPlayerEntity;
-import net.minecraft.client.input.MouseInput;
 import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
@@ -58,7 +57,6 @@
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -82,37 +80,12 @@ public abstract class GameRendererMixin {
 	private float fogBlue;
 	@Shadow
 	private boolean thiccFog;
-	@Unique
-	private float cachedMouseFactor;
 	@Shadow
 	private boolean debugCamera;
 
 	@Shadow
 	protected abstract FloatBuffer setFogColor(float par1, float par2, float par3, float par4);
 
-	@Inject(method = "render(FJ)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/MouseInput;dx:I"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-	public void axolotlclient$rawMouseInput(float tickDelta, long nanoTime, CallbackInfo ci, boolean displayActive, float f,
-											float g) {
-		if (AxolotlClient.CONFIG.rawMouseInput.get()) {
-			cachedMouseFactor = g;
-		}
-	}
-
-	@Redirect(method = "render(FJ)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/MouseInput;dx:I"))
-	public int axolotlclient$rawMouseX(MouseInput instance) {
-		if (AxolotlClient.CONFIG.rawMouseInput.get()) {
-			return (int) (instance.dx / cachedMouseFactor * minecraft.options.mouseSensitivity);
-		}
-		return instance.dx;
-	}
-
-	@Redirect(method = "render(FJ)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/MouseInput;dy:I"))
-	public int axolotlclient$rawMouseY(MouseInput instance) {
-		if (AxolotlClient.CONFIG.rawMouseInput.get()) {
-			return (int) (instance.dy / cachedMouseFactor * minecraft.options.mouseSensitivity);
-		}
-		return instance.dy;
-	}
 
 	@Inject(method = "renderFog", at = @At("HEAD"), cancellable = true)
 	public void axolotlclient$noFog(int i, float tickDelta, CallbackInfo ci) {

1.8.9/src/main/java/io/github/axolotlclient/util/GLFWUtil.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2025 moehreag <[email protected]> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.util;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.function.Consumer;
+
+import org.lwjgl.opengl.Display;
+
+public class GLFWUtil {
+
+	private static MethodHandle getHandle;
+
+	static {
+		try {
+			getHandle = MethodHandles.lookup().findVirtual(Display.class, "getHandle", MethodType.methodType(Long.class));
+		} catch (Throwable ignored) {
+		}
+	}
+
+	private static long windowHandle = -1;
+
+	public static long getWindowHandle(){
+		if (windowHandle == -1){
+
+			try {
+				windowHandle = (long) getHandle.invoke();
+			} catch (Throwable ignored) {
+			}
+		}
+		return windowHandle;
+	}
+
+	// Since the reflection used for this only works with legacy-lwjgl3 it's possible for us not being able to access the window handle.
+	// This however should not lead to a crash despite compiling against glfw.
+	public static boolean isHandleAvailable() {
+		return getWindowHandle() != -1;
+	}
+
+	public static void runUsingGlfwHandle(Consumer<Long> action) {
+		if (isHandleAvailable()) {
+			action.accept(getWindowHandle());
+		}
+	}
+}

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.1-rc.9
+version=3.1.1-rc.10
 
 maven_group=io.github.axolotlclient