Skip to content

修复部分情况下导致的原始输入只能获取一个鼠标移动的bug #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vlouboos merged 1 commit into from
Apr 9, 2026
Merged

修复部分情况下导致的原始输入只能获取一个鼠标移动的bug #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions src/main/java/top/fpsmaster/utils/input/raw/RawInputMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
import top.fpsmaster.modules.logger.ClientLogger;

import java.io.File;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;

public class RawInputMod {

private Thread inputThread;
public static Mouse mouse = null;
public static ArrayList<Mouse> mouses = new ArrayList<>();
public static Controller[] controllers;
public static final AtomicInteger dx = new AtomicInteger(0);
public static final AtomicInteger dy = new AtomicInteger(0);
Expand All @@ -25,34 +26,44 @@ public void start() {
}
Minecraft.getMinecraft().mouseHelper = new RawMouseHelper();
String environment;
if (checkLibrary("jinput-dx8")){
if (checkLibrary("jinput-dx8")) {
environment = "DirectInputEnvironmentPlugin";
}else if (checkLibrary("jinput-raw")){
} else if (checkLibrary("jinput-raw")) {
environment = "DirectAndRawInputEnvironmentPlugin";
}else{
} else {
return;
}

Class<?> aClass = Class.forName("net.java.games.input." + environment);
aClass.getDeclaredConstructor().setAccessible(true);
ControllerEnvironment env = (ControllerEnvironment) aClass.newInstance();
controllers = env.getControllers();
inputThread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
int i = 0;
while (controllers != null && i < controllers.length && mouse == null) {
if (controllers[i].getType() == Controller.Type.MOUSE) {
controllers[i].poll();
if (((Mouse) controllers[i]).getX().getPollData() != 0.0 || ((Mouse) controllers[i]).getY().getPollData() != 0.0) {
mouse = (Mouse) controllers[i];
if(environment.equals("DirectInputEnvironmentPlugin")){
int i = 0;
while (controllers != null && i < controllers.length && mouses.isEmpty()) {
if (controllers[i].getType() == Controller.Type.MOUSE) {
controllers[i].poll();
if (((Mouse) controllers[i]).getX().getPollData() != 0.0 || ((Mouse) controllers[i]).getY().getPollData() != 0.0) {
mouses.add((Mouse) controllers[i]);
}
}
i++;
}
}else {
for (Controller controller : controllers) {
if (controller.getType() == Controller.Type.MOUSE) {
mouses.add((Mouse) controller);
}
}
i++;
}
if (mouse != null) {
mouse.poll();
dx.addAndGet((int) mouse.getX().getPollData());
dy.addAndGet((int) mouse.getY().getPollData());

if (!mouses.isEmpty()) {
for (Mouse mouse : mouses) {
mouse.poll();
dx.addAndGet((int) mouse.getX().getPollData());
dy.addAndGet((int) mouse.getY().getPollData());
}
if (Minecraft.getMinecraft().currentScreen != null) {
dx.set(0);
dy.set(0);
Expand Down Expand Up @@ -80,7 +91,7 @@ public void stop() {
inputThread.join(200L);
}
inputThread = null;
mouse = null;
mouses = new ArrayList<>();
controllers = null;
dx.set(0);
dy.set(0);
Expand Down
Loading