Fix mixin conflict with Sodium 0.5 (Fixes #31)

zbx1425 · Apr 29, 2024 · 4dbbf87 · 4dbbf87
1 parent d062f9f
commit 4dbbf87
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/mixin/GLFWMixin.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/mixin/GLFWMixin.java
@@ -0,0 +1,23 @@
+package cn.zbx1425.mtrsteamloco.mixin;
+
+import cn.zbx1425.sowcer.ContextCapability;
+import com.mojang.blaze3d.platform.Window;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(GLFW.class)
+public class GLFWMixin {
+
+    // Promote to a higher OpenGL version, as glVertexAttribDivisor is only available in OpenGL 3.3+
+
+    @Inject(method = "glfwCreateWindow(IILjava/lang/CharSequence;JJ)J", at = @At("HEAD"), cancellable = true, remap = false)
+    private static void glfwCreateWindow(int width, int height, CharSequence title, long monitor, long share, CallbackInfoReturnable<Long> cir) {
+        cir.setReturnValue(ContextCapability.createWindow(width, height, title, monitor, share));
+    }
+
+}
diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/mixin/WindowMixin.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/mixin/WindowMixin.java
diff --git a/common/src/main/java/cn/zbx1425/sowcer/ContextCapability.java b/common/src/main/java/cn/zbx1425/sowcer/ContextCapability.java
@@ -4,6 +4,7 @@
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWErrorCallback;
 import org.lwjgl.opengl.GL33;
+import org.lwjgl.system.MemoryStack;
 
 import java.util.Locale;
 
@@ -21,7 +22,16 @@ public static long createWindow(int width, int height, CharSequence title, long
         for (int versionToTry : new int[] {46, 45, 44, 43, 42, 41, 40, 33, 32}) {
             GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MAJOR, versionToTry / 10);
             GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MINOR, versionToTry % 10);
-            window = GLFW.glfwCreateWindow(width, height, title, monitor, share);
+
+            MemoryStack stack = MemoryStack.stackGet(); int stackPointer = stack.getPointer();
+            try {
+                stack.nUTF8(title, true);
+                long titleEncoded = stack.getPointerAddress();
+                window = GLFW.nglfwCreateWindow(width, height, titleEncoded, monitor, share);
+            } finally {
+                stack.setPointer(stackPointer);
+            }
+
             if (window != 0) {
                 contextVersion = versionToTry;
                 break;

diff --git a/common/src/main/resources/mtrsteamloco.mixins.json b/common/src/main/resources/mtrsteamloco.mixins.json
@@ -25,7 +25,7 @@
     "TrainClientAccessor",
     "TrainClientMixin",
     "TrainClientRegistryMixin",
-    "WindowMixin"
+    "GLFWMixin"
   ],
   "injectors": {
     "defaultRequire": 1