🔨 chore: improve build script

Author: cxntered

.github/workflows/build.yml

@@ -17,15 +17,11 @@ jobs:
       - name: Make Gradle Wrapper executable
         run: chmod +x ./gradlew
       - name: Build
-        run: ./gradlew build
-      - name: Stage JARs for upload
-        run: |
-          mkdir -p staging
-          find versions -path "*/build/libs/*.jar" -exec cp {} staging/ \;
+        run: ./gradlew buildAndCollect
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: |
-            staging/*.jar
-            !staging/*-sources.jar
+            build/libs/*.jar
+            !build/libs/*-sources.jar

build.gradle.kts

@@ -2,30 +2,21 @@ plugins {
     id("net.fabricmc.fabric-loom-remap")
 }
 
-val mcMin = property("mod.mc_min") as String
-val mcMax = property("mod.mc_max") as String
-val mcVersionRange = if (mcMin == mcMax) mcMin else "$mcMin-$mcMax"
-val mcDep = if (mcMin == mcMax) mcMin else ">=$mcMin <=$mcMax"
-
-version = "${property("mod.version")}+$mcVersionRange"
-base.archivesName = property("mod.name") as String
-
-val requiredJava = when {
-    sc.current.parsed >= "1.20.6" -> JavaVersion.VERSION_21
-    sc.current.parsed >= "1.18" -> JavaVersion.VERSION_17
-    sc.current.parsed >= "1.17" -> JavaVersion.VERSION_16
-    else -> JavaVersion.VERSION_1_8
-}
+val mcMin = property("mod.mc_min").toString()
+val mcMax = property("mod.mc_max").toString()
+val mcDep = if (mcMax.isEmpty()) "~${mcMin}" else ">=${mcMin} <=${mcMax}"
+
+version = "${property("mod.version")}+$mcMin"
+base.archivesName = property("mod.name").toString()
+
+val requiredJava = JavaVersion.VERSION_21
 
 repositories {
-    /**
-     * Restricts dependency search of the given [groups] to the [maven URL][url],
-     * improving the setup speed.
-     */
     fun strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
         forRepository { maven(url) { name = alias } }
         filter { groups.forEach(::includeGroup) }
     }
+
     strictMaven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1", "DevAuth", "me.djtheredstoner")
     maven("https://maven.isxander.dev/releases") { name = "Xander" }
     strictMaven("https://maven.terraformersmc.com/releases", "TerraformersMC", "com.terraformersmc")
@@ -42,16 +33,30 @@ dependencies {
 }
 
 loom {
-    fabricModJsonPath = rootProject.file("src/main/resources/fabric.mod.json") // Useful for interface injection
+    fabricModJsonPath = rootProject.file("src/main/resources/fabric.mod.json")
 
     decompilerOptions.named("vineflower") {
-        options.put("mark-corresponding-synthetics", "1") // Adds names to lambdas - useful for mixins
+        options.put("mark-corresponding-synthetics", "1") // adds names to lambdas - useful for mixins
     }
 
-    runConfigs.all {
-        ideConfigGenerated(true)
-        vmArgs("-Dmixin.debug.export=true") // Exports transformed classes for debugging
-        runDir = "../../run" // Shares the run directory between versions
+    afterEvaluate {
+        val mixinJarFile = configurations.runtimeClasspath.get().incoming.artifactView {
+            componentFilter {
+                it is ModuleComponentIdentifier && it.group == "net.fabricmc" && it.module == "sponge-mixin"
+            }
+        }.files.first()
+
+        runConfigs.all {
+            ideConfigGenerated(true)
+
+            vmArg("-XX:+AllowEnhancedClassRedefinition")
+            vmArg("-javaagent:$mixinJarFile")
+            property("mixin.debug.export", "true")
+
+            runDir = "../../run"
+        }
+
+        runConfigs.remove(runConfigs["server"])
     }
 }
 
@@ -63,14 +68,6 @@ java {
 
 tasks {
     processResources {
-        inputs.property("id", project.property("mod.id"))
-        inputs.property("name", project.property("mod.name"))
-        inputs.property("version", project.property("mod.version"))
-
-        inputs.property("fabric_loader", project.property("deps.fabric_loader"))
-        inputs.property("minecraft", mcDep)
-        inputs.property("yacl", project.property("deps.yacl"))
-
         val props = mapOf(
             "id" to project.property("mod.id"),
             "name" to project.property("mod.name"),
@@ -79,18 +76,16 @@ tasks {
             "minecraft" to mcDep,
             "yacl" to project.property("deps.yacl")
         )
+        inputs.properties(props)
 
         filesMatching("fabric.mod.json") { expand(props) }
-
-        val mixinJava = "JAVA_${requiredJava.majorVersion}"
-        filesMatching("*.mixins.json") { expand("java" to mixinJava) }
+        filesMatching("*.mixins.json") { expand("java" to "JAVA_${requiredJava.majorVersion}") }
     }
 
-    // Builds the version into a shared folder in `build/libs/${mod version}/`
     register<Copy>("buildAndCollect") {
         group = "build"
         from(remapJar.map { it.archiveFile }, remapSourcesJar.map { it.archiveFile })
-        into(rootProject.layout.buildDirectory.file("libs/${project.property("mod.version")}"))
+        into(rootProject.layout.buildDirectory.file("libs"))
         dependsOn("build")
     }
 }

src/main/java/dev/cxntered/rankspoof/config/RankPreview.java

@@ -32,7 +32,7 @@ public int render(GuiGraphics guiGraphics, int x, int y, int width, float v) {
                 y + 5,
                 width - 10,
                 totalHeight - 10,
-                /*? if <=1.21.5 {*/ /*0, *//*?}*/
+                /*? if 1.21.4 {*/ /*0, *//*?}*/
                 null
         );
 

src/main/java/dev/cxntered/rankspoof/mixin/FontMixin.java

@@ -14,12 +14,13 @@
 @Mixin(Font.class)
 public abstract class FontMixin {
     @ModifyVariable(
-            //? if <=1.21.5 {
-            /*method = "renderText(Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)F",
-            *///?} elif <=1.21.10 {
-            /*method = "prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZI)Lnet/minecraft/client/gui/Font$PreparedText;",
-            *///?} else
+            //? if >=1.21.11 {
             method = "prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;",
+            //?} elif >=1.21.6 {
+            /*method = "prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZI)Lnet/minecraft/client/gui/Font$PreparedText;",
+            *///?} else {
+            /*method = "renderText(Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)F",
+            *///?}
             at = @At(value = "HEAD"),
             argsOnly = true
     )

versions/1.21.11/gradle.properties

@@ -1,4 +1,4 @@
 deps.mod_menu=17.0.0-beta.1
 
 mod.mc_min=1.21.11
-mod.mc_max=1.21.11
+mod.mc_max=