From 246eb45d908b129861ab74284516c5a8b4d46084 Mon Sep 17 00:00:00 2001 From: GiantLuigi4 <49770992+GiantLuigi4@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:23:45 -0400 Subject: [PATCH] prevent mouse from changing outside of the browser --- build.gradle | 2 +- gradle.properties | 2 +- .../net/montoyo/wd/client/gui/GuiMinePad.java | 24 ++++++++++++++++++- src/main/resources/META-INF/mods.toml | 4 ++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2c1f059..9fffd1a 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ dependencies { minecraft 'net.minecraftforge:forge:1.19.2-43.2.10' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' - implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:0b89f5faab") + implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:b874b3aa35") // implementation fg.deobf("curse.maven:cloth_config_forge-348521:3972423") implementation fg.deobf("curse.maven:SU-370704:4485052") implementation fg.deobf("curse.maven:spark-361579:4381167") diff --git a/gradle.properties b/gradle.properties index 84fff80..c6004e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.19.2+build.28 loader_version=0.14.14 # Mod Properties -mod_version = 1.0.0 +mod_version = 1.3.2 maven_group = net.montoyo.wd archives_base_name = webdisplays diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java b/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java index 9d68f4f..a8be35a 100644 --- a/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java +++ b/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java @@ -13,6 +13,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.montoyo.wd.WebDisplays; import net.montoyo.wd.client.ClientProxy; import net.montoyo.wd.utilities.BlockSide; +import org.cef.browser.CefBrowserOsr; import org.lwjgl.glfw.GLFW; import java.util.Optional; @@ -35,6 +36,10 @@ public class GuiMinePad extends WDScreen { public GuiMinePad(ClientProxy.PadData pad) { this(); this.pad = pad; + + if (pad.view instanceof CefBrowserOsr osr) { + osr.allowCursorChanges(true); + } } @Override @@ -212,5 +217,22 @@ public class GuiMinePad extends WDScreen { public boolean isForBlock(BlockPos bp, BlockSide side) { return false; } - + + @Override + public void removed() { + super.removed(); + if (pad.view instanceof CefBrowserOsr osr) { + osr.allowCursorChanges(true); + osr.onCursorChange(null, 0); + } + } + + @Override + public void onClose() { + super.onClose(); + if (pad.view instanceof CefBrowserOsr osr) { + osr.allowCursorChanges(true); + osr.onCursorChange(null, 0); + } + } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index d80f945..cc7f57f 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -10,7 +10,7 @@ issueTrackerURL="" #optional modId="webdisplays" #mandatory -version="1.0.0" #mandatory +version="1.3.2" #mandatory displayName="WebDisplays" #mandatory @@ -42,6 +42,6 @@ side="BOTH" [[dependencies.webdisplays]] modId="forgecef" mandatory=true -versionRange="[1.0.0, )" +versionRange="[1.2.4, )" ordering="NONE" side="BOTH"