feat: Add MC v26.1 support

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Retrieve JSON
         run: |
           curl -Ls -o "headlessmc.json" "https://api.github.com/repos/3arthqu4ke/headlessmc/releases/tags/2.7.1" --header "Authorization: ${{ secrets.GITHUB_TOKEN }}"
-          curl -Ls -o "mc-runtime-test.json" "https://api.github.com/repos/null2264/mc-runtime-test/releases/tags/5.2.3" --header "Authorization: ${{ secrets.GITHUB_TOKEN }}"
+          curl -Ls -o "mc-runtime-test.json" "https://api.github.com/repos/null2264/mc-runtime-test/releases/tags/5.2.5" --header "Authorization: ${{ secrets.GITHUB_TOKEN }}"
 
       - name: Upload jar files
         uses: actions/upload-artifact@v4
@@ -98,11 +98,12 @@ jobs:
             8
             17
             21
+            25
           gradle-no-cache-if: true
 
       - name: Setup properties
         run: |
-          echo "org.gradle.java.installations.fromEnv=JAVA_HOME,JAVA_HOME_8_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64" >> gradle.properties
+          echo "org.gradle.java.installations.fromEnv=JAVA_HOME,JAVA_HOME_8_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_25_X64" >> gradle.properties
 
       - name: Build with Gradle
         run: |

build.gradle.kts

@@ -4,13 +4,14 @@ import net.fabricmc.loom.LoomGradleExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import dependencies.minecraft as MC
 import org.apache.tools.ant.filters.StripJavaComments
+import org.gradle.api.internal.file.copy.CopySpecInternal
 
 plugins {
     id("java")
-    id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("io.github.null2264.architectury-loom") version "1.13-SNAPSHOT" apply false
+    id("architectury-plugin") version "3.5-SNAPSHOT"
+    id("io.github.null2264.architectury-loom-dyn") apply false
     id("com.gradleup.shadow") apply false
-    id("me.modmuss50.mod-publish-plugin") version "1.1.0"
+    id("me.modmuss50.mod-publish-plugin") version "2.1.1"
 }
 
 val modVersion = System.getenv("VERSION") ?: project.properties["mod_version"] as? String ?: "0.0.0"
@@ -19,21 +20,18 @@ val loaderName = project.properties["null2264.platform"] as? String ?: ""
 val isForge = loaderName.endsWith("forge")
 val isNeo = loaderName.endsWith("neoforge")
 val isFabric = loaderName.endsWith("fabric")
-val _mcVer = project.properties["mcVer"] as? String ?: ""
-val mcVersionStr = if (_mcVer.startsWith("1.")) _mcVer else "2.$_mcVer"
-val (major, minor, patch, hotfix) = mcVersionStr
+val mcVersionStr = project.properties["mcVer"] as? String ?: ""
+val (major, minor, patch) = mcVersionStr
     .split(".")
     .toMutableList()
-    .apply { while (this.size < 4) this.add("") }
-val mcHotfix: Int = hotfix.toIntOrNull() ?: 0
+    .apply { while (this.size < 3) this.add("") }
 val mcVersion: Int = "${major}${minor.padStart(2, '0')}${patch.padStart(2, '0')}".toInt()
 val versionRange = supportedVersionRange(mcVersion, loaderName)
 
 fun setupPreprocessor() {
     val buildProps = buildString {
         append("# DON'T TOUCH THIS FILE, This is handled by the build script\n")
         append("MC=${mcVersion}\n")
-        append("BUILD=${mcHotfix}\n")
         if (isFabric) append("FABRIC=1\n")
         if (isForge) append("FORGE=${if (!isNeo) "1" else "2"}\n")
     }
@@ -43,7 +41,7 @@ fun setupPreprocessor() {
 setupPreprocessor()
 
 architectury {
-    minecraft = MC.versioned(mcVersion, mcHotfix)
+    minecraft = MC.versioned(mcVersion)
 }
 
 allprojects {
@@ -52,7 +50,6 @@ allprojects {
 
     ext["mcVersion"] = mcVersion
     ext["mcVersionStr"] = mcVersionStr
-    ext["mcHotfix"] = mcHotfix
     ext["loaderName"] = loaderName
     ext["isFabric"] = isFabric
     ext["isForge"] = isForge
@@ -132,21 +129,27 @@ subprojects {
     if (isModModule) {
         // NOTE: This must be set before archloom is applied!
         extra.set("loom.platform", loaderName)
-    }
 
-    if (isMcModule) {
         apply(plugin = "architectury-plugin")
-        apply(plugin = "io.github.null2264.architectury-loom")
+
+        if (mcVersion < 260100) {
+            apply(plugin = "io.github.null2264.architectury-loom")
+        } else {
+            apply(plugin = "io.github.null2264.architectury-loom-no-remap")
+        }
+
         val arch = project.extensions["architectury"] as ArchitectPluginExtension
         arch.apply {
             if (isModModule)
                 loader(loaderName)
             else
                 common(listOf(loaderName))
         }
-        val loom = project.extensions["loom"] as LoomGradleExtension
-        loom.apply {
-            silentMojangMappingsLicense()
+        if (mcVersion < 260100) {
+            val loom = project.extensions["loom"] as LoomGradleExtension
+            loom.apply {
+                silentMojangMappingsLicense()
+            }
         }
     }
 
@@ -184,19 +187,21 @@ subprojects {
     }
 
     val loom by lazy {
-        if (!isMcModule) {
-            throw IllegalStateException("Loom only available for MC modules")
+        if (!isModModule) {
+            throw IllegalStateException("Loom only available for submodules that applied Loom")
         }
         project.the<LoomGradleExtensionAPI>()
     }
 
     dependencies {
-        if (isMcModule) {
+        if (isModModule) {
             val minecraft by configurations
-            val mappings by configurations
+            minecraft(MC.versioned(mcVersion))
 
-            minecraft(MC.versioned(mcVersion, mcHotfix))
-            mappings(loom.officialMojangMappings())
+            if (mcVersion < 260100) {
+                val mappings by configurations
+                mappings(loom.officialMojangMappings())
+            }
         }
 
         shade("blue.endless:jankson:${project.properties["jankson_version"]}")
@@ -207,8 +212,8 @@ subprojects {
 
         if (isModModule) {
             compileOnly(project(":stubs"))
-            compileInternal(project(":mclib", configuration = "namedElements")) { isTransitive = false }
-            shadeInternal(project(":mclib", configuration = "transformProduction$loaderProd")) {
+            compileInternal(project(":mclib")) { isTransitive = false }
+            shadeInternal(project(":mclib")) {
                 // Remove Junit test libraries
                 exclude(group = "org.junit.jupiter", module = "junit-jupiter")
                 exclude(group = "org.junit.jupiter", module = "junit-jupiter-engine")
@@ -226,6 +231,21 @@ subprojects {
     }
 
     val shadowJar by tasks.getting(ShadowJar::class) {
+        if (mcVersion >= 260100) {
+            dependsOn(tasks.jar)
+
+            val mainSpecMethod = AbstractCopyTask::class.java.getDeclaredMethod("getMainSpec").apply {
+                isAccessible = true
+            }
+            val actualMainSpec = mainSpecMethod.invoke(this)
+
+            val sourcePathsMethod = actualMainSpec::class.java.getMethod("getSourcePaths")
+            val sourcePaths = sourcePathsMethod.invoke(actualMainSpec) as MutableCollection<*>
+            sourcePaths.clear()
+
+            from(tasks.jar.map { zipTree(it.archiveFile) })
+        }
+
         isZip64 = true
         relocate("blue.endless.jankson", "io.github.null2264.shadowed.jankson")
         if (mcVersion <= 11605) {
@@ -237,14 +257,16 @@ subprojects {
         if (isFabric) {
             exclude("META-INF/mods.toml")
             exclude("META-INF/neoforge.mods.toml")
+            exclude("META-INF/accesstransformer.cfg")
         } else if (isForge) {
             exclude("fabric.mod.json")
             exclude(if (isNeo && mcVersion >= 12006) "META-INF/mods.toml" else "META-INF/neoforge.mods.toml")
+            if (mcVersion < 12105) exclude("META-INF/accesstransformer.cfg")
         }
         exclude("architectury.common.json")
 
         configurations = listOf(shade, shadeInternal)
-        archiveClassifier.set("dev-shade")
+        archiveClassifier.set(if (mcVersion >= 260100) null else "dev-shade")
         mergeServiceFiles()
     }
 
@@ -295,14 +317,29 @@ subprojects {
             project.file("build/resources/main/META-INF/mods.toml")
                 .processModsToml(mcVersion, if (!isForge) 0 else (if (isNeo) 2 else 1))
 
+            if (mcVersion >= 12105) {
+                if (isForge)
+                    project.file("build/resources/main/META-INF/accesstransformer.cfg")
+                        .processAT(mcVersion)
+                else
+                    project.file("build/resources/main/cobblegen.classtweaker")
+                        .processAW(mcVersion)
+            }
+
             // We can't preprocess resources files with Manifold, so we'll construct the json files manually here instead.
             project.file("build/resources/main/cobblegen.mixins.json").processMixinsJson(mcVersion, isFabric)
             if (isFabric) project.file("build/resources/main/fabric.mod.json").processFabricModJson(mcVersion)
         }
     }
 
     val targetJavaVersion = if (!isApi) {
-        if (mcVersion >= 12006) 21 else (if (mcVersion >= 11700) 17 else 8)
+        when (mcVersion) {
+            in 11200..11605 -> 8
+            in 11700..11701 -> 16
+            in 11800..12004 -> 17
+            in 12005..12111 -> 21
+            else -> 25
+        }
     } else {
         8  // APIs should always target Java 8
     }
@@ -324,6 +361,10 @@ subprojects {
     }
 
     tasks.jar {
+        if (mcVersion >= 260100) {
+            archiveClassifier.set("raw")
+        }
+
         from("LICENSE") {
             rename { "${it}_${base.archivesName.get()}" }
         }
@@ -398,6 +439,9 @@ publishMods {
             embeds {
                 slug = "jankson"
             }
+
+            client.set(true)  // Mostly for Recipe Viewer
+            server.set(true)
         }
     }
 

buildSrc/src/main/kotlin/ProcessAWAT.kt

@@ -0,0 +1,36 @@
+import java.io.File
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+
+fun File.processAW(
+    mcVersion: Int,
+) {
+    val content = buildString {
+        val mappingType = if (mcVersion >= 260100) "official" else "named"
+        appendLine("classTweaker  v1  ${mappingType}")
+
+        appendLine("accessible class net/minecraft/resources/RegistryDataLoader\$Loader")
+
+        val structureProviderName = if (mcVersion >= 260100) "\$Provider" else "\$Source"
+        appendLine("accessible class net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager$structureProviderName")
+        appendLine("accessible method net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager$structureProviderName <init> (Ljava/util/function/Function;Ljava/util/function/Supplier;)V")
+    }
+    writeText(content)
+}
+
+fun File.processAT(
+    mcVersion: Int,
+) {
+    val content = buildString {
+        appendLine("public net.minecraft.resources.RegistryDataLoader\$Loader")
+
+        val structureProviderName = if (mcVersion >= 260100) "\$Provider" else "\$Source"
+        appendLine("public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager$structureProviderName")
+        appendLine("public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager$structureProviderName <init>(Ljava/util/function/Function;Ljava/util/function/Supplier;)V")
+    }
+    writeText(content)
+}

buildSrc/src/main/kotlin/VersionRange.kt

@@ -71,7 +71,8 @@ fun supportedVersionRange(mcVersion: Int, loader: String): VersionRange {
         in 12100..12101 -> VersionRange("1.20.x", "1.21.1")
         in 12102..12104 -> VersionRange("1.21.1", "1.21.4")
         in 12105..12110 -> VersionRange("1.21.4", "1.21.10")
-        12111 -> VersionRange("1.21.10", null)
+        12111 -> VersionRange("1.21.10", "1.21.11")
+        260100 -> VersionRange("1.21.11", null)
         else -> VersionRange(null, null)
     }
 }

buildSrc/src/main/kotlin/dependencies/Create.kt

@@ -4,7 +4,7 @@ fun createMod(isNeo: Boolean) = Dependency(
     group = "com.simibubi.create",
     // Create finally support Neo on 1.21.1
     name = "create" + (if (!isNeo) "-1.18.2" else "-1.21.1"),
-    version = { mcVersion, hotfix ->
+    version = { mcVersion ->
         val version = if (!isNeo) "0.5.1.e-318" else "6.0.4-59"
         return@Dependency "$version:slim"
     },

buildSrc/src/main/kotlin/dependencies/Dependencies.kt

@@ -3,26 +3,42 @@ package dependencies
 data class Dependency(
     private val group: String,
     private val name: String,
-    private val version: (Int, Int) -> String,
+    private val version: (Int) -> String,
 ) {
-    fun versioned(mcVersion: Int, mcBuild: Int): String = "${group}:${name}:${version(mcVersion, mcBuild)}"
+    fun versioned(mcVersion: Int): String = "${group}:${name}:${version(mcVersion)}"
 }
 
-fun versionStr(versionCode: Int, hotfix: Int = 0, alwaysShowHotfix: Boolean = false): String {
+fun legacyVersionStr(versionCode: Int): String {
     val versionCodeStr = versionCode.toString()
     val major = versionCodeStr.getOrNull(0)?.toString() ?: "0"
     val minor = versionCodeStr
-        .substring(1, 3 + (versionCodeStr.length - 5))  // Future proofing, in case "1.100.0" happened
+        .substring(1, 3)
         .padStart(2, '0')
         .trimStart('0')
     val patch = versionCodeStr
-        .substring(3 + (versionCodeStr.length - 5))
+        .substring(3)
         .padEnd(1, '0').trimStart('0')
+
+    if (patch.isEmpty()) return "$major.$minor"
+    return "$major.$minor.$patch"
+}
+
+/**
+ * Transform version code (e.g. 260100) back to formatted string (e.g. 26.01).
+ */
+fun versionStr(versionCode: Int, alwaysShowHotfix: Boolean = false): String {
+    val versionCodeStr = versionCode.toString()
+    if (versionCodeStr.length == 5) return legacyVersionStr(versionCode)
 
-    if (major.toInt() <= 1) {
-        if (patch.isEmpty()) return "$major.$minor"
-        return "$major.$minor.$patch"
-    }
+    val year = versionCodeStr.substring(0, 2)
+    val release = versionCodeStr
+        .substring(2, 4)
+        .trimStart('0')
+        .let { if (it == "") "0" else it }
+    val hotfix = versionCodeStr
+        .substring(4)
+        .trimStart('0')
+        .let { if (it == "" && alwaysShowHotfix) "0" else it }
 
-    return if (hotfix > 0 || alwaysShowHotfix) "$minor.$patch.$hotfix" else "$minor.$patch"
+    return if (hotfix != "") "$year.$release.$hotfix" else "$year.$release"
 }

buildSrc/src/main/kotlin/dependencies/FabricAPI.kt

@@ -3,7 +3,7 @@ package dependencies
 val fapi = Dependency(
     group = "net.fabricmc.fabric-api",
     name = "fabric-api",
-    version = { mcVersion, hotfix ->
+    version = { mcVersion ->
         when (mcVersion) {
             11605 -> "0.42.0+1.16"
             11802 -> "0.76.0+1.18.2"
@@ -16,6 +16,7 @@ val fapi = Dependency(
             in 12102..12104 -> "0.106.1+1.21.3"
             in 12105..12110 -> "0.119.9+1.21.5"
             12111 -> "0.139.5+1.21.11"
+            260100 -> "0.141.1+26.1"
             else -> throw IllegalStateException("$mcVersion is not yet supported!")
         }
     },
@@ -24,9 +25,11 @@ val fapi = Dependency(
 val fapiGameTest = Dependency(
     group = "net.fabricmc.fabric-api",
     name = "fabric-gametest-api-v1",
-    version = { mcVersion, hotfix ->
+    version = { mcVersion ->
         when (mcVersion) {
-            12105 -> "3.1.2+2a6ec84b49"
+            in 12105..12110 -> "3.1.2+2a6ec84b49"
+            12111 -> "3.1.27+4fc5413f3e"
+            260100 -> "4.0.0+574290bac9"
             else -> throw IllegalStateException("$mcVersion is not yet supported!")
         }
     },
@@ -35,7 +38,7 @@ val fapiGameTest = Dependency(
 val fapiResourceLoader = Dependency(
     group = "net.fabricmc.fabric-api",
     name = "fabric-resource-loader-v0",
-    version = { mcVersion, hotfix ->
+    version = { mcVersion ->
         when (mcVersion) {
             12105 -> "3.1.6+02ca679649"
             else -> throw IllegalStateException("$mcVersion is not yet supported!")