mineflayer 4.1.0 → 4.4.0

package/lib/plugins/block_actions.js

@@ -16,8 +16,8 @@ const FACING_MAP = {
   east: { north: 'right', south: 'left' }
 }
 
-function inject (bot, { version }) {
-  const { instruments, blocks } = require('minecraft-data')(version)
+function inject (bot) {
+  const { instruments, blocks } = bot.registry
 
   // Stores how many players have currently open a container at a certain position
   const openCountByPos = {}
@@ -44,7 +44,7 @@ function inject (bot, { version }) {
       const perpendicularCardinals = Object.keys(FACING_MAP[facing])
       for (const cardinal of perpendicularCardinals) {
         const cardinalOffset = CARDINALS[cardinal]
-        if (bot.blockAt(chestBlock.position.plus(cardinalOffset)).type === chestBlock.type) {
+        if (bot.blockAt(chestBlock.position.plus(cardinalOffset))?.type === chestBlock.type) {
           return FACING_MAP[cardinal][facing]
         }
       }
@@ -100,13 +100,14 @@ function inject (bot, { version }) {
     const destroyStage = packet.destroyStage
     const pt = new Vec3(packet.location.x, packet.location.y, packet.location.z)
     const block = bot.blockAt(pt)
+    const entity = bot.entities[packet.entityId]
 
     if (destroyStage < 0 || destroyStage > 9) {
       // http://wiki.vg/Protocol#Block_Break_Progress
       // "0-9 to set it, any other value to remove it"
-      bot.emit('blockBreakProgressEnd', block)
+      bot.emit('blockBreakProgressEnd', block, entity)
     } else {
-      bot.emit('blockBreakProgressObserved', block, destroyStage)
+      bot.emit('blockBreakProgressObserved', block, destroyStage, entity)
     }
   })
 }

package/lib/plugins/book.js

@@ -3,9 +3,8 @@ const { once } = require('events')
 
 module.exports = inject
 
-function inject (bot, { version }) {
-  const mcData = require('minecraft-data')(version)
-  const Item = require('prismarine-item')(version)
+function inject (bot) {
+  const Item = require('prismarine-item')(bot.version)
 
   let editBook
   if (bot.supportFeature('editBookIsPluginChannel')) {
@@ -28,7 +27,7 @@ function inject (bot, { version }) {
   async function write (slot, pages, author, title, signing) {
     assert.ok(slot >= 0 && slot <= 44, 'slot out of inventory range')
     const book = bot.inventory.slots[slot]
-    assert.ok(book && book.type === mcData.itemsByName.writable_book.id, `no book found in slot ${slot}`)
+    assert.ok(book && book.type === bot.registry.itemsByName.writable_book.id, `no book found in slot ${slot}`)
     const quickBarSlot = bot.quickBarSlot
     const moveToQuickBar = slot < 36
 
@@ -60,7 +59,7 @@ function inject (bot, { version }) {
     }
     if (signing) {
       if (bot.supportFeature('clientUpdateBookIdWhenSign')) {
-        book.type = mcData.itemsByName.written_book.id
+        book.type = bot.registry.itemsByName.written_book.id
       }
       book.nbt.value.author = {
         type: 'string',

package/lib/plugins/chat.js

@@ -33,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,
@@ -43,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 => {
@@ -173,7 +173,7 @@ function inject (bot, options) {
 
   function addDefaultPatterns () {
     if (!defaultChatPatterns) return
-    const USERNAME_REGEX = '(?:\\(.+\\)|\\[.+\\]|.)*?(\\w+)'
+    const USERNAME_REGEX = '(?:\\(.{1,15}\\)|\\[.{1,15}\\]|.){0,5}?(\\w+)'
     bot.addChatPattern('whisper', new RegExp(`^${USERNAME_REGEX} whispers(?: to you)?:? (.*)$`), { deprecated: true })
     bot.addChatPattern('whisper', new RegExp(`^\\[${USERNAME_REGEX} -> \\w+\\s?\\] (.*)$`), { deprecated: true })
     bot.addChatPattern('chat', new RegExp(`^${USERNAME_REGEX}\\s?[>:\\-»\\]\\)~]+\\s(.*)$`), { deprecated: true })

package/lib/plugins/chest.js

@@ -1,8 +1,9 @@
+const { Vec3 } = require('vec3')
 
 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:ender_chest', 'minecraft:shulker_box', 'minecraft:hopper', 'minecraft:container', 'minecraft:dropper', 'minecraft:trapped_chest']
 
   function matchWindowType (window) {
     for (const type of allowedWindowTypes) {
@@ -11,10 +12,12 @@ function inject (bot) {
     return false
   }
 
-  async function openContainer (containerToOpen) {
+  async function openContainer (containerToOpen, direction, cursorPos) {
+    direction = direction ?? new Vec3(0, 1, 0)
+    cursorPos = cursorPos ?? new Vec3(0.5, 0.5, 0.5)
     let chest
-    if (containerToOpen.constructor.name === 'Block') {
-      chest = await bot.openBlock(containerToOpen)
+    if (containerToOpen.constructor.name === 'Block' && allowedWindowTypes.map(name => name.replace('minecraft:', '')).includes(containerToOpen.name)) {
+      chest = await bot.openBlock(containerToOpen, direction, cursorPos)
     } else if (containerToOpen.constructor.name === 'Entity') {
       chest = await bot.openEntity(containerToOpen)
     } else {

package/lib/plugins/command_block.js

@@ -8,7 +8,7 @@ function inject (bot) {
     assert.strictEqual(bot.player.gamemode, 1, new Error('The bot has to be in creative mode to open the command block window'))
     assert.notStrictEqual(pos, null)
     assert.notStrictEqual(command, null)
-    assert.strictEqual(bot.blockAt(pos).name, 'command_block', new Error("The block isn't a command block"))
+    assert.strictEqual(bot.blockAt(pos).name.includes('command_block'), true, new Error("The block isn't a command block"))
 
     // Default values when a command block is placed in vanilla minecraft
     options.trackOutput = options.trackOutput ?? false

package/lib/plugins/craft.js

@@ -4,8 +4,8 @@ const { once } = require('events')
 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)

package/lib/plugins/creative.js

@@ -1,32 +1,30 @@
 const assert = require('assert')
 const { Vec3 } = require('vec3')
-const { 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: setInventorySlot,
-    flyTo: flyTo,
+    setInventorySlot,
+    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 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/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) => {
@@ -570,7 +569,7 @@ function inject (bot, { version }) {
   function moveVehicle (left, forward) {
     bot._client.write('steer_vehicle', {
       sideways: left,
-      forward: forward,
+      forward,
       jump: 0x01
     })
   }

package/lib/plugins/fishing.js

@@ -4,14 +4,12 @@ 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

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

@@ -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()
 
@@ -151,45 +150,48 @@ function inject (bot, { version, hideErrors }) {
     }
   }
 
-  async function activateBlock (block) {
+  async function activateBlock (block, direction, cursorPos) {
+    direction = direction ?? new Vec3(0, 1, 0)
+    const directionNum = vectorToDirection(direction) // The packet needs a number as the direction
+    cursorPos = cursorPos ?? new Vec3(0.5, 0.5, 0.5)
     // TODO: tell the server that we are not sneaking while doing this
     await bot.lookAt(block.position.offset(0.5, 0.5, 0.5), false)
     // place block message
     if (bot.supportFeature('blockPlaceHasHeldItem')) {
       bot._client.write('block_place', {
         location: block.position,
-        direction: 1,
+        direction: directionNum,
         heldItem: Item.toNotch(bot.heldItem),
-        cursorX: 8,
-        cursorY: 8,
-        cursorZ: 8
+        cursorX: cursorPos.scaled(16).x,
+        cursorY: cursorPos.scaled(16).y,
+        cursorZ: cursorPos.scaled(16).z
       })
     } else if (bot.supportFeature('blockPlaceHasHandAndIntCursor')) {
       bot._client.write('block_place', {
         location: block.position,
-        direction: 1,
+        direction: directionNum,
         hand: 0,
-        cursorX: 8,
-        cursorY: 8,
-        cursorZ: 8
+        cursorX: cursorPos.scaled(16).x,
+        cursorY: cursorPos.scaled(16).y,
+        cursorZ: cursorPos.scaled(16).z
       })
     } else if (bot.supportFeature('blockPlaceHasHandAndFloatCursor')) {
       bot._client.write('block_place', {
         location: block.position,
-        direction: 1,
+        direction: directionNum,
         hand: 0,
-        cursorX: 0.5,
-        cursorY: 0.5,
-        cursorZ: 0.5
+        cursorX: cursorPos.x,
+        cursorY: cursorPos.y,
+        cursorZ: cursorPos.z
       })
     } else if (bot.supportFeature('blockPlaceHasInsideBlock')) {
       bot._client.write('block_place', {
         location: block.position,
-        direction: 1,
+        direction: directionNum,
         hand: 0,
-        cursorX: 0.5,
-        cursorY: 0.5,
-        cursorZ: 0.5,
+        cursorX: cursorPos.x,
+        cursorY: cursorPos.y,
+        cursorZ: cursorPos.z,
         insideBlock: false
       })
     }
@@ -251,7 +253,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,8 +305,8 @@ function inject (bot, { version, hideErrors }) {
 
   function extendWindow (window) {
     window.close = () => {
-      window.emit('close')
       closeWindow(window)
+      window.emit('close')
     }
 
     window.withdraw = async (itemType, metadata, count, nbt) => {
@@ -326,7 +328,7 @@ function inject (bot, { version, hideErrors }) {
     }
     window.deposit = async (itemType, metadata, count, nbt) => {
       const options = {
-        window: window,
+        window,
         itemType,
         metadata,
         count,
@@ -340,8 +342,8 @@ function inject (bot, { version, hideErrors }) {
     }
   }
 
-  async function openBlock (block) {
-    bot.activateBlock(block)
+  async function openBlock (block, direction, cursorPos) {
+    bot.activateBlock(block, direction, cursorPos)
     const [window] = await once(bot, 'windowOpen')
     extendWindow(window)
     return window
@@ -382,7 +384,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)
     }
   }
 
@@ -434,14 +436,11 @@ function inject (bot, { version, hideErrors }) {
     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,
+        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
@@ -517,7 +516,7 @@ function inject (bot, { version, hideErrors }) {
         slot,
         mouseButton,
         mode,
-        changedSlots: changedSlots,
+        changedSlots,
         cursorItem: Item.toNotch(window.selectedItem)
       })
     } else if (bot.supportFeature('actionIdUsed')) { // <= 1.16.5
@@ -535,7 +534,7 @@ function inject (bot, { version, hideErrors }) {
         slot,
         mouseButton,
         mode,
-        changedSlots: changedSlots,
+        changedSlots,
         cursorItem: Item.toNotch(window.selectedItem)
       })
     }
@@ -645,6 +644,28 @@ function inject (bot, { version, hideErrors }) {
     bot.emit(`setWindowItems:${window.id}`)
   })
 
+  /**
+   * Convert a vector direction to minecraft packet number direction
+   * @param {Vec3} v
+   * @returns {number}
+   */
+  function vectorToDirection (v) {
+    if (v.y < 0) {
+      return 0
+    } else if (v.y > 0) {
+      return 1
+    } else if (v.z < 0) {
+      return 2
+    } else if (v.z > 0) {
+      return 3
+    } else if (v.x < 0) {
+      return 4
+    } else if (v.x > 0) {
+      return 5
+    }
+    assert.ok(false, `invalid direction vector ${v}`)
+  }
+
   bot.activateBlock = activateBlock
   bot.activateEntity = activateEntity
   bot.activateEntityAt = activateEntityAt

package/lib/plugins/physics.js

@@ -15,10 +15,10 @@ 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)
+
+  const positionUpdateSentEveryTick = bot.supportFeature('positionUpdateSentEveryTick')
 
   bot.jumpQueued = false
   bot.jumpTicks = 0 // autojump cooldown
@@ -150,7 +150,7 @@ function inject (bot, { physicsEnabled }) {
       // Send a position packet every second, even if no update was made
       sendPacketPosition(position, onGround)
       lastSent.time = performance.now()
-    } else if (bot.supportFeature('positionUpdateSentEveryTick') && bot.isAlive) {
+    } else if (positionUpdateSentEveryTick && bot.isAlive) {
       // For versions < 1.12, one player packet should be sent every tick
       // for the server to update health correctly
       bot._client.write('flying', { onGround: bot.entity.onGround })

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

@@ -1,4 +1,5 @@
 const { Vec3 } = require('vec3')
+const { RaycastIterator } = require('prismarine-world').iterators
 
 module.exports = (bot) => {
   function getViewDirection (pitch, yaw) {
@@ -24,6 +25,41 @@ module.exports = (bot) => {
     return bot.world.raycast(eyePosition, viewDirection, maxDistance, matcher)
   }
 
+  bot.entityAtCursor = (maxDistance = 3.5) => {
+    const block = bot.blockAtCursor(maxDistance)
+    maxDistance = block?.intersect.distanceTo(bot.entity.position) ?? maxDistance
+
+    const entities = Object.values(bot.entities)
+      .filter(entity => entity.type !== 'object' && entity.username !== bot.username && entity.position.distanceTo(bot.entity.position) <= maxDistance)
+
+    const dir = new Vec3(-Math.sin(bot.entity.yaw) * Math.cos(bot.entity.pitch), Math.sin(bot.entity.pitch), -Math.cos(bot.entity.yaw) * Math.cos(bot.entity.pitch))
+    const iterator = new RaycastIterator(bot.entity.position.offset(0, bot.entity.height, 0), dir.normalize(), maxDistance)
+
+    let targetEntity = null
+    let targetDist = maxDistance
+
+    for (let i = 0; i < entities.length; i++) {
+      const entity = entities[i]
+      const w = entity.width / 2
+
+      const shapes = [[-w, 0, -w, w, entity.height + (entity.type === 'player' ? 0.18 : 0), w]]
+      const intersect = iterator.intersect(shapes, entity.position)
+      if (intersect) {
+        const entityDir = entity.position.minus(bot.entity.position) // Can be combined into 1 line
+        const sign = Math.sign(entityDir.dot(dir))
+        if (sign !== -1) {
+          const dist = bot.entity.position.distanceTo(intersect.pos)
+          if (dist < targetDist) {
+            targetEntity = entity
+            targetDist = dist
+          }
+        }
+      }
+    }
+
+    return targetEntity
+  }
+
   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

package/lib/plugins/settings.js

@@ -58,7 +58,7 @@ function inject (bot, options) {
       viewDistance: viewDistanceBits,
       chatFlags: chatBits,
       chatColors: bot.settings.colorsEnabled,
-      skinParts: skinParts,
+      skinParts,
       mainHand: handBits,
       enableTextFiltering: bot.settings.enableTextFiltering,
       enableServerListing: bot.settings.enableServerListing
@@ -90,7 +90,7 @@ function inject (bot, options) {
     enableServerListing: options.enableServerListing || true
   }
 
-  bot._client.once('login', () => {
+  bot._client.on('login', () => {
     setSettings({})
   })
 

package/lib/plugins/tablist.js

@@ -5,7 +5,7 @@ const escapeValueNewlines = str => {
 }
 
 function inject (bot) {
-  const ChatMessage = require('prismarine-chat')(bot.version)
+  const ChatMessage = require('prismarine-chat')(bot.version) // TODO: update for prismarine-registry
 
   bot.tablist = {
     header: new ChatMessage(''),

package/lib/plugins/team.js

@@ -29,8 +29,11 @@ function inject (bot) {
     }
     if (team !== undefined) {
       if (mode === 1) {
-        bot.emit('teamRemoved', teams[teamName])
+        team.members.forEach(member => {
+          delete bot.teamMap[member]
+        })
         delete teams[teamName]
+        bot.emit('teamRemoved', teams[teamName])
       }
       if (mode === 2) {
         team.update(

package/lib/plugins/villager.js

@@ -4,8 +4,8 @@ const { once } = require('events')
 module.exports = inject
 
 function inject (bot, { version }) {
-  const mcData = require('minecraft-data')(version)
-  const Item = require('prismarine-item')(version)
+  const { entitiesByName } = bot.registry
+  const Item = require('prismarine-item')(bot.version)
 
   let selectTrade
   if (bot.supportFeature('useMCTrSel')) {
@@ -70,7 +70,7 @@ function inject (bot, { version }) {
   }
 
   async function openVillager (villagerEntity) {
-    const villagerType = mcData.entitiesByName.villager ? mcData.entitiesByName.villager.id : mcData.entitiesByName.Villager.id
+    const villagerType = entitiesByName.villager ? entitiesByName.villager.id : entitiesByName.Villager.id
     assert.strictEqual(villagerEntity.entityType, villagerType)
     let ready = false
 

package/lib/scoreboard.js

@@ -5,7 +5,7 @@ const sortItems = (a, b) => {
 }
 
 module.exports = (bot) => {
-  const ChatMessage = require('prismarine-chat')(bot.version)
+  const ChatMessage = require('prismarine-chat')(bot.version) // TODO: update for prismarine-registry
 
   class ScoreBoard {
     constructor (packet) {

package/lib/team.js

@@ -3,8 +3,8 @@ let MessageBuilder
 
 module.exports = loader
 
-function loader (mcVersion) {
-  ChatMessage = require('prismarine-chat')(mcVersion)
+function loader (version) {
+  ChatMessage = require('prismarine-chat')(version) // TODO: update for prismarine-registry
   MessageBuilder = ChatMessage.MessageBuilder
   return Team
 }