From a6f0e4f630d6653d70d2d9f4650098c585c06261 Mon Sep 17 00:00:00 2001
From: Nixinova <nixinova@gmail.com>
Date: Sun, 12 May 2024 02:24:32 +1200
Subject: [PATCH] Update pack formats to 33 (R) / 42 (D)

---
 changelog.md                |  4 ++++
 readme.md                   |  2 ++
 src/index.ts                |  8 +++++++-
 test/pack-formats-tests.txt | 20 +++++++++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 12c4e47..0ff84e2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Next
+- Updated resource pack format to `32`.
+- Updated data pack format to `42`.
+
 ## 1.3.14
 *2024-04-15*
 - Updated resource pack format to `31`.
diff --git a/readme.md b/readme.md
index 37eb84b..53ecd53 100644
--- a/readme.md
+++ b/readme.md
@@ -6,6 +6,8 @@
 
 pack-format is a tool for retrieving the `pack_format` of any Minecraft version, including snapshots.
 
+**Updated for: 1.20.6 & 24w18a**
+
 ## About
 
 `pack_format` is a version number used by Minecraft in both resource packs and data packs for labeling compatible versions.
diff --git a/src/index.ts b/src/index.ts
index c645227..5b70823 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -19,7 +19,8 @@ const START_RELEASES: Record<VersionName, Record<PackType, FormatResult>> = {
     '1.20.x': { resource: 15, data: 15 },
     '1.20.2': { resource: 18, data: 18 },
     '1.20.3': { resource: 22, data: 26 },
-    '1.20.5': { resource: 31, data: 39 },
+    '1.20.5': { resource: 32, data: 41 },
+    '1.20.6': { resource: 32, data: 41 },
     '1.21.x': { resource: undefined, data: undefined },
 }
 
@@ -66,6 +67,7 @@ const START_SNAPSHOTS: Record<string, Record<PackType, FormatResult>> = {
     '24w12a': { resource: 30, data: 36 },
     '24w13a': { resource: 31, data: 37 },
     '24w14a': { resource: 31, data: 38 },
+    '24w18a': { resource: 33, data: 42 },
     [fauxCurrentSnapshot]: { resource: undefined, data: undefined },
 }
 
@@ -75,12 +77,16 @@ const SPECIAL: Record<PackType, Record<number, string[]>> = {
         5: ['combat4', 'combat5'],
         6: ['combat6', 'combat7a', 'combat7b', 'combat8a', 'combat8b', 'combat8c'],
         17: ['1.20.2-pre1'],
+        31: ['1.20.5-pre1', '1.20.5-pre2', '1.20.5-pre3'],
+        32: ['1.20.5-pre4', '1.20.5-rc1', '1.20.5-rc2', '1.20.5-rc3'],
     },
     data: {
         4: ['combat1', 'combat2', 'combat3'],
         5: ['combat4', 'combat5'],
         6: ['combat6', 'combat7a', 'combat7b', 'combat8a', 'combat8b', 'combat8c'],
         39: ['1.20.5-pre1'],
+        40: ['1.20.5-pre2'],
+        41: ['1.20.5-pre3', '1.20.5-pre4', '1.20.5-rc1', '1.20.5-rc2', '1.20.5-rc3'],
     },
 }
 
diff --git a/test/pack-formats-tests.txt b/test/pack-formats-tests.txt
index 4ec4ded..8229e89 100644
--- a/test/pack-formats-tests.txt
+++ b/test/pack-formats-tests.txt
@@ -21,7 +21,7 @@ Types:
 === Releases ===
 
 "1.50" (-) none
-"1.1" (-) none
+"1.1" (-) null
 "1.6" (-) 1
 "1.9" (-) 2
 "1.16.1" (-) 5
@@ -43,6 +43,10 @@ Types:
 "1.20.3" (r) 22
 "1.20.3" (d) 26
 "1.20.4" (r) 22
+"1.20.5" (r) 32
+"1.20.5" (d) 41
+"1.20.6" (r) 32
+"1.20.6" (d) 41
 
 === Pre-releases ===
 
@@ -56,6 +60,16 @@ Types:
 "1.20.2-pre1" (r) 17
 "1.20.2-pre1" (d) 18
 "1.20.2-pre2" (r) 18
+"1.20.5-pre1" (r) 31
+"1.20.5-pre1" (d) 39
+"1.20.5-pre2" (r) 31
+"1.20.5-pre2" (d) 40
+"1.20.5-pre3" (r) 31
+"1.20.5-pre3" (d) 41
+"1.20.5-pre4" (r) 32
+"1.20.5-pre4" (d) 41
+"1.20.5-rc1" (r) 32
+"1.20.5-rc1" (d) 41
 
 === Snapshots ===
 
@@ -124,8 +138,8 @@ Types:
 "24w13a" (d) 37
 "24w14a" (r) 31
 "24w14a" (d) 38
-"1.20.5-pre1" (r) 31
-"1.20.5-pre1" (d) 39
+"24w18a" (r) 33
+"24w18a" (d) 42
 
 === Special cases ===