Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-13 23:25:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

MidnightControls 1.9.2 - Fix #251

Browse Source
This commit is contained in:
Martin Prokoph
2023-12-31 11:00:14 +01:00
parent 2b143c6bf1
commit 3e665a14fd
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -21,7 +21,7 @@ boolean isMCVersionNonRelease() {
} }
String getMCVersionString() { String getMCVersionString() {
if (isMCVersionNonRelease() || project.minecraft_version == "1.20.2") { if (isMCVersionNonRelease() || project.minecraft_version == "1.20.4") {
return project.minecraft_version return project.minecraft_version
} }
def version = project.minecraft_version.split('\\.') def version = project.minecraft_version.split('\\.')

2
gradle.properties
View File

@@ -8,7 +8,7 @@ yarn_mappings=1.20.4+build.3
loader_version=0.15.3 loader_version=0.15.3
# Mod Properties # Mod Properties
mod_version = 1.9.1 mod_version = 1.9.2
maven_group = eu.midnightdust maven_group = eu.midnightdust
archives_base_name = midnightcontrols archives_base_name = midnightcontrols
modrinth_id = bXX9h73M modrinth_id = bXX9h73M

3
src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
View File

@@ -404,4 +404,7 @@ public class MidnightControlsConfig extends MidnightConfig {
else if (controller.contains("ouya")) return ControllerType.OUYA; else if (controller.contains("ouya")) return ControllerType.OUYA;
else return ControllerType.DEFAULT; else return ControllerType.DEFAULT;
} }
public static boolean doMixedInput() {
return touchInControllerMode && controlsMode == ControlsMode.CONTROLLER;
}
} }

13
src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java
View File

@@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import eu.midnightdust.midnightcontrols.client.mouse.EyeTrackerHandler; import eu.midnightdust.midnightcontrols.client.mouse.EyeTrackerHandler;
import static eu.midnightdust.midnightcontrols.client.MidnightControlsConfig.doMixedInput;
import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.glfw.GLFW.*;
/** /**
@@ -59,17 +60,13 @@ public abstract class MouseMixin implements MouseAccessor {
@Shadow private boolean leftButtonClicked; @Shadow private boolean leftButtonClicked;
@Shadow private int activeButton;
@Shadow private double glfwTime;
@Inject(method = "onMouseButton", at = @At(value = "HEAD"), cancellable = true) @Inject(method = "onMouseButton", at = @At(value = "HEAD"), cancellable = true)
private void midnightcontrols$onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) { private void midnightcontrols$onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) {
if (window != this.client.getWindow().getHandle()) return; if (window != this.client.getWindow().getHandle()) return;
if (action == 1 && button == GLFW.GLFW_MOUSE_BUTTON_4 && client.currentScreen != null) { if (action == 1 && button == GLFW.GLFW_MOUSE_BUTTON_4 && client.currentScreen != null) {
MidnightControlsClient.get().input.tryGoBack(client.currentScreen); MidnightControlsClient.get().input.tryGoBack(client.currentScreen);
} }
else if ((client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay) && client.player != null && button == GLFW_MOUSE_BUTTON_1) { else if ((doMixedInput() || client.currentScreen instanceof TouchscreenOverlay) && client.player != null && button == GLFW_MOUSE_BUTTON_1) {
double mouseX = x / client.getWindow().getScaleFactor(); double mouseX = x / client.getWindow().getScaleFactor();
double mouseY = y / client.getWindow().getScaleFactor(); double mouseY = y / client.getWindow().getScaleFactor();
int centerX = client.getWindow().getScaledWidth() / 2; int centerX = client.getWindow().getScaledWidth() / 2;
@@ -105,7 +102,7 @@ public abstract class MouseMixin implements MouseAccessor {
@Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true) @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
private void midnightcontrols$onCursorLocked(CallbackInfo ci) { private void midnightcontrols$onCursorLocked(CallbackInfo ci) {
if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN || (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse)) if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN || doMixedInput())
ci.cancel(); ci.cancel();
} }
@@ -124,14 +121,14 @@ public abstract class MouseMixin implements MouseAccessor {
cursorDeltaY = 0.0; cursorDeltaY = 0.0;
ci.cancel(); ci.cancel();
} }
if ((MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.touchInControllerMode) && client.isWindowFocused()) { if (doMixedInput() && client.isWindowFocused()) {
ci.cancel(); ci.cancel();
} }
} }
@Inject(method = "lockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/InputUtil;setCursorParameters(JIDD)V",shift = At.Shift.BEFORE), cancellable = true) @Inject(method = "lockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/InputUtil;setCursorParameters(JIDD)V",shift = At.Shift.BEFORE), cancellable = true)
private void midnightcontrols$lockCursor(CallbackInfo ci) { private void midnightcontrols$lockCursor(CallbackInfo ci) {
if ((MidnightControlsConfig.touchInControllerMode || MidnightControlsConfig.eyeTrackerAsMouse)) { if ((doMixedInput() || MidnightControlsConfig.eyeTrackerAsMouse)) {
//In eye tracking mode, we cannot have the cursor locked to the center. //In eye tracking mode, we cannot have the cursor locked to the center.
GLFW.glfwSetInputMode(client.getWindow().getHandle(), GLFW_CURSOR, GLFW_CURSOR_HIDDEN); GLFW.glfwSetInputMode(client.getWindow().getHandle(), GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
client.setScreen(null); client.setScreen(null);