Merge updates to current upstream

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.gitignore

@@ -10,4 +10,6 @@ test/server_*
 .vscode
 .DS_Store
 launcher_accounts.json
-data
+data
+.idea
+custom_tests

docs/README.md

@@ -221,6 +221,7 @@ The most updated and useful are :
  * [Projectile](https://github.com/firejoust/mineflayer-projectile) - Get the required launch angle for projectiles
  * [Movement](https://github.com/firejoust/mineflayer-movement) - Smooth and realistic player movement, best suited for PvP
  * [Collect Block](https://github.com/PrismarineJS/mineflayer-collectblock) - Quick and simple block collection API.
+ * [Crafting Util](https://github.com/generelschwerz/mineflayer-crafting-util) - Crafting planner and execution helpers for Mineflayer bots.
 
  But also check out :
 

examples/jumper.js

@@ -5,7 +5,7 @@
  *
  * This bot can move, jump, ride vehicles, attack nearby entities and much more.
  */
-const mineflayer = require('mineflayer')
+const mineflayer = require('..')
 
 if (process.argv.length < 4 || process.argv.length > 6) {
   console.log('Usage : node jumper.js <host> <port> [<name>] [<password>]')
@@ -21,6 +21,17 @@ const bot = mineflayer.createBot({
 
 let target = null
 
+bot.on('move', (lastPos) => {
+  console.log(`I moved from ${JSON.stringify(lastPos)} to ${JSON.stringify(bot.entity.position)}`)
+  console.log(`I have ${bot.entity.velocity.toString()} velocity`)
+  console.log(`I am on the ground: ${bot.entity.onGround}`)
+  // console.log(bot.entity)
+})
+
+bot.on('forcedMove', () => {
+  console.log('I am being forced to move')
+})
+
 bot.on('chat', (username, message) => {
   if (username === bot.username) return
   target = bot.players[username].entity
@@ -103,7 +114,7 @@ bot.once('spawn', () => {
 
   function watchTarget () {
     if (!target) return
-    bot.lookAt(target.position.offset(0, target.height, 0))
+    bot.lookAt(target.position.offset(0, target.height, 0), true)
   }
 })
 

examples/pathfinder/gps.js

@@ -1,7 +1,11 @@
 // This is an example that uses mineflayer-pathfinder to showcase how simple it is to walk to goals
 
-const mineflayer = require('mineflayer')
-const { pathfinder, Movements, goals: { GoalNear } } = require('mineflayer-pathfinder')
+const mineflayer = require('../../')
+const {
+  pathfinder,
+  Movements,
+  goals: { GoalNear }
+} = require('mineflayer-pathfinder')
 
 if (process.argv.length < 4 || process.argv.length > 6) {
   console.log('Usage : node gps.js <host> <port> [<name>] [<password>]')
@@ -22,17 +26,36 @@ bot.loadPlugin(pathfinder)
 bot.once('spawn', () => {
   const defaultMove = new Movements(bot)
 
+  bot.physics.yawSpeed = 5000
+  bot.physics.pitchSpeed = 5000
+
   bot.on('chat', (username, message) => {
+    console.log('Chat message received: ', username, message)
     if (username === bot.username) return
-    if (message !== 'come') return
+
+    const [cmd] = message.split(' ')
+
     const target = bot.players[username]?.entity
     if (!target) {
       bot.chat("I don't see you !")
       return
     }
-    const { x: playerX, y: playerY, z: playerZ } = target.position
 
-    bot.pathfinder.setMovements(defaultMove)
-    bot.pathfinder.setGoal(new GoalNear(playerX, playerY, playerZ, RANGE_GOAL))
+    switch (cmd) {
+      case 'come': {
+        const { x: playerX, y: playerY, z: playerZ } = target.position
+
+        bot.pathfinder.setMovements(defaultMove)
+        bot.pathfinder.setGoal(new GoalNear(playerX, playerY, playerZ, RANGE_GOAL))
+        break
+      }
+      case 'forward': {
+        bot.lookAt(target.position)
+        bot.setControlState('forward', true)
+        break
+      }
+    }
   })
 })
+
+bot.on('error', (err) => console.log(err))

examples/pathfinder/package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "mineflayer-pathfinder": "^2.4.5",
-    "mineflayer": "file:../../"
+    "mineflayer": "file:../../",
+    "mineflayer-pathfinder": "^2.4.5"
   },
   "description": "A mineflayer example"
 }

examples/velocity_manual_resourcepack.js

@@ -0,0 +1,56 @@
+/*
+ * This example shows how to disable the velocity plugin
+ * and manually handle resource packs during Velocity transfers
+ *
+ * Use this if you want full control over resource pack acceptance
+ * instead of the automatic behavior.
+ *
+ * WARNING: Disabling the velocity plugin will cause bot disconnections
+ * during Velocity server transfers unless you handle the configuration
+ * phase manually (advanced users only).
+ */
+const mineflayer = require('mineflayer')
+
+if (process.argv.length < 4 || process.argv.length > 6) {
+  console.log('Usage : node velocity_manual_resourcepack.js <host> <port> [<name>] [online?]')
+  process.exit(1)
+}
+
+const bot = mineflayer.createBot({
+  host: process.argv[2],
+  port: parseInt(process.argv[3]),
+  username: process.argv[4] ? process.argv[4] : 'manual_bot',
+  auth: process.argv[5] ? 'microsoft' : 'offline',
+  // Disable the velocity plugin
+  plugins: {
+    velocity: false
+  }
+})
+
+bot.on('login', () => {
+  console.log('Logged in (velocity plugin disabled)')
+})
+
+bot.on('spawn', () => {
+  console.log('Spawned in server:', bot.game.dimension)
+})
+
+// Manually accept resource packs
+bot.on('resourcePack', (url, uuid) => {
+  console.log('Resource pack received:', url)
+  console.log('Accepting manually...')
+  bot.acceptResourcePack()
+})
+
+bot.on('end', (reason) => {
+  console.log('Bot disconnected:', reason)
+})
+
+bot.on('error', (err) => {
+  console.error('Error:', err.message)
+})
+
+bot.on('kicked', (reason) => {
+  console.log('Kicked:', reason)
+  console.log('Note: If kicked during transfer, you may need to enable the velocity plugin')
+})

examples/velocity_transfer.js

@@ -0,0 +1,69 @@
+/*
+ * This example demonstrates connecting to a Velocity proxy server
+ * and handling server transfers (1.20.2+)
+ *
+  * The velocity plugin is loaded by default and will automatically:
+ * - Handle the configuration phase during transfers
+ * - Accept resource packs during configuration
+ * - Block physics packets while in configuration phase
+ * - Re-enable physics after configuration completes
+ *
+ * To disable the velocity plugin, add to createBot options:
+ *   plugins: { velocity: false }
+ *
+ * Note: The plugin is harmless even if loaded - it only activates
+ * during configuration phase (Velocity transfers, not normal gameplay)
+ *
+ * This fixes the issue: https://github.com/PrismarineJS/mineflayer/issues/3764
+ */
+const mineflayer = require('mineflayer')
+
+if (process.argv.length < 4 || process.argv.length > 6) {
+  console.log('Usage : node velocity_transfer.js <host> <port> [<name>] [online?]')
+  process.exit(1)
+}
+
+const bot = mineflayer.createBot({
+  host: process.argv[2],
+  port: parseInt(process.argv[3]),
+  username: process.argv[4] ? process.argv[4] : 'velocity_bot',
+  auth: process.argv[5] ? 'microsoft' : 'offline'
+  // The velocity plugin is enabled by default
+  // To disable it, uncomment the following line:
+  // plugins: { velocity: false }
+})
+
+bot.on('login', () => {
+  console.log('Logged in to Velocity proxy')
+})
+
+bot.on('spawn', () => {
+  console.log('Spawned in server:', bot.game.dimension)
+})
+
+// Track configuration phase events
+bot.on('configurationPhase', (phase) => {
+  if (phase === 'start') {
+    console.log('Entering configuration phase (server transfer starting...)')
+  } else if (phase === 'end') {
+    console.log('Exiting configuration phase (server transfer complete)')
+  }
+})
+
+// Optional: Track resource pack acceptance
+bot.on('resourcePack', (url, uuid) => {
+  console.log('Resource pack received:', url)
+  console.log('Note: Resource packs are automatically accepted during configuration phase')
+})
+
+bot.on('end', (reason) => {
+  console.log('Bot disconnected:', reason)
+})
+
+bot.on('error', (err) => {
+  console.error('Error:', err.message)
+})
+
+bot.on('kicked', (reason) => {
+  console.log('Kicked:', reason)
+})

index.d.ts

@@ -67,6 +67,7 @@ export interface BotEvents {
   unmatchedMessage: (stringMsg: string, jsonMsg: ChatMessage) => Promise<void> | void
   inject_allowed: () => Promise<void> | void
   login: () => Promise<void> | void
+  worldSwitch: () => Promise<void> | void
   /** When `respawn` option is disabled, you can call this method manually to respawn. */
   spawn: () => Promise<void> | void
   respawn: () => Promise<void> | void
@@ -164,6 +165,8 @@ export interface BotEvents {
   resourcePack: (url: string, hash?: string, uuid?: string) => Promise<void> | void
   heldItemChanged: (newItem: Item | null) => Promise<void> | void
   particle: (particle: Particle) => Promise<void> | void
+  heldItemChanged: (newItem: Item | null) => Promise<void> | void
+  abilities: (abilities: Abilities) => Promise<void> | void
 }
 
 export interface CommandBlockOptions {
@@ -178,7 +181,13 @@ export interface Bot extends TypedEmitter<BotEvents> {
   protocolVersion: string
   majorVersion: string
   version: string
-  entity: Entity
+  entity: Entity & {
+    abilities: Abilities
+    isInvulnerable: boolean
+    isFlying: boolean
+    canFly: boolean
+    canInstantlyBuild: boolean
+  }
   entities: { [id: string]: Entity }
   fireworkRocketDuration: number
   spawnPoint: Vec3
@@ -896,3 +905,9 @@ export let latestSupportedVersion: string
 export let oldestSupportedVersion: string
 
 export function supportFeature (feature: string, version: string): boolean
+
+export interface Abilities {
+  flags: number
+  flyingSpeed: number
+  walkingSpeed: number
+}

lib/conversions.js

@@ -18,6 +18,8 @@ exports.toNotchianYaw = yaw => toDegrees(PI - yaw)
 exports.toNotchianPitch = pitch => toDegrees(-pitch)
 exports.fromNotchianYawByte = yaw => fromNotchianYaw(yaw * FROM_NOTCH_BYTE)
 exports.fromNotchianPitchByte = pitch => fromNotchianPitch(pitch * FROM_NOTCH_BYTE)
+exports.fromDegreesToPitch = fromDegreesToPitch
+exports.fromDegreesToYaw = fromDegreesToYaw
 
 function toRadians (degrees) {
   return TO_RAD * degrees
@@ -38,3 +40,11 @@ function fromNotchianPitch (pitch) {
 function fromNotchVelocity (vel) {
   return new Vec3(vel.x * FROM_NOTCH_VEL, vel.y * FROM_NOTCH_VEL, vel.z * FROM_NOTCH_VEL)
 }
+
+function fromDegreesToPitch (degrees) {
+  return euclideanMod(toRadians(-degrees) + PI, PI_2) - PI
+}
+
+function fromDegreesToYaw (degrees) {
+  return euclideanMod(PI - toRadians(degrees), PI_2)
+}