🎈 1.21.9/1.21.10 support (#3754)

* Update to version 1.21.9

* Fix branch name in minecraft-data clone command

* 1.21.9: velocity field changes (#3807)

* Update to version 1.21.10

* Update ci.yml

* Update ci.yml

* Update package.json

* Update velocity handling in entities.js plugin and internalTest.js to use new feature

* Update spawn_point.js plugin to use new feature

* Fix incrorrect event listener in nether.js test

* Add delays to flaky tests

* Use new gamerule to prevent monsters spawning during tests and killing the bot

* Update ci.yml

* Update package.json

* remove feature flags on packet writes

* rename .movement to .velocity

* Update entities.js

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: extremeheat <extreme@protonmail.ch>

* fix version check

* ver fix

* update internaltest

* add clearInventory delay

* Update ci.yml

* Update minecraft-protocol dependency version

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Romain Beaumont <romain.rom1@gmail.com>
Co-authored-by: extremeheat <extreme@protonmail.ch>
Co-authored-by: SuperGamerTron <45374546+SuperGamerTron@users.noreply.github.com>

Author: 5 people

docs/README.md

@@ -17,7 +17,7 @@ First time using Node.js? You may want to start with the [tutorial](tutorial.md)
 
 ## Features
 
- * Supports Minecraft 1.8 to 1.21.8 (1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.20, 1.21.8) <!--version-->
+ * Supports Minecraft 1.8 to 1.21.9 (1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19, 1.20, 1.21, 1.21.9) <!--version-->
  * Entity knowledge and tracking.
  * Block knowledge. You can query the world around you. Milliseconds to find any block.
  * Physics and movement - handle all bounding boxes

lib/loader.js

@@ -47,6 +47,8 @@ const plugins = {
 
 const minecraftData = require('minecraft-data')
 const { testedVersions, latestSupportedVersion, oldestSupportedVersion } = require('./version')
+const latestSupportedProtocolVersion = minecraftData.versionsByMinecraftVersion.pc[latestSupportedVersion].version
+if (!latestSupportedProtocolVersion) throw new Error(`Version '${latestSupportedVersion}' not supported by minecraft-data - is it up to date?`)
 
 module.exports = {
   createBot,
@@ -118,7 +120,7 @@ function createBot (options = {}) {
     if (!bot.registry?.version) throw new Error(`Server version '${serverPingVersion}' is not supported, no data for version`)
 
     const versionData = bot.registry.version
-    if (versionData['>'](latestSupportedVersion)) {
+    if (versionData['>'](latestSupportedVersion) && (versionData.version !== latestSupportedProtocolVersion)) {
       throw new Error(`Server version '${serverPingVersion}' is not supported. Latest supported version is '${latestSupportedVersion}'.`)
     } else if (versionData['<'](oldestSupportedVersion)) {
       throw new Error(`Server version '${serverPingVersion}' is not supported. Oldest supported version is '${oldestSupportedVersion}'.`)

lib/plugins/entities.js

@@ -271,7 +271,12 @@ function inject (bot) {
     entity.pitch = conv.fromNotchianPitchByte(packet.pitch)
     entity.headPitch = conv.fromNotchianPitchByte(packet.headPitch)
 
-    const notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
+    let notchVel
+    if (bot.supportFeature('entityVelocityIsLpVec3')) {
+      notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
+    } else {
+      notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
+    }
     entity.velocity.update(conv.fromNotchVelocity(notchVel))
     entity.metadata = parseMetadata(packet.metadata, entity.metadata)
 
@@ -281,7 +286,12 @@ function inject (bot) {
   bot._client.on('entity_velocity', (packet) => {
     // entity velocity
     const entity = fetchEntity(packet.entityId)
-    const notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
+    let notchVel
+    if (bot.supportFeature('entityVelocityIsLpVec3')) {
+      notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
+    } else {
+      notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
+    }
     entity.velocity.update(conv.fromNotchVelocity(notchVel))
   })
 

lib/plugins/spawn_point.js

@@ -5,7 +5,8 @@ module.exports = inject
 function inject (bot) {
   bot.spawnPoint = new Vec3(0, 0, 0)
   bot._client.on('spawn_position', (packet) => {
-    bot.spawnPoint = new Vec3(packet.location.x, packet.location.y, packet.location.z)
+    const pos = bot.supportFeature('spawnPositionIsGlobal') ? packet.globalPos.location : packet.location
+    bot.spawnPoint = new Vec3(pos.x, pos.y, pos.z)
     bot.emit('game')
   })
 }

lib/version.js

@@ -1,4 +1,4 @@
-const testedVersions = ['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', '1.20.2', '1.20.4', '1.20.6', '1.21.1', '1.21.3', '1.21.4', '1.21.5', '1.21.6', '1.21.8']
+const testedVersions = ['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', '1.20.2', '1.20.4', '1.20.6', '1.21.1', '1.21.3', '1.21.4', '1.21.5', '1.21.6', '1.21.8', '1.21.9']
 module.exports = {
 
   testedVersions,

package.json

@@ -22,7 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "minecraft-data": "^3.98.0",
-    "minecraft-protocol": "^1.61.0",
+    "minecraft-protocol": "^1.63.0",
     "prismarine-biome": "^1.1.1",
     "prismarine-block": "^1.22.0",
     "prismarine-chat": "^1.7.1",

test/externalTest.js

@@ -68,6 +68,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
         bot.once('spawn', () => {
           console.log('bot spawned, opping...')
           wrap.writeServer('op flatbot\n')
+          wrap.writeServer('gamerule spawnMonsters false\n')
           bot.once('messagestr', msg => {
             if (msg.includes('Made flatbot a server operator') || msg === '[Server: Opped flatbot]') {
               done()

test/externalTests/crafting.js

@@ -53,6 +53,7 @@ module.exports = () => async (bot) => {
   await bot.test.setBlock({ x: 1, y: 0, z: 0, relative: true, blockName: 'crafting_table' })
   bot.chat('/give @p stick 7')
   await once(bot.inventory, 'updateSlot')
+  await bot.test.wait(500)
   const craftingTable = bot.findBlock({ matching: blocksByName.crafting_table.id })
   await bot.craft(bot.recipesFor(itemsByName.ladder.id, null, null, true)[0], 1, craftingTable)
 }

test/externalTests/enchanting.js

@@ -54,6 +54,7 @@ module.exports = () => async (bot) => {
 
   console.log('Table ready')
   await enchantingTable.enchant(enchantSlot)
+  await bot.test.wait(500)
   const result = await enchantingTable.takeTargetItem()
 
   assert.notStrictEqual(result.nbt, undefined)

test/externalTests/nether.js

@@ -13,7 +13,7 @@ module.exports = () => async (bot) => {
   assert.notStrictEqual(signItem, null)
 
   const p = new Promise((resolve, reject) => {
-    bot._client.on('open_sign_entity', (packet) => {
+    bot._client.once('open_sign_entity', (packet) => {
       console.log('Open sign', packet)
       const sign = bot.blockAt(new Vec3(packet.location))
       bot.updateSign(sign, '1\n2\n3\n')