rm faulty mineflayer ver, fix kickin in singleplayer

2025-08-15 01:33:37 +03:00 · 2025-08-15 01:33:37 +03:00 · 65575e2665
commit 65575e2665
parent 1ddaa79162
5 changed files with 30 additions and 41 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -23,6 +23,7 @@
        // ],
        "@stylistic/arrow-spacing": "error",
        "@stylistic/block-spacing": "error",
+        "@typescript-eslint/no-this-alias": "off",
        "@stylistic/brace-style": [
            "error",
            "1tbs",
--- a/package.json
+++ b/package.json
@ -196,6 +196,7 @@
  },
  "pnpm": {
    "overrides": {
+      "mineflayer": "github:zardoy/mineflayer#gen-the-master",
      "@nxg-org/mineflayer-physics-util": "1.8.10",
      "buffer": "^6.0.3",
      "vec3": "0.1.10",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -5,6 +5,7 @@ settings:
  excludeLinksFromLockfile: false

 overrides:
+  mineflayer: github:zardoy/mineflayer#gen-the-master
  '@nxg-org/mineflayer-physics-util': 1.8.10
  buffer: ^6.0.3
  vec3: 0.1.10
@ -136,7 +137,7 @@ importers:
        version: 4.17.21
      mcraft-fun-mineflayer:
        specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13))
      minecraft-data:
        specifier: 3.92.0
        version: 3.92.0
@ -341,7 +342,7 @@ importers:
        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
      mineflayer:
        specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
      mineflayer-mouse:
        specifier: ^0.1.17
        version: 0.1.17
@ -6668,13 +6669,9 @@ packages:
    resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}

-  mineflayer@4.31.0:
-    resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
-    engines: {node: '>=22'}
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
-    version: 4.31.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09}
+    version: 8.0.0
    engines: {node: '>=22'}

  minimalistic-assert@1.0.1:
@ -11311,7 +11308,7 @@ snapshots:
    dependencies:
      '@nxg-org/mineflayer-util-plugin': 1.8.4
      minecraft-data: 3.92.0
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
      prismarine-item: 1.17.0
      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@ -16951,12 +16948,12 @@ snapshots:
      maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
      zod: 3.24.2

-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)):
    dependencies:
      '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
      exit-hook: 2.2.1
      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
      prismarine-item: 1.17.0
      ws: 8.18.1
    transitivePeerDependencies:
@ -17326,7 +17323,7 @@ snapshots:

  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
    dependencies:
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
      sharp: 0.30.7
    transitivePeerDependencies:
      - encoding
@ -17341,30 +17338,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  mineflayer@4.31.0(encoding@0.1.13):
-    dependencies:
-      minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
-      prismarine-registry: 1.11.0
-      prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      protodef: 1.18.0
-      typed-emitter: 1.4.0
-      vec3: 0.1.10
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13):
    dependencies:
      '@nxg-org/mineflayer-physics-util': 1.8.10
      minecraft-data: 3.92.0
--- a/src/customClient.js
+++ b/src/customClient.js
@ -1,6 +1,7 @@
+//@ts-check
+import * as nbt from 'prismarine-nbt'
 import { options } from './optionsStorage'

-//@ts-check
 const { EventEmitter } = require('events')
 const debug = require('debug')('minecraft-protocol')
 const states = require('minecraft-protocol/src/states')
@ -51,8 +52,20 @@ class CustomChannelClient extends EventEmitter {
    this.emit('state', newProperty, oldProperty)
  }

-  end(reason) {
-    this._endReason = reason
+  end(endReason, fullReason) {
+    // eslint-disable-next-line unicorn/no-this-assignment
+    const client = this
+    if (client.state === states.PLAY) {
+      fullReason ||= loadedData.supportFeature('chatPacketsUseNbtComponents')
+        ? nbt.comp({ text: nbt.string(endReason) })
+        : JSON.stringify({ text: endReason })
+      client.write('kick_disconnect', { reason: fullReason })
+    } else if (client.state === states.LOGIN) {
+      fullReason ||= JSON.stringify({ text: endReason })
+      client.write('disconnect', { reason: fullReason })
+    }
+
+    this._endReason = endReason
    this.emit('end', this._endReason) // still emits on server side only, doesn't send anything to our client
  }

--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@ -77,7 +77,7 @@ export const defaultOptions = {
  frameLimit: false as number | false,
  alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
  alwaysShowMobileControls: false,
-  excludeCommunicationDebugEvents: [],
+  excludeCommunicationDebugEvents: [] as string[],
  preventDevReloadWhilePlaying: false,
  numWorkers: 4,
  localServerOptions: {