fix java version being too high for 1.20.1

Author: DeDiamondPro

build.gradle.kts

@@ -68,6 +68,10 @@ val shadeModImplementation: Configuration by configurations.creating {
 }
 
 // Version definitions
+val javaVersion = VersionDefinition(
+    "1.20.1" to "17",
+    default = "21",
+)
 val parchmentVersion = VersionDefinition(
     "1.20.1" to "1.20.1:2023.09.03",
     "1.21.1" to "1.21.1:2024.11.17",
@@ -217,4 +221,8 @@ tasks {
         from(rootProject.file("LICENSE"))
         from(rootProject.file("LICENSE.LESSER"))
     }
+}
+
+configure<JavaPluginExtension> {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion.get(mcPlatform)))
 }

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

@@ -17,12 +17,12 @@
 
 package dev.dediamondpro.buildsource
 
-class VersionDefinition(vararg pairs: Pair<String, String>) {
+class VersionDefinition(vararg pairs: Pair<String, String>, private val default: String? = null) {
     private val versions = mapOf(*pairs)
 
     fun getOrNull(platform: Platform): String? {
         // Try full platform first, then mc version
-        return versions.get(platform.name) ?: versions.get(platform.versionString)
+        return versions[platform.name] ?: versions[platform.versionString] ?: default
     }
 
     fun get(platform: Platform): String {

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "kotlinforforge"
-loaderVersion = "[1,)"
+loaderVersion = "[4.11,)" # We need kotlin 2.0+
 license = "LGPL 3.0"
 issueTrackerURL = "https://github.com/DeDiamondPro/Resourcify/issues"
 showAsResourcePack = false

src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,5 @@
 modLoader = "kotlinforforge"
-loaderVersion = "[1,)"
+loaderVersion = "[4.11,)" # We need kotlin 2.0+
 license = "LGPL 3.0"
 issueTrackerURL = "https://github.com/DeDiamondPro/Resourcify/issues"
 showAsResourcePack = false

src/main/resources/fabric.mod.json

@@ -36,7 +36,7 @@
   "environment": "client",
   "depends": {
     "fabric-language-kotlin": ">=1.11.0+kotlin.2.0.0",
-    "fabricloader": ">=0.12.0",
+    "fabricloader": ">=0.15.0",
     "fabric-resource-loader-v0": "*",
     "minecraft": "${fabricMcVersion}"
   }