From 5bebac36620d8f8ec256d19483e20e643d63de2a Mon Sep 17 00:00:00 2001 From: Grooble Date: Sat, 26 Oct 2024 23:52:46 +0200 Subject: [PATCH] 1.21 Support (#1342) * Update default version * Update README * 1.21.1 * Update version.js * Update ci.yml * Update version.js * add values for vec2f and ChatTypes * fix lint * fix server tests * fix lint * update mcdata * remove debug install --------- Co-authored-by: Romain Beaumont --- docs/README.md | 2 +- package.json | 2 +- src/version.js | 4 ++-- test/packetTest.js | 6 ++++++ test/serverTest.js | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index 68fdd4bb..97360021 100644 --- a/docs/README.md +++ b/docs/README.md @@ -13,7 +13,7 @@ Parse and serialize minecraft packets, plus authentication and encryption. * Supports Minecraft PC version 1.7.10, 1.8.8, 1.9 (15w40b, 1.9, 1.9.1-pre2, 1.9.2, 1.9.4), 1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), and 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4) - , 1.15 (1.15, 1.15.1, 1.15.2) and 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17 (21w07a, 1.17, 1.17.1), 1.18 (1.18, 1.18.1 and 1.18.2), 1.19 (1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6) + , 1.15 (1.15, 1.15.1, 1.15.2) and 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17 (21w07a, 1.17, 1.17.1), 1.18 (1.18, 1.18.1 and 1.18.2), 1.19 (1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6, 1.21.1) * Parses all packets and emits events with packet fields as JavaScript objects. * Send a packet by supplying fields as a JavaScript object. diff --git a/package.json b/package.json index b7978074..7904916b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "endian-toggle": "^0.0.0", "lodash.get": "^4.1.2", "lodash.merge": "^4.3.0", - "minecraft-data": "^3.75.0", + "minecraft-data": "^3.78.0", "minecraft-folder-path": "^1.2.0", "node-fetch": "^2.6.1", "node-rsa": "^0.4.2", diff --git a/src/version.js b/src/version.js index 1bfcd27a..327c242b 100644 --- a/src/version.js +++ b/src/version.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { - defaultVersion: '1.20.6', - supportedVersions: ['1.7', '1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20', '1.20.1', '1.20.2', '1.20.4', '1.20.6'] + defaultVersion: '1.21.1', + supportedVersions: ['1.7', '1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20', '1.20.1', '1.20.2', '1.20.4', '1.20.6', '1.21.1'] } diff --git a/test/packetTest.js b/test/packetTest.js index da03037d..534d28ed 100644 --- a/test/packetTest.js +++ b/test/packetTest.js @@ -135,6 +135,9 @@ const values = { delete results['..'] return results }, + vec2f: { + x: 0, y: 0 + }, vec3f: { x: 0, y: 0, z: 0 }, @@ -153,6 +156,9 @@ const values = { SlotComponent: { type: 'hide_tooltip' }, + ChatTypes: { + registryIndex: 1 + }, SlotComponentType: 0, nbt: nbtValue, optionalNbt: nbtValue, diff --git a/test/serverTest.js b/test/serverTest.js index 30ed0b0f..5837e765 100644 --- a/test/serverTest.js +++ b/test/serverTest.js @@ -83,7 +83,7 @@ for (const supportedVersion of mc.supportedVersions) { plainMessage: message, signedChatContent: '', unsignedChatContent: JSON.stringify({ text: message }), - type: 0, + type: mcData.supportFeature('incrementedChatType') ? { registryIndex: 1 } : 0, senderUuid: 'd3527a0b-bc03-45d5-a878-2aafdd8c8a43', // random senderName: JSON.stringify({ text: sender }), senderTeam: undefined,