1.21.6 (#3713)

* 1.21.6

* update ci

* Update ci.yml to add debug

* Fix entity_action packet compatibility for Minecraft 1.21.6

- Update elytra flying to use string mapping 'start_elytra_flying' for 1.21.6+
- Update sprint actions to use string mappings for 1.21.6+
- Move sneak handling to player_input packet for 1.21.6+
- Maintain backward compatibility with older versions using feature detection

Fixes compatibility with Minecraft 1.21.6 protocol changes where:
- entity_action packets now use string mappers instead of numeric IDs
- sneak functionality moved from entity_action to player_input packet

Co-authored-by: Claude <noreply@anthropic.com>

* fix lint

* Update ci.yml

* Update team.js

Add logging

* Update team.js

* Update ci.yml remove bail

* swtich in team.js

* Fix teams

* schema updates

* Revert "schema updates"

This reverts commit 0518d08.

* Update ci.yml

---------

Co-authored-by: Romain Beaumont <romain.rom1@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>

Author: 3 people

lib/loader.js

@@ -74,6 +74,10 @@ function createBot (options = {}) {
   const bot = new EventEmitter()
   bot._client = options.client
   bot.end = (reason) => bot._client.end(reason)
+  bot._warn = function (...message) {
+    if (options.hideErrors) return
+    console.warn('[mineflayer]', ...message)
+  }
   if (options.logErrors) {
     bot.on('error', err => {
       if (!options.hideErrors) {

lib/plugins/bed.js

@@ -167,7 +167,7 @@ function inject (bot) {
   }
 
   bot._client.on('game_state_change', (packet) => {
-    if (packet.reason === 0) {
+    if (packet.reason === 0 || packet.reason === 'no_respawn_block_available') {
       // occurs when you can't spawn in your bed and your spawn point gets reset
       bot.emit('spawnReset')
     }

lib/plugins/game.js

@@ -116,10 +116,10 @@ function inject (bot, options) {
   })
 
   bot._client.on('game_state_change', (packet) => {
-    if (packet?.reason === 4 && packet?.gameMode === 1) {
+    if ((packet.reason === 4 || packet.reason === 'win_game') && packet.gameMode === 1) {
       bot._client.write('client_command', { action: 0 })
     }
-    if (packet.reason === 3) {
+    if ((packet.reason === 3) || (packet.reason === 'change_game_mode')) {
       bot.game.gameMode = parseGameMode(packet.gameMode)
       bot.emit('game')
     }

lib/plugins/physics.js

@@ -232,7 +232,7 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
     }
     bot._client.write('entity_action', {
       entityId: bot.entity.id,
-      actionId: 8,
+      actionId: bot.supportFeature('entityActionUsesStringMapper') ? 'start_elytra_flying' : 8,
       jumpBoost: 0
     })
   }
@@ -247,15 +247,27 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
     } else if (control === 'sprint') {
       bot._client.write('entity_action', {
         entityId: bot.entity.id,
-        actionId: state ? 3 : 4,
+        actionId: bot.supportFeature('entityActionUsesStringMapper')
+          ? (state ? 'start_sprinting' : 'stop_sprinting')
+          : (state ? 3 : 4),
         jumpBoost: 0
       })
     } else if (control === 'sneak') {
-      bot._client.write('entity_action', {
-        entityId: bot.entity.id,
-        actionId: state ? 0 : 1,
-        jumpBoost: 0
-      })
+      if (bot.supportFeature('newPlayerInputPacket')) {
+        // In 1.21.6+, sneak is handled via player_input packet
+        bot._client.write('player_input', {
+          inputs: {
+            shift: state
+          }
+        })
+      } else {
+        // Legacy entity_action approach for older versions
+        bot._client.write('entity_action', {
+          entityId: bot.entity.id,
+          actionId: state ? 0 : 1,
+          jumpBoost: 0
+        })
+      }
     }
   }
 

lib/plugins/rain.js

@@ -1,20 +1,22 @@
 module.exports = inject
+const states = ['no_respawn_block_available', 'start_raining', 'stop_raining', 'change_game_mode', 'win_game', 'demo_event', 'play_arrow_hit_sound', 'rain_level_change', 'thunder_level_change', 'puffer_fish_sting', 'guardian_elder_effect', 'immediate_respawn', 'limited_crafting', 'level_chunks_load_start']
 
 function inject (bot) {
   bot.isRaining = false
   bot.thunderState = 0
   bot.rainState = 0
   bot._client.on('game_state_change', (packet) => {
-    if (packet.reason === 1) {
+    const reason = states[packet.reason] ?? packet.reason
+    if (reason === 'start_raining') {
       bot.isRaining = true
       bot.emit('rain')
-    } else if (packet.reason === 2) {
+    } else if (reason === 'stop_raining') {
       bot.isRaining = false
       bot.emit('rain')
-    } else if (packet.reason === 7) {
+    } else if (reason === 'rain_level_change') {
       bot.rainState = packet.gameMode
       bot.emit('weatherUpdate')
-    } else if (packet.reason === 8) {
+    } else if (reason === 'thunder_level_change') {
       bot.thunderState = packet.gameMode
       bot.emit('weatherUpdate')
     }

lib/plugins/team.js

@@ -1,41 +1,49 @@
 module.exports = inject
 
+// TODO: apply this to all versions and rename scoreboard_team -> teams in minecraft-data
+const TEAM_MODES = ['add', 'remove', 'change', 'join', 'leave']
+
 function inject (bot) {
   const Team = require('../team')(bot.registry)
   const teams = {}
 
   function teamHandler (packet) {
-    const { team: teamName, mode } = packet
+    const { team: teamName, players = [] } = packet
+    const mode = typeof packet.mode === 'number' ? TEAM_MODES[packet.mode] : packet.mode
+
     let team = teams[teamName]
-    if (mode === 0) {
-      team = new Team(
-        packet.team,
-        packet.name,
-        packet.friendlyFire,
-        packet.nameTagVisibility,
-        packet.collisionRule,
-        packet.formatting,
-        packet.prefix,
-        packet.suffix
-      )
-      if (Array.isArray(packet.players)) {
-        packet.players.forEach(player => {
+
+    switch (mode) {
+      case 'add':
+        team = new Team(
+          teamName,
+          packet.name,
+          packet.friendlyFire,
+          packet.nameTagVisibility,
+          packet.collisionRule,
+          packet.formatting,
+          packet.prefix,
+          packet.suffix
+        )
+        for (const player of players) {
           team.add(player)
           bot.teamMap[player] = team
-        })
-      }
-      teams[teamName] = team
-      bot.emit('teamCreated', teams[teamName])
-    }
-    if (team !== undefined) {
-      if (mode === 1) {
-        team.members.forEach(member => {
+        }
+        teams[teamName] = team
+        bot.emit('teamCreated', teams[teamName])
+        break
+
+      case 'remove':
+        if (!team) break
+        team.members.forEach((member) => {
           delete bot.teamMap[member]
         })
         delete teams[teamName]
         bot.emit('teamRemoved', teams[teamName])
-      }
-      if (mode === 2) {
+        break
+
+      case 'change':
+        if (!team) break
         team.update(
           packet.name,
           packet.friendlyFire,
@@ -46,23 +54,28 @@ function inject (bot) {
           packet.suffix
         )
         bot.emit('teamUpdated', teams[teamName])
-      }
-      if (Array.isArray(packet.players)) {
-        if (mode === 3) {
-          packet.players.forEach((player) => {
-            team.add(player)
-            bot.teamMap[player] = team
-          })
-          bot.emit('teamMemberAdded', teams[teamName])
+        break
+
+      case 'join':
+        if (!team) break
+        for (const player of players) {
+          team.add(player)
+          bot.teamMap[player] = team
         }
-        if (mode === 4) {
-          packet.players.forEach((player) => {
-            team.remove(player)
-            delete bot.teamMap[player]
-          })
-          bot.emit('teamMemberRemoved', teams[teamName])
+        bot.emit('teamMemberAdded', teams[teamName])
+        break
+
+      case 'leave':
+        if (!team) break
+        for (const player of players) {
+          team.remove(player)
+          delete bot.teamMap[player]
         }
-      }
+        bot.emit('teamMemberRemoved', teams[teamName])
+        break
+
+      default:
+        bot._warn(`Unknown team mode handling team update: ${mode}`)
     }
   }
 

lib/version.js

@@ -1,4 +1,4 @@
-const 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', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1', '1.20.2', '1.20.4', '1.20.6', '1.21.1', '1.21.3', '1.21.4', '1.21.5']
+const 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', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1', '1.20.2', '1.20.4', '1.20.6', '1.21.1', '1.21.3', '1.21.4', '1.21.5', '1.21.6']
 module.exports = {
 
   testedVersions,

test/externalTests/trade.js

@@ -42,7 +42,7 @@ module.exports = () => async (bot) => {
 
   const villager = await bot.openVillager(entity)
   console.log('Opened villager')
-  console.dir(villager, { depth: null })
+  // console.dir(villager, { depth: null })
 
   // Handle trade #1 -- takes 2x emerald and returns 2x pumpkin_pie
   {