mineflayer 3.18.0 → 4.2.0

package/.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
          - javaVersion: 16
            mcVersion: '1.17.1'
          - javaVersion: 17
-           mcVersion: '1.18.1'
+           mcVersion: '1.18.2'
       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 and 1.18.
  * 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 and 1.18.
  * 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

@@ -20,8 +20,8 @@
     - [Biome](#biome)
     - [Item](#item)
     - [windows.Window (base class)](#windowswindow-base-class)
-      - [window.deposit(itemType, metadata, count)](#windowdeposititemtype-metadata-count)
-      - [window.withdraw(itemType, metadata, count)](#windowwithdrawitemtype-metadata-count)
+      - [window.deposit(itemType, metadata, count, nbt)](#windowdeposititemtype-metadata-count-nbt)
+      - [window.withdraw(itemType, metadata, count, nbt)](#windowwithdrawitemtype-metadata-count-nbt)
       - [window.close()](#windowclose)
     - [Recipe](#recipe)
     - [mineflayer.Container](#mineflayercontainer)
@@ -78,6 +78,7 @@
   - [Bot](#bot)
     - [mineflayer.createBot(options)](#mineflayercreatebotoptions)
     - [Properties](#properties)
+      - [bot.registry](#botregistry)
       - [bot.world](#botworld)
         - [world "blockUpdate" (oldBlock, newBlock)](#world-blockupdate-oldblock-newblock)
         - [world "blockUpdate:(x, y, z)" (oldBlock, newBlock)](#world-blockupdatex-y-z-oldblock-newblock)
@@ -94,6 +95,8 @@
       - [bot.game.hardcore](#botgamehardcore)
       - [bot.game.maxPlayers](#botgamemaxplayers)
       - [bot.game.serverBrand](#botgameserverbrand)
+      - [bot.game.minY](#botgameminy)
+      - [bot.game.height](#botgameheight)
     - [bot.physicsEnabled](#botphysicsenabled)
     - [bot.player](#botplayer)
       - [bot.players](#botplayers)
@@ -113,6 +116,8 @@
         - [bot.settings.skinParts.showLeftPants - boolean](#botsettingsskinpartsshowleftpants---boolean)
         - [bot.settings.skinParts.showRightPants - boolean](#botsettingsskinpartsshowrightpants---boolean)
         - [bot.settings.skinParts.showHat - boolean](#botsettingsskinpartsshowhat---boolean)
+      - [bot.settings.enableTextFiltering - boolean](#botsettingsenabletextfiltering---boolean)
+      - [bot.settings.enableServerListing - boolean](#botsettingsenableserverlisting---boolean)
       - [bot.experience.level](#botexperiencelevel)
       - [bot.experience.points](#botexperiencepoints)
       - [bot.experience.progress](#botexperienceprogress)
@@ -418,21 +423,23 @@ See [prismarine-item](https://github.com/PrismarineJS/prismarine-item)
 
 See [prismarine-windows](https://github.com/PrismarineJS/prismarine-windows)
 
-#### window.deposit(itemType, metadata, count)
+#### window.deposit(itemType, metadata, count, nbt)
 
 This function returns a `Promise`, with `void` as its argument when done depositing.
 
  * `itemType` - numerical item id
  * `metadata` - numerical value. `null` means match anything.
  * `count` - how many to deposit. `null` is an alias to 1.
+ * `nbt` - match nbt data. `null` is do not match nbt.
 
-#### window.withdraw(itemType, metadata, count)
+#### window.withdraw(itemType, metadata, count, nbt)
 
-This function returns a `Promise`, with `void` as its argument when done withdrawing.
+This function returns a `Promise`, with `void` as its argument when done withdrawing. Throws and error if the bot has no free room in its inventory.
 
  * `itemType` - numerical item id
  * `metadata` - numerical value. `null` means match anything.
  * `count` - how many to withdraw. `null` is an alias to 1.
+ * `nbt` - match nbt data. `null` is do not match nbt.
 
 #### window.close()
 
@@ -745,11 +752,17 @@ Create and return an instance of the class bot.
  * [viewDistance](#bot.settings.viewDistance)
  * [difficulty](#bot.settings.difficulty)
  * [skinParts](#bot.settings.skinParts)
+ * [enableTextFiltering](#bot.settings.enableTextFiltering)
+ * [enableServerListing](#bot.settings.enableServerListing)
  * chatLengthLimit : the maximum amount of characters that can be sent in a single message. If this is not set, it will be 100 in < 1.11 and 256 in >= 1.11.
  * defaultChatPatterns: defaults to true, set to false to not add the patterns such as chat and whisper
 
 ### Properties
 
+#### bot.registry
+
+Instance of minecraft-data used by the bot. Pass this to constructors that expect an instance of minecraft-data, such as prismarine-block.
+
 #### bot.world
 
 A sync representation of the world. Check the doc at http://github.com/PrismarineJS/prismarine-world
@@ -881,6 +894,7 @@ Default true, whether or not you receive color codes in chats from the server.
 
 #### bot.settings.viewDistance
 
+Can be a string listed below or a postive number.
 Choices:
  * `far` (default)
  * `normal`
@@ -911,7 +925,10 @@ If you have a cape you can turn it off by setting this to false.
 
 ##### bot.settings.skinParts.showHat - boolean
 
-
+#### bot.settings.enableTextFiltering - boolean
+Unused, defaults to false in Notchian (Vanilla) client.
+#### bot.settings.enableServerListing - boolean
+This setting is sent to the server to determine whether the player should show up in server listings
 #### bot.experience.level
 
 #### bot.experience.points
@@ -1847,13 +1864,13 @@ use shears.
 Attack a player or a mob.
 
  * `entity` is a type of entity. To get a specific entity use [bot.nearestEntity()](#botnearestentitymatch--entity---return-true-) or [bot.entities](#botentities).
- * `swing` Default `true`. If false the bot does not swing is arm when attacking.
+ * `swing` Default to `true`. If false the bot does not swing its arm when attacking.
 
 #### bot.swingArm([hand], showHand)
 
 Play an arm swing animation.
 
- * `hand` can take `left` or `right` which is arm that is animated. Default: `right`
+ * `hand` can take `left` or `right` which is the arm that is animated. Default: `right`
  * `showHand` is a boolean whether to add the hand to the packet, Default: `true`
 
 #### bot.mount(entity)
@@ -2039,7 +2056,7 @@ but it is assumed and often required that the bot be in creative mode for these
 
 #### bot.creative.setInventorySlot(slot, item)
 
-This function returns a `Promise`, with `void` as its argument when gets fired when the servers sets the slot.
+This function returns a `Promise`, with `void` as its argument when gets fired when the server sets the slot.
 
 Gives the bot the specified item in the specified inventory slot.
 
@@ -2049,6 +2066,18 @@ Gives the bot the specified item in the specified inventory slot.
 
 If this method changes anything, you can be notified via `bot.inventory.on("updateSlot")`.
 
+#### bot.creative.clearSlot(slot)
+
+This function returns a `Promise`, with `void` as its argument when gets fired when the server clears the slot.
+
+Makes the sets the item in the slot given to null.
+
+ * `slot` is in inventory window coordinates (where 36 is the first quickbar slot, etc.).
+
+#### bot.creative.clearInventory()
+
+This function returns a `Promise`, with `void` as its argument when gets fired when the server clears the slot.
+
 #### bot.creative.flyTo(destination)
 
 This function returns a `Promise`, with `void` as its argument when the bot arrives at the destination.

package/docs/es/README_ES.md

@@ -17,7 +17,7 @@ Crea bots para Minecraft con una API de JavaScript potente, estable y de alto ni
 
 ## Características
 
- * Soporta Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15 y 1.16.
+ * Soporta Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17 y 1.18.
  * Rastreo e información de entidades.
  * Información sobre bloques. Puedes solicitar información de todo lo que te rodea. Encuentra bloques en milisegundos
  * Físicas y movimientos básicos - maneja todos los cuadros de colisión
@@ -34,6 +34,7 @@ Crea bots para Minecraft con una API de JavaScript potente, estable y de alto ni
 Echa un vistazo a nuestros [proyectos actuales](https://github.com/PrismarineJS/mineflayer/wiki/Big-Prismarine-projects)
 
 ## Instalación
+Primero instala Node.js >= 14 desde [nodejs.org](https://nodejs.org/)
 
 `npm install mineflayer`
 
@@ -66,10 +67,9 @@ Si quieres aprender más, puedes mirar [aquí, ](https://www.youtube.com/playlis
 
 **Empezando**
 
-Sin especificar una versión, la versión del servidor se detectará automáticamente, puedes configurar una versión específica utilizando la opción de versión.
-Por ejemplo `version:" 1.8 "`.
+Si no se especifica una versión, la versión del servidor se detectará automáticamente. Si no se especifica ningún tipo de autenticación, se utilizará el login de Mojang automáticamente. 
 
-### Ejemplo
+### Ejemplo: echo
 ```js
 const mineflayer = require('mineflayer')
 
@@ -92,7 +92,7 @@ bot.on('kicked', (reason, loggedIn) => console.log(reason, loggedIn))
 bot.on('error', err => console.log(err))
 ```
 
-### Mira lo que tu bot hace
+### Mira lo que hace tu bot
 
 Gracias al proyecto [prismarine-viewer](https://github.com/PrismarineJS/prismarine-viewer), puedes ver en una pestaña del navegador qué está haciendo tu bot.
 Solo tienes que ejecutar `npm install prismarine-viewer` y añadir lo siguiente a tu bot:
@@ -124,7 +124,7 @@ Más ejemplos en la carpeta de [ejemplos](https://github.com/PrismarineJS/minefl
 
 ### Módulos
 
-La mayoría del desarrollo se esta produciendo dentro de pequeños módulos npm que son usados por mineflayer
+La mayoría del desarrollo se está produciendo dentro de pequeños módulos npm que son usados por mineflayer
 
 #### The Node Way™
 

package/docs/history.md

@@ -1,3 +1,23 @@
+## 4.2.0
+
+* add missing extraInfos argument to Bot.blockAt function (@dumbasPL)
+* Emit window close event AFTER updating the inventory (@imharvol)
+* Move supportFeature to mcdata (@U9G)
+* Update lib/ and test/ to use prismarine-registry (@extremeheat)
+* only open chests with openContainer (@U9G)
+* Add bot.creative.clearSlot and bot.creative.clearInventory (@U9G)
+* remove transaction warning
+
+## 4.1.0
+
+* 1.18.2 support
+* Add nbt option to withdraw and deposit
+
+## 4.0.0
+
+* useEntity maintains sneak state
+* BREAKING: remove all callbacks in favor of promises
+
 ## 3.18.0
 
 * remove callbacks from types and docs

package/docs/ru/README_RU.md

@@ -18,7 +18,7 @@
 
 ## Возможности
 
- * Поддержка 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15 и 1.16.
+ * Поддержка 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17 и 1.18
  * Поддержка энтити и их отслеживание
  * Вы можете полностью взаимодействовать с миром. Миллисекунды на поиск любого блока
  * Физика и управление
@@ -46,7 +46,6 @@
 | -------------------------------------------------------------------------- | ------------------------------------- |
 | [Обучение](tutorial.md)                                                    | Знакомство с Node.js и Mineflayer     |
 | [FAQ](FAQ_RU.md)                                                           | Появился вопрос? Найдите ответ здесь. |
-| [API](api_ru.md)                                                           | Методы API                            |
 | [Нестабильное API](unstable_api_ru.md)                                     | Нестабильные методы API               |
 | [Обновления](history.md)                                                   | Список изменений в обновлениях        |
 | [Примеры](https://github.com/PrismarineJS/mineflayer/tree/master/examples) | Примеры использования Mineflayer      |

package/docs/tutorial.md

@@ -17,7 +17,7 @@
     - [Logging in](#logging-in)
   - [Passing along functions](#passing-along-functions)
   - [Listening for an event](#listening-for-an-event)
-  - [Callbacks](#callbacks)
+  - [Promises](#promises)
     - [Correct and incorrect approach](#correct-and-incorrect-approach)
 - [Advanced](#advanced)
   - [Asynchronousy](#asynchronousy)
@@ -430,18 +430,18 @@ To remove specific listener you can use `bot.removeListener()` method.
 
 Not only bot object, [`Chest`](http://mineflayer.prismarine.js.org/#/api?id=mineflayerchest), [`Furnace`](http://mineflayer.prismarine.js.org/#/api?id=mineflayerfurnace), [`Dispenser`](http://mineflayer.prismarine.js.org/#/api?id=mineflayerdispenser), [`EnchantmentTable`](http://mineflayer.prismarine.js.org/#/api?id=mineflayerenchantmenttable), [`Villager`](http://mineflayer.prismarine.js.org/#/api?id=mineflayervillager) object also have their own events!
 
-### Callbacks
-A [callback](https://en.wikipedia.org/wiki/Callback_(computer_programming)) is a function that you can give to another function, that is expected to be *called back*, generally when that function ends.  
-In Mineflayer, callbacks are often used to handle errors.
+### Promises
+A [promise](https://nodejs.dev/learn/understanding-javascript-promises) is a function that you can use the `await` variable to wait on until it's job is complete. (you can omit the await to not wait for results)
 
 ```js
-bot.consume((error) => {
-  if (error) { // This checks if an error occurred.
-    console.log(error)
-  } else {
+async function consume (bot) {
+  try {
+    await bot.consume()
     console.log('Finished consuming')
+  } catch (err) {
+    console.log(error)
   }
-})
+}
 ```
 
 The above code will try to consume what the bot is currently holding.  
@@ -456,91 +456,40 @@ Below is an example of a bot that will craft oak logs into oak planks and then i
 Incorect approach ❌:
 
 ```js
-const plankRecipe = bot.recipesFor(5)[0] // Get the first recipe for item id 5, which is oak planks.
-bot.craft(plankRecipe, 1) // ❌ start crafting oak planks.
+function craft (bot) {
+  const mcData = require('minecraft-data')(bot.version)
+  const plankRecipe = bot.recipesFor(mcData.itemsByName.oak_planks.id ?? mcData.itemsByName.planks.id)[0] // Get the first recipe for oak planks
+  bot.craft(plankRecipe, 1) // ❌ start crafting oak planks.
 
-const stickRecipe = bot.recipesFor(280)[0] // Get the first recipe for item id 5, which is sticks.
-bot.craft(stickRecipe, 1) // ❌ start crafting sticks.
+  const stickRecipe = bot.recipesFor(mcData.itemsByName.sticks.id)[0] // Get the first recipe for sticks
+  bot.craft(stickRecipe, 1) // ❌ start crafting sticks.
+}
 ```
 
-Correct approach with callbacks ✔️:
+Correct approach with promises ✔️:
 
 ```js
-const plankRecipe = bot.recipesFor(5)[0]
-
-bot.craft(plankRecipe, 1, null, (error) => {
-  // After bot.craft(plankRecipe, ...) is finished, this callback is called and we continue. ✔️
-  if (error) { // Check if an error happened.
-    console.log(error)
-  } else {
-    const stickRecipe = bot.recipesFor(280)[0]
-
-    bot.craft(stickRecipe, 1, null, (error) => {
-      // After bot.craft(stickRecipe, ...) is finished, this callback is called and we continue. ✔️
-      if (error) { // Check if an error happened.
-        console.log(error)
-      } else {
-        bot.chat('Crafting Sticks finished')
-      }
-    })
-  }
-})
+async function craft (bot) {
+  const mcData = require('minecraft-data')(bot.version)
+  const plankRecipe = bot.recipesFor(mcData.itemsByName.oak_planks.id ?? mcData.itemsByName.planks.id)[0]
+  await bot.craft(plankRecipe, 1, null)
+  const stickRecipe = bot.recipesFor(mcData.itemsByName.sticks.id)[0]
+  await bot.craft(stickRecipe, 1, null)
+  bot.chat('Crafting Sticks finished')
+}
 ```
 
 The reason the incorrect approach is wrong is because when `bot.craft()` is called, the code will continue below while the bot is crafting.  
 By the time the code reaches the second `bot.craft()`, the first probably hasn't finished yet, which means the wanted resource is not available yet.  
-Using callbacks can fix this because they will only be called after the `bot.craft()` is finished.
+Using promises can fix this because they will only be called after the `bot.craft()` is finished.
 
-More on the [bot.craft()](https://mineflayer.prismarine.js.org/#/api?id=botcraftrecipe-count-craftingtable-callback) method.
+More on the [bot.craft()](https://github.com/PrismarineJS/mineflayer/blob/master/docs/api.md#botcraftrecipe-count-craftingtable) method.
 
 ## Advanced
 
 The following concepts aren't necessary to create a Mineflayer bot, but they can be useful to understand and create more advanced bots.  
 We assume you have understood the [Basics](#basics) tutorial.
 
-### Asynchronousy
-In Javascript, asynchronousy is an important concept.  
-By default, Javascript will run everything line by line, and only go to the next line if the current line is done. This is called blocking.  
-However, sometimes you have to do something that takes a relatively long time, and you don't want your whole program to block and wait for it to finish.  
-
-Interacting with the filesystem is often done using asynchronousy, because reading and writing large files can take a long time.  
-
-```js
-const myPromise = new Promise((resolve, reject) => {
-  setTimeout(() => {
-    resolve('Success!') // Yay! Everything went well!
-  }, 1000)
-})
-
-myPromise.then((successMessage) => {
-  console.log(successMessage)
-})
-
-myPromise.catch((error) => {
-  console.log(error)
-})
-```
-
-The above codes uses what is called a Promise. A promise promises it will eventually complete.  
-The function given you a promise always has 2 parameters, a `resolve` function and a `reject` function.  
-If the promise is successful, it will call the `resolve` function, otherwise it will call the `reject` function.  
-The above code uses a `setTimeout`, which calls the given function after the set amount of milliseconds, 1000 in this case.  
-You can then tell the promise what it should do when it succeeds with `.then(function)` or when it fails with `.catch(function)`
-
-The `.then` and `.catch` function can also be chained together with the promise to simplify the code.
-
-```js
-const myPromise = new Promise((resolve, reject) => {
-  setTimeout(() => {
-    resolve('Success!') // Yay! Everything went well!
-  }, 1000)
-}).then((successMessage) => {
-  console.log(successMessage)
-}).catch((error) => {
-  console.log(error)
-})
-```
-
 ### Loop over an object
 
 The `for of` loop described in the [loops](#loops) chapter can also be used to loop over an object.

package/examples/inventory.js

@@ -129,7 +129,7 @@ async function craftItem (name, amount) {
   amount = parseInt(amount, 10)
   const mcData = require('minecraft-data')(bot.version)
 
-  const item = mcData.findItemOrBlockByName(name)
+  const item = mcData.itemsByName[name]
   const craftingTableID = mcData.blocksByName.crafting_table.id
 
   const craftingTable = bot.findBlock({

package/index.d.ts

@@ -197,7 +197,7 @@ export interface Bot extends TypedEmitter<BotEvents> {
 
   end: (reason?: string) => void
 
-  blockAt: (point: Vec3) => Block | null
+  blockAt: (point: Vec3, extraInfos?: boolean) => Block | null
 
   blockInSight: (maxSteps: number, vectorLength: number) => Block | null
 
@@ -294,7 +294,7 @@ export interface Bot extends TypedEmitter<BotEvents> {
 
   digTime: (block: Block) => number
 
-  placeBlock: (referenceBlock: Block, faceVector: Vec3, cb?: () => void) => Promise<void>
+  placeBlock: (referenceBlock: Block, faceVector: Vec3) => Promise<void>
 
   placeEntity: (referenceBlock: Block, faceVector: Vec3) => Promise<Entity>
 
@@ -328,8 +328,8 @@ export interface Bot extends TypedEmitter<BotEvents> {
 
   craft: (
     recipe: Recipe,
-    count: number | null,
-    craftingTable: Block
+    count?: number,
+    craftingTable?: Block
   ) => Promise<void>
 
   writeBook: (
@@ -571,6 +571,10 @@ export interface creativeMethods {
     item: Item | null
   ) => Promise<void>
 
+  clearSlot: (slot: number) => Promise<void>
+
+  clearInventory: () => Promise<void>
+
   flyTo: (destination: Vec3) => Promise<void>
 
   startFlying: () => void

package/lib/bossbar.js

@@ -5,7 +5,7 @@ const divisions = [0, 6, 10, 12, 20]
 module.exports = loader
 
 function loader (mcVersion) {
-  ChatMessage = require('prismarine-chat')(mcVersion)
+  ChatMessage = require('prismarine-chat')(mcVersion) // TODO: update for prismarine-registry
   return BossBar
 }
 

package/lib/loader.js

@@ -1,7 +1,6 @@
 const mc = require('minecraft-protocol')
 const { EventEmitter } = require('events')
 const pluginLoader = require('./plugin_loader')
-const supportFeature = require('./supportFeature')
 const plugins = {
   bed: require('./plugins/bed'),
   title: require('./plugins/title'),
@@ -56,7 +55,7 @@ module.exports = {
   BossBar: require('./bossbar'),
   supportedVersions,
   testedVersions,
-  supportFeature
+  supportFeature: (feature, version) => require('minecraft-data')(version).supportFeature(feature)
 }
 
 function createBot (options = {}) {
@@ -105,7 +104,8 @@ function createBot (options = {}) {
   if (!bot._client.wait_connect) next()
   else bot._client.once('connect_allowed', next)
   function next () {
-    const version = require('minecraft-data')(bot._client.version).version
+    bot.registry = require('prismarine-registry')(bot._client.version)
+    const version = bot.registry.version
     if (supportedVersions.indexOf(version.majorVersion) === -1) {
       throw new Error(`Version ${version.minecraftVersion} is not supported.`)
     }
@@ -120,7 +120,7 @@ function createBot (options = {}) {
     bot.majorVersion = version.majorVersion
     bot.version = version.minecraftVersion
     options.version = version.minecraftVersion
-    bot.supportFeature = feature => supportFeature(feature, version.minecraftVersion)
+    bot.supportFeature = bot.registry.supportFeature
     bot.emit('inject_allowed')
   }
   return bot

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
 
@@ -7,7 +6,6 @@ const CARDINAL_DIRECTIONS = ['south', 'west', 'north', 'east']
 
 function inject (bot) {
   bot.isSleeping = false
-  const mcData = require('minecraft-data')(bot.version)
 
   const beds = new Set(['white_bed', 'orange_bed', 'magenta_bed', 'light_blue_bed', 'yellow_bed', 'lime_bed', 'pink_bed', 'gray_bed',
     'light_gray_bed', 'cyan_bed', 'purple_bed', 'blue_bed', 'brown_bed', 'green_bed', 'red_bed', 'black_bed', 'bed'])
@@ -25,7 +23,7 @@ function inject (bot) {
     }
 
     if (bot.supportFeature('blockStateId')) {
-      const state = bedBlock.stateId - mcData.blocksByStateId[bedBlock.stateId].minStateId
+      const state = bedBlock.stateId - bot.registry.blocksByStateId[bedBlock.stateId].minStateId
       const bitMetadata = state.toString(2).padStart(4, '0') // FACING (first 2 bits), PART (3rd bit), OCCUPIED (4th bit)
       metadata.part = bitMetadata[3] === '0'
       metadata.occupied = bitMetadata[2] === '0'
@@ -174,7 +172,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/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 = {}

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
 
@@ -548,7 +548,7 @@ function inject (bot, { version, storageBuilder }) {
   bot.canSeeBlock = canSeeBlock
   bot.blockAt = blockAt
   bot._updateBlockState = updateBlockState
-  bot.waitForChunksToLoad = callbackify(waitForChunksToLoad)
+  bot.waitForChunksToLoad = waitForChunksToLoad
 }
 
 function onesInShort (n) {

package/lib/plugins/book.js

@@ -1,12 +1,10 @@
 const assert = require('assert')
 const { once } = require('events')
-const { callbackify } = require('../promise_utils')
 
 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')) {
@@ -29,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
 
@@ -61,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',
@@ -83,11 +81,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)
-  })
+  }
 }