mineflayer 3.11.0 → 3.13.0

package/lib/plugins/generic_place.js

@@ -1,5 +1,4 @@
 const assert = require('assert')
-const { once } = require('events')
 module.exports = inject
 
 function inject (bot, { version }) {
@@ -8,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
@@ -40,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,
@@ -80,14 +83,6 @@ function inject (bot, { version }) {
       })
     }
 
-    if (bot.game.gameMode !== 'creative') {
-      if (handToPlaceWith === 0) {
-        await once(bot.inventory, `updateSlot:${bot.heldItem.slot}`)
-      } else {
-        await once(bot.inventory, 'updateSlot:45')
-      }
-    }
-
     return pos
   }
   bot._genericPlace = _genericPlace

package/lib/plugins/inventory.js

@@ -118,7 +118,7 @@ function inject (bot, { version, hideErrors }) {
     bot.usingHeldItem = false
   }
 
-  async function putSelectedItemRange (start, end, window, slot, noWaiting = false) {
+  async function putSelectedItemRange (start, end, window, slot) {
     // put the selected item back indow the slot range in window
 
     // try to put it in an item that already exists and just increase
@@ -427,13 +427,24 @@ function inject (bot, { version, hideErrors }) {
   function confirmTransaction (windowId, actionId, accepted) {
     // drop the queue entries for all the clicks that the server did not send
     // transaction packets for.
-    let click = windowClickQueue.shift()
-    if (click === undefined) {
+    // Also reject transactions that aren't sent from mineflayer
+    let click = windowClickQueue[0]
+    if (click === undefined || !windowClickQueue.some(clicks => clicks.id === actionId)) {
+      // mimic vanilla client and send a rejection for faulty transaction packets
+      bot._client.write('transaction', {
+        windowId: windowId,
+        action: actionId,
+        accepted: true
+        // bot.emit(`confirmTransaction${click.id}`, false)
+      })
       if (!hideErrors) {
         console.log(`WARNING : unknown transaction confirmation for window ${windowId}, action ${actionId} and accepted ${accepted}`)
       }
       return
     }
+    // shift it later if packets are sent out of order
+    click = windowClickQueue.shift()
+
     assert.ok(click.id <= actionId)
     while (actionId > click.id) {
       onAccepted()
@@ -534,20 +545,20 @@ function inject (bot, { version, hideErrors }) {
       }
       const [success] = await response
       if (!success) {
-        throw new Error(`Server rejected transaction for clicking on slot ${slot}, on window ${JSON.stringify(window.slots, null, 2)}.`)
+        throw new Error(`Server rejected transaction for clicking on slot ${slot}, on window with id ${window?.id}.`)
       }
     } else {
       await waitForWindowUpdate(window, slot)
     }
   }
 
-  async function putAway (slot, noWaiting = false) {
+  async function putAway (slot) {
     const window = bot.currentWindow || bot.inventory
     const promisePutAway = once(window, `updateSlot:${slot}`)
     await clickWindow(slot, 0, 0)
     const start = window.inventoryStart
     const end = window.inventoryEnd
-    await putSelectedItemRange(start, end, window, null, noWaiting)
+    await putSelectedItemRange(start, end, window, null)
     await promisePutAway
   }
 
@@ -564,9 +575,6 @@ function inject (bot, { version, hideErrors }) {
 
   bot._client.on('transaction', (packet) => {
     // confirm transaction
-    if (packet.action < 0) {
-      return
-    }
     confirmTransaction(packet.windowId, packet.action, packet.accepted)
   })
 

package/lib/plugins/physics.js

@@ -1,4 +1,4 @@
-const Vec3 = require('vec3').Vec3
+const { Vec3 } = require('vec3')
 const assert = require('assert')
 const math = require('../math')
 const conv = require('../conversions')
@@ -33,6 +33,7 @@ function inject (bot, { physicsEnabled }) {
     sneak: false
   }
   let lastSentYaw = null
+  let lastSentPitch = null
   let doPhysicsTimer = null
   let lastPhysicsFrameTime = null
   let shouldUsePhysics = false
@@ -122,13 +123,16 @@ function inject (bot, { physicsEnabled }) {
 
     // Increment the yaw in baby steps so that notchian clients (not the server) can keep up.
     const dYaw = deltaYaw(bot.entity.yaw, lastSentYaw)
+    const dPitch = bot.entity.pitch - (lastSentPitch || 0)
 
     // Vanilla doesn't clamp yaw, so we don't want to do it either
     const maxDeltaYaw = dt * physics.yawSpeed
+    const maxDeltaPitch = dt * physics.pitchSpeed
     lastSentYaw += math.clamp(-maxDeltaYaw, dYaw, maxDeltaYaw)
+    lastSentPitch += math.clamp(-maxDeltaPitch, dPitch, maxDeltaPitch)
 
-    const yaw = conv.toNotchianYaw(lastSentYaw)
-    const pitch = conv.toNotchianPitch(bot.entity.pitch)
+    const yaw = Math.fround(conv.toNotchianYaw(lastSentYaw))
+    const pitch = Math.fround(conv.toNotchianPitch(lastSentPitch))
     const position = bot.entity.position
     const onGround = bot.entity.onGround
 
@@ -225,8 +229,15 @@ function inject (bot, { physicsEnabled }) {
     }
     lookingTask = createTask()
 
-    bot.entity.yaw = yaw
-    bot.entity.pitch = pitch
+    // this is done to bypass certain anticheat checks that detect the player's sensitivity
+    // by calculating the gcd of how much they move the mouse each tick
+    const sensitivity = conv.fromNotchianPitch(0.15) // this is equal to 100% sensitivity in vanilla
+    const yawChange = Math.round((yaw - bot.entity.yaw) / sensitivity) * sensitivity
+    const pitchChange = Math.round((pitch - bot.entity.pitch) / sensitivity) * sensitivity
+
+    bot.entity.yaw += yawChange
+    bot.entity.pitch += pitchChange
+
     if (force) {
       lastSentYaw = yaw
       return

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/ray_trace.js

@@ -23,4 +23,14 @@ module.exports = (bot) => {
 
     return bot.world.raycast(eyePosition, viewDirection, maxDistance, matcher)
   }
+
+  bot.blockAtEntityCursor = (entity = bot.entity, maxDistance = 256, matcher = null) => {
+    if (!entity.position || !entity.height || !entity.pitch || !entity.yaw) return null
+    const { position, height, pitch, yaw } = entity
+
+    const eyePosition = position.offset(0, height, 0)
+    const viewDirection = getViewDirection(pitch, yaw)
+
+    return bot.world.raycast(eyePosition, viewDirection, maxDistance, matcher)
+  }
 }

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/plugins/sound.js

@@ -1,4 +1,4 @@
-const Vec3 = require('vec3').Vec3
+const { Vec3 } = require('vec3')
 
 module.exports = inject
 

package/lib/plugins/spawn_point.js

@@ -1,4 +1,4 @@
-const Vec3 = require('vec3').Vec3
+const { Vec3 } = require('vec3')
 
 module.exports = inject
 

package/lib/plugins/villager.js

@@ -118,7 +118,6 @@ function inject (bot, { version }) {
       if (!ready) {
         ready = true
         villager.emit('ready')
-        console.log('emit ready')
       }
     }
   }
@@ -205,12 +204,12 @@ function inject (bot, { version }) {
         }
       }
 
-      await bot.putAway(2, true)
+      await bot.putAway(2)
     }
 
     for (const i of [0, 1]) {
       if (villager.slots[i]) {
-        await bot.putAway(i, true) // 1.14+ whole stacks of items will automatically be placed , so there might be some left over
+        await bot.putAway(i) // 1.14+ whole stacks of items will automatically be placed , so there might be some left over
       }
     }
   }

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/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'],
   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']
-}
+} // when updating testedVersions, make sure to update CI.yml

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "3.11.0",
+  "version": "3.13.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,31 +21,32 @@
   },
   "license": "MIT",
   "dependencies": {
-    "minecraft-data": "^2.79.0",
-    "minecraft-protocol": "^1.17.0",
-    "prismarine-biome": "^1.1.0",
-    "prismarine-block": "^1.6.0",
-    "prismarine-chat": "^1.1.0",
-    "prismarine-chunk": "^1.24.0",
-    "prismarine-entity": "^1.0.0",
-    "prismarine-item": "^1.6.0",
-    "prismarine-physics": "^1.0.4",
+    "minecraft-data": "^2.95.0",
+    "minecraft-protocol": "^1.26.5",
+    "prismarine-biome": "^1.1.1",
+    "prismarine-block": "^1.10.3",
+    "prismarine-chat": "^1.3.3",
+    "prismarine-chunk": "^1.26.0",
+    "prismarine-entity": "^1.2.0",
+    "prismarine-item": "^1.11.0",
+    "prismarine-nbt": "^2.0.0",
+    "prismarine-physics": "^1.3.1",
     "prismarine-recipe": "^1.1.0",
-    "prismarine-windows": "^2.3.0",
+    "prismarine-windows": "^2.4.2",
     "prismarine-world": "^3.6.0",
-    "protodef": "^1.8.0",
-    "typed-emitter": "^1.2.0",
-    "vec3": "^0.1.6"
+    "protodef": "^1.14.0",
+    "typed-emitter": "^1.3.1",
+    "vec3": "^0.1.7"
   },
   "devDependencies": {
-    "@types/node": "^16.0.1",
-    "doctoc": "^2.0.0",
-    "minecraft-wrap": "^1.2.1",
+    "@types/node": "^17.0.0",
+    "doctoc": "^2.0.1",
+    "minecraft-wrap": "^1.3.0",
     "mineflayer": "file:.",
-    "mocha": "^9.0.0",
-    "standard": "^16.0.1",
-    "standard-markdown": "^6.0.0",
-    "ts-standard": "^10.0.0",
-    "typescript": "^4.3.2"
+    "mocha": "^9.1.2",
+    "standard": "^16.0.4",
+    "standard-markdown": "^7.1.0",
+    "ts-standard": "^11.0.0",
+    "typescript": "^4.4.3"
   }
 }