mineflayer 3.18.0 → 4.2.0

package/lib/plugins/chat.js

@@ -1,5 +1,4 @@
 const { once } = require('events')
-const { printCallbackDepreciation } = require('../promise_utils')
 
 module.exports = inject
 
@@ -34,7 +33,7 @@ function inject (bot, options) {
   bot.addChatPattern = (name, pattern, opts = {}) => {
     if (!(pattern instanceof RegExp)) throw new Error('Pattern parameter should be of type RegExp')
     const { repeat = true, deprecated = false, parse = false } = opts
-    _patterns[_length++] = {
+    _patterns[_length] = {
       name,
       patterns: [pattern],
       position: 0,
@@ -44,7 +43,7 @@ function inject (bot, options) {
       repeat,
       parse
     }
-    return _length
+    return _length++ // increment length after we give it back to the user
   }
 
   bot.removeChatPattern = name => {
@@ -170,7 +169,7 @@ function inject (bot, options) {
     chatWithHeader('', message)
   }
 
-  bot.tabComplete = callbackify(tabComplete)
+  bot.tabComplete = tabComplete
 
   function addDefaultPatterns () {
     if (!defaultChatPatterns) return
@@ -194,21 +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) {
-        printCallbackDepreciation()
-        cb(undefined, r)
-      } return r
-    }, err => {
-      if (cb) {
-        printCallbackDepreciation()
-        cb(err)
-      } else throw err
-    })
-  }
-}

package/lib/plugins/chest.js

@@ -1,9 +1,8 @@
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
 function inject (bot) {
-  const allowedWindowTypes = ['minecraft:generic', 'minecraft:chest', 'minecraft:dispenser', 'minecraft:shulker_box', 'minecraft:hopper', 'minecraft:container', 'minecraft:dropper']
+  const allowedWindowTypes = ['minecraft:generic', 'minecraft:chest', 'minecraft:dispenser', 'minecraft:shulker_box', 'minecraft:hopper', 'minecraft:container', 'minecraft:dropper', 'minecraft:trapped_chest']
 
   function matchWindowType (window) {
     for (const type of allowedWindowTypes) {
@@ -14,7 +13,7 @@ function inject (bot) {
 
   async function openContainer (containerToOpen) {
     let chest
-    if (containerToOpen.constructor.name === 'Block') {
+    if (containerToOpen.constructor.name === 'Block' && allowedWindowTypes.map(name => name.replace('minecraft:', '')).includes(containerToOpen.name)) {
       chest = await bot.openBlock(containerToOpen)
     } else if (containerToOpen.constructor.name === 'Entity') {
       chest = await bot.openEntity(containerToOpen)
@@ -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,12 +1,11 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 module.exports = inject
 
 function inject (bot, { version }) {
-  const Item = require('prismarine-item')(version)
-  const Recipe = require('prismarine-recipe')(version).Recipe
+  const Item = require('prismarine-item')(bot.version)
+  const Recipe = require('prismarine-recipe')(version).Recipe // TODO: update for prismarine-registry
 
   async function craft (recipe, count, craftingTable) {
     assert.ok(recipe)
@@ -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,32 +1,30 @@
 const assert = require('assert')
 const { Vec3 } = require('vec3')
-const { callbackify, sleep } = require('../promise_utils')
+const { sleep, onceWithCleanup } = require('../promise_utils')
 const { once } = require('events')
 
 module.exports = inject
 
-function inject (bot, { version }) {
-  const Item = require('prismarine-item')(version)
+function inject (bot) {
+  const Item = require('prismarine-item')(bot.version)
 
   // these features only work when you are in creative mode.
   bot.creative = {
-    setInventorySlot: callbackify(setInventorySlot),
-    flyTo: callbackify(flyTo),
+    setInventorySlot,
+    flyTo: flyTo,
     startFlying,
-    stopFlying
+    stopFlying,
+    clearSlot: slotNum => setInventorySlot(slotNum, null),
+    clearInventory
   }
 
   const creativeSlotsUpdates = []
-  bot._client.on('set_slot', ({ windowId, slot, item }) => {
-    if (windowId === 0 && creativeSlotsUpdates[slot]) {
-      bot.emit(`set_creative_slot_${slot}`)
-    }
-  })
 
-  // 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)
 
+    if (Item.equal(bot.inventory.slots[slot], item, true)) return
     if (creativeSlotsUpdates[slot]) {
       throw new Error(`Setting slot ${slot} cancelled due to calling bot.creative.setInventorySlot(${slot}, ...) again`)
     }
@@ -37,10 +35,14 @@ function inject (bot, { version }) {
       item: Item.toNotch(item)
     })
 
-    await once(bot, `set_creative_slot_${slot}`)
+    await onceWithCleanup(bot.inventory, `updateSlot:${slot}`, { checkCondition: (oldItem, newItem) => item === null ? newItem === null : newItem?.name === item.name && newItem?.count === item.count && newItem?.metadata === item.metadata })
     creativeSlotsUpdates[slot] = false
   }
 
+  async function clearInventory () {
+    return Promise.all(bot.inventory.slots.filter(item => item).map(item => setInventorySlot(item.slot, null)))
+  }
+
   let normalGravity = null
   const flyingSpeedPerUpdate = 0.5
 

package/lib/plugins/digging.js

@@ -1,5 +1,5 @@
 const { performance } = require('perf_hooks')
-const { createDoneTask, createTask, printCallbackDepreciation } = require('../promise_utils')
+const { createDoneTask, createTask } = require('../promise_utils')
 const BlockFaces = require('prismarine-world').iterators.BlockFace
 const { Vec3 } = require('vec3')
 
@@ -198,35 +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) {
-        printCallbackDepreciation()
-        cb(undefined, r)
-      } return r
-    }, err => {
-      if (cb) {
-        printCallbackDepreciation()
-        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

@@ -24,13 +24,12 @@ const entityStatusEvents = {
   10: 'entityEatingGrass'
 }
 
-function inject (bot, { version }) {
-  const Entity = require('prismarine-entity')(version)
-  const objects = require('minecraft-data')(version).objects
-  const mobs = require('minecraft-data')(version).mobs
-  const entitiesArray = require('minecraft-data')(version).entitiesArray
-  const Item = require('prismarine-item')(version)
-  const ChatMessage = require('prismarine-chat')(version)
+function inject (bot) {
+  const { objects, mobs, entitiesArray } = bot.registry
+  const Entity = require('prismarine-entity')(bot.version) // TODO: update for prismarine-registry
+  const Item = require('prismarine-item')(bot.version)
+  const ChatMessage = require('prismarine-chat')(bot.version) // TODO: update for prismarine-registry
+
   // ONLY 1.17 has this destroy_entity packet which is the same thing as entity_destroy packet except the entity is singular
   // 1.17.1 reverted this change so this is just a simpler fix
   bot._client.on('destroy_entity', (packet) => {
@@ -588,6 +587,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 +595,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,17 +1,15 @@
 const { Vec3 } = require('vec3')
-const { callbackify, createDoneTask, createTask } = require('../promise_utils')
+const { createDoneTask, createTask } = require('../promise_utils')
 
 module.exports = inject
 
 function inject (bot) {
-  const mcData = require('minecraft-data')(bot.version)
-
   let bobberId = 90
   // Before 1.14 the bobber entity keep changing name at each version (but the id stays 90)
   // 1.14 changes the id, but hopefully we can stick with the name: fishing_bobber
   // the alternative would be to rename it in all version of mcData
   if (bot.supportFeature('fishingBobberCorrectlyNamed')) {
-    bobberId = mcData.entitiesByName.fishing_bobber.id
+    bobberId = bot.registry.entitiesByName.fishing_bobber.id
   }
 
   let fishingTask = createDoneTask()
@@ -27,7 +25,7 @@ function inject (bot) {
     if (!lastBobber || fishingTask.done) return
 
     const pos = lastBobber.position
-    const parts = mcData.particlesByName
+    const parts = bot.registry.particlesByName
     if (packet.particleId === (parts?.fishing ?? parts.bubble).id && packet.particles === 6 && pos.distanceTo(new Vec3(packet.x, pos.y, packet.z)) <= 1.23) {
       bot.activateItem()
       lastBobber = undefined
@@ -54,5 +52,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/game.js

@@ -67,10 +67,13 @@ function inject (bot, options) {
 
     bot.emit('login')
     bot.emit('game')
-    bot._client.write('held_item_slot', { slotId: 0 })
 
     // varint length-prefixed string as data
     bot._client.writeChannel(brandChannel, options.brand)
+
+    if (packet.dimensionCodec) {
+      bot.registry.loadDimensionCodec(packet.dimensionCodec)
+    }
   })
 
   bot._client.on('respawn', (packet) => {

package/lib/plugins/generic_place.js

@@ -1,8 +1,8 @@
 const assert = require('assert')
 module.exports = inject
 
-function inject (bot, { version }) {
-  const Item = require('prismarine-item')(version)
+function inject (bot) {
+  const Item = require('prismarine-item')(bot.version)
   /**
    *
    * @param {import('prismarine-block').Block} referenceBlock

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
 
@@ -20,10 +20,9 @@ const ALWAYS_CONSUMABLES = [
   'golden_apple'
 ]
 
-function inject (bot, { version, hideErrors }) {
-  const Item = require('prismarine-item')(version)
-  const windows = require('prismarine-windows')(version)
-  const mcData = require('minecraft-data')(version)
+function inject (bot, { hideErrors }) {
+  const Item = require('prismarine-item')(bot.version)
+  const windows = require('prismarine-windows')(bot.version) // TODO: update for prismarine-registry
 
   let eatingTask = createDoneTask()
 
@@ -251,7 +250,7 @@ function inject (bot, { version, hideErrors }) {
         (nbt != null && window.selectedItem.nbt !== nbt)) {
         // we are not holding the item we need. click it.
         const sourceItem = window.findItemRange(sourceStart, sourceEnd, itemType, metadata, false, nbt)
-        const mcDataEntry = mcData.itemsArray.find(x => x.id === itemType)
+        const mcDataEntry = bot.registry.itemsArray.find(x => x.id === itemType)
         assert(mcDataEntry, 'Invalid itemType')
         if (!sourceItem) throw new Error(`Can't find ${mcDataEntry.name} in slots [${sourceStart} - ${sourceEnd}], (item id: ${itemType})`)
         if (firstSourceSlot === null) firstSourceSlot = sourceItem.slot
@@ -303,39 +302,41 @@ function inject (bot, { version, hideErrors }) {
 
   function extendWindow (window) {
     window.close = () => {
-      window.emit('close')
       closeWindow(window)
+      window.emit('close')
     }
-    window.withdraw = callbackify(async (itemType, metadata, count) => {
+
+    window.withdraw = async (itemType, metadata, count, nbt) => {
       if (bot.inventory.emptySlotCount() === 0) {
         throw new Error('Unable to withdraw, Bot inventory is full.')
       }
-
       const options = {
         window,
         itemType,
         metadata,
         count,
+        nbt,
         sourceStart: 0,
         sourceEnd: window.inventoryStart,
         destStart: window.inventoryStart,
         destEnd: window.inventoryEnd
       }
       await transfer(options)
-    })
-    window.deposit = callbackify(async (itemType, metadata, count) => {
+    }
+    window.deposit = async (itemType, metadata, count, nbt) => {
       const options = {
         window: window,
         itemType,
         metadata,
         count,
+        nbt,
         sourceStart: window.inventoryStart,
         sourceEnd: window.inventoryEnd,
         destStart: 0,
         destEnd: window.inventoryStart
       }
       await transfer(options)
-    })
+    }
   }
 
   async function openBlock (block) {
@@ -380,7 +381,7 @@ function inject (bot, { version, hideErrors }) {
       if (item) {
         item.slot = slot
       }
-      bot.inventory.slots[slot] = item
+      if (!Item.equal(bot.inventory.slots[slot], item, true)) bot.inventory.updateSlot(slot, item)
     }
   }
 
@@ -437,9 +438,6 @@ function inject (bot, { version, hideErrors }) {
         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
@@ -643,21 +641,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')
 
@@ -15,10 +15,8 @@ const PHYSICS_INTERVAL_MS = 50
 const PHYSICS_TIMESTEP = PHYSICS_INTERVAL_MS / 1000
 
 function inject (bot, { physicsEnabled }) {
-  const mcData = require('minecraft-data')(bot.version)
-
   const world = { getBlock: (pos) => { return bot.blockAt(pos, false) } }
-  const physics = Physics(mcData, world)
+  const physics = Physics(bot.registry, world)
 
   bot.jumpQueued = false
   bot.jumpTicks = 0 // autojump cooldown
@@ -223,7 +221,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 +243,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/place_entity.js

@@ -2,8 +2,8 @@ const assert = require('assert')
 
 module.exports = inject
 
-function inject (bot, { version }) {
-  const Item = require('prismarine-item')(version)
+function inject (bot) {
+  const Item = require('prismarine-item')(bot.version)
 
   /**
    *

package/lib/plugins/settings.js

@@ -23,13 +23,27 @@ const viewDistanceToBits = {
 function inject (bot, options) {
   function setSettings (settings) {
     extend(bot.settings, settings)
+
+    // chat
     const chatBits = chatToBits[bot.settings.chat]
     assert.ok(chatBits != null, `invalid chat setting: ${bot.settings.chat}`)
-    const viewDistanceBits = viewDistanceToBits[bot.settings.viewDistance]
+
+    // view distance
+    let viewDistanceBits = null
+    if (typeof bot.settings.viewDistance === 'string') {
+      viewDistanceBits = viewDistanceToBits[bot.settings.viewDistance]
+    } else if (typeof bot.settings.viewDistance === 'number' && bot.settings.viewDistance > 0) { // Make sure view distance is a valid # || should be 2 or more
+      viewDistanceBits = bot.settings.viewDistance
+    }
     assert.ok(viewDistanceBits != null, `invalid view distance setting: ${bot.settings.viewDistance}`)
+
+    // hand
     const handBits = handToBits[bot.settings.mainHand]
     assert.ok(handBits != null, `invalid main hand: ${bot.settings.mainHand}`)
-    bot.settings.showCape = !!bot.settings.showCape
+
+    // skin
+    // cape is inverted, not used at all (legacy?)
+    // bot.settings.showCape = !!bot.settings.showCape
     const skinParts = bot.settings.skinParts.showCape << 0 |
           bot.settings.skinParts.showJacket << 1 |
           bot.settings.skinParts.showLeftSleeve << 2 |
@@ -37,13 +51,17 @@ function inject (bot, options) {
           bot.settings.skinParts.showLeftPants << 4 |
           bot.settings.skinParts.showRightPants << 5 |
           bot.settings.skinParts.showHat << 6
+
+    // write the packet
     bot._client.write('settings', {
       locale: bot.settings.locale || 'en_US',
       viewDistance: viewDistanceBits,
       chatFlags: chatBits,
       chatColors: bot.settings.colorsEnabled,
       skinParts: skinParts,
-      mainHand: handBits
+      mainHand: handBits,
+      enableTextFiltering: bot.settings.enableTextFiltering,
+      enableServerListing: bot.settings.enableServerListing
     })
   }
 
@@ -67,10 +85,12 @@ function inject (bot, options) {
           showHat: true
         }
       : options.skinParts,
-    mainHand: options.mainHand || 'right'
+    mainHand: options.mainHand || 'right',
+    enableTextFiltering: options.enableTextFiltering || false,
+    enableServerListing: options.enableServerListing || true
   }
 
-  bot._client.once('login', () => {
+  bot._client.on('login', () => {
     setSettings({})
   })
 

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 }