feat: 添加 SDL3 以支持启动 26.3 snapshot 4+ & 支持 Controlify 模组

LWJGL/3.3.3/build.gradle.kts

@@ -1,7 +1,24 @@
+import java.security.MessageDigest
+
 plugins {
     java
 }
 
+fun writeVersion(file: File, inputs: List<File>) {
+    val digest = MessageDigest.getInstance("SHA-1")
+    inputs.forEach { input ->
+        input.inputStream().use { stream ->
+            val buffer = ByteArray(8192)
+            while (true) {
+                val count = stream.read(buffer)
+                if (count < 0) break
+                digest.update(buffer, 0, count)
+            }
+        }
+    }
+    file.writeText(digest.digest().joinToString("") { "%02x".format(it) })
+}
+
 val lwjglVersion = "3.3.3"
 group = "org.lwjgl.glfw"
 
@@ -83,8 +100,10 @@ tasks.jar {
             from(excludedModulesFileList)
             into(archiveFile.get().asFile.parentFile)
         }
-        versionFile.writeText(System.currentTimeMillis().toString())
+        writeVersion(versionFile, listOf(archiveFile.get().asFile) + excludedModulesFileList)
     }
+    outputs.file(versionFile)
+    outputs.files(excludedModules.map { path -> File(destinationDirectory.get().asFile, path) })
     exclude("net/java/openjdk/cacio/ctc/**")
 }
 

LWJGL/3.4.1/build.gradle.kts

@@ -1,7 +1,24 @@
+import java.security.MessageDigest
+
 plugins {
     java
 }
 
+fun writeVersion(file: File, inputs: List<File>) {
+    val digest = MessageDigest.getInstance("SHA-1")
+    inputs.forEach { input ->
+        input.inputStream().use { stream ->
+            val buffer = ByteArray(8192)
+            while (true) {
+                val count = stream.read(buffer)
+                if (count < 0) break
+                digest.update(buffer, 0, count)
+            }
+        }
+    }
+    file.writeText(digest.digest().joinToString("") { "%02x".format(it) })
+}
+
 val lwjglVersion = "3.4.1"
 group = "org.lwjgl.glfw"
 
@@ -81,7 +98,7 @@ tasks.jar {
             from(excludedModulesFileList)
             into(archiveFile.get().asFile.parentFile)
         }
-        versionFile.writeText(System.currentTimeMillis().toString())
+        writeVersion(versionFile, listOf(archiveFile.get().asFile) + excludedModulesFileList)
     }
     // Adds the jank to outputs
     outputs.file(versionFile)

LWJGL/3.4.1/src/main/java/org/lwjgl/glfw/CallbackBridge.java

@@ -1,4 +1,5 @@
 package org.lwjgl.glfw;
+import java.nio.ByteBuffer;
 import java.util.*;
 
 public class CallbackBridge {
@@ -17,8 +18,13 @@ public class CallbackBridge {
 
     public static final int ANDROID_TYPE_GRAB_STATE = 0;
 
+    public static final int SDL = 0;
+    public static final int INIT = 0;
+
     public static final boolean INPUT_DEBUG_ENABLED;
 
+    public static boolean sGamepadDirectEnabled;
+
     // TODO send grab state event to Android
 
     static {
@@ -40,12 +46,21 @@ public class CallbackBridge {
     }
 
 
+    public static void enableGamepadDirectInput() {
+        if (sGamepadDirectEnabled) return;
+        sGamepadDirectEnabled = nativeEnableGamepadDirectInput();
+    }
+
     public static void sendData(int type, String data) {
         nativeSendData(false, type, data);
     }
     public static native void nativeSendData(boolean isAndroid, int type, String data);
     public static native boolean nativeSetInputReady(boolean ready);
     public static native String nativeClipboard(int action, byte[] copy);
     public static native void nativeSetGrabbing(boolean grab);
+    public static native boolean nativeNotifyLauncher(int type, int... action);
+    public static native boolean nativeEnableGamepadDirectInput();
+    public static native ByteBuffer nativeCreateGamepadButtonBuffer();
+    public static native ByteBuffer nativeCreateGamepadAxisBuffer();
 }
 

LWJGL/3.4.1/src/main/java/org/lwjgl/glfw/GLFW.java

@@ -29,6 +29,9 @@ public class GLFW
 {
     static FloatBuffer joystickData = (FloatBuffer)FloatBuffer.allocate(8).flip();
     static ByteBuffer buttonData = (ByteBuffer)ByteBuffer.allocate(8).flip();
+    private static long gamepadDataPointer;
+    private static ByteBuffer gamepadButtonData;
+    private static FloatBuffer gamepadAxisData;
     /** The major version number of the GLFW library. This is incremented when the API is changed in non-compatible ways. */
     public static final int GLFW_VERSION_MAJOR = 3;
 
@@ -556,7 +559,7 @@ public class GLFW
     public static boolean mGLFWIsInputReady;
     private static boolean mGLFWInputPumping;
     private static boolean mGLFWWindowVisibleOnCreation = true;
-    public static final ByteBuffer keyDownBuffer = ByteBuffer.allocateDirect(317);
+    public static final ByteBuffer keyDownBuffer = ByteBuffer.allocateDirect(318);
     public static final ByteBuffer mouseDownBuffer = ByteBuffer.allocateDirect(8);
 
     public static long mainContext = 0;
@@ -929,8 +932,10 @@ public static void glfwGetWindowFrameSize(@NativeType("GLFWwindow *") long windo
     }
 
     public static void glfwGetWindowContentScale(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("float *") FloatBuffer xscale, @Nullable @NativeType("float *") FloatBuffer yscale) {
-        if (xscale != null) xscale.put(1f);
-        if (yscale != null) yscale.put(1f);
+        if (xscale != null && yscale != null) {
+            xscale.put(1f);
+            yscale.put(1f);
+        }
     }
 
     @Nullable
@@ -1385,13 +1390,16 @@ public static int glfwGetKeyScancode(int key) {
     }
 
     public static int glfwGetKey(@NativeType("GLFWwindow *") long window, int key) {
-        // This is jank, anything asking for int 348 results in an IndexOutOfBounds because idk.
-        // Probably an off-by-one error. This is the 'fix'
-        if (key == GLFW_KEY_LAST){return GLFW_KEY_LAST;}
-        return keyDownBuffer.get(Math.max(0, key-31));
+        if (key < 31 || key > GLFW_KEY_LAST) {
+            return 0;
+        }
+        return keyDownBuffer.get(key - 31);
     }
 
     public static int glfwGetMouseButton(@NativeType("GLFWwindow *") long window, int button) {
+        if (button < 0 || button >= mouseDownBuffer.capacity()) {
+            return 0;
+        }
         return mouseDownBuffer.get(button);
     }
     public static void glfwGetCursorPos(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("double *") DoubleBuffer xpos, @Nullable @NativeType("double *") DoubleBuffer ypos) {
@@ -1444,51 +1452,60 @@ public static String glfwGetClipboardString(@NativeType("GLFWwindow *") long win
     public static void glfwRequestWindowAttention(@NativeType("GLFWwindow *") long window) {
     }
 
+    private static native long internalGetGamepadDataPointer();
+
+    private static void ensureGamepadBuffers() {
+        if (gamepadDataPointer == 0L) {
+            gamepadDataPointer = internalGetGamepadDataPointer();
+            gamepadButtonData = CallbackBridge.nativeCreateGamepadButtonBuffer();
+            gamepadAxisData = CallbackBridge.nativeCreateGamepadAxisBuffer().order(ByteOrder.LITTLE_ENDIAN).asFloatBuffer();
+            CallbackBridge.enableGamepadDirectInput();
+        }
+    }
+
     public static boolean glfwJoystickPresent(int jid) {
-        if(jid == 0) {
-            return true;
-        }else return false;
+        return jid == 0;
     }
     public static String glfwGetJoystickName(int jid) {
-        if(jid == 0) {
-            return "AIC event bus controller";
-        }else return null;
+        return jid == 0 ? "Pojav XBOX 360 compatible gamepad" : null;
     }
     public static FloatBuffer glfwGetJoystickAxes(int jid) {
-        if(jid == 0) {
-            return joystickData;
-        }else return null;
+        if (jid != 0) return null;
+        ensureGamepadBuffers();
+        return gamepadAxisData;
     }
     public static ByteBuffer glfwGetJoystickButtons(int jid) {
-        if(jid == 0) {
-            return buttonData;
-        }else return null;
+        if (jid != 0) return null;
+        ensureGamepadBuffers();
+        return gamepadButtonData;
     }
     public static ByteBuffer glfwGetjoystickHats(int jid) {
         return null;
     }
     public static boolean glfwJoystickIsGamepad(int jid) {
-        if(jid == 0) return true;
-        else return false;
+        if (jid != 0) return false;
+        ensureGamepadBuffers();
+        return true;
     }
     public static String glfwGetJoystickGUID(int jid) {
-        if(jid == 0) return "aio0";
-        else return null;
+        return jid == 0 ? "030000005e0400008e02000056210000" : null;
     }
     public static long glfwGetJoystickUserPointer(int jid) {
         return 0;
     }
     public static void glfwSetJoystickUserPointer(int jid, long pointer) {
-
     }
     public static boolean glfwUpdateGamepadMappings(ByteBuffer string) {
         return false;
     }
     public static String glfwGetGamepadName(int jid) {
-        return null;
+        return jid == 0 ? "Pojav XBOX 360 compatible gamepad" : null;
     }
     public static boolean glfwGetGamepadState(int jid, GLFWGamepadState state) {
-        return false;
+        if (jid != 0 || state == null) return false;
+        ensureGamepadBuffers();
+        memCopy(gamepadDataPointer, state.address(), state.sizeof());
+        return true;
     }
 
     /** Array version of: {@link #glfwGetVersion GetVersion} */