Skip to content

Commit d0bb7ff

Browse files
committed
Add pack format 18 for 1.20.2
1 parent 07de16f commit d0bb7ff

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ data class ForgePackDescriptor(val format: Int, val comment: String) {
5353
val FORMAT_10 = ForgePackDescriptor(10, "")
5454
val FORMAT_12 = ForgePackDescriptor(12, "")
5555
val FORMAT_15 = ForgePackDescriptor(15, "")
56+
val FORMAT_18 = ForgePackDescriptor(18, "")
5657

5758
// See https://minecraft.gamepedia.com/Tutorials/Creating_a_resource_pack#.22pack_format.22
5859
fun forMcVersion(version: SemanticVersion): ForgePackDescriptor? = when {
@@ -65,7 +66,8 @@ data class ForgePackDescriptor(val format: Int, val comment: String) {
6566
version < MinecraftVersions.MC1_19 -> FORMAT_9
6667
version < MinecraftVersions.MC1_19_3 -> FORMAT_10
6768
version < MinecraftVersions.MC1_20 -> FORMAT_12
68-
version >= MinecraftVersions.MC1_20 -> FORMAT_15
69+
version < MinecraftVersions.MC1_20_2 -> FORMAT_15
70+
version >= MinecraftVersions.MC1_20_2 -> FORMAT_18
6971
else -> null
7072
}
7173
}

src/main/kotlin/util/MinecraftVersions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ object MinecraftVersions {
3535
val MC1_19_3 = SemanticVersion.release(1, 19, 3)
3636
val MC1_19_4 = SemanticVersion.release(1, 19, 4)
3737
val MC1_20 = SemanticVersion.release(1, 20)
38+
val MC1_20_2 = SemanticVersion.release(1, 20, 2)
3839

3940
fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when {
4041
minecraftVersion <= MC1_16_5 -> JavaSdkVersion.JDK_1_8

0 commit comments

Comments
 (0)