Move to essential loom

Author: DeDiamondPro

.github/workflows/build.yml

@@ -15,11 +15,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: 21
           distribution: temurin
+          java-version: |
+            17
+            21
+            25
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

build.gradle.kts

@@ -29,6 +29,9 @@ plugins {
 buildscript {
     // Set loom platform to correct loader
     extra["loom.platform"] = project.name.split('-')[1]
+    if (project.name[0] != '1') {
+        extra.set("fabric.loom.disableObfuscation", "true")
+    }
 }
 
 val mcPlatform = Platform.fromProject(project)
@@ -70,6 +73,7 @@ val shadeModImplementation: Configuration by configurations.creating {
 
 // Version definitions
 val mcVersion = VersionDefinition( // Used for pre releases and release candidates
+    "26.1" to "26.1-pre-2",
     default = mcPlatform.versionString
 )
 val compatibleMcVersion = VersionDefinition(
@@ -82,9 +86,11 @@ val compatibleMcVersion = VersionDefinition(
     "1.21.8" to VersionRange("1.21.6", "1.21.8", name = "1.21.8"),
     "1.21.10" to VersionRange("1.21.9", "1.21.10", name = "1.21.10"),
     "1.21.11" to VersionRange("1.21.11", "1.21.11", name = "1.21.11"),
+    "26.1" to VersionRange("26.1", "26.2", inclusive = false, name = "26.1")
 )
 val javaVersion = VersionDefinition(
     "1.20.1" to "17",
+    "26.1" to "25",
     default = "21",
 )
 val parchmentVersion = VersionDefinition(
@@ -102,6 +108,7 @@ val fabricApiVersion = VersionDefinition(
     "1.21.8" to "0.129.0+1.21.8",
     "1.21.10" to "0.136.0+1.21.10",
     "1.21.11" to "0.139.4+1.21.11",
+    "26.1" to "0.143.14+26.1",
 )
 val modMenuVersion = VersionDefinition(
     "1.20.1" to "7.2.2",
@@ -110,7 +117,8 @@ val modMenuVersion = VersionDefinition(
     "1.21.5" to "14.0.0",
     "1.21.8" to "15.0.0",
     "1.21.10" to "16.0.0-rc.1",
-    "1.21.11" to "17.0.0-alpha.1"
+    "1.21.11" to "17.0.0-alpha.1",
+    "26.1" to "18.0.0-alpha.6",
 )
 val neoForgeVersion = VersionDefinition(
     "1.21.1" to "21.1.95",
@@ -143,19 +151,21 @@ val universalMcVersion = VersionDefinition(
     default = mcPlatform.versionString
 )
 val universalVersion = VersionDefinition(
-    default = "${universalMcVersion.get(mcPlatform)}-${mcPlatform.loaderString}:446"
+    default = "${universalMcVersion.get(mcPlatform)}-${mcPlatform.loaderString}:466"
 )
 
 dependencies {
     minecraft("com.mojang:minecraft:${mcVersion.get(mcPlatform)}")
 
-    @Suppress("UnstableApiUsage")
-    mappings(loom.layered {
-        officialMojangMappings()
-        parchmentVersion.getOrNull(mcPlatform)?.let {
-            parchment("org.parchmentmc.data:parchment-$it@zip")
-        }
-    })
+    if (mcPlatform.major == 1) {
+        @Suppress("UnstableApiUsage")
+        mappings(loom.layered {
+            officialMojangMappings()
+            parchmentVersion.getOrNull(mcPlatform)?.let {
+                parchment("org.parchmentmc.data:parchment-$it@zip")
+            }
+        })
+    }
 
     if (mcPlatform.isFabric) {
         modImplementation("net.fabricmc:fabric-loader:0.17.3")

buildSrc/src/main/java/dev/dediamondpro/buildsource/Platform.java

@@ -53,7 +53,10 @@ public int getVersion() {
     }
 
     public String getVersionString() {
-        return major + "." + minor + "." + patch;
+        if (patch != 0) {
+            return major + "." + minor + "." + patch;
+        }
+        return major + "." + minor;
     }
 
     public Loader getLoader() {
@@ -89,7 +92,10 @@ public static Platform fromProject(Project project) {
         String[] versionSplit = nameSplit[0].split("\\.");
         int major = Integer.parseInt(versionSplit[0]);
         int minor = Integer.parseInt(versionSplit[1]);
-        int patch = Integer.parseInt(versionSplit[2]);
+        int patch = 0;
+        if (versionSplit.length > 2) {
+            patch = Integer.parseInt(versionSplit[2]);
+        }
         Loader loader = Loader.valueOf(nameSplit[1].toUpperCase());
         return new Platform(major, minor, patch, loader);
     }

buildSrc/src/main/java/dev/dediamondpro/buildsource/VersionRange.kt

@@ -23,6 +23,7 @@ class VersionRange(
     private val name: String = "$startVersion-$endVersion",
     private val openEnd: Boolean = false,
     private val allowAll: Boolean = false, // Mostly used for pre releases and release candidates
+    private val inclusive: Boolean = true,
 ) {
     fun getName(): String {
         return name;
@@ -34,11 +35,20 @@ class VersionRange(
 
     fun getFabricRange(): String {
         if (allowAll) return "*"
-        return ">=$startVersion" + if (!openEnd) " <=$endVersion" else ""
+        return buildString {
+            append(">= $startVersion")
+            if (!openEnd && inclusive) append(" <=$endVersion")
+            else if (!openEnd) append(" <$endVersion")
+        }
     }
 
     fun getForgeRange(): String {
         if (allowAll) return "[1,)"
-        return "[$startVersion," + if (!openEnd) "$endVersion]" else ")"
+        return buildString {
+            append("[$startVersion,")
+            if (!openEnd && inclusive) append("$endVersion]")
+            else if (!openEnd) append("$endVersion[")
+            else append(")")
+        }
     }
 }

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 # Kotlin
-kotlin = "2.0.20"
+kotlin = "2.3.10"
 fabric_language_kotlin = "1.11.0+kotlin.2.0.0" # Use 2.0.0 here since it is the minimum kotlin version we require
 
 # Build system
-arch_loom = "1.13-SNAPSHOT"
+arch_loom = "1.15.45"
 shadow = "8.1.1"
 publishing = "0.8.3"
 
@@ -31,7 +31,7 @@ tagsoup = { module = "org.ccil.cowan.tagsoup:tagsoup", version.ref = "tagsoup" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
 # Build system
-arch_loom = { id = "dev.architectury.loom", version.ref = "arch_loom" }
+arch_loom = { id = "gg.essential.loom", version.ref = "arch_loom" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 publishing = { id = "me.modmuss50.mod-publish-plugin", version.ref = "publishing" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -22,6 +22,7 @@ pluginManagement {
         maven("https://maven.fabricmc.net")
         maven("https://maven.architectury.dev/")
         maven("https://maven.minecraftforge.net")
+        maven("https://repo.essential.gg/repository/maven-public/")
     }
     dependencyResolutionManagement.versionCatalogs.create("libs")
 }
@@ -46,6 +47,7 @@ val platforms = listOf(
     "1.21.8-fabric",
     "1.21.10-fabric",
     "1.21.11-fabric",
+//    "26.1-fabric",
 )
 
 stonecutter {