mineflayer 3.15.0 → 4.0.0

package/lib/features.json

@@ -328,5 +328,10 @@
     "name": "tallWorld",
     "description": "world starts at -64 and ends at 384",
     "versions": ["1.18", "1.18.1"]
+  },
+  {
+    "name": "sendStringifiedSignText",
+    "description": "sign text send when updating signs is send as stringified strings",
+    "versions": ["1.8", "1.8.9"]
   }
 ]

package/lib/plugins/anvil.js

@@ -1,5 +1,5 @@
 const assert = require('assert')
-const { callbackify, sleep } = require('../promise_utils')
+const { sleep } = require('../promise_utils')
 const { once } = require('events')
 
 module.exports = inject
@@ -105,11 +105,11 @@ function inject (bot) {
       await bot.transfer(options)
     }
 
-    anvil.combine = callbackify(combine)
-    anvil.rename = callbackify(rename)
+    anvil.combine = combine
+    anvil.rename = rename
 
     return anvil
   }
 
-  bot.openAnvil = callbackify(openAnvil)
+  bot.openAnvil = openAnvil
 }

package/lib/plugins/bed.js

@@ -1,5 +1,4 @@
 const { Vec3 } = require('vec3')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -174,7 +173,7 @@ function inject (bot) {
   })
 
   bot.parseBedMetadata = parseBedMetadata
-  bot.wake = callbackify(wake)
-  bot.sleep = callbackify(sleep)
+  bot.wake = wake
+  bot.sleep = sleep
   bot.isABed = isABed
 }

package/lib/plugins/blocks.js

@@ -1,7 +1,7 @@
 const { Vec3 } = require('vec3')
 const assert = require('assert')
 const Painting = require('../painting')
-const { onceWithCleanup, callbackify } = require('../promise_utils')
+const { onceWithCleanup } = require('../promise_utils')
 
 const { OctahedronIterator } = require('prismarine-world').iterators
 
@@ -21,17 +21,12 @@ const dimensionNames = {
 }
 
 function inject (bot, { version, storageBuilder }) {
-  const nbt = require('prismarine-nbt')
   const Block = require('prismarine-block')(version)
   const Chunk = require('prismarine-chunk')(version)
-  const ChatMessage = require('prismarine-chat')(version)
   const World = require('prismarine-world')(version)
-  const signs = {}
   const paintingsByPos = {}
   const paintingsById = {}
 
-  const blockEntities = new Map()
-
   function addPainting (painting) {
     paintingsById[painting.id] = painting
     paintingsByPos[painting.position] = painting
@@ -42,43 +37,6 @@ function inject (bot, { version, storageBuilder }) {
     delete paintingsByPos[painting.position]
   }
 
-  function addBlockEntity (nbtData, x, y, z, type) {
-    const blockEntity = nbtData === undefined ? {} : nbt.simplify(nbtData)
-    const pos = (x !== undefined ? new Vec3(x, y, z) : new Vec3(blockEntity.x, blockEntity.y, blockEntity.z)).floored()
-    // Set raw nbt of blockEntity
-    blockEntity.raw = nbtData
-    blockEntity.type = type
-    const signType = 7
-    // Handle signs
-    if (blockEntity.id === 'minecraft:sign' || blockEntity.id === 'Sign' || blockEntity.type === signType) {
-      const prepareJson = (i) => {
-        const data = blockEntity[`Text${i}`]
-
-        if (data === null || data === '') return ''
-
-        const json = JSON.parse(data)
-        if (json === null || !('text' in json)) return ''
-
-        json.text = json.text.replace(/^"|"$/g, '')
-        return json
-      }
-
-      blockEntity.Text1 = new ChatMessage(prepareJson(1))
-      blockEntity.Text2 = new ChatMessage(prepareJson(2))
-      blockEntity.Text3 = new ChatMessage(prepareJson(3))
-      blockEntity.Text4 = new ChatMessage(prepareJson(4))
-
-      signs[pos] = [
-        blockEntity.Text1.toString(),
-        blockEntity.Text2.toString(),
-        blockEntity.Text3.toString(),
-        blockEntity.Text4.toString()
-      ].join('\n')
-    }
-
-    blockEntities[pos] = blockEntity
-  }
-
   function delColumn (chunkX, chunkZ) {
     bot.world.unloadColumn(chunkX, chunkZ)
   }
@@ -254,9 +212,7 @@ function inject (bot, { version, storageBuilder }) {
     if (!block) return null
 
     if (extraInfos) {
-      block.signText = signs[block.position]
       block.painting = paintingsByPos[block.position]
-      block.blockEntity = blockEntities[block.position]
     }
 
     return block
@@ -293,9 +249,6 @@ function inject (bot, { version, storageBuilder }) {
     }
     if (oldBlock.type !== newBlock.type) {
       const pos = point.floored()
-      delete blockEntities[pos]
-      delete signs[pos]
-
       const painting = paintingsByPos[pos]
       if (painting) deletePainting(painting)
     }
@@ -335,11 +288,13 @@ function inject (bot, { version, storageBuilder }) {
     })
 
     if (typeof packet.blockEntities !== 'undefined') {
+      const column = bot.world.getColumn(packet.x, packet.z)
       for (const blockEntity of packet.blockEntities) {
-        if (blockEntity.x !== undefined) {
-          addBlockEntity(blockEntity.nbtData, blockEntity.x, blockEntity.y, blockEntity.z, blockEntity.type)
+        if (blockEntity.x !== undefined) { // 1.17+
+          column.setBlockEntity(blockEntity, blockEntity.nbtData)
         } else {
-          addBlockEntity(blockEntity)
+          const pos = new Vec3(blockEntity.value.x.value & 0xf, blockEntity.value.y.value, blockEntity.value.z.value & 0xf)
+          column.setBlockEntity(pos, blockEntity)
         }
       }
     }
@@ -434,36 +389,33 @@ function inject (bot, { version, storageBuilder }) {
   })
 
   bot._client.on('update_sign', (packet) => {
-    const pos = new Vec3(packet.location.x, packet.location.y, packet.location.z)
-
-    const prepareString = (i) => {
-      let text = packet[`text${i}`]
+    const pos = new Vec3(packet.location.x & 0xf, packet.location.y, packet.location.z & 0xf)
 
-      if (text === 'null' || text === '') {
-        text = '""'
-      }
-
-      const json = JSON.parse(text)
-      if (json.text) {
-        json.text = json.text.replace(/^"|"$/g, '')
-      }
-
-      return new ChatMessage(json)
+    // TODO: warn if out of loaded world?
+    const column = bot.world.getColumn(packet.location.x >> 4, packet.location.z >> 4)
+    if (!column) {
+      return
     }
 
-    signs[pos] = [
-      prepareString(1),
-      prepareString(2),
-      prepareString(3),
-      prepareString(4)
-    ].join('\n')
+    const blockAt = column.getBlock(pos)
+
+    blockAt.signText = [packet.text1, packet.text2, packet.text3, packet.text4].map(text => {
+      if (text === 'null' || text === '') return ''
+      return JSON.parse(text)
+    })
+    column.setBlock(pos, blockAt)
   })
 
   bot._client.on('tile_entity_data', (packet) => {
     if (packet.location !== undefined) {
-      addBlockEntity(packet.nbtData, packet.location.x, packet.location.y, packet.location.z, packet.action)
+      const column = bot.world.getColumn(packet.location.x >> 4, packet.location.z >> 4)
+      const pos = new Vec3(packet.location.x & 0xf, packet.location.y, packet.location.z & 0xf)
+      column.setBlockEntity(pos, packet.nbtData)
     } else {
-      addBlockEntity(packet.nbtData)
+      const tag = packet.nbtData
+      const column = bot.world.getColumn(tag.value.x.value >> 4, tag.value.z.value >> 4)
+      const pos = new Vec3(tag.value.x.value & 0xf, tag.value.y.value, tag.value.z.value & 0xf)
+      column.setBlockEntity(pos, tag)
     }
   })
 
@@ -480,12 +432,25 @@ function inject (bot, { version, storageBuilder }) {
       }
     }
 
+    let signData
+    if (bot.supportFeature('sendStringifiedSignText')) {
+      signData = {
+        text1: lines[0] ? JSON.stringify(lines[0]) : '""',
+        text2: lines[1] ? JSON.stringify(lines[1]) : '""',
+        text3: lines[2] ? JSON.stringify(lines[2]) : '""',
+        text4: lines[3] ? JSON.stringify(lines[3]) : '""'
+      }
+    } else {
+      signData = {
+        text1: lines[0] ?? '',
+        text2: lines[1] ?? '',
+        text3: lines[2] ?? '',
+        text4: lines[3] ?? ''
+      }
+    }
     bot._client.write('update_sign', {
       location: block.position,
-      text1: JSON.stringify(lines[0]),
-      text2: JSON.stringify(lines[1]),
-      text3: JSON.stringify(lines[2]),
-      text4: JSON.stringify(lines[3])
+      ...signData
     })
   }
 
@@ -583,8 +548,7 @@ function inject (bot, { version, storageBuilder }) {
   bot.canSeeBlock = canSeeBlock
   bot.blockAt = blockAt
   bot._updateBlockState = updateBlockState
-  bot._blockEntities = blockEntities
-  bot.waitForChunksToLoad = callbackify(waitForChunksToLoad)
+  bot.waitForChunksToLoad = waitForChunksToLoad
 }
 
 function onesInShort (n) {

package/lib/plugins/book.js

@@ -1,6 +1,5 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -83,11 +82,11 @@ function inject (bot, { version }) {
     return book
   }
 
-  bot.writeBook = callbackify(async (slot, pages) => {
+  bot.writeBook = async (slot, pages) => {
     await write(slot, pages, null, null, false)
-  })
+  }
 
-  bot.signBook = callbackify(async (slot, pages, author, title) => {
+  bot.signBook = async (slot, pages, author, title) => {
     await write(slot, pages, author, title, true)
-  })
+  }
 }

package/lib/plugins/chat.js

@@ -169,7 +169,7 @@ function inject (bot, options) {
     chatWithHeader('', message)
   }
 
-  bot.tabComplete = callbackify(tabComplete)
+  bot.tabComplete = tabComplete
 
   function addDefaultPatterns () {
     if (!defaultChatPatterns) return
@@ -193,11 +193,3 @@ function inject (bot, options) {
   }
   bot.awaitMessage = awaitMessage
 }
-
-function callbackify (f) { // specifically for this function because cb isn't the last parameter
-  return function (...args) {
-    const cb = args[1]
-    args.splice(1, 1)
-    return f(...args).then(r => { if (cb) { cb(undefined, r) } return r }, err => { if (cb) { cb(err) } else throw err })
-  }
-}

package/lib/plugins/chest.js

@@ -1,4 +1,3 @@
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -26,7 +25,7 @@ function inject (bot) {
     return chest
   }
 
-  bot.openContainer = callbackify(openContainer)
-  bot.openChest = callbackify(openContainer)
-  bot.openDispenser = callbackify(openContainer)
+  bot.openContainer = openContainer
+  bot.openChest = openContainer
+  bot.openDispenser = openContainer
 }

package/lib/plugins/craft.js

@@ -1,6 +1,5 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -226,7 +225,7 @@ function inject (bot, { version }) {
     return true
   }
 
-  bot.craft = callbackify(craft)
+  bot.craft = craft
   bot.recipesFor = recipesFor
   bot.recipesAll = recipesAll
 }

package/lib/plugins/creative.js

@@ -1,6 +1,6 @@
 const assert = require('assert')
 const { Vec3 } = require('vec3')
-const { callbackify, sleep } = require('../promise_utils')
+const { sleep } = require('../promise_utils')
 const { once } = require('events')
 
 module.exports = inject
@@ -10,8 +10,8 @@ function inject (bot, { version }) {
 
   // these features only work when you are in creative mode.
   bot.creative = {
-    setInventorySlot: callbackify(setInventorySlot),
-    flyTo: callbackify(flyTo),
+    setInventorySlot: setInventorySlot,
+    flyTo: flyTo,
     startFlying,
     stopFlying
   }
@@ -23,7 +23,7 @@ function inject (bot, { version }) {
     }
   })
 
-  // WARN: This method should not be called twice on the same slot before first callback succeeds
+  // WARN: This method should not be called twice on the same slot before first promise succeeds
   async function setInventorySlot (slot, item) {
     assert(slot >= 0 && slot <= 44)
 

package/lib/plugins/digging.js

@@ -198,25 +198,12 @@ function inject (bot) {
     return block.digTime(type, creative, bot.entity.isInWater, !bot.entity.onGround, enchantments, bot.entity.effects)
   }
 
-  bot.dig = callbackify(dig)
+  bot.dig = dig
   bot.stopDigging = noop
   bot.canDigBlock = canDigBlock
   bot.digTime = digTime
 }
 
-function callbackify (f) { // specifically for this function because cb could be the non-last parameter
-  return function (...args) {
-    const cbIndex = typeof args[1] === 'function' ? 1 : (typeof args[2] === 'function' ? 2 : 3)
-    const cb = args[cbIndex]
-
-    if (cbIndex === 1) args[1] = true
-    else if (typeof args[1] === 'string') args[1] = args[1] === 'ignore' ? args[1] : false
-    else args[1] = !!args[1] // coerce to boolean
-
-    return f(...args).then(r => { if (cb) { cb(undefined, r) } return r }, err => { if (cb) { cb(err) } else throw err })
-  }
-}
-
 function noop (err) {
   if (err) throw err
 }

package/lib/plugins/enchantment_table.js

@@ -1,6 +1,5 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -15,10 +14,10 @@ function inject (bot) {
 
     resetEnchantmentOptions()
 
-    enchantmentTable.enchant = callbackify(enchant)
-    enchantmentTable.takeTargetItem = callbackify(takeTargetItem)
-    enchantmentTable.putTargetItem = callbackify(putTargetItem)
-    enchantmentTable.putLapis = callbackify(putLapis)
+    enchantmentTable.enchant = enchant
+    enchantmentTable.takeTargetItem = takeTargetItem
+    enchantmentTable.putTargetItem = putTargetItem
+    enchantmentTable.putLapis = putLapis
     enchantmentTable.targetItem = function () { return this.slots[0] }
 
     bot._client.on('craft_progress_bar', onUpdateWindowProperty)
@@ -100,5 +99,5 @@ function inject (bot) {
     }
   }
 
-  bot.openEnchantmentTable = callbackify(openEnchantmentTable)
+  bot.openEnchantmentTable = openEnchantmentTable
 }

package/lib/plugins/entities.js

@@ -588,6 +588,7 @@ function inject (bot, { version }) {
   }
 
   function useEntity (target, leftClick, x, y, z) {
+    const sneaking = bot.getControlState('sneak')
     if (x && y && z) {
       bot._client.write('use_entity', {
         target: target.id,
@@ -595,13 +596,13 @@ function inject (bot, { version }) {
         x,
         y,
         z,
-        sneaking: false
+        sneaking
       })
     } else {
       bot._client.write('use_entity', {
         target: target.id,
         mouse: leftClick,
-        sneaking: false
+        sneaking
       })
     }
   }

package/lib/plugins/fishing.js

@@ -1,5 +1,5 @@
 const { Vec3 } = require('vec3')
-const { callbackify, createDoneTask, createTask } = require('../promise_utils')
+const { createDoneTask, createTask } = require('../promise_utils')
 
 module.exports = inject
 
@@ -54,5 +54,5 @@ function inject (bot) {
     await fishingTask.promise
   }
 
-  bot.fish = callbackify(fish)
+  bot.fish = fish
 }

package/lib/plugins/furnace.js

@@ -1,5 +1,4 @@
 const assert = require('assert')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -25,11 +24,11 @@ function inject (bot) {
     furnace.totalProgress = null
     furnace.progress = null
     furnace.progressSeconds = null
-    furnace.takeInput = callbackify(takeInput)
-    furnace.takeFuel = callbackify(takeFuel)
-    furnace.takeOutput = callbackify(takeOutput)
-    furnace.putInput = callbackify(putInput)
-    furnace.putFuel = callbackify(putFuel)
+    furnace.takeInput = takeInput
+    furnace.takeFuel = takeFuel
+    furnace.takeOutput = takeOutput
+    furnace.putInput = putInput
+    furnace.putFuel = putFuel
     furnace.inputItem = function () { return this.slots[0] }
     furnace.fuelItem = function () { return this.slots[1] }
     furnace.outputItem = function () { return this.slots[2] }
@@ -118,5 +117,5 @@ function inject (bot) {
     return ticks * 0.05
   }
 
-  bot.openFurnace = callbackify(openFurnace)
+  bot.openFurnace = openFurnace
 }

package/lib/plugins/inventory.js

@@ -1,7 +1,7 @@
 const assert = require('assert')
 const { Vec3 } = require('vec3')
 const { once } = require('events')
-const { callbackify, sleep, createDoneTask, createTask, withTimeout } = require('../promise_utils')
+const { sleep, createDoneTask, createTask, withTimeout } = require('../promise_utils')
 
 module.exports = inject
 
@@ -306,7 +306,7 @@ function inject (bot, { version, hideErrors }) {
       window.emit('close')
       closeWindow(window)
     }
-    window.withdraw = callbackify(async (itemType, metadata, count) => {
+    window.withdraw = async (itemType, metadata, count) => {
       if (bot.inventory.emptySlotCount() === 0) {
         throw new Error('Unable to withdraw, Bot inventory is full.')
       }
@@ -322,8 +322,8 @@ function inject (bot, { version, hideErrors }) {
         destEnd: window.inventoryEnd
       }
       await transfer(options)
-    })
-    window.deposit = callbackify(async (itemType, metadata, count) => {
+    }
+    window.deposit = async (itemType, metadata, count) => {
       const options = {
         window: window,
         itemType,
@@ -335,7 +335,7 @@ function inject (bot, { version, hideErrors }) {
         destEnd: window.inventoryStart
       }
       await transfer(options)
-    })
+    }
   }
 
   async function openBlock (block) {
@@ -643,21 +643,21 @@ function inject (bot, { version, hideErrors }) {
     bot.emit(`setWindowItems:${window.id}`)
   })
 
-  bot.activateBlock = callbackify(activateBlock)
-  bot.activateEntity = callbackify(activateEntity)
-  bot.activateEntityAt = callbackify(activateEntityAt)
-  bot.consume = callbackify(consume)
+  bot.activateBlock = activateBlock
+  bot.activateEntity = activateEntity
+  bot.activateEntityAt = activateEntityAt
+  bot.consume = consume
   bot.activateItem = activateItem
   bot.deactivateItem = deactivateItem
 
   // not really in the public API
-  bot.clickWindow = callbackify(clickWindow)
+  bot.clickWindow = clickWindow
   bot.putSelectedItemRange = putSelectedItemRange
   bot.putAway = putAway
   bot.closeWindow = closeWindow
-  bot.transfer = callbackify(transfer)
-  bot.openBlock = callbackify(openBlock)
-  bot.openEntity = callbackify(openEntity)
-  bot.moveSlotItem = callbackify(moveSlotItem)
+  bot.transfer = transfer
+  bot.openBlock = openBlock
+  bot.openEntity = openEntity
+  bot.moveSlotItem = moveSlotItem
   bot.updateHeldItem = updateHeldItem
 }

package/lib/plugins/physics.js

@@ -3,7 +3,7 @@ const assert = require('assert')
 const math = require('../math')
 const conv = require('../conversions')
 const { performance } = require('perf_hooks')
-const { callbackify, createDoneTask, createTask } = require('../promise_utils')
+const { createDoneTask, createTask } = require('../promise_utils')
 
 const { Physics, PlayerState } = require('prismarine-physics')
 
@@ -223,7 +223,7 @@ function inject (bot, { physicsEnabled }) {
     }
   })
 
-  bot.look = callbackify(async (yaw, pitch, force) => {
+  bot.look = async (yaw, pitch, force) => {
     if (!lookingTask.done) {
       lookingTask.finish() // finish the previous one
     }
@@ -245,15 +245,15 @@ function inject (bot, { physicsEnabled }) {
     }
 
     await lookingTask.promise
-  })
+  }
 
-  bot.lookAt = callbackify(async (point, force) => {
+  bot.lookAt = async (point, force) => {
     const delta = point.minus(bot.entity.position.offset(0, bot.entity.height, 0))
     const yaw = Math.atan2(-delta.x, -delta.z)
     const groundDistance = Math.sqrt(delta.x * delta.x + delta.z * delta.z)
     const pitch = Math.atan2(delta.y, groundDistance)
     await bot.look(yaw, pitch, force)
-  })
+  }
 
   // player position and look (clientbound)
   bot._client.on('position', (packet) => {

package/lib/plugins/place_block.js

@@ -1,4 +1,4 @@
-const { onceWithCleanup, callbackify } = require('../promise_utils')
+const { onceWithCleanup } = require('../promise_utils')
 
 module.exports = inject
 
@@ -24,6 +24,6 @@ function inject (bot) {
     await placeBlockWithOptions(referenceBlock, faceVector, { swingArm: 'right' })
   }
 
-  bot.placeBlock = callbackify(placeBlock)
+  bot.placeBlock = placeBlock
   bot._placeBlockWithOptions = placeBlockWithOptions
 }

package/lib/plugins/simple_inventory.js

@@ -1,5 +1,4 @@
 const assert = require('assert')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -144,10 +143,10 @@ function inject (bot) {
     return bot.clickWindow(slot, 1, 0)
   }
 
-  bot.equip = callbackify(equip)
-  bot.unequip = callbackify(unequip)
-  bot.toss = callbackify(toss)
-  bot.tossStack = callbackify(tossStack)
+  bot.equip = equip
+  bot.unequip = unequip
+  bot.toss = toss
+  bot.tossStack = tossStack
   bot.setQuickBarSlot = setQuickBarSlot
   bot.getEquipmentDestSlot = getDestSlot
   bot.simpleClick = { leftMouse, rightMouse }

package/lib/plugins/villager.js

@@ -1,6 +1,5 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
@@ -249,6 +248,6 @@ function inject (bot, { version }) {
     await bot.transfer(options)
   }
 
-  bot.openVillager = callbackify(openVillager)
-  bot.trade = callbackify(trade)
+  bot.openVillager = openVillager
+  bot.trade = trade
 }

package/lib/promise_utils.js

@@ -1,13 +1,3 @@
-function callbackify (f) {
-  return function (...args) {
-    const cb = args[f.length]
-    return f(...args).then(r => {
-      if (cb) { cb(undefined, r) }
-      return r
-    }, err => { if (cb) { cb(err) } else throw err })
-  }
-}
-
 function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
@@ -92,7 +82,6 @@ function withTimeout (promise, timeout) {
 }
 
 module.exports = {
-  callbackify,
   sleep,
   createTask,
   createDoneTask,