From f2fde37e6ad0c0ee4a1a912ced641223ec286b49 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Wed, 22 Jan 2025 21:04:14 +0300 Subject: [PATCH] ci: update patch, should fix dedupe --- package.json | 2 +- ...0.patch => minecraft-protocol@1.53.0.patch} | 18 +++++++++--------- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) rename patches/{minecraft-protocol@1.49.0.patch => minecraft-protocol@1.53.0.patch} (93%) diff --git a/package.json b/package.json index 66d1649c0..5fbe30820 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "three@0.154.0": "patches/three@0.154.0.patch", "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@1.53.0": "patches/minecraft-protocol@1.49.0.patch" + "minecraft-protocol@1.53.0": "patches/minecraft-protocol@1.53.0.patch" } }, "packageManager": "pnpm@9.0.4" diff --git a/patches/minecraft-protocol@1.49.0.patch b/patches/minecraft-protocol@1.53.0.patch similarity index 93% rename from patches/minecraft-protocol@1.49.0.patch rename to patches/minecraft-protocol@1.53.0.patch index c54d54691..243e0bd7d 100644 --- a/patches/minecraft-protocol@1.49.0.patch +++ b/patches/minecraft-protocol@1.53.0.patch @@ -95,10 +95,10 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108 function onJoinServerResponse (err) { diff --git a/src/client.js b/src/client.js -index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c278950ba7f396 100644 +index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644 --- a/src/client.js +++ b/src/client.js -@@ -88,10 +88,12 @@ class Client extends EventEmitter { +@@ -89,10 +89,12 @@ class Client extends EventEmitter { parsed.metadata.name = parsed.data.name parsed.data = parsed.data.params parsed.metadata.state = state @@ -115,7 +115,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895 } if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') { if (this._mcBundle.length) { // End bundle -@@ -109,7 +111,13 @@ class Client extends EventEmitter { +@@ -110,7 +112,13 @@ class Client extends EventEmitter { this._hasBundlePacket = false } } else { @@ -130,7 +130,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895 } }) } -@@ -167,7 +175,10 @@ class Client extends EventEmitter { +@@ -168,7 +176,10 @@ class Client extends EventEmitter { } const onFatalError = (err) => { @@ -142,7 +142,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895 endSocket() } -@@ -196,6 +207,8 @@ class Client extends EventEmitter { +@@ -197,6 +208,8 @@ class Client extends EventEmitter { serializer -> framer -> socket -> splitter -> deserializer */ if (this.serializer) { this.serializer.end() @@ -151,7 +151,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895 } else { if (this.socket) this.socket.end() } -@@ -237,8 +250,11 @@ class Client extends EventEmitter { +@@ -238,8 +251,11 @@ class Client extends EventEmitter { write (name, params) { if (!this.serializer.writable) { return } @@ -166,10 +166,10 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895 } diff --git a/src/index.d.ts b/src/index.d.ts -index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4cde02f19 100644 +index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644 --- a/src/index.d.ts +++ b/src/index.d.ts -@@ -134,6 +134,7 @@ declare module 'minecraft-protocol' { +@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' { sessionServer?: string keepAlive?: boolean closeTimeout?: number @@ -177,7 +177,7 @@ index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4 noPongTimeout?: number checkTimeoutInterval?: number version?: string -@@ -154,6 +155,8 @@ declare module 'minecraft-protocol' { +@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' { disableChatSigning?: boolean /** Pass custom client implementation if needed. */ Client?: Client diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b479143a5..39ceba480 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ overrides: patchedDependencies: minecraft-protocol@1.53.0: - hash: 7sh5krubuk2vjuogjioaktvwzi - path: patches/minecraft-protocol@1.49.0.patch + hash: 2xxbvh5jy3p5fjsq3y4zvvhxye + path: patches/minecraft-protocol@1.53.0.patch mineflayer-item-map-downloader@1.2.0: hash: bck55yjvd4wrgz46x7o4vfur5q path: patches/mineflayer-item-map-downloader@1.2.0.patch @@ -138,7 +138,7 @@ importers: version: 3.83.1 minecraft-protocol: specifier: github:PrismarineJS/node-minecraft-protocol#master - version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13) + version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13) mineflayer-item-map-downloader: specifier: github:zardoy/mineflayer-item-map-downloader version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13) @@ -12722,7 +12722,7 @@ snapshots: flatmap: 0.0.3 long: 5.2.3 minecraft-data: 3.83.1 - minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13) + minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13) mkdirp: 2.1.6 node-gzip: 1.1.2 node-rsa: 1.1.1 @@ -16823,7 +16823,7 @@ snapshots: - '@types/react' - react - minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13): + minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13): dependencies: '@types/node-rsa': 1.1.4 '@types/readable-stream': 4.0.12 @@ -16893,7 +16893,7 @@ snapshots: mineflayer@4.25.0(encoding@0.1.13): dependencies: minecraft-data: 3.83.1 - minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13) + minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13) prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0) prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3 prismarine-chat: 1.10.1 @@ -16916,7 +16916,7 @@ snapshots: mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13): dependencies: minecraft-data: 3.83.1 - minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13) + minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13) prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0) prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3 prismarine-chat: 1.10.1