User: rednesto
Date: 17 Apr 24 10:18
Revision: a62cd60033682be7f370841704adff9b532daeba
Summary:
Fix #2278 1.20.5 requires Java 21


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9260&personal=false

Index: src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt
===================================================================
--- src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt	(revision 4f0e1d8b11e3bba1dcd40e615bd413c1f617b24a)
+++ src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt	(revision a62cd60033682be7f370841704adff9b532daeba)
@@ -55,6 +55,7 @@
         val FORMAT_15 = ForgePackDescriptor(15, "")
         val FORMAT_18 = ForgePackDescriptor(18, "")
         val FORMAT_26 = ForgePackDescriptor(26, "")
+        val FORMAT_41 = ForgePackDescriptor(26, "")
 
         // See https://minecraft.gamepedia.com/Tutorials/Creating_a_resource_pack#.22pack_format.22
         fun forMcVersion(version: SemanticVersion): ForgePackDescriptor? = when {
@@ -69,7 +70,8 @@
             version < MinecraftVersions.MC1_20 -> FORMAT_12
             version < MinecraftVersions.MC1_20_2 -> FORMAT_15
             version < MinecraftVersions.MC1_20_3 -> FORMAT_18
-            version >= MinecraftVersions.MC1_20_3 -> FORMAT_26
+            version < MinecraftVersions.MC1_20_5 -> FORMAT_26
+            version >= MinecraftVersions.MC1_20_5 -> FORMAT_41
             else -> null
         }
     }
Index: src/main/kotlin/util/MinecraftVersions.kt
===================================================================
--- src/main/kotlin/util/MinecraftVersions.kt	(revision 4f0e1d8b11e3bba1dcd40e615bd413c1f617b24a)
+++ src/main/kotlin/util/MinecraftVersions.kt	(revision a62cd60033682be7f370841704adff9b532daeba)
@@ -38,10 +38,12 @@
     val MC1_20_2 = SemanticVersion.release(1, 20, 2)
     val MC1_20_3 = SemanticVersion.release(1, 20, 3)
     val MC1_20_4 = SemanticVersion.release(1, 20, 4)
+    val MC1_20_5 = SemanticVersion.release(1, 20, 5)
 
     fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when {
         minecraftVersion <= MC1_16_5 -> JavaSdkVersion.JDK_1_8
         minecraftVersion <= MC1_17_1 -> JavaSdkVersion.JDK_16
-        else -> JavaSdkVersion.JDK_17
+        minecraftVersion <= MC1_20_4 -> JavaSdkVersion.JDK_17
+        else -> JavaSdkVersion.JDK_21
     }
 }