mineflayer 4.7.0 → 4.8.0

package/.github/workflows/ci.yml

@@ -33,6 +33,8 @@ jobs:
            mcVersion: '1.19'
          - javaVersion: 17
            mcVersion: '1.19.2'
+         - javaVersion: 17
+           mcVersion: '1.19.3'
       fail-fast: false
 
     steps:

package/docs/history.md

@@ -1,3 +1,9 @@
+## 4.8.0
+
+* Update chat parsing (@frej4189)
+* Fix message event not including chat position (@frej4189)
+* 1.19.3  (@frej4189)
+
 ## 4.7.0
 
 * 1.19.2 support (@frej4189)

package/docs/ru/README_RU.md

@@ -12,9 +12,9 @@
 | <sub>EN</sub> [English](../README.md) | <sub>RU</sub> [русский](../ru/README_RU.md) | <sub>ES</sub> [Español](../es/README_ES.md) | <sub>FR</sub> [Français](../fr/README_FR.md) | <sub>TR</sub> [Türkçe](../tr/README_TR.md) | <sub>ZH</sub> [中文](../zh/README_ZH_CN.md) |
 |-------------------------|----------------------------|----------------------------|----------------------------|----------------------------|----------------------------|
 
-Создавайте ботов Minecraft с помощью мощного, стабильного и высокоуровневого JavaScript [API](api.md).
+Создавайте ботов Minecraft с помощью мощного, стабильного и высокоуровневого JavaScript [API](api.md), также можете использовать Python
 
-Первый раз используете Node.js? Начните с [этого](tutorial.md).
+Первый раз используете Node.js? Начните с [этого](tutorial.md). Любите гонять змею? Зацените [Python примеры](https://github.com/PrismarineJS/mineflayer/tree/master/examples/python) и попробуйте колабнуться в [Mineflayer Google коллабе](https://colab.research.google.com/github/PrismarineJS/mineflayer/blob/master/docs/mineflayer.ipynb).
 
 ## Возможности
 

package/index.d.ts

@@ -567,6 +567,7 @@ export interface TransferOptions {
   window: Window
   itemType: number
   metadata: number | null
+  count?: number,
   sourceStart: number
   sourceEnd: number
   destStart: number

package/lib/plugins/chat.js

@@ -113,30 +113,18 @@ function inject (bot, options) {
     const verified = data.verified
     let msg
     if (bot.supportFeature('clientsideChatFormatting')) {
-      let sender
-
-      try {
-        sender = JSON.parse(data.senderName)
-      } catch {
-        sender = {
-          insertion: data.senderName,
-          clickEvent: { action: 'suggest_command', value: `/tell ${data.senderName} ` },
-          hoverEvent: { action: 'show_entity', contents: { id: bot.findPlayer(data.senderName).id, name: data.senderName } },
-          text: data.senderName
-        }
-      }
-
       const parameters = {
-        sender,
+        sender: data.senderName ? JSON.parse(data.senderName) : undefined,
+        target: data.targetName ? JSON.parse(data.targetName) : undefined,
         content: message ? JSON.parse(message) : { text: data.plainMessage }
       }
       msg = ChatMessage.fromNetwork(data.type, parameters)
 
       if (data.unsignedContent) {
-        msg.unsigned = ChatMessage.fromNetwork(data.type, { sender, content: JSON.parse(data.unsignedContent) })
+        msg.unsigned = ChatMessage.fromNetwork(data.type, { sender: parameters.sender, target: parameters.target, content: JSON.parse(data.unsignedContent) })
       }
     } else {
-      msg = ChatMessage.fromNotch(data.formattedMessage)
+      msg = ChatMessage.fromNotch(message)
     }
     bot.emit('message', msg, 'chat', data.sender, verified)
     bot.emit('messagestr', msg.toString(), 'chat', msg, data.sender, verified)
@@ -148,9 +136,9 @@ function inject (bot, options) {
       1: 'system',
       2: 'game_info'
     }
-    bot.emit('message', msg, chatPositions[data.positionid], null)
-    bot.emit('messagestr', msg.toString(), chatPositions[data.positionid], msg, null)
-    if (data.positionid === 2) bot.emit('actionBar', msg, null)
+    bot.emit('message', msg, chatPositions[data.positionId], null)
+    bot.emit('messagestr', msg.toString(), chatPositions[data.positionId], msg, null)
+    if (data.positionId === 2) bot.emit('actionBar', msg, null)
   })
 
   function chatWithHeader (header, message) {
@@ -170,6 +158,8 @@ function inject (bot, options) {
           salt: 0n,
           argumentSignatures: [],
           signedPreview: false,
+          messageCount: 0,
+          acknowledged: Buffer.alloc(3),
           // 1.19.2 Chat Command packet also includes an array of last seen messages
           previousMessages: []
         })

package/lib/plugins/entities.js

@@ -361,13 +361,14 @@ function inject (bot) {
     entity.metadata = metadata
     bot.emit('entityUpdate', entity)
 
-    const typeSlot = bot.supportFeature('itemsAreAlsoBlocks') ? 5 : 6
+    const typeSlot = (bot.supportFeature('itemsAreAlsoBlocks') ? 5 : 6) + (bot.supportFeature('entityMetadataHasLong') ? 1 : 0)
     const slot = packet.metadata.find(e => e.type === typeSlot)
     if (entity.name && (entity.name.toLowerCase() === 'item' || entity.name === 'item_stack') && slot) {
       bot.emit('itemDrop', entity)
     }
 
-    const pose = packet.metadata.find(e => e.type === 18)
+    const typePose = bot.supportFeature('entityMetadataHasLong') ? 19 : 18
+    const pose = packet.metadata.find(e => e.type === typePose)
     if (pose && pose.value === 2) {
       bot.emit('entitySleep', entity)
     }
@@ -444,81 +445,149 @@ function inject (bot) {
 
   bot._client.on('player_info', (packet) => {
     // player list item(s)
-    for (const item of packet.data) {
-      let player = bot.uuidToUsername[item.UUID] ? bot.players[bot.uuidToUsername[item.UUID]] : null
-      if (packet.action === 0) {
+
+    if (bot.supportFeature('playerInfoActionIsBitfield')) {
+      for (const item of packet.data) {
+        let player = bot.uuidToUsername[item.uuid] ? bot.players[bot.uuidToUsername[item.uuid]] : null
         let newPlayer = false
 
-        // New Player
-        if (!player) {
-          player = bot.players[item.name] = {
-            username: item.name,
-            ping: item.ping,
-            uuid: item.UUID,
-            displayName: new ChatMessage({ text: '', extra: [{ text: item.name }] }),
-            profileKeys: item.crypto
-              ? {
-                  publicKey: item.crypto.publicKey, // DER-encoded public key
-                  signature: item.crypto.signature // Signature
-                }
-              : null
-          }
+        const obj = {
+          uuid: item.uuid
+        }
 
-          bot.uuidToUsername[item.UUID] = item.name
-          bot.emit('playerJoined', player)
-          newPlayer = true
-        } else {
-          // Just an Update
-          player.gamemode = item.gamemode
-          player.ping = item.ping
-          if (item.crypto) {
-            player.profileKeys = {
-              publicKey: item.crypto.publicKey,
-              signature: item.crypto.signature
-            }
-          }
+        if (!player) newPlayer = true
+
+        player = player || obj
+
+        if (packet.action & 1) {
+          obj.username = item.player.name
+          obj.displayName = player.displayName || new ChatMessage({ text: '', extra: [{ text: item.player.name }] })
+        }
+
+        if (packet.action & 4) {
+          obj.gamemode = item.gamemode
+        }
+
+        if (packet.action & 16) {
+          obj.ping = item.latency
         }
 
         if (item.displayName) {
-          player.displayName = new ChatMessage(JSON.parse(item.displayName))
+          obj.displayName = new ChatMessage(JSON.parse(item.displayName))
+        } else if (packet.action & 32) obj.displayName = new ChatMessage({ text: '', extra: [{ text: player.username || obj.username }] })
+
+        if (newPlayer) {
+          if (!obj.username) continue // Should be unreachable
+          player = bot.players[obj.username] = obj
+          bot.uuidToUsername[obj.uuid] = obj.username
+        } else {
+          Object.assign(player, obj)
         }
 
-        const playerEntity = Object.values(bot.entities).find(e => e.type === 'player' && e.username === item.name)
+        const playerEntity = Object.values(bot.entities).find(e => e.type === 'player' && e.username === obj.username)
         player.entity = playerEntity
 
         if (playerEntity === bot.entity) {
           bot.player = player
         }
 
-        if (!newPlayer) {
-          bot.emit('playerUpdated', player)
-        }
-      } else if (player) {
-        if (packet.action === 1) {
-          player.gamemode = item.gamemode
-        } else if (packet.action === 2) {
-          player.ping = item.ping
-        } else if (packet.action === 3 && !item.displayName) {
-          player.displayName = new ChatMessage({ text: '', extra: [{ text: player.username }] })
-        } else if (packet.action === 3 && item.displayName) {
-          player.displayName = new ChatMessage(JSON.parse(item.displayName))
-        } else if (packet.action === 4) {
-          if (player.entity === bot.entity) continue
-
-          player.entity = null
-          delete bot.players[player.username]
-          delete bot.uuidToUsername[item.UUID]
-          bot.emit('playerLeft', player)
-          continue
+        if (newPlayer) {
+          bot.emit('playerJoined', player)
         } else {
-          continue
+          bot.emit('playerUpdated', player)
         }
+      }
+    } else {
+      for (const item of packet.data) {
+        let player = bot.uuidToUsername[item.UUID] ? bot.players[bot.uuidToUsername[item.UUID]] : null
+        if (packet.action === 0) {
+          let newPlayer = false
+
+          // New Player
+          if (!player) {
+            player = bot.players[item.name] = {
+              username: item.name,
+              ping: item.ping,
+              uuid: item.UUID,
+              displayName: new ChatMessage({ text: '', extra: [{ text: item.name }] }),
+              profileKeys: item.crypto
+                ? {
+                    publicKey: item.crypto.publicKey, // DER-encoded public key
+                    signature: item.crypto.signature // Signature
+                  }
+                : null
+            }
+
+            bot.uuidToUsername[item.UUID] = item.name
+            bot.emit('playerJoined', player)
+            newPlayer = true
+          } else {
+            // Just an Update
+            player.gamemode = item.gamemode
+            player.ping = item.ping
+            if (item.crypto) {
+              player.profileKeys = {
+                publicKey: item.crypto.publicKey,
+                signature: item.crypto.signature
+              }
+            }
+          }
+
+          if (item.displayName) {
+            player.displayName = new ChatMessage(JSON.parse(item.displayName))
+          }
+
+          const playerEntity = Object.values(bot.entities).find(e => e.type === 'player' && e.username === item.name)
+          player.entity = playerEntity
+
+          if (playerEntity === bot.entity) {
+            bot.player = player
+          }
 
-        bot.emit('playerUpdated', player)
+          if (!newPlayer) {
+            bot.emit('playerUpdated', player)
+          }
+        } else if (player) {
+          if (packet.action === 1) {
+            player.gamemode = item.gamemode
+          } else if (packet.action === 2) {
+            player.ping = item.ping
+          } else if (packet.action === 3 && !item.displayName) {
+            player.displayName = new ChatMessage({ text: '', extra: [{ text: player.username }] })
+          } else if (packet.action === 3 && item.displayName) {
+            player.displayName = new ChatMessage(JSON.parse(item.displayName))
+          } else if (packet.action === 4) {
+            if (player.entity === bot.entity) continue
+
+            player.entity = null
+            delete bot.players[player.username]
+            delete bot.uuidToUsername[item.UUID]
+            bot.emit('playerLeft', player)
+            continue
+          } else {
+            continue
+          }
+
+          bot.emit('playerUpdated', player)
+        }
       }
     }
   })
 
+  // (1.19.3) player(s) leave the game
+  bot._client.on('player_remove', (packet) => {
+    for (const uuid of packet.players) {
+      const player = bot.uuidToUsername[uuid] ? bot.players[bot.uuidToUsername[uuid]] : null
+
+      if (player.entity === bot.entity) continue
+
+      player.entity = null
+      delete bot.players[player.username]
+      delete bot.uuidToUsername[uuid]
+      bot.emit('playerLeft', player)
+    }
+  })
+
   // attaching to a vehicle
   bot._client.on('attach_entity', (packet) => {
     if (packet.entityId !== bot.entity.id) return

package/lib/version.js

@@ -1,4 +1,4 @@
 module.exports = {
   supportedVersions: ['1.8', '1.9', '1.10', '1.11', '1.12', '1.13', '1.14', '1.15', '1.16', '1.17', '1.18', '1.19'],
-  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']
+  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']
 } // when updating testedVersions, make sure to update CI.yml

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,8 +21,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "minecraft-data": "^3.15.2",
-    "minecraft-protocol": "^1.38.1",
+    "minecraft-data": "^3.26.0",
+    "minecraft-protocol": "^1.40.3",
     "prismarine-biome": "^1.1.1",
     "prismarine-block": "^1.13.1",
     "prismarine-chat": "^1.7.1",