mineflayer 4.4.0 → 4.5.0

package/.github/workflows/ci.yml

@@ -29,6 +29,8 @@ jobs:
            mcVersion: '1.17.1'
          - javaVersion: 17
            mcVersion: '1.18.2'
+         - javaVersion: 17
+           mcVersion: '1.19'
       fail-fast: false
 
     steps:

package/README.md

@@ -17,7 +17,7 @@ First time using Node.js? You may want to start with the [tutorial](tutorial.md)
 
 ## Features
 
- * Supports Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17 and 1.18.
+ * Supports Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18 and 1.19.
  * Entity knowledge and tracking.
  * Block knowledge. You can query the world around you. Milliseconds to find any block.
  * Physics and movement - handle all bounding boxes

package/docs/README.md

@@ -17,7 +17,7 @@ First time using Node.js? You may want to start with the [tutorial](tutorial.md)
 
 ## Features
 
- * Supports Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17 and 1.18.
+ * Supports Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18 and 1.19.
  * Entity knowledge and tracking.
  * Block knowledge. You can query the world around you. Milliseconds to find any block.
  * Physics and movement - handle all bounding boxes

package/docs/api.md

@@ -150,9 +150,9 @@
     - [Events](#events)
       - ["chat" (username, message, translate, jsonMsg, matches)](#chat-username-message-translate-jsonmsg-matches)
       - ["whisper" (username, message, translate, jsonMsg, matches)](#whisper-username-message-translate-jsonmsg-matches)
-      - ["actionBar" (jsonMsg)](#actionbar-jsonmsg)
-      - ["message" (jsonMsg, position)](#message-jsonmsg-position)
-      - ["messagestr" (message, messagePosition, jsonMsg)](#messagestr-message-messageposition-jsonmsg)
+      - ["actionBar" (jsonMsg, verified)](#actionbar-jsonmsg-verified)
+      - ["message" (jsonMsg, position, sender, verified)](#message-jsonmsg-position-sender-verified)
+      - ["messagestr" (message, messagePosition, jsonMsg, sender, verified)](#messagestr-message-messageposition-jsonmsg-sender-verified)
       - ["inject_allowed"](#inject_allowed)
       - ["login"](#login)
       - ["spawn"](#spawn)
@@ -209,8 +209,8 @@
       - ["noteHeard" (block, instrument, pitch)](#noteheard-block-instrument-pitch)
       - ["pistonMove" (block, isPulling, direction)](#pistonmove-block-ispulling-direction)
       - ["chestLidMove" (block, isOpen, block2)](#chestlidmove-block-isopen-block2)
-      - ["blockBreakProgressObserved" (block, destroyStage)](#blockbreakprogressobserved-block-destroystage)
-      - ["blockBreakProgressEnd" (block)](#blockbreakprogressend-block)
+      - ["blockBreakProgressObserved" (block, destroyStage, entity)](#blockbreakprogressobserved-block-destroystage-entity)
+      - ["blockBreakProgressEnd" (block, entity)](#blockbreakprogressend-block-entity)
       - ["diggingCompleted" (block)](#diggingcompleted-block)
       - ["diggingAborted" (block)](#diggingaborted-block)
       - ["move"](#move)
@@ -244,7 +244,7 @@
       - [bot.waitForChunksToLoad()](#botwaitforchunkstoload)
       - [bot.blockInSight(maxSteps, vectorLength)](#botblockinsightmaxsteps-vectorlength)
       - [bot.blockAtCursor(maxDistance=256)](#botblockatcursormaxdistance256)
-      - [bot.entityAtCursor(maxDistance = 3.5)](#botentityatcursormaxdistance35)
+      - [bot.entityAtCursor(maxDistance=3.5)](#botentityatcursormaxdistance35)
       - [bot.blockAtEntityCursor(entity=bot.entity, maxDistance=256)](#botblockatentitycursorentitybotentity-maxdistance256)
       - [bot.canSeeBlock(block)](#botcanseeblockblock)
       - [bot.findBlocks(options)](#botfindblocksoptions)
@@ -1106,13 +1106,14 @@ Only emitted when a player chats to you privately.
  * `jsonMsg` - unmodified JSON message from the server
  * `matches` - array of returned matches from regular expressions. May be null
 
-#### "actionBar" (jsonMsg)
+#### "actionBar" (jsonMsg, verified)
 
 Emitted for every server message which appears on the Action Bar.
 
  * `jsonMsg` - unmodified JSON message from the server
+ * `verified` -> null if non signed, true if signed and correct, false if signed and incorrect
 
-#### "message" (jsonMsg, position)
+#### "message" (jsonMsg, position, sender, verified)
 
 Emitted for every server message, including chats.
 
@@ -1123,10 +1124,18 @@ Emitted for every server message, including chats.
    * system
    * game_info
 
-#### "messagestr" (message, messagePosition, jsonMsg)
+ * `sender` - UUID of sender if known (1.16+), else null
+
+ * `verified` -> null if non signed, true if signed and correct, false if signed and incorrect
+
+#### "messagestr" (message, messagePosition, jsonMsg, sender, verified)
 
 Alias for the "message" event but it calls .toString() on the message object to get a string for the message before emitting.
 
+ * `sender` - UUID of sender if known (1.16+), else null
+
+ * `verified` -> null if non signed, true if signed and correct, false if signed and incorrect
+
 #### "inject_allowed"
 Fires when the index file has been loaded, you can load mcData and plugins here but it's better to wait for "spawn" event.
 

package/docs/history.md

@@ -1,22 +1,30 @@
+## 4.5.0
+
+* 1.19 support (@extremeheat @rom1504 @FCKJohni @Shorent)
+* refactoring examples to use bot.registry (@Epirito)
+* Added barrel and coloured shulker boxes to openable windows (@lazydancer)
+* types: Fix return type for openBlock and openEntity (@sefirosweb)
+* Update activateEntity and activateEntityAt types (@amoraschi)
+
 ## 4.4.0
 
-* Fix chatterbox example not getting dropped item
-* Fix 404d link to license [#2601](https://github.com/PrismarineJS/mineflayer/pull/2601)
-* Add bot.clickWindow mode disclaimer [#2595](https://github.com/PrismarineJS/mineflayer/pull/2595)
-* Add spectator to GameMode types [#2627](https://github.com/PrismarineJS/mineflayer/pull/2627)
-* Update types for isABed [#2628](https://github.com/PrismarineJS/mineflayer/pull/2628)
-* Replace openChest with openContainer in docs and examples [#2656](https://github.com/PrismarineJS/mineflayer/pull/2656)
-* Add ender chests as a chest type [#2642](https://github.com/PrismarineJS/mineflayer/pull/2642)
-* Added method to wait until sleep function is in reality sleeping [#2617](https://github.com/PrismarineJS/mineflayer/pull/2617)
-* Added type on move event [#2712](https://github.com/PrismarineJS/mineflayer/pull/2712)
-* Added thunderState type [#2711](https://github.com/PrismarineJS/mineflayer/pull/2711)
-* Fix type error on chest open [#2684](https://github.com/PrismarineJS/mineflayer/pull/2684)
-* Add support for repeating and chain command blocks. [#2669](https://github.com/PrismarineJS/mineflayer/pull/2669)
-* Add player object to blockBreakProgressEnd & observed. [#2647](https://github.com/PrismarineJS/mineflayer/pull/2647)
-* Add entity to blockBreakProgress [#2648](https://github.com/PrismarineJS/mineflayer/pull/2648)
-* Add direction support to activateBlock, openBlock [#2039](https://github.com/PrismarineJS/mineflayer/pull/2039)
-* Add entityAtCursor function [#2077](https://github.com/PrismarineJS/mineflayer/pull/2077)
-* Fix regex dos [#2350](https://github.com/PrismarineJS/mineflayer/pull/2350)
+* Fix chatterbox example not getting dropped item (@u9g) [commit](https://github.com/PrismarineJS/mineflayer/commit/f860eac01a0418f4a3de749482d8cab681acc48a)
+* Fix 404d link to license (@BalaM314) [#2601](https://github.com/PrismarineJS/mineflayer/pull/2601)
+* Add bot.clickWindow mode disclaimer (@IceTank) [#2595](https://github.com/PrismarineJS/mineflayer/pull/2595)
+* Add spectator to GameMode types (@IceTank) [#2627](https://github.com/PrismarineJS/mineflayer/pull/2627)
+* Update types for isABed (@amoraschi) [#2628](https://github.com/PrismarineJS/mineflayer/pull/2628)
+* Replace openChest with openContainer in docs and examples (@slightly-imperfect) [#2656](https://github.com/PrismarineJS/mineflayer/pull/2656)
+* Add ender chests as a chest type (@RoseChilds) [#2642](https://github.com/PrismarineJS/mineflayer/pull/2642)
+* Added method to wait until sleep function is in reality sleeping (@sefirosweb) [#2617](https://github.com/PrismarineJS/mineflayer/pull/2617)
+* Added type on move event (@sefirosweb) [#2712](https://github.com/PrismarineJS/mineflayer/pull/2712)
+* Added thunderState type (@sefirosweb) [#2711](https://github.com/PrismarineJS/mineflayer/pull/2711)
+* Fix type error on chest open (@IceTank) [#2684](https://github.com/PrismarineJS/mineflayer/pull/2684)
+* Add support for repeating and chain command blocks. (@mirkokral) [#2669](https://github.com/PrismarineJS/mineflayer/pull/2669)
+* Add player object to blockBreakProgressEnd & observed. (@JackCrispy) [#2647](https://github.com/PrismarineJS/mineflayer/pull/2647)
+* Add entity to blockBreakProgress (@JackCrispy ) [#2648](https://github.com/PrismarineJS/mineflayer/pull/2648)
+* Add direction support to activateBlock, openBlock (@IceTank) [#2039](https://github.com/PrismarineJS/mineflayer/pull/2039)
+* Add entityAtCursor function (@O-of) [#2077](https://github.com/PrismarineJS/mineflayer/pull/2077)
+* Fix regex dos (@IceTank) [#2350](https://github.com/PrismarineJS/mineflayer/pull/2350)
 
 ## 4.3.0
 

package/docs/ru/FAQ_RU.md

@@ -54,7 +54,7 @@ function getLore (item) {
   if (item.nbt == null) return message
 
   const nbt = require('prismarine-nbt')
-  const ChatMessage = require('prismarine-chat')(bot.version)
+  const ChatMessage = require('prismarine-chat')(bot.registry)
 
   const data = nbt.simplify(item.nbt)
   const display = data.display

package/docs/zh/README_ZH_CN.md

@@ -10,7 +10,7 @@
 [![Try it on gitpod](https://img.shields.io/badge/try-on%20gitpod-brightgreen.svg)](https://gitpod.io/#https://github.com/PrismarineJS/mineflayer)
 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/PrismarineJS/mineflayer/blob/master/docs/mineflayer.ipynb)
 
-| <sub>EN</sub> [English](README.md) | <sub>RU</sub> [русский](ru/README_RU.md) | <sub>ES</sub> [Español](es/README_ES.md) | <sub>FR</sub> [Français](fr/README_FR.md) | <sub>TR</sub> [Türkçe](tr/README_TR.md) | <sub>ZH</sub> [中文](zh/README_ZH_CN.md) |
+| <sub>EN</sub> [English](../README.md) | <sub>RU</sub> [русский](../ru/README_RU.md) | <sub>ES</sub> [Español](../es/README_ES.md) | <sub>FR</sub> [Français](../fr/README_FR.md) | <sub>TR</sub> [Türkçe](../tr/README_TR.md) | <sub>ZH</sub> [中文](../zh/README_ZH_CN.md) 
 |-------------------------|----------------------------|----------------------------|----------------------------|----------------------------|----------------------------|
 
 使用强大、稳定、高级的JavaScript [API](../api.md) 来开发Minecraft机器人，同时支持 Python。

package/examples/anvil.js

@@ -29,10 +29,6 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-
-bot.on('spawn', () => { mcData = require('minecraft-data')(bot.version) })
-
 bot.on('chat', async (username, message) => {
   const command = message.split(' ')
 
@@ -105,10 +101,10 @@ function sayItems (items = bot.inventory.items()) {
 }
 
 function getAnvilIds () {
-  const matchingBlocks = [mcData.blocksByName.anvil.id]
-  if (mcData.blocksByName?.chipped_anvil) {
-    matchingBlocks.push(mcData.blocksByName.chipped_anvil.id)
-    matchingBlocks.push(mcData.blocksByName.damaged_anvil.id)
+  const matchingBlocks = [bot.registry.blocksByName.anvil.id]
+  if (bot.registry.blocksByName?.chipped_anvil) {
+    matchingBlocks.push(bot.registry.blocksByName.chipped_anvil.id)
+    matchingBlocks.push(bot.registry.blocksByName.damaged_anvil.id)
   }
   return matchingBlocks
 }

package/examples/auto_totem.js

@@ -17,9 +17,8 @@ const bot = mineflayer.createBot({
 })
 
 bot.on('spawn', () => {
-  const mcData = require('minecraft-data')(bot.version) // You will know the version when the bot has spawned
-  const totemId = mcData.itemsByName.totem_of_undying.id // Get the correct id
-  if (mcData.itemsByName.totem_of_undying) {
+  const totemId = bot.registry.itemsByName.totem_of_undying.id // Get the correct id
+  if (bot.registry.itemsByName.totem_of_undying) {
     setInterval(() => {
       const totem = bot.inventory.findInventoryItem(totemId, null)
       if (totem) {

package/examples/block_entity.js

@@ -16,11 +16,6 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.on('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 bot.on('message', (cm) => {
   if (cm.toString().includes('spawner')) {
     spawner()
@@ -30,9 +25,9 @@ bot.on('message', (cm) => {
 function spawner () {
   let blockName
   if (bot.supportFeature('mobSpawner')) {
-    blockName = mcData.blocksByName.mob_spawner.id
+    blockName = bot.registry.blocksByName.mob_spawner.id
   } else if (bot.supportFeature('spawner')) {
-    blockName = mcData.blocksByName.spawner.id
+    blockName = bot.registry.blocksByName.spawner.id
   }
   const block = bot.findBlock({
     matching: blockName,

package/examples/blockfinder.js

@@ -20,8 +20,6 @@ const bot = mineflayer.createBot({
 bot.on('chat', async (username, message) => {
   if (username === bot.username) return
 
-  const mcData = require('minecraft-data')(bot.version)
-
   if (message === 'loaded') {
     console.log(bot.entity.position)
     await bot.waitForChunksToLoad()
@@ -30,11 +28,11 @@ bot.on('chat', async (username, message) => {
 
   if (message.startsWith('find')) {
     const name = message.split(' ')[1]
-    if (mcData.blocksByName[name] === undefined) {
+    if (bot.registry.blocksByName[name] === undefined) {
       bot.chat(`${name} is not a block name`)
       return
     }
-    const ids = [mcData.blocksByName[name].id]
+    const ids = [bot.registry.blocksByName[name].id]
 
     const startTime = performance.now()
     const blocks = bot.findBlocks({ matching: ids, maxDistance: 128, count: 10 })

package/examples/chest.js

@@ -33,11 +33,6 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.once('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 bot.on('experience', () => {
   bot.chat(`I am level ${bot.experience.level}`)
 })
@@ -86,7 +81,7 @@ async function watchChest (minecart, blocks = []) {
   let chestToOpen
   if (minecart) {
     chestToOpen = Object.keys(bot.entities)
-      .map(id => bot.entities[id]).find(e => e.entityType === mcData.entitiesByName.chest_minecart &&
+      .map(id => bot.entities[id]).find(e => e.entityType === bot.registry.entitiesByName.chest_minecart &&
       e.objectData.intField === 1 &&
       bot.entity.position.distanceTo(e.position) < 3)
     if (!chestToOpen) {
@@ -95,7 +90,7 @@ async function watchChest (minecart, blocks = []) {
     }
   } else {
     chestToOpen = bot.findBlock({
-      matching: blocks.map(name => mcData.blocksByName[name].id),
+      matching: blocks.map(name => bot.registry.blocksByName[name].id),
       maxDistance: 6
     })
     if (!chestToOpen) {
@@ -170,7 +165,7 @@ async function watchChest (minecart, blocks = []) {
 
 async function watchFurnace () {
   const furnaceBlock = bot.findBlock({
-    matching: ['furnace', 'lit_furnace'].filter(name => mcData.blocksByName[name] !== undefined).map(name => mcData.blocksByName[name].id),
+    matching: ['furnace', 'lit_furnace'].filter(name => bot.registry.blocksByName[name] !== undefined).map(name => bot.registry.blocksByName[name].id),
     maxDistance: 6
   })
   if (!furnaceBlock) {
@@ -256,7 +251,7 @@ async function watchFurnace () {
 
 async function watchEnchantmentTable () {
   const enchantTableBlock = bot.findBlock({
-    matching: ['enchanting_table'].map(name => mcData.blocksByName[name].id),
+    matching: ['enchanting_table'].map(name => bot.registry.blocksByName[name].id),
     maxDistance: 6
   })
   if (!enchantTableBlock) {
@@ -322,8 +317,8 @@ async function watchEnchantmentTable () {
     }
 
     async function addLapis () {
-      const item = itemByType(table.window.items(), ['dye', 'purple_dye', 'lapis_lazuli'].filter(name => mcData.itemByName[name] !== undefined)
-        .map(name => mcData.itemByName[name].id))
+      const item = itemByType(table.window.items(), ['dye', 'purple_dye', 'lapis_lazuli'].filter(name => bot.registry.itemByName[name] !== undefined)
+        .map(name => bot.registry.itemByName[name].id))
       if (item) {
         try {
           await table.putLapis(item)

package/examples/collectblock.js

@@ -26,19 +26,13 @@ const bot = mineflayer.createBot({
 bot.loadPlugin(pathfinder)
 bot.loadPlugin(collectBlock)
 
-// Load mc data
-let mcData
-bot.once('spawn', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 // Listen for when a player says "collect [something]" in chat
 bot.on('chat', (username, message) => {
   const args = message.split(' ')
   if (args[0] !== 'collect') return
 
   // Get the correct block type
-  const blockType = mcData.blocksByName[args[1]]
+  const blockType = bot.registry.blocksByName[args[1]]
   if (!blockType) {
     bot.chat("I don't know any blocks with that name.")
     return

package/examples/command_block.js

@@ -16,18 +16,13 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.once('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 bot.on('chat', (username, message) => {
   if (username === bot.username) return
   const command = message.split(' ')
   switch (true) {
     case /^setCommandBlock (.+)$/.test(message): {
       const commandBlock = bot.findBlock({
-        matching: mcData.blocksByName.command_block.id
+        matching: bot.registry.blocksByName.command_block.id
       })
       bot.setCommandBlock(commandBlock.position, command[1], false)
       break

package/examples/digger.js

@@ -104,7 +104,6 @@ function build () {
 }
 
 async function equipDirt () {
-  const mcData = require('minecraft-data')(bot.version)
   let itemsByName
   if (bot.supportFeature('itemsAreNotBlocks')) {
     itemsByName = 'itemsByName'
@@ -112,7 +111,7 @@ async function equipDirt () {
     itemsByName = 'blocksByName'
   }
   try {
-    await bot.equip(mcData[itemsByName].dirt.id, 'hand')
+    await bot.equip(bot.registry[itemsByName].dirt.id, 'hand')
     bot.chat('equipped dirt')
   } catch (err) {
     bot.chat(`unable to equip dirt: ${err.message}`)

package/examples/farmer.js

@@ -13,18 +13,13 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.on('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 // To fish we have to give bot the seeds
 // /give farmer wheat_seeds 64
 
 function blockToSow () {
   return bot.findBlock({
     point: bot.entity.position,
-    matching: mcData.blocksByName.farmland.id,
+    matching: bot.registry.blocksByName.farmland.id,
     maxDistance: 6,
     useExtraInfo: (block) => {
       const blockAbove = bot.blockAt(block.position.offset(0, 1, 0))
@@ -38,7 +33,7 @@ function blockToHarvest () {
     point: bot.entity.position,
     maxDistance: 6,
     matching: (block) => {
-      return block && block.type === mcData.blocksByName.wheat.id && block.metadata === 7
+      return block && block.type === bot.registry.blocksByName.wheat.id && block.metadata === 7
     }
   })
 }
@@ -56,7 +51,7 @@ async function loop () {
     while (1) {
       const toSow = blockToSow()
       if (toSow) {
-        await bot.equip(mcData.itemsByName.wheat_seeds.id, 'hand')
+        await bot.equip(bot.registry.itemsByName.wheat_seeds.id, 'hand')
         await bot.placeBlock(toSow, new Vec3(0, 1, 0))
       } else {
         break

package/examples/fisherman.js

@@ -12,11 +12,6 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.on('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 // To fish we have to give bot the fishing rod and teleport bot to the water
 // /give fisherman fishing_rod 1
 // /teleport fisherman ~ ~ ~
@@ -50,7 +45,7 @@ function onCollect (player, entity) {
 async function startFishing () {
   bot.chat('Fishing')
   try {
-    await bot.equip(mcData.itemsByName.fishing_rod.id, 'hand')
+    await bot.equip(bot.registry.itemsByName.fishing_rod.id, 'hand')
   } catch (err) {
     return bot.chat(err.message)
   }
@@ -78,7 +73,7 @@ async function eat () {
   stopFishing()
 
   try {
-    await bot.equip(mcData.itemsByName.fish.id, 'hand')
+    await bot.equip(bot.registry.itemsByName.fish.id, 'hand')
   } catch (err) {
     return bot.chat(err.message)
   }

package/examples/graffiti.js

@@ -23,11 +23,6 @@ const bot = mineflayer.createBot({
   password: process.argv[5]
 })
 
-let mcData
-bot.once('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 bot.on('chat', (username, message) => {
   if (username === bot.username) return
   switch (true) {
@@ -49,7 +44,7 @@ function watchPaintingOrSign () {
     }
   })
   const signBlock = bot.findBlock({
-    matching: ['painting', 'sign'].map(name => mcData.blocksByName[name].id)
+    matching: ['painting', 'sign'].map(name => bot.registry.blocksByName[name].id)
   })
   if (signBlock) {
     bot.chat(`The sign says: ${signBlock.signText}`)
@@ -62,7 +57,7 @@ function watchPaintingOrSign () {
 
 function updateSign (message) {
   const signBlock = bot.findBlock({
-    matching: ['painting', 'sign'].map(name => mcData.blocksByName[name].id)
+    matching: ['painting', 'sign'].map(name => bot.registry.blocksByName[name].id)
   })
   if (signBlock) {
     bot.updateSign(signBlock, message.split(' ').slice(1).join(' '))

package/examples/guard.js

@@ -42,8 +42,7 @@ function stopGuarding () {
 
 // Pathfinder to the guard position
 function moveToGuardPos () {
-  const mcData = require('minecraft-data')(bot.version)
-  bot.pathfinder.setMovements(new Movements(bot, mcData))
+  bot.pathfinder.setMovements(new Movements(bot))
   bot.pathfinder.setGoal(new goals.GoalBlock(guardPos.x, guardPos.y, guardPos.z))
 }
 

package/examples/inventory.js

@@ -67,7 +67,7 @@ bot.on('chat', async (username, message) => {
 function sayItems (items = null) {
   if (!items) {
     items = bot.inventory.items()
-    if (require('minecraft-data')(bot.version).isNewerOrEqualTo('1.9') && bot.inventory.slots[45]) items.push(bot.inventory.slots[45])
+    if (bot.registry.isNewerOrEqualTo('1.9') && bot.inventory.slots[45]) items.push(bot.inventory.slots[45])
   }
   const output = items.map(itemToString).join(', ')
   if (output) {
@@ -127,10 +127,8 @@ function useEquippedItem () {
 
 async function craftItem (name, amount) {
   amount = parseInt(amount, 10)
-  const mcData = require('minecraft-data')(bot.version)
-
-  const item = mcData.itemsByName[name]
-  const craftingTableID = mcData.blocksByName.crafting_table.id
+  const item = bot.registry.itemsByName[name]
+  const craftingTableID = bot.registry.blocksByName.crafting_table.id
 
   const craftingTable = bot.findBlock({
     matching: craftingTableID
@@ -164,6 +162,6 @@ function itemToString (item) {
 
 function itemByName (name) {
   const items = bot.inventory.items()
-  if (require('minecraft-data')(bot.version).isNewerOrEqualTo('1.9') && bot.inventory.slots[45]) items.push(bot.inventory.slots[45])
+  if (bot.registry.isNewerOrEqualTo('1.9') && bot.inventory.slots[45]) items.push(bot.inventory.slots[45])
   return items.filter(item => item.name === name)[0]
 }

package/examples/jumper.js

@@ -63,7 +63,7 @@ bot.on('chat', (username, message) => {
       }
       break
     case 'mount':
-      entity = bot.nearestEntity((entity) => { return entity.type === 'object' })
+      entity = bot.nearestEntity((entity) => { return entity.name === 'minecart' })
       if (entity) {
         bot.mount(entity)
       } else {

package/examples/pathfinder/gps.js

@@ -20,8 +20,7 @@ const RANGE_GOAL = 1 // get within this radius of the player
 bot.loadPlugin(pathfinder)
 
 bot.once('spawn', () => {
-  const mcData = require('minecraft-data')(bot.version)
-  const defaultMove = new Movements(bot, mcData)
+  const defaultMove = new Movements(bot)
 
   bot.on('chat', (username, message) => {
     if (username === bot.username) return

package/examples/place_end_crystal/index.js

@@ -22,14 +22,7 @@ const bot = mineflayer.createBot({
 
 const MAX_DIST_FROM_BLOCK_TO_PLACE = 4
 
-let mcData = null
-bot.once('spawn', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
-
 bot.on('chat', async (ign, msg) => {
-  if (!mcData) mcData = require('minecraft-data')(bot.version)
-
   // solve where the bot will place the crystal near
   let findBlocksNearPoint = null
   if (msg === 'place crystal near bot') {
@@ -44,13 +37,13 @@ bot.on('chat', async (ign, msg) => {
   }
 
   // find end crystal(s) in inventory
-  const item = bot.inventory.findInventoryItem(mcData.itemsByName.end_crystal.id)
+  const item = bot.inventory.findInventoryItem(bot.registry.itemsByName.end_crystal.id)
   if (!item) bot.chat("I don't have any ender crystals")
 
   // find the crystal
   const block = bot.findBlock({
     point: findBlocksNearPoint,
-    matching: ['bedrock', 'obsidian'].map(blockName => mcData.blocksByName[blockName].id),
+    matching: ['bedrock', 'obsidian'].map(blockName => bot.registry.blocksByName[blockName].id),
     useExtraInfo: block => {
       const hasAirAbove = bot.blockAt(block.position.offset(0, 1, 0)).name === 'air'
       const botNotStandingOnBlock = block.position.xzDistanceTo(bot.entity.position) > 2

package/examples/python/basic.py

@@ -17,8 +17,7 @@ print("Started mineflayer")
 @On(bot, 'spawn')
 def handle(*args):
   print("I spawned 👋")
-  mcData = require('minecraft-data')(bot.version)
-  movements = pathfinder.Movements(bot, mcData)
+  movements = pathfinder.Movements(bot)
 
   @On(bot, 'chat')
   def handleMsg(this, sender, message, *args):

package/examples/python/chatterbox.py

@@ -34,7 +34,7 @@ bot = mineflayer.createBot({
     "port": port
 })
 
-Item = require("prismarine-item")(bot.version)
+Item = require("prismarine-item")(bot.registry)
 
 
 @On(bot, "chat")

package/examples/trader.js

@@ -25,10 +25,6 @@ const bot = mineflayer.createBot({
   username: process.argv[4] ? process.argv[4] : 'trader',
   password: process.argv[5]
 })
-let mcData
-bot.once('inject_allowed', () => {
-  mcData = require('minecraft-data')(bot.version)
-})
 
 bot.on('chat', (username, message) => {
   if (username === bot.username) return
@@ -50,7 +46,7 @@ bot.on('chat', (username, message) => {
 })
 
 function showVillagers () {
-  const villagers = Object.keys(bot.entities).map(id => bot.entities[id]).filter(e => e.entityType === mcData.entitiesByName.villager.id)
+  const villagers = Object.keys(bot.entities).map(id => bot.entities[id]).filter(e => e.entityType === bot.registry.entitiesByName.villager.id)
   const closeVillagersId = villagers.filter(e => bot.entity.position.distanceTo(e.position) < 3).map(e => e.id)
   bot.chat(`found ${villagers.length} villagers`)
   bot.chat(`villager(s) you can trade with: ${closeVillagersId.join(', ')}`)
@@ -69,7 +65,7 @@ async function showTrades (id) {
     case !e:
       bot.chat(`cant find entity with id ${id}`)
       break
-    case e.entityType !== mcData.entitiesByName.villager.id:
+    case e.entityType !== bot.registry.entitiesByName.villager.id:
       bot.chat('entity is not a villager')
       break
     case bot.entity.position.distanceTo(e.position) > 3:
@@ -91,7 +87,7 @@ async function trade (id, index, count) {
     case !e:
       bot.chat(`cant find entity with id ${id}`)
       break
-    case e.entityType !== mcData.entitiesByName.villager.id:
+    case e.entityType !== bot.registry.entitiesByName.villager.id:
       bot.chat('entity is not a villager')
       break
     case bot.entity.position.distanceTo(e.position) > 3:
@@ -168,7 +164,7 @@ function stringifyItem (item) {
       text += ` enchanted with ${(ench || StoredEnchantments).value.value.map((e) => {
         const lvl = e.lvl.value
         const id = e.id.value
-        return mcData.enchantments[id].displayName + ' ' + lvl
+        return bot.registry.enchantments[id].displayName + ' ' + lvl
       }).join(' ')}`
     }
   }