Merge branch 'next' into release

Author: zardoy

package.json

@@ -198,7 +198,7 @@
   "pnpm": {
     "overrides": {
       "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-      "@nxg-org/mineflayer-physics-util": "1.8.10",
+      "@nxg-org/mineflayer-physics-util": "1.8.19",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
@@ -222,8 +222,7 @@
     "patchedDependencies": {
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol": "patches/minecraft-protocol.patch",
-      "@nxg-org/mineflayer-physics-util": "patches/@nxg-org__mineflayer-physics-util.patch"
+      "minecraft-protocol": "patches/minecraft-protocol.patch"
     },
     "ignoredBuiltDependencies": [
       "canvas",

patches/@nxg-org__mineflayer-physics-util.patch

@@ -1,5 +1,92 @@
+diff --git a/src/client.js b/src/client.js
+index e369e77..f6c408d 100644
+--- a/src/client.js
++++ b/src/client.js
+@@ -75,7 +75,35 @@ class Client extends EventEmitter {
+       }
+       const deserializerDirection = this.isServer ? 'toServer' : 'toClient'
+       e.field = [this.protocolState, deserializerDirection].concat(parts).join('.')
+-      e.message = e.buffer ? `Parse error for ${e.field} (${e.buffer?.length} bytes, ${e.buffer?.toString('hex').slice(0, 6)}...) : ${e.message}` : `Parse error for ${e.field}: ${e.message}`
++      e.message = e.buffer
++          ? `Parse error for ${e.field} (${e.buffer?.length} bytes, ${e.buffer?.toString('hex').slice(0, 6)}...) : ${e.message}`
++          : `Parse error for ${e.field}: ${e.message}`
++
++      // Non-fatal play-state parse error — e.g. Hypixel sending NBT tag IDs outside
++      // the standard 0-20 range (tag 71 = custom component data introduced in 1.21.4+).
++      // The deserializer stream is destroyed by Node.js on error, so we tear it down
++      // fully, rebuild it via setSerializer, and re-pipe it into the chain so packet
++      // processing continues normally. We emit 'warning' instead of 'error' so nothing
++      // upstream treats this as a fatal connection failure.
++      if (this.protocolState === states.PLAY) {
++        console.warn(`[minecraft-protocol] Non-fatal parse error (connection kept alive): ${e.message}`)
++        this.deserializer.removeAllListeners()
++        if (!this.compressor) {
++          this.splitter.unpipe(this.deserializer)
++        } else {
++          this.decompressor.unpipe(this.deserializer)
++        }
++        this.setSerializer(states.PLAY)
++        if (!this.compressor) {
++          this.splitter.pipe(this.deserializer)
++        } else {
++          this.decompressor.pipe(this.deserializer)
++        }
++        this.emit('warning', e)
++        return
++      }
++
++      // All other parse errors are still fatal — re-pipe attempt then propagate.
+       if (!this.compressor) { this.splitter.pipe(this.deserializer) } else { this.decompressor.pipe(this.deserializer) }
+       this.emit('error', e)
+     })
+@@ -111,7 +139,13 @@ class Client extends EventEmitter {
+           this._hasBundlePacket = false
+         }
+       } else {
+-        emitPacket(parsed)
++        try {
++          emitPacket(parsed)
++        } catch (err) {
++          console.log('Client incorrectly handled packet ' + parsed.metadata.name)
++          console.error(err)
++          // todo investigate why it doesn't close the stream even if unhandled there
++        }
+       }
+     })
+   }
+@@ -169,7 +203,10 @@ class Client extends EventEmitter {
+     }
+ 
+     const onFatalError = (err) => {
+-      this.emit('error', err)
++      // todo find out what is trying to write after client disconnect
++      if(err.code !== 'ECONNABORTED') {
++        this.emit('error', err)
++      }
+       endSocket()
+     }
+ 
+@@ -198,6 +235,10 @@ class Client extends EventEmitter {
+     serializer -> framer -> socket -> splitter -> deserializer */
+     if (this.serializer) {
+       this.serializer.end()
++      setTimeout(() => {
++        this.socket?.end()
++        this.socket?.emit('end')
++      }, 2000) // allow the serializer to finish writing
+     } else {
+       if (this.socket) this.socket.end()
+     }
+@@ -243,6 +284,7 @@ class Client extends EventEmitter {
+       debug('writing packet ' + this.state + '.' + name)
+       debug(params)
+     }
++    this.emit('writePacket', name, params)
+     this.serializer.write({ name, params })
+   }
+ 
 diff --git a/src/client/chat.js b/src/client/chat.js
-index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b43cb102a 100644
+index 0021870..a53fceb 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
 @@ -116,7 +116,7 @@ module.exports = function (client, options) {
@@ -57,7 +144,7 @@ index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b
          previousMessages: client._lastSeenMessages.map((e) => ({
            messageSender: e.sender,
 diff --git a/src/client/encrypt.js b/src/client/encrypt.js
-index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f85410eaef 100644
+index 63cc2bd..36df57d 100644
 --- a/src/client/encrypt.js
 +++ b/src/client/encrypt.js
 @@ -25,7 +25,11 @@ module.exports = function (client, options) {
@@ -73,8 +160,72 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
        }
 
        function onJoinServerResponse (err) {
+diff --git a/src/client/play.js b/src/client/play.js
+index 71ad739..7130b22 100644
+--- a/src/client/play.js
++++ b/src/client/play.js
+@@ -31,11 +31,37 @@ module.exports = function (client, options) {
+ 
+   client.once('success', onLogin)
+ 
++  function pickLocale () {
++    const locales = [
++      ['en_US', 0.60],
++      ['en_GB', 0.10],
++      ['de_DE', 0.12],
++      ['id_ID', 0.10],
++      ['fr_FR', 0.04],
++      ['es_ES', 0.04]
++    ]
++    const roll = Math.random()
++    let cumulative = 0
++    for (const [locale, weight] of locales) {
++      cumulative += weight
++      if (roll < cumulative) return locale
++    }
++    return 'en_US'
++  }
++
+   function onLogin (packet) {
+     const mcData = require('minecraft-data')(client.version)
+     client.uuid = packet.uuid
+     client.username = packet.username
+ 
++    const resolvedProfile = {
++      locale: options.clientProfile?.locale ?? pickLocale(),
++      viewDistance: options.clientProfile?.viewDistance ?? 10,
++      mainHand: options.clientProfile?.mainHand !== undefined
++          ? options.clientProfile.mainHand
++          : (Math.random() < 0.75 ? 1 : 0)
++    }
++
+     if (mcData.supportFeature('hasConfigurationState')) {
+       client.write('login_acknowledged', {})
+       enterConfigState(onReady)
+@@ -53,6 +79,21 @@ module.exports = function (client, options) {
+         client.write('configuration_acknowledged', {})
+       }
+       client.state = states.CONFIGURATION
++
++      // Send client information immediately on entering config phase.
++      // Some servers *cough cough hypixel* require this before they will proceed past
++      // configuration state. Without it, you get the socketClosed error.
++      client.write('settings', {
++        locale: resolvedProfile.locale,
++        viewDistance: resolvedProfile.viewDistance,
++        chatFlags: 0,
++        chatColors: true,
++        skinParts: 127,
++        mainHand: resolvedProfile.mainHand,
++        enableTextFiltering: false,
++        enableServerListing: true
++      })
++
+       client.once('select_known_packs', () => {
+         client.write('select_known_packs', { packs: [] })
+       })
 diff --git a/src/client/pluginChannels.js b/src/client/pluginChannels.js
-index 671eb452f31e6b5fcd57d715f1009d010160c65f..7f69f511c8fb97d431ec5125c851b49be8e2ab76 100644
+index 671eb45..7f69f51 100644
 --- a/src/client/pluginChannels.js
 +++ b/src/client/pluginChannels.js
 @@ -57,7 +57,7 @@ module.exports = function (client, options) {
@@ -86,53 +237,3 @@ index 671eb452f31e6b5fcd57d715f1009d010160c65f..7f69f511c8fb97d431ec5125c851b49b
            return
          }
        }
-diff --git a/src/client.js b/src/client.js
-index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875989cdf0c 100644
---- a/src/client.js
-+++ b/src/client.js
-@@ -111,7 +111,13 @@ class Client extends EventEmitter {
-           this._hasBundlePacket = false
-         }
-       } else {
--        emitPacket(parsed)
-+        try {
-+          emitPacket(parsed)
-+        } catch (err) {
-+          console.log('Client incorrectly handled packet ' + parsed.metadata.name)
-+          console.error(err)
-+          // todo investigate why it doesn't close the stream even if unhandled there
-+        }
-       }
-     })
-   }
-@@ -169,7 +175,10 @@ class Client extends EventEmitter {
-     }
- 
-     const onFatalError = (err) => {
--      this.emit('error', err)
-+      // todo find out what is trying to write after client disconnect
-+      if(err.code !== 'ECONNABORTED') {
-+        this.emit('error', err)
-+      }
-       endSocket()
-     }
- 
-@@ -198,6 +207,10 @@ class Client extends EventEmitter {
-     serializer -> framer -> socket -> splitter -> deserializer */
-     if (this.serializer) {
-       this.serializer.end()
-+      setTimeout(() => {
-+        this.socket?.end()
-+        this.socket?.emit('end')
-+      }, 2000) // allow the serializer to finish writing
-     } else {
-       if (this.socket) this.socket.end()
-     }
-@@ -243,6 +256,7 @@ class Client extends EventEmitter {
-       debug('writing packet ' + this.state + '.' + name)
-       debug(params)
-     }
-+    this.emit('writePacket', name, params)
-     this.serializer.write({ name, params })
-   }
-