mineflayer 4.34.0 → 4.35.0

package/.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

package/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

package/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

package/docs/history.md

@@ -1,3 +1,8 @@
+## 4.35.0
+* [🎈 1.21.11 (#3781)](https://github.com/PrismarineJS/mineflayer/commit/597745c7c061943620fcacba7254bccee05b7a3e) (thanks @rom1504bot)
+* [Fix chat pattern and event listener in tutorial (#3783)](https://github.com/PrismarineJS/mineflayer/commit/48586138f560991de60bea639c71fa82954cf50f) (thanks @brentspine)
+* [Update history.md](https://github.com/PrismarineJS/mineflayer/commit/c9f766513d5bb5a93c5b86c07827128716c0afdb) (thanks @extremeheat)
+
 ## 4.34.0
 * [🎈 1.21.9/1.21.10 support (#3754)](https://github.com/PrismarineJS/mineflayer/commit/f0afaf73061c15b67e5d3457b60ed543e711acb6) (thanks @rom1504bot)
 * [Update russian docs (#3762)](https://github.com/PrismarineJS/mineflayer/commit/887b52b933d943c8d605d7835d6d55d198208fee) (thanks @fungoza)

package/docs/tutorial.md

@@ -576,8 +576,8 @@ Here we're creating a bot that answer 'hello' from the other player.
 
 ```js
 bot.addChatPattern(
-  /(helo|hello|Hello)/,
   'hello',
+  /(helo|hello|Hello)/,
   'Someone says hello'
 )
 
@@ -585,7 +585,7 @@ const hi = () => {
   bot.chat('Hi!')
 }
 
-bot.on('hello', hi)
+bot.on('chat:hello', hi)
 ```
 
 #### Custom chat

package/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()
           }

package/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)
         }

package/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()
         }

package/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "4.34.0",
+  "version": "4.35.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",
@@ -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",