User: rednesto Date: 24 Sep 23 08:34 Revision: d0bb7ff02ab52edc8d959b296053059c5a3f4c8e Summary: Add pack format 18 for 1.20.2 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8763&personal=false Index: src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt =================================================================== --- src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt (revision 07de16f68440656d4d108de8bd06e4d21cd477d0) +++ src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt (revision d0bb7ff02ab52edc8d959b296053059c5a3f4c8e) @@ -53,6 +53,7 @@ val FORMAT_10 = ForgePackDescriptor(10, "") val FORMAT_12 = ForgePackDescriptor(12, "") val FORMAT_15 = ForgePackDescriptor(15, "") + val FORMAT_18 = ForgePackDescriptor(18, "") // See https://minecraft.gamepedia.com/Tutorials/Creating_a_resource_pack#.22pack_format.22 fun forMcVersion(version: SemanticVersion): ForgePackDescriptor? = when { @@ -65,7 +66,8 @@ version < MinecraftVersions.MC1_19 -> FORMAT_9 version < MinecraftVersions.MC1_19_3 -> FORMAT_10 version < MinecraftVersions.MC1_20 -> FORMAT_12 - version >= MinecraftVersions.MC1_20 -> FORMAT_15 + version < MinecraftVersions.MC1_20_2 -> FORMAT_15 + version >= MinecraftVersions.MC1_20_2 -> FORMAT_18 else -> null } } Index: src/main/kotlin/util/MinecraftVersions.kt =================================================================== --- src/main/kotlin/util/MinecraftVersions.kt (revision 07de16f68440656d4d108de8bd06e4d21cd477d0) +++ src/main/kotlin/util/MinecraftVersions.kt (revision d0bb7ff02ab52edc8d959b296053059c5a3f4c8e) @@ -35,6 +35,7 @@ val MC1_19_3 = SemanticVersion.release(1, 19, 3) val MC1_19_4 = SemanticVersion.release(1, 19, 4) val MC1_20 = SemanticVersion.release(1, 20) + val MC1_20_2 = SemanticVersion.release(1, 20, 2) fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when { minecraftVersion <= MC1_16_5 -> JavaSdkVersion.JDK_1_8