Fixes to MC info + V3

Author: Deftu

gradle.properties

@@ -5,5 +5,5 @@ org.gradle.jvmargs=-Xmx8G
 
 # Project properties
 project.name=gradle-toolkit
-project.version=2.53.0
+project.version=2.54.0
 project.group=dev.deftu.gradle

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

@@ -6,13 +6,12 @@ import dev.deftu.gradle.utils.version.MinecraftVersionMap
 import org.gradle.api.Project
 
 sealed class MinecraftInfo {
-
     companion object {
-
         private val revisions = listOf(
-            MinecraftInfoV0,
-            MinecraftInfoV1,
-            MinecraftInfoV2
+            { MinecraftInfoV0() },
+            { MinecraftInfoV1() },
+            { MinecraftInfoV2() },
+            { MinecraftInfoV3() },
         )
 
         @JvmStatic
@@ -26,7 +25,8 @@ sealed class MinecraftInfo {
                             "Please update the toolkit to a newer version or check which revisions are available."
                 )
             }
-            return revisions[revision].also(MinecraftInfo::initialize)
+
+            return revisions[revision]().also(MinecraftInfo::initialize)
         }
 
     }
@@ -38,23 +38,14 @@ sealed class MinecraftInfo {
         protected set
 
     val fabricYarnVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val fabricApiVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val fabricModMenuDefinitions: MinecraftVersionMap<Pair<String, String>> = MinecraftVersionMap()
-
     val legacyFabricYarnVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val legacyFabricApiVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val kotlinForForgeVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val forgeVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val mcpDefinitions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val neoForgeVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
-
     val parchmentVersions: MinecraftVersionMap<String> = MinecraftVersionMap()
 
     /** updates versions as needed and/or inherits if needed */
@@ -134,5 +125,4 @@ sealed class MinecraftInfo {
         return parchmentVersions[version]
             ?: throw IllegalArgumentException("No Parchment version found for $version")
     }
-
 }

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

@@ -2,10 +2,8 @@ package dev.deftu.gradle.utils.mcinfo
 
 import dev.deftu.gradle.utils.version.MinecraftVersions
 
-object MinecraftInfoV0 : MinecraftInfo() {
-
+class MinecraftInfoV0 : MinecraftInfo() {
     override var fabricLoaderVersion = "0.16.14"
-
     override var fabricLanguageKotlinVersion = "1.12.1+kotlin.2.0.20"
 
     override fun initialize() {
@@ -289,5 +287,4 @@ object MinecraftInfoV0 : MinecraftInfo() {
             MinecraftVersions.VERSION_1_16_5 to "1.16.5:2022.03.06"
         ))
     }
-
 }

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

@@ -2,16 +2,15 @@ package dev.deftu.gradle.utils.mcinfo
 
 import dev.deftu.gradle.utils.version.MinecraftVersions
 
-object MinecraftInfoV1 : MinecraftInfo() {
-
+class MinecraftInfoV1 : MinecraftInfo() {
     override fun initialize() {
-        inherit(MinecraftInfoV0)
+        inherit(MinecraftInfoV0())
 
         fabricApiVersions.putAll(listOf(
             MinecraftVersions.VERSION_1_21_5 to "0.127.1+1.21.5",
             MinecraftVersions.VERSION_1_21_4 to "0.119.3+1.21.4",
             MinecraftVersions.VERSION_1_21_3 to "0.114.1+1.21.3",
-            MinecraftVersions.VERSION_1_21_3 to "0.116.3+1.21.1",
+            MinecraftVersions.VERSION_1_21_1 to "0.116.3+1.21.1",
             MinecraftVersions.VERSION_1_20_4 to "0.97.3+1.20.4",
             MinecraftVersions.VERSION_1_20_1 to "0.92.6+1.20.1",
         ))
@@ -37,11 +36,10 @@ object MinecraftInfoV1 : MinecraftInfo() {
             MinecraftVersions.VERSION_1_21_5 to "21.5.79",
             MinecraftVersions.VERSION_1_21_4 to "21.4.140",
             MinecraftVersions.VERSION_1_21_3 to "21.3.79",
-            MinecraftVersions.VERSION_1_21_1 to "21.8.182",
+            MinecraftVersions.VERSION_1_21_1 to "21.1.182",
             MinecraftVersions.VERSION_1_20_6 to "20.6.135",
             MinecraftVersions.VERSION_1_20_4 to "20.4.248",
             MinecraftVersions.VERSION_1_20_2 to "20.2.93",
         ))
     }
-
 }

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

@@ -2,10 +2,9 @@ package dev.deftu.gradle.utils.mcinfo
 
 import dev.deftu.gradle.utils.version.MinecraftVersions
 
-object MinecraftInfoV2 : MinecraftInfo() {
-
+class MinecraftInfoV2 : MinecraftInfo() {
     override fun initialize() {
-        inherit(MinecraftInfoV1)
+        inherit(MinecraftInfoV1())
 
         fabricYarnVersions.putAll(listOf(
             MinecraftVersions.VERSION_1_21_8 to "1.21.8+build.1:v2",
@@ -52,5 +51,4 @@ object MinecraftInfoV2 : MinecraftInfo() {
             MinecraftVersions.VERSION_1_14_4 to "1.14.4+build.18:v2"
         ))
     }
-
-}
+}

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

@@ -0,0 +1,65 @@
+package dev.deftu.gradle.utils.mcinfo
+
+import dev.deftu.gradle.utils.version.MinecraftVersions
+
+class MinecraftInfoV3 : MinecraftInfo() {
+    override fun initialize() {
+        inherit(MinecraftInfoV2())
+
+        this.fabricLoaderVersion = "0.17.2"
+        this.fabricLanguageKotlinVersion = "1.13.5+kotlin.2.2.10"
+
+        this.fabricYarnVersions.putAll(listOf(
+            MinecraftVersions.VERSION_1_21_7 to "1.21.7+build.8:v2",
+            MinecraftVersions.VERSION_1_19_2 to "1.19.2+build.28:v2",
+        ))
+
+        this.fabricApiVersions.putAll(listOf(
+            MinecraftVersions.VERSION_1_21_8 to "0.133.4+1.21.8",
+            MinecraftVersions.VERSION_1_21_7 to "0.129.0+1.21.7",
+            MinecraftVersions.VERSION_1_21_6 to "0.128.2+1.21.6",
+            MinecraftVersions.VERSION_1_21_5 to "0.128.2+1.21.5",
+            MinecraftVersions.VERSION_1_21_4 to "0.119.4+1.21.4",
+            MinecraftVersions.VERSION_1_21_1 to "0.116.6+1.21.1",
+
+            MinecraftVersions.VERSION_1_18 to "0.44.0+1.18",
+        ))
+
+        this.fabricModMenuDefinitions.putAll(listOf(
+            MinecraftVersions.VERSION_1_21_8 to ("com.terraformersmc:modmenu:" to "15.0.0"),
+            MinecraftVersions.VERSION_1_21_7 to ("com.terraformersmc:modmenu:" to "15.0.0"),
+            MinecraftVersions.VERSION_1_21_6 to ("com.terraformersmc:modmenu:" to "15.0.0"),
+        ))
+
+        this.legacyFabricYarnVersions.putAll(listOf(
+            MinecraftVersions.VERSION_1_13_2 to "1.13.2+build.571:v2",
+            MinecraftVersions.VERSION_1_12_2 to "1.12.2+build.571:v2",
+            MinecraftVersions.VERSION_1_11_2 to "1.11.2+build.571:v2",
+            MinecraftVersions.VERSION_1_10_2 to "1.10.2+build.571:v2",
+            MinecraftVersions.VERSION_1_9_4 to "1.9.4+build.571:v2",
+            MinecraftVersions.VERSION_1_8_9 to "1.8.9+build.571:v2"
+        ))
+
+        this.legacyFabricApiVersions.putAll(listOf(
+            MinecraftVersions.VERSION_1_12_2 to "1.13.1+1.12.2",
+            MinecraftVersions.VERSION_1_11_2 to "1.13.1+1.11.2",
+            MinecraftVersions.VERSION_1_10_2 to "1.13.1+1.10.2",
+            MinecraftVersions.VERSION_1_9_4 to "1.13.1+1.9.4",
+            MinecraftVersions.VERSION_1_8_9 to "1.13.1+1.8.9"
+        ))
+
+        this.neoForgeVersions.putAll(listOf(
+            MinecraftVersions.VERSION_1_21_8 to "21.8.47",
+            MinecraftVersions.VERSION_1_21_7 to "21.7.25-beta",
+            MinecraftVersions.VERSION_1_21_6 to "21.6.20-beta",
+            MinecraftVersions.VERSION_1_21_5 to "21.5.95",
+            MinecraftVersions.VERSION_1_21_4 to "21.4.154",
+            MinecraftVersions.VERSION_1_21_3 to "21.3.93",
+            MinecraftVersions.VERSION_1_21_1 to "21.1.209",
+
+            MinecraftVersions.VERSION_1_20_6 to "20.6.138",
+            MinecraftVersions.VERSION_1_20_4 to "20.4.250",
+            MinecraftVersions.VERSION_1_20_2 to "20.2.93"
+        ))
+    }
+}