🎈 1.21.11 (#3781)

* Update to version 1.21.11

* add `gameRuleUsesResourceLocation` feature flag (#3820)

* Use new gamerule feature

* Update ci.yml

* Update package.json

* Update ci.yml

* Update package.json

---------

Co-authored-by: extremeheat <extreme@protonmail.ch>

* Fix flaky time test race condition and add timeouts to promise chains (#3824)

* Initial plan

* Add timeouts to promises to prevent test hangs and fix time test race condition

Co-authored-by: extremeheat <13713600+extremeheat@users.noreply.github.com>

* Use onceWithCleanup with checkCondition for cleaner promise handling

Co-authored-by: extremeheat <13713600+extremeheat@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: extremeheat <13713600+extremeheat@users.noreply.github.com>

* Fix flaky CI: increase before-hook timeout and guard after-hook against undefined bot (#3825)

The 1.9.4 test was failing because the 60s timeout for downloading,
starting the server, connecting, and opping was too tight for CI.
Increased to 120s. Also added a null guard in the after hook so it
doesn't crash when bot was never created due to a before-hook timeout.

Co-authored-by: Simeon Kummer <simeon@hitthecode.de>
Co-authored-by: Cursor <cursoragent@cursor.com>

* Clean up CI workflow by removing unnecessary commands

Removed outdated commands for cloning minecraft-data and downloading protodef files.

* Update minecraft-protocol dependency version

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: SuperGamerTron <45374546+SuperGamerTron@users.noreply.github.com>
Co-authored-by: extremeheat <extreme@protonmail.ch>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: extremeheat <13713600+extremeheat@users.noreply.github.com>
Co-authored-by: plainprince <119175160+plainprince@users.noreply.github.com>
Co-authored-by: Simeon Kummer <simeon@hitthecode.de>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Romain Beaumont <romain.rom1@gmail.com>

Author: 9 people

.github/workflows/ci.yml

@@ -56,5 +56,6 @@ jobs:
           java-package: jre
       - name: Install Dependencies
         run: npm install
+
       - name: Start Tests
         run: npm run mocha_test -- -g ${{ matrix.mcVersion }}v

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.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-->
+ * Supports Minecraft 1.8 to 1.21.11 (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, 1.21.11) <!--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/plugins/blocks.js

@@ -70,7 +70,7 @@ function inject (bot, { version, storageBuilder, hideErrors }) {
   async function waitForChunksToLoad () {
     const dist = 2
     // This makes sure that the bot's real position has been already sent
-    if (!bot.entity.height) await onceWithCleanup(bot, 'chunkColumnLoad')
+    if (!bot.entity.height) await onceWithCleanup(bot, 'chunkColumnLoad', { timeout: 10000 })
     const pos = bot.entity.position
     const center = new Vec3(pos.x >> 4 << 4, 0, pos.z >> 4 << 4)
     // get corner coords of 5x5 chunks around us
@@ -84,10 +84,16 @@ function inject (bot, { version, storageBuilder, hideErrors }) {
     }
 
     if (chunkPosToCheck.size) {
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          bot.world.off('chunkColumnLoad', waitForLoadEvents)
+          reject(new Error(`Timeout waiting for ${chunkPosToCheck.size} chunks to load after 10000ms`))
+        }, 10000)
+
         function waitForLoadEvents (columnCorner) {
           chunkPosToCheck.delete(columnCorner.toString())
           if (chunkPosToCheck.size === 0) { // no chunks left to find
+            clearTimeout(timeout)
             bot.world.off('chunkColumnLoad', waitForLoadEvents) // remove this listener instance
             resolve()
           }

lib/plugins/chat.js

@@ -206,10 +206,17 @@ function inject (bot, options) {
   }
 
   function awaitMessage (...args) {
+    const timeout = typeof args[args.length - 1] === 'number' ? args.pop() : 20000
     return new Promise((resolve, reject) => {
       const resolveMessages = args.flatMap(x => x)
+      const timeoutHandle = setTimeout(() => {
+        bot.off('messagestr', messageListener)
+        reject(new Error(`Timeout waiting for message after ${timeout}ms`))
+      }, timeout)
+
       function messageListener (msg) {
         if (resolveMessages.some(x => x instanceof RegExp ? x.test(msg) : msg === x)) {
+          clearTimeout(timeoutHandle)
           resolve(msg)
           bot.off('messagestr', messageListener)
         }

lib/plugins/physics.js

@@ -427,10 +427,17 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
 
   bot.waitForTicks = async function (ticks) {
     if (ticks <= 0) return
-    await new Promise(resolve => {
+    await new Promise((resolve, reject) => {
+      // Assuming 20 ticks per second, add extra time for lag
+      const timeout = setTimeout(() => {
+        bot.removeListener('physicsTick', tickListener)
+        reject(new Error(`Timeout waiting for ${ticks} ticks after ${(ticks * 50 + 5000)}ms`))
+      }, ticks * 50 + 5000) // 50ms per tick + 5s buffer
+
       const tickListener = () => {
         ticks--
         if (ticks === 0) {
+          clearTimeout(timeout)
           bot.removeListener('physicsTick', tickListener)
           resolve()
         }

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', '1.21.9']
+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', '1.21.11']
 module.exports = {
 
   testedVersions,

package.json

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

test/externalTest.js

@@ -52,7 +52,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
       console.log(`Port chosen: ${PORT}`)
     })
     before(function (done) {
-      this.timeout(1000 * 60)
+      this.timeout(1000 * 120)
       function begin () {
         bot = mineflayer.createBot({
           username: 'flatbot',
@@ -68,7 +68,11 @@ 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')
+          if (bot.supportFeature('gameRuleUsesResourceLocation')) {
+            wrap.writeServer('gamerule minecraft:spawn_monsters false\n')
+          } else {
+            wrap.writeServer('gamerule spawnMonsters false\n')
+          }
           bot.once('messagestr', msg => {
             if (msg.includes('Made flatbot a server operator') || msg === '[Server: Opped flatbot]') {
               done()
@@ -112,7 +116,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
     })
 
     after((done) => {
-      bot.quit()
+      if (bot) bot.quit()
       wrap.stopServer((err) => {
         if (err) {
           console.log(err)

test/externalTests/bossBar.js

@@ -1,5 +1,5 @@
 const assert = require('assert')
-const { once } = require('../../lib/promise_utils')
+const { once, onceWithCleanup } = require('../../lib/promise_utils')
 
 module.exports = (version) => async (bot) => {
   // Skip test for versions older than 1.13 (bossbar command not available)
@@ -44,15 +44,13 @@ module.exports = (version) => async (bot) => {
     bot.test.sayEverywhere(`/bossbar set ${uuid} value ${newHealth * 100}`)
 
     // Wait for the boss bar to have the expected state
-    let bossBar
-    while (true) {
-      [bossBar] = await once(bot, 'bossBarUpdated')
-      if (
+    const [bossBar] = await onceWithCleanup(bot, 'bossBarUpdated', {
+      timeout: 5000,
+      checkCondition: (bossBar) =>
         bossBar.health === newHealth &&
         bossBar.color === newColor &&
         bossBar.dividers === 10
-      ) break
-    }
+    })
     assert.strictEqual(bossBar.health, newHealth)
     assert.strictEqual(bossBar.color, newColor)
     assert.strictEqual(bossBar.dividers, 10)

test/externalTests/time.js

@@ -1,5 +1,5 @@
 const assert = require('assert')
-const { once } = require('../../lib/promise_utils')
+const { once, onceWithCleanup } = require('../../lib/promise_utils')
 
 module.exports = () => async (bot) => {
   // Test time properties and ranges
@@ -30,9 +30,17 @@ module.exports = () => async (bot) => {
   // Helper functions
   const isTimeClose = (current, target) => Math.abs(current - target) < 510
   const isTimeInRange = (current, start, end) => start <= end ? current >= start && current <= end : current >= start || current <= end
-  const waitForTime = async () => {
-    await once(bot, 'time')
-    await bot.test.wait(200)
+  const waitForTime = async (expectedTime) => {
+    // Wait for a time event that matches our expectation (if provided)
+    // This helps avoid race conditions where we catch an old time update
+    if (expectedTime !== undefined) {
+      await onceWithCleanup(bot, 'time', {
+        timeout: 5000,
+        checkCondition: () => isTimeClose(bot.time.timeOfDay, expectedTime)
+      })
+    } else {
+      await once(bot, 'time')
+    }
   }
 
   // Test time transitions
@@ -45,7 +53,7 @@ module.exports = () => async (bot) => {
 
   for (const test of timeTests) {
     bot.test.sayEverywhere(`/time set ${test.time}`)
-    await waitForTime()
+    await waitForTime(test.time)
     assert(isTimeClose(bot.time.timeOfDay, test.time), `Expected time to be close to ${test.time}, got ${bot.time.timeOfDay}`)
     assert.strictEqual(bot.time.isDay, test.isDay, `${test.name} should be ${test.isDay ? 'day' : 'night'}`)
   }
@@ -60,11 +68,19 @@ module.exports = () => async (bot) => {
 
   // Test daylight cycle
   const originalDaylightCycle = bot.time.doDaylightCycle
-  bot.test.sayEverywhere('/gamerule doDaylightCycle false')
+  if (bot.supportFeature('gameRuleUsesResourceLocation')) {
+    bot.test.sayEverywhere('/gamerule minecraft:advance_time false')
+  } else {
+    bot.test.sayEverywhere('/gamerule doDaylightCycle false')
+  }
   await waitForTime()
   assert.strictEqual(bot.time.doDaylightCycle, false)
 
-  bot.test.sayEverywhere(`/gamerule doDaylightCycle ${originalDaylightCycle}`)
+  if (bot.supportFeature('gameRuleUsesResourceLocation')) {
+    bot.test.sayEverywhere(`/gamerule minecraft:advance_time ${originalDaylightCycle}`)
+  } else {
+    bot.test.sayEverywhere(`/gamerule doDaylightCycle ${originalDaylightCycle}`)
+  }
   await waitForTime()
   assert.strictEqual(bot.time.doDaylightCycle, originalDaylightCycle)