3rdparty/peytonplayz585-c0.30
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mouse lock

Browse Source
This commit is contained in:
PeytonPlayz595 2023-07-14 07:50:37 -04:00
parent 22b5efc2a6
commit 2e821c783e
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/teavm/java/com/mojang/minecraft/Minecraft.java
View File

@ -233,6 +233,13 @@ public final class Minecraft implements Runnable {
this.tick(); this.tick();
} }
if(!hasMouse & GL11.isPointerLocked2() && this.currentScreen == null) {
hasMouse = true;
} else if(!GL11.isPointerLocked2()) {
hasMouse = false;
this.ungrabMouse();
}
checkGLError("Pre render"); checkGLError("Pre render");
GL11.glEnable(3553); GL11.glEnable(3553);
if(!this.online) { if(!this.online) {
@ -249,14 +256,8 @@ public final class Minecraft implements Runnable {
int var86; int var86;
int var81; int var81;
if(var66.minecraft.hasMouse) { if(var66.minecraft.hasMouse) {
var81 = 0;
var86 = 0;
if(var66.minecraft.levelLoaded) {
GL11.mouseSetCursorPosition(var66.minecraft.width / 2, var66.minecraft.height / 2);
} else {
var81 = GL11.mouseGetDX(); var81 = GL11.mouseGetDX();
var86 = GL11.mouseGetDY(); var86 = GL11.mouseGetDY();
}
byte var91 = 1; byte var91 = 1;
if(var66.minecraft.settings.invertMouse) { if(var66.minecraft.settings.invertMouse) {
@ -865,19 +866,30 @@ public final class Minecraft implements Runnable {
} }
public final void grabMouse() { public final void grabMouse() {
if(GL11.isFocused()) { if(!GL11.isFocused()) {
return; return;
} }
if (GL11.isPointerLocked2()) { if (GL11.isPointerLocked2()) {
return; return;
} else { } else {
GL11.mouseSetGrabbed(true); GL11.mouseSetGrabbed(true);
this.setCurrentScreen((GuiScreen)null); //this.setCurrentScreen((GuiScreen)null);
this.lastClick = this.ticks + 10000; this.lastClick = this.ticks + 10000;
return; return;
} }
} }
public final void ungrabMouse() {
if (GL11.isPointerLocked2()) {
GL11.mouseSetGrabbed(false);
} else {
GL11.mouseSetGrabbed(false);
//this.setCurrentScreen((GuiScreen)null);
//this.lastClick = this.ticks + 10000;
return;
}
}
public final void pause() { public final void pause() {
if(this.currentScreen == null) { if(this.currentScreen == null) {
this.setCurrentScreen(new PauseScreen()); this.setCurrentScreen(new PauseScreen());