mineflayer 3.17.0 → 4.1.0

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/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,7 +85,9 @@ 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', () => {

package/lib/plugins/simple_inventory.js

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

package/lib/plugins/villager.js

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

package/lib/promise_utils.js

@@ -1,25 +1,3 @@
-function printCallbackDepreciation () {
-  console.log('[depreciation notice] Callback are deprecated with mineflayer, use promise instead. They will be removed in version 4.0.0.')
-}
-
-function callbackify (f) {
-  return function (...args) {
-    const cb = args[f.length]
-    return f(...args).then(r => {
-      if (cb) {
-        printCallbackDepreciation()
-        cb(undefined, r)
-      }
-      return r
-    }, err => {
-      if (cb) {
-        printCallbackDepreciation()
-        cb(err)
-      } else throw err
-    })
-  }
-}
-
 function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
@@ -104,11 +82,9 @@ function withTimeout (promise, timeout) {
 }
 
 module.exports = {
-  callbackify,
   sleep,
   createTask,
   createDoneTask,
   onceWithCleanup,
-  withTimeout,
-  printCallbackDepreciation
+  withTimeout
 }

package/lib/version.js

@@ -1,4 +1,4 @@
 module.exports = {
   supportedVersions: ['1.8', '1.9', '1.10', '1.11', '1.12', '1.13', '1.14', '1.15', '1.16', '1.17', '1.18'],
-  testedVersions: ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.1']
+  testedVersions: ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.2']
 } // when updating testedVersions, make sure to update CI.yml

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "3.17.0",
+  "version": "4.1.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,8 +21,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "minecraft-data": "^2.109.0",
-    "minecraft-protocol": "^1.26.5",
+    "minecraft-data": "^2.114.1",
+    "minecraft-protocol": "^1.31.0",
     "prismarine-biome": "^1.1.1",
     "prismarine-block": "^1.13.1",
     "prismarine-chat": "^1.3.3",