Build: Port to 1.21.7 Forge+NeoForge

README.md

@@ -74,6 +74,8 @@ done
             <img alt="standalone" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-standalone/maven-metadata.xml">
           </td>
         </tr>
+        <tr><td>1.21.7</td><td>neoforge</td><td><img alt="1.21.7-neoforge" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-1.21.7-neoforge/maven-metadata.xml"></td></tr>
+        <tr><td>1.21.7</td><td>forge</td><td><img alt="1.21.7-forge" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-1.21.7-forge/maven-metadata.xml"></td></tr>
         <tr><td>1.21.7</td><td>fabric</td><td><img alt="1.21.7-fabric" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-1.21.7-fabric/maven-metadata.xml"></td></tr>
         <tr><td>1.21.6</td><td>fabric</td><td><img alt="1.21.6-fabric" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-1.21.6-fabric/maven-metadata.xml"></td></tr>
         <tr><td>1.21.5</td><td>neoforge</td><td><img alt="1.21.5-neoforge" src="https://img.shields.io/badge/dynamic/xml?color=A97BFF&label=%20&query=/metadata/versioning/versions/version[not(contains(text(),'%2B'))][last()]&url=https://repo.essential.gg/repository/maven-releases/gg/essential/universalcraft-1.21.5-neoforge/maven-metadata.xml"></td></tr>

root.gradle.kts

@@ -12,6 +12,8 @@ version = versionFromBuildIdAndBranch()
 preprocess {
     strictExtraMappings.set(true)
 
+    val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
+    val forge12107 = createNode("1.21.7-forge", 12107, "srg")
     val fabric12107 = createNode("1.21.7-fabric", 12107, "srg")
     val fabric12106 = createNode("1.21.6-fabric", 12106, "srg")
     val neoForge12105 = createNode("1.21.5-neoforge", 12105, "srg")
@@ -54,6 +56,8 @@ preprocess {
     val forge11202 = createNode("1.12.2-forge", 11202, "srg")
     val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+    neoForge12107.link(fabric12107)
+    forge12107.link(fabric12107)
     fabric12107.link(fabric12106)
     fabric12106.link(fabric12105)
     neoForge12105.link(fabric12105)

settings.gradle.kts

@@ -8,7 +8,7 @@ pluginManagement {
         maven("https://repo.essential.gg/repository/maven-public")
     }
     plugins {
-        val egtVersion = "0.6.7"
+        val egtVersion = "0.6.8"
         id("gg.essential.multi-version.root") version egtVersion
         id("gg.essential.multi-version.api-validation") version egtVersion
     }
@@ -62,6 +62,8 @@ listOf(
     "1.21.5-neoforge",
     "1.21.6-fabric",
     "1.21.7-fabric",
+    "1.21.7-forge",
+    "1.21.7-neoforge",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

src/main/java/gg/essential/universal/UGraphics.java

@@ -698,7 +698,7 @@ public static void drawString(UMatrixStack stack, String text, float x, float y,
     //$$
     //$$     @Override
     //$$     public void drawGlyph(BakedGlyph.DrawnGlyph drawnGlyph) {
-    //$$         BakedGlyph bakedGlyph = drawnGlyph.comp_3316();
+    //$$         BakedGlyph bakedGlyph = drawnGlyph.glyph();
     //$$         if (bakedGlyph.getTexture() == null) return;
     //$$         setupBuffer(bakedGlyph);
     //$$         bakedGlyph.draw(drawnGlyph, matrix, bufferBuilder, LIGHT, false);

src/main/kotlin/gg/essential/universal/render/URenderPipeline.kt

@@ -86,7 +86,7 @@ class URenderPipeline private constructor(
     //$$     renderPass.setPipeline(mcRenderPipeline)
     //$$
         //#if MC>=12106
-        //$$ renderPass.drawIndexed(0, 0, builtBuffer.drawParameters.comp_751(), 1)
+        //$$ renderPass.drawIndexed(0, 0, builtBuffer.drawParameters.indexCount, 1)
         //#else
         //$$ renderPass.drawIndexed(0, builtBuffer.drawParameters.indexCount())
         //#endif