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

Merge pull request #272 from kabliz/eye_tracking_range_combat

Browse Source 
Improved Range Combat While Eye Tracking
This commit is contained in:
Martin Prokoph
2024-04-29 20:05:21 +02:00
committed by GitHub
parent e6fcd1469c eb54245c21
commit 728a2d4603
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,8 +115,15 @@ public abstract class MouseMixin implements MouseAccessor {
cursorXSmoother.clear(); cursorXSmoother.clear();
cursorYSmoother.clear(); cursorYSmoother.clear();
} }
net.minecraft.item.ItemStack items = client.player != null ? client.player.getActiveItem() : net.minecraft.item.ItemStack.EMPTY;
boolean isUsingLongRangedTool = (leftButtonClicked &&
items.getUseAction() == net.minecraft.util.UseAction.BOW &&
items.getUseAction() == net.minecraft.util.UseAction.CROSSBOW &&
items.getUseAction() == net.minecraft.util.UseAction.SPEAR)
||
items.getItem() instanceof net.minecraft.item.ThrowablePotionItem;
EyeTrackerHandler.updateMouseWithEyeTracking(x + cursorDeltaX, y + cursorDeltaY, client, EyeTrackerHandler.updateMouseWithEyeTracking(x + cursorDeltaX, y + cursorDeltaY, client,
glfwTime, leftButtonClicked, cursorXSmoother, cursorYSmoother); glfwTime, leftButtonClicked, isUsingLongRangedTool, cursorXSmoother, cursorYSmoother);
glfwTime = GlfwUtil.getTime(); glfwTime = GlfwUtil.getTime();
cursorDeltaX = 0.0; cursorDeltaX = 0.0;
cursorDeltaY = 0.0; cursorDeltaY = 0.0;

6
src/main/java/eu/midnightdust/midnightcontrols/client/mouse/EyeTrackerHandler.java
View File

@@ -15,6 +15,7 @@ public class EyeTrackerHandler {
MinecraftClient client, MinecraftClient client,
double lastMouseUpdateTime, double lastMouseUpdateTime,
boolean holdingLeftMouseButton, boolean holdingLeftMouseButton,
boolean usingLongRangedTool,
SmoothUtil smoothX, SmoothUtil smoothX,
SmoothUtil smoothY SmoothUtil smoothY
) { ) {
@@ -45,7 +46,7 @@ public class EyeTrackerHandler {
} else { } else {
frameScalar = moveScalar; frameScalar = moveScalar;
} }
if(holdingLeftMouseButton){ if(holdingLeftMouseButton && !usingLongRangedTool) {
frameScalar *= 0.5; //Don't move the camera so much while mining. It's annoying. frameScalar *= 0.5; //Don't move the camera so much while mining. It's annoying.
} }
@@ -68,7 +69,8 @@ public class EyeTrackerHandler {
if (client.options.getInvertYMouse().getValue()) { if (client.options.getInvertYMouse().getValue()) {
invertY = -1.0; invertY = -1.0;
} }
if (client.player != null && moveMagnitude > MidnightControlsConfig.eyeTrackerDeadzone) { boolean notInDeadzone = (moveMagnitude > MidnightControlsConfig.eyeTrackerDeadzone) && !usingLongRangedTool;
if (client.player != null && notInDeadzone) {
client.player.changeLookDirection(moveX, moveY * invertY); client.player.changeLookDirection(moveX, moveY * invertY);
client.getTutorialManager().onUpdateMouse(moveX, moveY); client.getTutorialManager().onUpdateMouse(moveX, moveY);
} }