mineflayer 3.12.0 → 3.13.0

package/docs/history.md

@@ -1,3 +1,9 @@
+## 3.13.0
+
+* compute scoreboard displayName dynamically (@U9G)
+* SkinsRestorer fix (@U5B)
+* Fix bot not swinging arm on block place (@IceTank)
+
 ## 3.12.0
 
 * Bypass anticheats that detect sensitivity (@mat-1)

package/lib/plugins/blocks.js

@@ -476,6 +476,7 @@ function inject (bot, { version, storageBuilder }) {
   // if we get a respawn packet and the dimension is changed,
   // unload all chunks from memory.
   let dimension
+  let worldName
   function dimensionToFolderName (dimension) {
     if (bot.supportFeature('dimensionIsAnInt')) {
       return dimensionNames[dimension]
@@ -511,13 +512,26 @@ function inject (bot, { version, storageBuilder }) {
   }
 
   bot._client.on('login', (packet) => {
-    dimension = packet.dimension
+    if (bot.supportFeature('dimensionIsAnInt')) {
+      dimension = packet.dimension
+    } else {
+      dimension = packet.dimension
+      worldName = packet.worldName
+    }
     switchWorld()
   })
 
   bot._client.on('respawn', (packet) => {
-    if (dimension === packet.dimension) return
-    dimension = packet.dimension
+    if (bot.supportFeature('dimensionIsAnInt')) { // <=1.15.2
+      if (dimension === packet.dimension) return
+      dimension = packet.dimension
+    } else { // >= 1.15.2
+      if (dimension === packet.dimension) return
+      if (worldName === packet.worldName && packet.copyMetadata === true) return // don't unload chunks if in same world and metaData is true
+      // Metadata is true when switching dimensions however, then the world name is different
+      dimension = packet.dimension
+      worldName = packet.worldName
+    }
     switchWorld()
   })
 

package/lib/plugins/entities.js

@@ -89,7 +89,11 @@ function inject (bot, { version }) {
     return best
   }
 
-  bot._client.once('login', (packet) => {
+  // Reset list of players and entities on login
+  bot._client.on('login', (packet) => {
+    bot.players = {}
+    bot.uuidToUsername = {}
+    bot.entities = {}
     // login
     bot.entity = fetchEntity(packet.entityId)
     bot.username = bot._client.username

package/lib/plugins/generic_place.js

@@ -7,7 +7,7 @@ function inject (bot, { version }) {
    *
    * @param {import('prismarine-block').Block} referenceBlock
    * @param {import('vec3').Vec3} faceVector
-   * @param {{half?: 'top'|'bottom', delta?: import('vec3').Vec3, forceLook?: boolean | 'ignore', offhand?: boolean}} options
+   * @param {{half?: 'top'|'bottom', delta?: import('vec3').Vec3, forceLook?: boolean | 'ignore', offhand?: boolean, swingArm?: 'right' | 'left', showHand?: boolean}} options
    */
   async function _genericPlace (referenceBlock, faceVector, options) {
     let handToPlaceWith = 0
@@ -39,6 +39,10 @@ function inject (bot, { version }) {
     // TODO: tell the server that we are sneaking while doing this
     const pos = referenceBlock.position
 
+    if (options.swingArm) {
+      bot.swingArm(options.swingArm, options.showHand)
+    }
+
     if (bot.supportFeature('blockPlaceHasHeldItem')) {
       const packet = {
         location: pos,

package/lib/plugins/place_block.js

@@ -21,7 +21,7 @@ function inject (bot) {
   }
 
   async function placeBlock (referenceBlock, faceVector) {
-    await placeBlockWithOptions(referenceBlock, faceVector, {})
+    await placeBlockWithOptions(referenceBlock, faceVector, { swingArm: 'right' })
   }
 
   bot.placeBlock = callbackify(placeBlock)

package/lib/plugins/place_entity.js

@@ -5,6 +5,12 @@ module.exports = inject
 function inject (bot, { version }) {
   const Item = require('prismarine-item')(version)
 
+  /**
+   *
+   * @param {import('prismarine-block').Block} referenceBlock
+   * @param {import('vec3').Vec3} faceVector
+   * @param {{forceLook?: boolean | 'ignore', offhand?: boolean, swingArm?: 'right' | 'left', showHand?: boolean}} options
+   */
   async function placeEntityWithOptions (referenceBlock, faceVector, options) {
     if (!bot.heldItem) throw new Error('must be holding an item to place an entity')
 
@@ -20,14 +26,14 @@ function inject (bot, { version }) {
       name = bot.heldItem.spawnEggMobName
     }
 
-    const pos = await bot._genericPlace(referenceBlock, faceVector, options)
-
     if (type === 'spawn_egg') {
-      bot.swingArm(undefined, false)
-    } else {
-      bot.swingArm()
+      options.showHand = false
     }
 
+    if (!options.swingArm) options.swingArm = options.offhand ? 'left' : 'right'
+
+    const pos = await bot._genericPlace(referenceBlock, faceVector, options)
+
     if (type === 'boat') {
       if (bot.supportFeature('useItemWithOwnPacket')) {
         bot._client.write('use_item', {

package/lib/plugins/scoreboard.js

@@ -1,9 +1,7 @@
-const ScoreBoard = require('../scoreboard')
-
 module.exports = inject
 
 function inject (bot) {
-  const ChatMessage = require('prismarine-chat')(bot.version)
+  const ScoreBoard = require('../scoreboard')(bot)
   const scoreboards = {}
 
   bot._client.on('scoreboard_objective', (packet) => {
@@ -29,12 +27,7 @@ function inject (bot) {
   bot._client.on('scoreboard_score', (packet) => {
     const scoreboard = scoreboards[packet.scoreName]
     if (scoreboard !== undefined && packet.action === 0) {
-      const { itemName, value } = packet
-      let displayName = new ChatMessage(itemName)
-      if (itemName in bot.teamMap) {
-        displayName = bot.teamMap[itemName].displayName(itemName)
-      }
-      const updated = scoreboard.add(itemName, value, displayName)
+      const updated = scoreboard.add(packet.itemName, packet.value)
       bot.emit('scoreUpdated', scoreboard, updated)
     }
 

package/lib/scoreboard.js

@@ -4,49 +4,62 @@ const sortItems = (a, b) => {
   return 1
 }
 
-class ScoreBoard {
-  constructor (packet) {
-    this.name = packet.name
-    this.setTitle(packet.displayText)
-    this.itemsMap = {}
-  }
+module.exports = (bot) => {
+  const ChatMessage = require('prismarine-chat')(bot.version)
 
-  setTitle (title) {
-    try {
-      this.title = JSON.parse(title).text // version>1.13
-    } catch {
-      this.title = title
+  class ScoreBoard {
+    constructor (packet) {
+      this.name = packet.name
+      this.setTitle(packet.displayText)
+      this.itemsMap = {}
     }
-  }
 
-  add (name, value, displayName) {
-    this.itemsMap[name] = { name, value, displayName }
-    return this.itemsMap[name]
-  }
+    setTitle (title) {
+      try {
+        this.title = JSON.parse(title).text // version>1.13
+      } catch {
+        this.title = title
+      }
+    }
 
-  remove (name) {
-    const removed = this.itemsMap[name]
-    delete this.itemsMap[name]
-    return removed
-  }
+    add (name, value) {
+      this.itemsMap[name] = { name, value }
+      this.itemsMap[name] = {
+        name,
+        value,
+        get displayName () {
+          if (name in bot.teamMap) {
+            return bot.teamMap[name].displayName(name)
+          }
+          return new ChatMessage(name)
+        }
+      }
+      return this.itemsMap[name]
+    }
 
-  get items () {
-    return Object.values(this.itemsMap).sort(sortItems)
+    remove (name) {
+      const removed = this.itemsMap[name]
+      delete this.itemsMap[name]
+      return removed
+    }
+
+    get items () {
+      return Object.values(this.itemsMap).sort(sortItems)
+    }
   }
-}
 
-ScoreBoard.positions = {
-  get list () {
-    return this[0]
-  },
+  ScoreBoard.positions = {
+    get list () {
+      return this[0]
+    },
 
-  get sidebar () {
-    return this[1]
-  },
+    get sidebar () {
+      return this[1]
+    },
 
-  get belowName () {
-    return this[2]
+    get belowName () {
+      return this[2]
+    }
   }
+  return ScoreBoard
 }
-
-module.exports = ScoreBoard

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",