Update to LWJGL SNAPSHOT-3.3.4 Build 6, support all the architectures

Author: KitsuneAlex

build.gradle.kts

@@ -45,10 +45,7 @@ val license: String = buildConfig["license"] as String
 val mcVersion: String = libs.versions.minecraft.get()
 val buildNumber: Int = System.getenv("CI_PIPELINE_IID")?.toIntOrNull() ?: 0
 val buildTime: Instant = Instant.now()
-
-val yogaPlatforms: List<String> = (buildConfig["yoga_platforms"] as String).split(',')
-val freeTypePlatforms: List<String> = (buildConfig["freetype_platforms"] as String).split(',')
-val msdfgenPlatforms: List<String> = (buildConfig["msdfgen_platforms"] as String).split(',')
+val platforms: List<String> = (buildConfig["platforms"] as String).split(',')
 
 version = "${libs.versions.pda.get()}.$buildNumber"
 group = buildConfig["group"] as String
@@ -116,6 +113,15 @@ repositories {
     maven("https://git.karmakrafts.dev/api/v4/projects/267/packages/maven")
 }
 
+fun DependencyHandlerScope.localLwjglModule(name: String) {
+    libraryConfig(files(projectPath / "libs" / "lwjgl-$name.jar"))
+    compileOnly(files(projectPath / "libs" / "lwjgl-$name-javadoc.jar"))
+    compileOnly(files(projectPath / "libs" / "lwjgl-$name-sources.jar"))
+    platforms.forEach { platform ->
+        libraryConfig(files(projectPath / "libs" / "lwjgl-$name-natives-$platform.jar"))
+    }
+}
+
 dependencies {
     minecraft(libs.minecraftForge)
     implementation(libs.kotlinForForge)
@@ -127,32 +133,9 @@ dependencies {
     coreLibraryConfig(libs.materialColorUtils)
     coreLibraryConfig(libs.lz4j)
 
-    libraryConfig(libs.lwjglYoga)
-    yogaPlatforms.forEach { platform ->
-        libs.lwjglYoga.get().apply {
-            libraryConfig(module.group, module.name, version, classifier = "natives-$platform") {
-                isTransitive = false
-            }
-        }
-    }
-
-    libraryConfig(files(projectPath / "libs" / "lwjgl-freetype-3.3.4-SNAPSHOT.jar"))
-    compileOnly(files(projectPath / "libs" / "lwjgl-freetype-3.3.4-SNAPSHOT-javadoc.jar"))
-    compileOnly(files(projectPath / "libs" / "lwjgl-freetype-3.3.4-SNAPSHOT-sources.jar"))
-    freeTypePlatforms.forEach { platform ->
-        libs.lwjglFreeType.get().apply {
-            libraryConfig(module.group, module.name, version, classifier = "natives-$platform") {
-                isTransitive = false
-            }
-        }
-    }
-
-    libraryConfig(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT.jar"))
-    compileOnly(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT-javadoc.jar"))
-    compileOnly(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT-sources.jar"))
-    msdfgenPlatforms.forEach { platform ->
-        libraryConfig(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT-natives-$platform.jar"))
-    }
+    localLwjglModule("freetype")
+    localLwjglModule("msdfgen")
+    localLwjglModule("yoga")
 
     compileOnly(apiSourceSet.output)
 
@@ -307,6 +290,13 @@ fun DependencyFilter.includeCoreLibs() {
     include(dependency(libs.lz4j.toShadowInclude()))
 }
 
+fun DependencyFilter.includeLocalLwjglModule(name: String) {
+    include(dependency(files(projectPath / "libs" / "lwjgl-$name.jar")))
+    platforms.forEach { platform ->
+        include(dependency(files(projectPath / "libs" / "lwjgl-$name-natives-$platform.jar")))
+    }
+}
+
 val shadowJarTask = tasks.getByName<ShadowJar>("shadowJar") {
     from(
         mainSourceSet.output,
@@ -320,13 +310,9 @@ val shadowJarTask = tasks.getByName<ShadowJar>("shadowJar") {
     finalizedBy("reobfShadowJar") // Lazy forward dependency
     dependencies {
         includeCoreLibs()
-        include(dependency(libs.lwjglYoga.toShadowInclude()))
-        include(dependency(libs.lwjglFreeType.toShadowInclude()))
-        include(dependency(files(projectPath / "libs" / "lwjgl-freetype-3.3.4-SNAPSHOT.jar")))
-        include(dependency(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT.jar")))
-        msdfgenPlatforms.forEach { platform ->
-            include(dependency(files(projectPath / "libs" / "lwjgl-msdfgen-3.3.4-SNAPSHOT-natives-$platform.jar")))
-        }
+        includeLocalLwjglModule("freetype")
+        includeLocalLwjglModule("msdfgen")
+        includeLocalLwjglModule("yoga")
     }
 }
 val reobfShadowJarTask = reobf.create("shadowJar")

build.properties

@@ -7,6 +7,4 @@ mod_name=PDA
 group=io.karma.pda
 mappings_channel=parchment
 license=All Rights Reserved
-yoga_platforms=linux,linux-arm64,macos,macos-arm64,windows,windows-arm64
-freetype_platforms=linux,linux-arm64,macos,macos-arm64,windows,windows-arm64
-msdfgen_platforms=linux,macos,macos-arm64,windows
+platforms=linux,linux-arm32,linux-arm64,linux-ppc64le,linux-riscv64,macos,macos-arm64,windows,windows-arm64,windows-x86,freebsd

gradle/libs.versions.toml

@@ -16,7 +16,6 @@ jackson = "2.17.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.co
 materialColorUtils = "1.1.0.8" # https://git.karmakrafts.dev/kk/material-color-utils/-/packages/
 lz4j = "1.8.0" # https://mvnrepository.com/artifact/org.lz4/lz4-java
 kotlinForForge = "4.10.0" # https://thedarkcolour.github.io/KotlinForForge/thedarkcolour/kotlinforforge/web.html
-lwjgl = "3.3.3" # https://mvnrepository.com/artifact/org.lwjgl/lwjgl
 junit = "5.10.3" # https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
 
 [libraries]
@@ -26,8 +25,6 @@ jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core", version.ref
 jacksonAnnotationns = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 kotlinForForge = { module = "thedarkcolour:kotlinforforge", version.ref = "kotlinForForge" }
-lwjglYoga = { module = "org.lwjgl:lwjgl-yoga", version.ref = "lwjgl" }
-lwjglFreeType = { module = "org.lwjgl:lwjgl-freetype", version.ref = "lwjgl" }
 materialColorUtils = { module = "io.karma.material:material-color-utils", version.ref = "materialColorUtils" }
 lz4j = { module = "org.lz4:lz4-java", version.ref = "lz4j" }
 junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }

libs/lwjgl-freetype-3.3.4-SNAPSHOT-javadoc.jar renamed to libs/lwjgl-freetype-javadoc.jar

@@ -150,7 +150,7 @@ private void buildAndMeasureShapes(final MSDFFont fontResource, final StitchCont
                     context.shapes.put(c, MemoryUtil.NULL);
                     continue;
                 }
-                final var boundsBuffer = MSDFGenBounds.malloc(1, stack);
+                final var boundsBuffer = MSDFGenBounds.malloc(stack);
                 MSDFUtils.throwIfError(MSDFGen.msdf_shape_get_bounds(shape, boundsBuffer));
                 final var width = boundsBuffer.r() - boundsBuffer.l();
                 if (context.maxWidth < width) {
@@ -186,7 +186,7 @@ private void renderShapes(final MSDFFont fontResource, final StitchContext conte
                 final var totalSpriteBorder = spriteBorder << 1;
                 final var actualSpriteSize = spriteSize - totalSpriteBorder;
 
-                final var boundsBuffer = MSDFGenBounds.malloc(1, stack);
+                final var boundsBuffer = MSDFGenBounds.malloc(stack);
                 MSDFUtils.throwIfError(MSDFGen.msdf_shape_get_bounds(shape, boundsBuffer));
                 final var bbWidth = boundsBuffer.r() - boundsBuffer.l();
                 final var bbHeight = boundsBuffer.t() - boundsBuffer.b();

libs/lwjgl-freetype-natives-freebsd.jar

@@ -21,6 +21,7 @@
 import org.lwjgl.util.freetype.FT_GlyphSlot;
 import org.lwjgl.util.freetype.FreeType;
 import org.lwjgl.util.msdfgen.MSDFGen;
+import org.lwjgl.util.msdfgen.MSDFGenExt;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +51,7 @@ public final class MSDFFont implements AutoCloseable {
         LibFFI.ffi_type_pointer);
 
     static {
-        MSDFUtils.throwIfError(MSDFGen.msdf_ft_set_load_callback(nameAddress -> FreeType.getLibrary().getFunctionAddress(
+        MSDFUtils.throwIfError(MSDFGenExt.msdf_ft_set_load_callback(nameAddress -> FreeType.getLibrary().getFunctionAddress(
             MemoryUtil.memASCII(nameAddress))));
     }
 
@@ -112,8 +113,7 @@ public MSDFFont(final InputStream stream) throws IOException {
 
             // Setup msdfgen to use LWJGL FreeType bindings
             final var fontAddressBuffer = stack.mallocPointer(1);
-            MSDFUtils.throwIfError(MSDFGen.msdf_ft_adopt_font(MemoryUtil.memByteBuffer(face.address(), face.sizeof()),
-                fontAddressBuffer));
+            MSDFUtils.throwIfError(MSDFGenExt.msdf_ft_adopt_font(face.address(), fontAddressBuffer));
             font = Checks.check(fontAddressBuffer.get());
         }
     }
@@ -130,7 +130,10 @@ public long createGlyphShape(final int c) {
         try (final var stack = MemoryStack.stackPush()) {
             final var addressBuffer = stack.mallocPointer(1);
             // Convert raw Java character to unicode codepoint to properly support surrogate pairs
-            MSDFUtils.throwIfError(MSDFGen.msdf_ft_font_load_glyph(font, c, addressBuffer));
+            MSDFUtils.throwIfError(MSDFGenExt.msdf_ft_font_load_glyph(font,
+                c,
+                MSDFGenExt.MSDF_FONT_SCALING_NONE,
+                addressBuffer));
             final var shape = Checks.check(addressBuffer.get());
             MSDFUtils.throwIfError(MSDFGen.msdf_shape_normalize(shape));
             MSDFUtils.rewindShapeIfNeeded(shape);
@@ -187,7 +190,7 @@ public FT_Face getFace() {
     @Override
     public void close() throws Exception {
         stream.close();
-        MSDFGen.msdf_ft_font_destroy(font);
+        MSDFGenExt.msdf_ft_font_destroy(font);
         PDAMod.LOGGER.debug("Freed font instance at 0x{}", Long.toHexString(font));
         FreeType.FT_Done_Face(face);
         PDAMod.LOGGER.debug("Freed font face instance at 0x{}", Long.toHexString(face.address()));

libs/lwjgl-freetype-natives-linux-arm32.jar

@@ -26,13 +26,13 @@ private MSDFUtils() {}
 
     public static void rewindShapeIfNeeded(final long shape) {
         try (final var stack = MemoryStack.stackPush()) {
-            final var bounds = MSDFGenBounds.malloc(1, stack);
+            final var bounds = MSDFGenBounds.malloc(stack);
             MSDFUtils.throwIfError(MSDFGen.msdf_shape_get_bounds(shape, bounds));
             final var outerPoint = new Vector2d(bounds.l() - (bounds.r() - bounds.l()) - 1,
                 bounds.b() - (bounds.t() - bounds.b()) - 1);
             final var distanceBuffer = stack.mallocDouble(1);
             MSDFUtils.throwIfError(MSDFGen.msdf_shape_one_shot_distance(shape,
-                MSDFGenVector2.malloc(1, stack).x(outerPoint.x).y(outerPoint.y),
+                MSDFGenVector2.malloc(stack).x(outerPoint.x).y(outerPoint.y),
                 distanceBuffer));
             if (distanceBuffer.get() > 0.0) {
                 PDAMod.LOGGER.debug("Shape wound incorrectly, correcting winding order");
@@ -81,7 +81,7 @@ public static void scaleShape(final long shape, final double scale) {
                             final var pointCount = pointCountBuffer.get();
                             for (long k = 0; k < pointCount; k++) {
                                 try (final var pointStack = MemoryStack.stackPush()) {
-                                    final var pos = MSDFGenVector2.malloc(1, pointStack);
+                                    final var pos = MSDFGenVector2.malloc(pointStack);
                                     throwIfError(MSDFGen.msdf_segment_get_point(segment, k, pos));
                                     pos.x(pos.x() * scale);
                                     pos.y(pos.y() * scale);
@@ -114,7 +114,7 @@ public static void throwIfError(final int result) {
         }
     }
 
-    public static void blitBitmapToImage(final MSDFGenBitmap.Buffer bitmap, final BufferedImage image, final int dstX,
+    public static void blitBitmapToImage(final MSDFGenBitmap bitmap, final BufferedImage image, final int dstX,
                                          final int dstY) {
         if (image.getType() != BufferedImage.TYPE_INT_ARGB) {
             throw new IllegalArgumentException("Invalid target image format");
@@ -157,9 +157,9 @@ public static void renderShapeToImage(final int type, final int width, final int
                                           final double yOffset, final double range, final BufferedImage dst,
                                           final int dstX, final int dstY) {
         try (final var stack = MemoryStack.stackPush()) {
-            final var bitmap = MSDFGenBitmap.malloc(1, stack);
+            final var bitmap = MSDFGenBitmap.malloc(stack);
             throwIfError(MSDFGen.msdf_bitmap_alloc(type, width, height, bitmap));
-            final var transform = MSDFGenTransform.malloc(1, stack);
+            final var transform = MSDFGenTransform.malloc(stack);
             transform.scale().set(xScale, yScale);
             transform.translation().set(xOffset, yOffset);
             transform.distance_mapping().set(-0.5 * range, 0.5 * range);