Simplify MinecraftVersion generics; misc updates

Convert MinecraftVersion from a generic interface to a non-generic one and update all usages (types, collections, parsing results, compareTo signatures, helpers and conditionals) to match. Bump com.gradleup.shadow plugin to 9.4.0 and project.version to 2.75.0; reduce org.gradle.jvmargs to -Xmx2G. Add extra runtime dependencies for drop versions in loom.gradle.kts and fix shadow fatJar configuration. Add debug logging when resolving MCData version and minor parser/validation tweaks in MinecraftDropVersion. Misc. import and utility adjustments (fabricId formatting, version utilities) to align with the API changes.

Author: Deftu

build.gradle.kts

@@ -54,7 +54,7 @@ dependencies {
     implementation("com.github.breadmoirai:github-release:2.5.2")
 
     // Other
-    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.8")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.4.0")
     implementation("dev.deftu:Bloom:0.2.0")
 }
 

gradle.properties

@@ -1,9 +1,9 @@
 # Project args
 kotlin.code.style=official
 kotlin.version=2.3.0
-org.gradle.jvmargs=-Xmx8G
+org.gradle.jvmargs=-Xmx2G
 
 # Project properties
 project.name=gradle-toolkit
-project.version=2.70.0
+project.version=2.75.0
 project.group=dev.deftu.gradle

src/main/kotlin/dev/deftu/gradle/tools/minecraft/ReleasingExtension.kt

@@ -20,7 +20,7 @@ abstract class ReleasingExtension(
     abstract val version: Property<String>
     abstract val versionType: Property<VersionType>
     abstract val detectVersionType: Property<Boolean>
-    abstract val gameVersions: ListProperty<MinecraftVersion<*>>
+    abstract val gameVersions: ListProperty<MinecraftVersion>
     abstract val loaders: ListProperty<ModLoader>
     abstract val file: Property<Zip>
 

src/main/kotlin/dev/deftu/gradle/tools/minecraft/ReleasingV2Extension.kt

@@ -25,7 +25,7 @@ abstract class ReleasingV2Extension @Inject constructor(private val project: Pro
     abstract val debugMode: Property<Boolean>
     abstract val releaseName: Property<String>
     abstract val releaseVersion: Property<String>
-    abstract val gameVersions: ListProperty<MinecraftVersion<*>>
+    abstract val gameVersions: ListProperty<MinecraftVersion>
     abstract val loaders: ListProperty<ModLoader>
 
     val versionType: Property<VersionType> = this.objects.property()
@@ -138,7 +138,7 @@ abstract class ReleasingV2Extension @Inject constructor(private val project: Pro
         return "${version}${suffix}"
     }
 
-    private fun defaultGameVersions(): List<MinecraftVersion<*>> {
+    private fun defaultGameVersions(): List<MinecraftVersion> {
         val mcData = MCData.from(project)
         return listOf(mcData.version)
     }

src/main/kotlin/dev/deftu/gradle/tools/minecraft/loom.gradle.kts

@@ -8,6 +8,7 @@ import dev.deftu.gradle.utils.*
 import dev.deftu.gradle.utils.mcinfo.MinecraftInfo
 import dev.deftu.gradle.utils.version.MinecraftDropVersion
 import dev.deftu.gradle.utils.version.MinecraftVersions
+import org.gradle.kotlin.dsl.version
 
 // Set XML parsers so Gradle stops complaining.
 extra.set("systemProp.javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl")
@@ -191,6 +192,14 @@ dependencies {
             mcData.isNeoForge -> "neoForge"("net.neoforged:neoforge:${mcData.dependencies.neoForged.neoForgeVersion}")
         }
     }
+
+    if (mcData.version.isDrop) {
+        // These aren't on the classpath for some reason? So we'll just add them manually for now
+        implementation("net.fabricmc:sponge-mixin:0.17.0+mixin.0.8.7")
+        implementation("io.github.llamalad7:mixinextras-fabric:0.5.0")
+        implementation("org.ow2.asm:asm:9.9")
+        implementation("org.ow2.asm:asm-tree:9.9")
+    }
 }
 
 // https://github.com/architectury/architectury-loom/pull/10

src/main/kotlin/dev/deftu/gradle/tools/minecraft/releases-v2.gradle.kts

@@ -71,7 +71,7 @@ fun setupModrinth(token: String) {
         if (extension.jars.isUsingSourcesJar) this.additionalFiles.add(extension.jars.uploadedSourcesJar)
         if (extension.jars.isUsingJavadocJar) this.additionalFiles.add(extension.jars.uploadedJavadocJar)
 
-        this.gameVersions.addAll(extension.gameVersions.get().map(MinecraftVersion<*>::toString))
+        this.gameVersions.addAll(extension.gameVersions.get().map(MinecraftVersion::toString))
         this.loaders.addAll(extension.loaders.get().map(ModLoader::toString))
 
         this.dependencies.addAll(extension.dependencies.map { dependency ->
@@ -116,7 +116,7 @@ fun setupCurseForge(token: String) {
             if (extension.jars.isUsingSourcesJar) withAdditionalFile(extension.jars.uploadedSourcesJar)
             if (extension.jars.isUsingJavadocJar) withAdditionalFile(extension.jars.uploadedJavadocJar)
 
-            extension.gameVersions.get().map(MinecraftVersion<*>::toString).forEach(this::addGameVersion)
+            extension.gameVersions.get().map(MinecraftVersion::toString).forEach(this::addGameVersion)
             extension.loaders.get().map(ModLoader::toString).forEach(this::addModLoader)
 
             extension.dependencies.forEach { dependency ->

src/main/kotlin/dev/deftu/gradle/tools/minecraft/releases.gradle.kts

@@ -164,7 +164,7 @@ fun setupModrinth(token: String) {
         }
 
         changelog.set(extension.changelog.get())
-        gameVersions.addAll(extension.getGameVersions().map(MinecraftVersion<*>::toString))
+        gameVersions.addAll(extension.getGameVersions().map(MinecraftVersion::toString))
         loaders.addAll(extension.getLoaders().map(ModLoader::toString))
         if (mcData.isFabric && extension.describeFabricWithQuilt.getOrElse(false)) {
             loaders.add("quilt")

src/main/kotlin/dev/deftu/gradle/tools/shadow.gradle.kts

@@ -20,7 +20,7 @@ val fatJar = tasks.register<ShadowJar>("fatJar") {
     description = "Builds a fat JAR with all dependencies shaded in"
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    configurations = mutableListOf(shade) as List<FileCollection>? // Complains about useless cast but also complains about not being a compatible type... Okay...
+    configurations.add(shade)
     archiveVersion.set(project.version.toString())
     archiveClassifier.set("all")
 

src/main/kotlin/dev/deftu/gradle/utils/MCData.kt

@@ -248,7 +248,7 @@ class MCDependencies(
 data class MCData(
     val project: Project,
     val isPresent: Boolean,
-    val version: MinecraftVersion<*>,
+    val version: MinecraftVersion,
     val loader: ModLoader
 ) {
     val isFabric: Boolean get() = loader == ModLoader.FABRIC
@@ -296,6 +296,7 @@ data class MCData(
             }
 
             val version = MinecraftVersions.get(project, project.minecraftVersion)
+            project.logger.debug("Determined Minecraft version for project {} as {} [{}]", project.name, version, version::class.java)
             val data = MCData(project, true, version, project.modLoader)
             project.extensions.add("mcData", data)
             return data

src/main/kotlin/dev/deftu/gradle/utils/mcinfo/MinecraftInfo.kt

@@ -70,27 +70,27 @@ sealed class MinecraftInfo {
         this.parchmentVersions.putAll(other.parchmentVersions)
     }
 
-    fun getFabricYarnVersion(version: MinecraftVersion<*>): String {
+    fun getFabricYarnVersion(version: MinecraftVersion): String {
         return fabricYarnVersions[version]
             ?: throw IllegalArgumentException("No Fabric Yarn version found for $version")
     }
 
-    fun getFabricApiVersion(version: MinecraftVersion<*>): String {
+    fun getFabricApiVersion(version: MinecraftVersion): String {
         return fabricApiVersions[version]
             ?: throw IllegalArgumentException("No Fabric API version found for $version")
     }
 
-    fun getFabricModMenuDefinition(version: MinecraftVersion<*>): Pair<String, String> {
+    fun getFabricModMenuDefinition(version: MinecraftVersion): Pair<String, String> {
         return fabricModMenuDefinitions[version]
             ?: throw IllegalArgumentException("No Fabric Mod Menu definition found for $version")
     }
 
-    fun getLegacyFabricYarnVersion(version: MinecraftVersion<*>): String {
+    fun getLegacyFabricYarnVersion(version: MinecraftVersion): String {
         return legacyFabricYarnVersions[version]
             ?: throw IllegalArgumentException("No Legacy Fabric Yarn version found for $version")
     }
 
-    fun getLegacyFabricApiVersion(version: MinecraftVersion<*>): String {
+    fun getLegacyFabricApiVersion(version: MinecraftVersion): String {
         return legacyFabricApiVersions[version]
             ?: throw IllegalArgumentException("No Legacy Fabric API version found for $version")
     }
@@ -99,30 +99,30 @@ sealed class MinecraftInfo {
      * we need to do a comparison here as we don't expect all versions to be filled out. rather,
      * it's a range, where we just match the closest version that is less than or equal to the given version.
      */
-    fun getKotlinForForgeVersion(version: MinecraftVersion<*>): String {
+    fun getKotlinForForgeVersion(version: MinecraftVersion): String {
         return kotlinForForgeVersions
             .filter { it.key <= version }
             .maxByOrNull { it.key }?.value
             ?: throw IllegalArgumentException("No Kotlin for Forge version found for $version")
     }
 
-    fun getForgeVersion(version: MinecraftVersion<*>): String {
+    fun getForgeVersion(version: MinecraftVersion): String {
         return forgeVersions[version]
             ?: throw IllegalArgumentException("No Forge version found for $version")
     }
 
-    fun getMcpDefinition(version: MinecraftVersion<*>): String {
+    fun getMcpDefinition(version: MinecraftVersion): String {
         val definition = mcpDefinitions[version]
             ?: throw IllegalArgumentException("No MCP definition found for $version")
         return "de.oceanlabs.mcp:mcp_$definition"
     }
 
-    fun getNeoForgeVersion(version: MinecraftVersion<*>): String {
+    fun getNeoForgeVersion(version: MinecraftVersion): String {
         return neoForgeVersions[version]
             ?: throw IllegalArgumentException("No NeoForge version found for $version")
     }
 
-    fun getParchmentVersion(version: MinecraftVersion<*>): String {
+    fun getParchmentVersion(version: MinecraftVersion): String {
         return parchmentVersions[version]
             ?: throw IllegalArgumentException("No Parchment version found for $version")
     }