(janky) stonecutter implementation + compile against more mc versions

Author: DeDiamondPro

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build
-        run: ./gradlew build --no-daemon
+        run: ./gradlew chiseledBuild --no-daemon
 
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4

README.md

@@ -89,4 +89,22 @@ MineMarkCore<MyStyle, MyRenderObject> core = MineMarkCore.<MyStyle, MyRenderObje
 
 Then you have to call `core.parse(myStyle, markdown)` to parse the markdown, this will return a `MineMarkElement`.
 This element has a `draw`, `beforeDraw` and `onMouseClick` method that should be called by your rendering
-implementation.
+implementation.
+
+## Building
+
+To build MineMark, you should run the `chiseledBuild` task or build a specific subproject, the root `build` task will
+throw errors!
+
+Example to build everything:
+```shell
+./gradlew chiseledBuild
+```
+Example to build the root project:
+```shell
+./gradlew :build
+```
+Example to build the elementa subproject project:
+```shell
+./gradlew elementa:build
+```

build.gradle.kts

@@ -36,62 +36,81 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-//tasks {
-//    register("chiseledBuild") {
-//        project.subprojects.forEach { subProject ->
-//            if (!subProject.name.contains("minecraft")) {
-//                dependsOn(subProject.tasks.named("build"))
-//            }
-//        }
-//    }
-//}
-
-//allprojects {
-//    apply(plugin = "java-library")
-//    apply(plugin = "maven-publish")
-//
-//    java {
-//        withSourcesJar()
-//        withJavadocJar()
-//    }
-//
-//    repositories {
-//        mavenCentral()
-//    }
-//
-//    publishing {
-//        publications {
-//            var name = project.name.lowercase()
-//            name = if (name != "minemark") "minemark-$name" else "minemark-core"
-//            register<MavenPublication>(name) {
-//                groupId = "dev.dediamondpro"
-//                artifactId = name
-//
-//                from(components["java"])
-//            }
-//        }
-//        repositories {
-//            maven {
-//                name = "diamond"
-//
-//                url = uri("https://maven.dediamondpro.dev/releases")
-//
-//                credentials {
-//                    username = System.getenv("MAVEN_DIAMOND_USER")
-//                    password = System.getenv("MAVEN_DIAMOND_PASSWORD")
-//                }
-//
-//                version = rootProject.version
-//            }
-//        }
-//    }
-//}
-
-//subprojects {
-//    dependencies {
-//        implementation(project.rootProject)
-//    }
-//}
+tasks {
+    register("chiseledBuild") {
+        project.allprojects.forEach { subProject ->
+            if (!subProject.name.contains("minecraft")) {
+                dependsOn(subProject.tasks.named("build"))
+            }
+        }
+    }
+    register("chiseledPublish") {
+        project.allprojects.forEach { subProject ->
+            if (!subProject.name.contains("minecraft")) {
+                dependsOn(subProject.tasks.named("publish"))
+            }
+        }
+    }
+    register("chiseledPublishToMavenLocal") {
+        project.allprojects.forEach { subProject ->
+            if (!subProject.name.contains("minecraft")) {
+                dependsOn(subProject.tasks.named("publishToMavenLocal"))
+            }
+        }
+    }
+}
+
+allprojects {
+    apply(plugin = "java-library")
+    apply(plugin = "maven-publish")
+
+    java {
+        withSourcesJar()
+        withJavadocJar()
+    }
+
+    repositories {
+        mavenCentral()
+    }
+
+    publishing {
+        publications {
+            var name = project.name.lowercase()
+            name = if (project.parent?.name == "minecraft") {
+                "minemark-minecraft-$name"
+            } else if (name != "minemark") {
+                "minemark-$name"
+            } else "minemark-core"
+
+            register<MavenPublication>(name) {
+                groupId = "dev.dediamondpro"
+                artifactId = name
+
+                from(components["java"])
+            }
+        }
+        repositories {
+            maven {
+                name = "diamond"
+
+                url = uri("https://maven.dediamondpro.dev/releases")
+
+                credentials {
+                    username = System.getenv("MAVEN_DIAMOND_USER")
+                    password = System.getenv("MAVEN_DIAMOND_PASSWORD")
+                }
+
+                version = rootProject.version
+            }
+        }
+    }
+}
+
+subprojects {
+    dependencies {
+        implementation(project.rootProject)
+    }
+}
 
 tasks.test {
     useJUnitPlatform()

elementa/build.gradle.kts

@@ -36,5 +36,4 @@ dependencies {
     implementation(libs.elementa)
     implementation(libs.commonmark.ext.striketrough)
     implementation(libs.commonmark.ext.tables)
-    implementation(project.rootProject)
 }

minecraft/build.gradle.kts

@@ -20,7 +20,6 @@ import dev.dediamondpro.buildsource.VersionDefinition
 
 plugins {
     id("dev.architectury.loom") version "1.10-SNAPSHOT"
-    id("dev.kikugie.stonecutter")
 }
 
 buildscript {
@@ -54,19 +53,30 @@ val forgeVersion = VersionDefinition(
     "1.21.4" to "1.21.4-54.1.0",
     "1.21.5" to "1.21.5-55.0.4"
 )
+val neoForgeVersion = VersionDefinition(
+    "1.21.1" to "21.1.95",
+    "1.21.4" to "21.4.124",
+    "1.21.5" to "21.5.34-beta"
+)
+
+repositories {
+    mavenCentral()
+    maven("https://maven.neoforged.net/releases/")
+}
 
 dependencies {
     minecraft("com.mojang:minecraft:${mcPlatform.versionString}")
     mappings(loom.officialMojangMappings())
 
     implementation(libs.commonmark.ext.striketrough)
     implementation(libs.commonmark.ext.tables)
-    implementation(project.rootProject)
 
     if (mcPlatform.isFabric) {
         modImplementation("net.fabricmc:fabric-loader:0.16.10")
     } else if (mcPlatform.isForge) {
         "forge"("net.minecraftforge:forge:${forgeVersion.get(mcPlatform)}")
+    } else if (mcPlatform.isNeoForge) {
+        "neoForge"("net.neoforged:neoforge:${neoForgeVersion.get(mcPlatform)}")
     }
 
     if (buildTestMod) {

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/elements/MarkdownImageElement.java

@@ -39,7 +39,9 @@ public void drawImage(MarkdownDynamicImage image, float x, float y, float width,
 
     @Override
     public void close() {
-        image.close();
+        if (image != null) {
+            image.close();
+        }
         super.close();
     }
 }

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/platform/MarkdownDynamicImage.java

@@ -26,24 +26,32 @@
 import java.io.IOException;
 
 public class MarkdownDynamicImage implements Closeable {
-    private final ResourceLocation identifier;
+    private static long identifierCounter = 0;
 
-    public MarkdownDynamicImage(ResourceLocation identifier) {
-        this.identifier = identifier;
+    private NativeImage image;
+    private ResourceLocation identifier = null;
+
+    public MarkdownDynamicImage(NativeImage image) {
+        this.image = image;
     }
 
     public void draw(int x, int y, int width, int height, MarkdownRenderer renderer) {
+        if (identifier == null) {
+            // Upload here to make sure we are on the correct thread, this can be an issue on 1.21.5 for some reason
+            DynamicTexture texture = new DynamicTexture(/*? if >=1.21.5 {*/ null, /*?}*/ image);
+            //? if <1.21 {
+            /*ResourceLocation identifier = new ResourceLocation("minemark", "dynamic-image-" + (identifierCounter++));
+             *///?} else
+            ResourceLocation identifier = ResourceLocation.fromNamespaceAndPath("minemark", "dynamic-image-" + (identifierCounter++));
+            Minecraft.getInstance().getTextureManager().register(identifier, texture);
+            this.identifier = identifier;
+            image = null;
+        }
         renderer.drawTexture(identifier, x, y, width, height);
     }
 
     @Override
     public void close() {
         Minecraft.getInstance().getTextureManager().release(identifier);
     }
-
-    public static MarkdownDynamicImage of(NativeImage image) throws IOException {
-        DynamicTexture texture = new DynamicTexture(image);
-        ResourceLocation identifier = Minecraft.getInstance().getTextureManager().register("minemark", texture);
-        return new MarkdownDynamicImage(identifier);
-    }
 }

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/platform/MarkdownRenderer.java

@@ -21,6 +21,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderType;
 
 public class MarkdownRenderer {
     private final GuiGraphics context;
@@ -59,7 +60,7 @@ public void drawRect(int x, int y, int width, int height, int color) {
     }
 
     public void drawTexture(ResourceLocation identifier, int x, int y, int width, int height) {
-        context.blit(identifier, x, y, 0, 0, width, height, width, height);
+        context.blit(/*? >=1.21.2 {*/ RenderType::guiTextured, /*?}*/ identifier, x, y, 0, 0, width, height, width, height);
     }
 
     public GuiGraphics getDrawContext() {

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/utils/MinecraftImageProvider.java

@@ -48,7 +48,7 @@ public void getImage(String src, Consumer<Dimension> dimensionCallback, Consumer
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                 ImageIO.write(bufferedImage, "png", out);
                 NativeImage nativeImage = NativeImage.read(new ByteArrayInputStream(out.toByteArray()));
-                imageCallback.accept(MarkdownDynamicImage.of(nativeImage));
+                imageCallback.accept(new MarkdownDynamicImage(nativeImage));
             } catch (IOException e) {
                 e.printStackTrace();
             }

minecraft/stonecutter.gradle.kts

@@ -1,4 +1,19 @@
 plugins {
     id("dev.kikugie.stonecutter")
 }
-stonecutter active "1.20.1-fabric"
+stonecutter active "1.21.5-fabric" /* [SC] DO NOT EDIT */
+
+stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) { 
+    group = "project"
+    ofTask("build")
+}
+
+stonecutter registerChiseled tasks.register("chiseledPublish", stonecutter.chiseled) {
+    group = "project"
+    ofTask("publish")
+}
+
+stonecutter registerChiseled tasks.register("chiseledPublishToMavenLocal", stonecutter.chiseled) {
+    group = "project"
+    ofTask("publishToMavenLocal")
+}