From be28e276b8769d072eff4ee7780fe37ca184dd71 Mon Sep 17 00:00:00 2001 From: ghostflyby Date: Sat, 23 Sep 2023 18:17:20 +0800 Subject: [PATCH] Fix macOS cmd + not sending pressed (#79) * Fix macOS cmd + not sending pressed * Cancel Super+key char events on non-mac platforms * Update buildscript and fix wildcard imports --------- Co-authored-by: Raven Szewczyk --- build.gradle | 60 ++++++++++++++++--- .../fml/relauncher/FMLSecurityManager.java | 4 +- .../common/util/EnumHelper.java | 3 +- .../me/eigenraven/lwjgl3ify/BufferCasts.java | 8 ++- .../lwjgl3ify/core/Lwjgl3ifyCoremod.java | 2 +- .../lwjgl3ify/mixins/game/MixinStitcher.java | 5 +- src/main/java/org/lwjglx/BufferChecks.java | 10 +++- src/main/java/org/lwjglx/LWJGLUtil.java | 7 ++- src/main/java/org/lwjglx/MemoryUtil.java | 10 +++- src/main/java/org/lwjglx/PointerBuffer.java | 2 +- .../java/org/lwjglx/opengl/AWTGLCanvas.java | 6 +- src/main/java/org/lwjglx/opengl/Display.java | 16 ++++- 12 files changed, 108 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index b894d64..7ff83a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1692122114 +//version: 1695409603 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output') def projectJavaVersion = JavaLanguageVersion.of(8) boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false +boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false + +final String CHECKSTYLE_CONFIG = """ + + + + + + + + + + + +""" checkPropertyExists("modName") checkPropertyExists("modId") @@ -140,6 +157,17 @@ if (!disableSpotless) { apply from: Blowdryer.file('spotless.gradle') } +if (!disableCheckstyle) { + apply plugin: 'checkstyle' + tasks.named("checkstylePatchedMc") { enabled = false } + tasks.named("checkstyleMcLauncher") { enabled = false } + tasks.named("checkstyleIdeVirtualMain") { enabled = false } + tasks.named("checkstyleInjectedTags") { enabled = false } + checkstyle { + config = resources.text.fromString(CHECKSTYLE_CONFIG) + } +} + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -600,15 +628,10 @@ repositories { } maven { name = "ic2" - url = "https://maven.ic2.player.to/" - metadataSources { - mavenPom() - artifact() + url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/") + content { + includeGroup "net.industrial-craft" } - } - maven { - name = "ic2-mirror" - url = "https://maven2.ic2.player.to/" metadataSources { mavenPom() artifact() @@ -1576,6 +1599,25 @@ def getSecondaryArtifacts() { return secondaryArtifacts } +def getURL(String main, String fallback) { + return pingURL(main, 10000) ? main : fallback +} + +// credit: https://stackoverflow.com/a/3584332 +def pingURL(String url, int timeout) { + url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates. + try { + HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection() + connection.setConnectTimeout(timeout) + connection.setReadTimeout(timeout) + connection.setRequestMethod("HEAD") + int responseCode = connection.getResponseCode() + return 200 <= responseCode && responseCode <= 399 + } catch (IOException ignored) { + return false + } +} + // For easier scripting of things that require variables defined earlier in the buildscript if (file('addon.late.gradle.kts').exists()) { apply from: 'addon.late.gradle.kts' diff --git a/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java index 8bb6a69..7bee51b 100644 --- a/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java +++ b/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java @@ -1,12 +1,12 @@ package cpw.mods.fml.relauncher; -import java.awt.*; +import java.awt.GraphicsEnvironment; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.security.Permission; -import javax.swing.*; +import javax.swing.JOptionPane; /** * A custom security manager stopping certain events from happening unexpectedly. diff --git a/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java b/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java index 2d408ce..1f9c2f5 100644 --- a/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java +++ b/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java @@ -2,7 +2,8 @@ package net.minecraftforge.common.util; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.minecraft.block.BlockPressurePlate.Sensitivity; import net.minecraft.block.material.Material; diff --git a/src/main/java/me/eigenraven/lwjgl3ify/BufferCasts.java b/src/main/java/me/eigenraven/lwjgl3ify/BufferCasts.java index ae53839..f27b0e7 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/BufferCasts.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/BufferCasts.java @@ -1,6 +1,12 @@ package me.eigenraven.lwjgl3ify; -import java.nio.*; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.LongBuffer; +import java.nio.ShortBuffer; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java index 345fd2a..9aefd67 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java @@ -1,6 +1,6 @@ package me.eigenraven.lwjgl3ify.core; -import java.awt.*; +import java.awt.Toolkit; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java index 389c69b..375f641 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java @@ -1,6 +1,9 @@ package me.eigenraven.lwjgl3ify.mixins.game; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; import net.minecraft.client.renderer.texture.Stitcher; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/org/lwjglx/BufferChecks.java b/src/main/java/org/lwjglx/BufferChecks.java index 6e42d51..e07c711 100644 --- a/src/main/java/org/lwjglx/BufferChecks.java +++ b/src/main/java/org/lwjglx/BufferChecks.java @@ -15,7 +15,13 @@ */ package org.lwjglx; -import java.nio.*; +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.LongBuffer; +import java.nio.ShortBuffer; /** *

@@ -24,7 +30,7 @@ import java.nio.*; * * Internal class, don't use. *

- * + * * @author cix_foo * @author elias_naur * @version $Revision$ $Id$ diff --git a/src/main/java/org/lwjglx/LWJGLUtil.java b/src/main/java/org/lwjglx/LWJGLUtil.java index 64df590..8e3c485 100644 --- a/src/main/java/org/lwjglx/LWJGLUtil.java +++ b/src/main/java/org/lwjglx/LWJGLUtil.java @@ -24,7 +24,12 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import org.lwjgl.system.Platform; diff --git a/src/main/java/org/lwjglx/MemoryUtil.java b/src/main/java/org/lwjglx/MemoryUtil.java index a8635d6..a4ebb3f 100644 --- a/src/main/java/org/lwjglx/MemoryUtil.java +++ b/src/main/java/org/lwjglx/MemoryUtil.java @@ -15,8 +15,14 @@ */ package org.lwjglx; -import java.nio.*; -import java.nio.charset.*; +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.LongBuffer; +import java.nio.ShortBuffer; /** * [INTERNAL USE ONLY] diff --git a/src/main/java/org/lwjglx/PointerBuffer.java b/src/main/java/org/lwjglx/PointerBuffer.java index 7bc8185..1bca362 100644 --- a/src/main/java/org/lwjglx/PointerBuffer.java +++ b/src/main/java/org/lwjglx/PointerBuffer.java @@ -16,7 +16,7 @@ package org.lwjglx; import java.lang.reflect.Field; -import java.nio.*; +import java.nio.ByteBuffer; import javax.annotation.Nullable; diff --git a/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java index fbb78b5..7ab5d23 100644 --- a/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java +++ b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java @@ -15,7 +15,11 @@ */ package org.lwjglx.opengl; -import java.awt.*; +import java.awt.Canvas; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.GraphicsDevice; +import java.awt.Point; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.HierarchyEvent; diff --git a/src/main/java/org/lwjglx/opengl/Display.java b/src/main/java/org/lwjglx/opengl/Display.java index d8190e8..8c2f80f 100644 --- a/src/main/java/org/lwjglx/opengl/Display.java +++ b/src/main/java/org/lwjglx/opengl/Display.java @@ -3,24 +3,28 @@ package org.lwjglx.opengl; import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.system.MemoryUtil.NULL; -import java.awt.*; +import java.awt.Canvas; import java.awt.event.KeyEvent; import java.nio.ByteBuffer; import java.nio.IntBuffer; -import org.lwjgl.glfw.*; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWCharCallback; import org.lwjgl.glfw.GLFWCursorPosCallback; +import org.lwjgl.glfw.GLFWFramebufferSizeCallback; +import org.lwjgl.glfw.GLFWImage; import org.lwjgl.glfw.GLFWKeyCallback; import org.lwjgl.glfw.GLFWMouseButtonCallback; +import org.lwjgl.glfw.GLFWScrollCallback; import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.glfw.GLFWWindowFocusCallback; import org.lwjgl.glfw.GLFWWindowIconifyCallback; import org.lwjgl.glfw.GLFWWindowPosCallback; import org.lwjgl.glfw.GLFWWindowRefreshCallback; +import org.lwjgl.glfw.GLFWWindowSizeCallback; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; +import org.lwjgl.system.Platform; import org.lwjglx.BufferUtils; import org.lwjglx.Sys; import org.lwjglx.input.KeyCodes; @@ -169,7 +173,13 @@ public class Display { cancelNextChar = false; if (key > GLFW_KEY_SPACE && key <= GLFW_KEY_GRAVE_ACCENT) { // Handle keys have a char. Exclude space to // avoid extra input when switching IME - if ((GLFW_MOD_CONTROL & mods) != 0 && (GLFW_MOD_ALT & mods) == 0) { // Handle ctrl + x/c/v. + if ((GLFW_MOD_SUPER & mods) != 0) { + Keyboard.addGlfwKeyEvent(window, key, scancode, action, mods, (char) key); + if (Platform.get() != Platform.MACOSX) { + // MacOS doesn't send a char event for Cmd+KEY presses, but other platforms do. + cancelNextChar = true; + } + } else if ((GLFW_MOD_CONTROL & mods) != 0 && (GLFW_MOD_ALT & mods) == 0) { // Handle ctrl + x/c/v. Keyboard.addGlfwKeyEvent(window, key, scancode, action, mods, (char) (key & 0x1f)); cancelNextChar = true; // Cancel char event from ctrl key since its already handled here } else if (action > 0) { // Delay press and repeat key event to actual char input. There is ALWAYS a