diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 81345cb..08d22e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,12 +6,12 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 8 - continue-on-error: ${{ matrix.version == '1.19.2' }} + continue-on-error: ${{ matrix.version == '1.19.3' }} strategy: fail-fast: false matrix: flavor: ['bukkit', 'spigot', 'paper', 'purpur'] - version: ['1.19.2', '1.18.2', '1.17.1', '1.16.5'] + version: ['1.19.3', '1.18.2', '1.17.1', '1.16.5'] steps: # Download code from repository - name: Checkout code @@ -80,7 +80,7 @@ jobs: env: VERSION: ${{ matrix.version }} run: | - if [ $VERSION == "1.19.2" ]; then + if [ $VERSION == "1.19.3" ]; then url="https://ci.dmulloy2.net/job/ProtocolLib/lastStableBuild/artifact/target/ProtocolLib.jar" else url="https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar" diff --git a/automata/package-lock.json b/automata/package-lock.json index ef63cde..e5ebc77 100644 --- a/automata/package-lock.json +++ b/automata/package-lock.json @@ -6,24 +6,24 @@ "": { "name": "@yamipa/automata", "dependencies": { - "mineflayer": "^4.3.0", + "mineflayer": "^4.5.1", "rcon-client": "^4.2.3" } }, "node_modules/@azure/msal-common": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.0.0.tgz", - "integrity": "sha512-EkaHGjv0kw1RljhboeffM91b+v9d5VtmyG+0a/gvdqjbLu3kDzEfoaS5BNM9QqMzbxgZylsjAjQDtxdHLX/ziA==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz", + "integrity": "sha512-eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==", "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-node": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.10.0.tgz", - "integrity": "sha512-oSv9mg199FpRTe+fZ3o9NDYpKShOHqeceaNcCHJcKUaAaCojAbfbxD1Cvsti8BEsLKE6x0HcnjilnM1MKmZekA==", + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz", + "integrity": "sha512-NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==", "dependencies": { - "@azure/msal-common": "^7.0.0", + "@azure/msal-common": "^9.0.1", "jsonwebtoken": "^8.5.1", "uuid": "^8.3.0" }, @@ -32,17 +32,17 @@ } }, "node_modules/@types/node": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz", - "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==" + "version": "18.11.16", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.16.tgz", + "integrity": "sha512-6T7P5bDkRhqRxrQtwj7vru+bWTpelgtcETAZEUSdq0YISKz8WKdoBukQLYQQ6DFHvU9JRsbFq0JH5C51X2ZdnA==" }, "node_modules/@types/readable-stream": { - "version": "2.3.13", - "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.13.tgz", - "integrity": "sha512-4JSCx8EUzaW9Idevt+9lsRAt1lcSccoQfE+AouM1gk8sFxnnytKNIO3wTl9Dy+4m6jRJ1yXhboLHHT/LXBQiEw==", + "version": "2.3.15", + "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.15.tgz", + "integrity": "sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==", "dependencies": { "@types/node": "*", - "safe-buffer": "*" + "safe-buffer": "~5.1.1" } }, "node_modules/@xboxreplay/errors": { @@ -59,6 +59,17 @@ "axios": "^0.21.1" } }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/aes-js": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz", @@ -92,12 +103,57 @@ "follow-redirects": "^1.14.0" } }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/buffer-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", - "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", + "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==", "engines": { - "node": ">=0.4.0" + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/buffer-equal-constant-time": { @@ -144,6 +200,22 @@ "resolved": "https://registry.npmjs.org/endian-toggle/-/endian-toggle-0.0.0.tgz", "integrity": "sha512-ShfqhXeHRE4TmggSlHXG8CMGIcsOsqDw/GcoPcosToE59Rm9e4aXaMhEQf2kPBsBRrKem1bbOAv5gOKnkliMFQ==" }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "engines": { + "node": ">=0.8.x" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -155,9 +227,9 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "funding": [ { "type": "individual", @@ -173,15 +245,34 @@ } } }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/jose": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.8.3.tgz", - "integrity": "sha512-7rySkpW78d8LBp4YU70Wb7+OTgE3OwAALNVZxhoIhp4Kscp+p/fBkdpxGAMKxvCAMV4QfXBU9m6l9nX/vGwd2g==", + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz", + "integrity": "sha512-YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -287,9 +378,9 @@ "integrity": "sha512-vGBKTA+jwM4KgjGZ+S/8/Mkj9rWzePyGY6jManXPGhiWu63RYwW8dKPyk5koP+8qNVhPhHgFa1y/MJ4wrjsNrg==" }, "node_modules/minecraft-data": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.5.1.tgz", - "integrity": "sha512-6EZJwauZckCualacuAJ/RCP1Q+aTUCQuY23CsCQey/xRMYstlBnqdxaXptsRtSGLAjs56mR9K/N8FdTB5+Y3lQ==" + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.20.0.tgz", + "integrity": "sha512-xBQZwY0FoVq7jirFTD8mexNatSddP72CpDYweISHKE3J0co+CgfjtvQ94ykdQW+QPTMgrIIlATxVGIlk0Xjm8w==" }, "node_modules/minecraft-folder-path": { "version": "1.2.0", @@ -297,9 +388,9 @@ "integrity": "sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==" }, "node_modules/minecraft-protocol": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.35.0.tgz", - "integrity": "sha512-Ie4TQ/liooo77s58Xo68ywH998KW7Jemy8TkMjiqUrMpecNgpm7n/P2ddD85EvLS7EHVZLto7YmiTvVlSF6UGg==", + "version": "1.36.2", + "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.36.2.tgz", + "integrity": "sha512-Z7wNk1FTe0bnlmHxJEbpVnIpWLOsAfjoKDFR6DbUHVuL+rNuG9gR/Z3la3a20o4ZrlnToV6vbJkkPhvtn1rSYg==", "dependencies": { "@types/readable-stream": "^2.3.13", "aes-js": "^3.1.2", @@ -308,14 +399,14 @@ "endian-toggle": "^0.0.0", "lodash.get": "^4.1.2", "lodash.merge": "^4.3.0", - "minecraft-data": "^3.0.0", + "minecraft-data": "^3.8.0", "minecraft-folder-path": "^1.2.0", "node-fetch": "^2.6.1", "node-rsa": "^0.4.2", - "prismarine-auth": "^1.1.0", + "prismarine-auth": "^2.0.0", "prismarine-nbt": "^2.0.0", "protodef": "^1.8.0", - "readable-stream": "^3.0.6", + "readable-stream": "^4.1.0", "uuid-1345": "^1.0.1", "yggdrasil": "^1.4.0" }, @@ -324,23 +415,23 @@ } }, "node_modules/mineflayer": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.3.0.tgz", - "integrity": "sha512-GOA/kjtwjw05/OQehei40YjJ215NrZaBjpK6jWshdo4KmJAs9cnSQ+3TmU838V5zb6wDDQ9XEnAJ55loTyYCPw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.5.1.tgz", + "integrity": "sha512-UBNGJ7pFdEP0COjOyZAAhFPS80vulipSZi+X+2HsP+RbY59R9xKAfU/f63LwAhG4So0mhU02aFMf3OZ+kZwdnw==", "dependencies": { - "minecraft-data": "^3.0.0", - "minecraft-protocol": "^1.31.0", + "minecraft-data": "^3.15.2", + "minecraft-protocol": "^1.36.0", "prismarine-biome": "^1.1.1", "prismarine-block": "^1.13.1", - "prismarine-chat": "^1.3.3", - "prismarine-chunk": "^1.29.0", - "prismarine-entity": "^2.0.0", - "prismarine-item": "^1.11.5", + "prismarine-chat": "^1.7.1", + "prismarine-chunk": "^1.32.0", + "prismarine-entity": "^2.2.0", + "prismarine-item": "^1.12.1", "prismarine-nbt": "^2.0.0", "prismarine-physics": "^1.3.1", - "prismarine-recipe": "^1.1.0", - "prismarine-registry": "^1.0.0", - "prismarine-windows": "^2.4.2", + "prismarine-recipe": "^1.3.0", + "prismarine-registry": "^1.5.0", + "prismarine-windows": "^2.5.0", "prismarine-world": "^3.6.0", "protodef": "^1.14.0", "typed-emitter": "^1.0.0", @@ -359,9 +450,9 @@ } }, "node_modules/moo": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", - "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" }, "node_modules/ms": { "version": "2.1.2", @@ -417,9 +508,9 @@ } }, "node_modules/prismarine-auth": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/prismarine-auth/-/prismarine-auth-1.5.3.tgz", - "integrity": "sha512-MPkyJ0yXxL6r+aiOZV4PGlI47tXs13z3bA7rI+3vx2xpWEcmrGKP9m3sLJfGu9cOtmRz/4BGVkZ18XjD3cqjXA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/prismarine-auth/-/prismarine-auth-2.1.1.tgz", + "integrity": "sha512-KPWA2ZL4Tewl2gDKL2WT9yUSRKfE7MNgQ++RY+mSDUo+dJpRsqKnR7VZIhyRn8ai/iA8v/SFc/MmJiZ2TsZGmQ==", "dependencies": { "@azure/msal-node": "^1.1.0", "@xboxreplay/xboxlive-auth": "^3.3.3", @@ -453,21 +544,21 @@ } }, "node_modules/prismarine-chat": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.6.1.tgz", - "integrity": "sha512-BvDR6Jzz9aoSKa7L5peOPzEp0MyrEj+N5nRaBT2VBpPtGXx+jQCxqAK7XDWF65Z5iRhjubfGdZZf65ayWG3oDA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.7.2.tgz", + "integrity": "sha512-+m03T/MFhsXyLF2lH+MF5BPjqDvpeyX/T6v7l6rncVLahMVq/0knr7FPyrYHHzqIpSW8tx4iwhdfDcmwzMVBEQ==", "dependencies": { - "minecraft-data": "^3.0.0", "mojangson": "^2.0.1", "prismarine-item": "^1.10.0", "prismarine-nbt": "^2.0.0", + "prismarine-registry": "^1.4.0", "sprintf-js": "^1.1.2" } }, "node_modules/prismarine-chunk": { - "version": "1.31.0", - "resolved": "https://registry.npmjs.org/prismarine-chunk/-/prismarine-chunk-1.31.0.tgz", - "integrity": "sha512-Co5nE63yRabMaK2dRfflk5fGbNafFStz5zm8fsgUmG0g4d7qtPvIuQiB7kpl66pm+nv55rtQcW2UvxCo6u4w1A==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/prismarine-chunk/-/prismarine-chunk-1.32.0.tgz", + "integrity": "sha512-2Abh7M93BPbqRZEclmjIHC2RcETWN2/0zYsbPc5SgWXqe7u34kQaB2lv3YUS1xZ3vg9kdtR8mzElk8i84eX7PA==", "dependencies": { "minecraft-data": "^3.0.0", "prismarine-biome": "^1.2.0", @@ -483,23 +574,24 @@ } }, "node_modules/prismarine-entity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/prismarine-entity/-/prismarine-entity-2.1.1.tgz", - "integrity": "sha512-79iWUYNf0KRhMvvVJ4TTCQQZItPanA5zWBstx+eu98480WrCWi9fCdCPtY0Bsl4+o+tnkcTb6oMLlndx4yPwLA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/prismarine-entity/-/prismarine-entity-2.2.0.tgz", + "integrity": "sha512-boqJbMpGHG2ddFUUo9aKkKPUHQbFMWkUCw8SRdZ+jrZxABsstL9619I8ujwPYoOMJjMyfYWgdEPNyHGiUqqukA==", "dependencies": { "minecraft-data": "^3.0.0", "prismarine-chat": "^1.4.1", "prismarine-item": "^1.11.2", + "prismarine-registry": "^1.4.0", "vec3": "^0.1.4" } }, "node_modules/prismarine-item": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/prismarine-item/-/prismarine-item-1.11.5.tgz", - "integrity": "sha512-aWH1AXTiSDUUM0LVnFtJJ96If/sOiuM3DBZmSvtwFD+ufQsF3WndH2QW2Pv6FbabKByneF9xyPsq5dhUnvcG7g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/prismarine-item/-/prismarine-item-1.12.1.tgz", + "integrity": "sha512-Q+cV8WCM6gTO/K8gIpe4sTCVj0wdXy/IIctpQhgj4iRPoRY/rLCI88FAGsLNU1cabOFQDO3a0NIz+KLvhOvbQA==", "dependencies": { - "minecraft-data": "^3.0.0", - "prismarine-nbt": "^2.0.0" + "prismarine-nbt": "^2.0.0", + "prismarine-registry": "^1.4.0" } }, "node_modules/prismarine-nbt": { @@ -521,29 +613,30 @@ } }, "node_modules/prismarine-recipe": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/prismarine-recipe/-/prismarine-recipe-1.2.0.tgz", - "integrity": "sha512-ZkCtEi5xDS7tAJgDS/BxjvEYPAXusikcyIWYhPOpA6nslIUqWF5+QevC6FpNa3eQVdebgiNBQqHggcnI4xww5g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/prismarine-recipe/-/prismarine-recipe-1.3.0.tgz", + "integrity": "sha512-1Omu4rZr1HXIGuT7BCdFq2REkrSvm7qGx+aGspLvsGHLqJCI26ZNjqOUQ2PL16TfdEBIPwE6v5JNGRGbvXA9gQ==", "peerDependencies": { - "minecraft-data": "^3.0.0" + "prismarine-registry": "^1.4.0" } }, "node_modules/prismarine-registry": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.2.0.tgz", - "integrity": "sha512-c3aEnn9/KrHo0zv4KihX0caFilCw5VW8Kaj9LXtArGRk5NkncDCguhM0S1SEj4WqoXsFSY4yG5HM5G4F92SKHg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.6.0.tgz", + "integrity": "sha512-oduDRuwa5rXT8CkPeMSlBsuBzxZF9oRsDpFK0oBStpIoNwSuTqqGGGgLlyL20OS2O9pmqYpOMlmG80CW4uuKJw==", "dependencies": { "minecraft-data": "^3.0.0", "prismarine-nbt": "^2.0.0" } }, "node_modules/prismarine-windows": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/prismarine-windows/-/prismarine-windows-2.4.4.tgz", - "integrity": "sha512-bjva7DtEu9V37SGgCqMiAgMRtwTypqyB95bS8VULUxoMPNhbcyTxdQhU6Fe2OFq4ufT9x3hGMKpMwJy+oepE0A==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/prismarine-windows/-/prismarine-windows-2.6.1.tgz", + "integrity": "sha512-5B8+W4Zb9MWaakd38I/WW564zEgat6bC23ftcv15yVYmHZTq8mtUfX2GsOUD3Pu/aFKarvXpyyJahFMUTUVoXg==", "dependencies": { - "minecraft-data": "^3.0.0", - "prismarine-item": "^1.5.0" + "prismarine-item": "^1.5.0", + "prismarine-registry": "^1.5.0", + "typed-emitter": "^1.0.0" } }, "node_modules/prismarine-world": { @@ -557,6 +650,14 @@ "node": ">=8.0.0" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/protodef": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/protodef/-/protodef-1.15.0.tgz", @@ -582,6 +683,19 @@ "protodef-validator": "cli.js" } }, + "node_modules/protodef/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -621,16 +735,17 @@ "integrity": "sha512-Tfay0l6gJMP5rkil8CzGbLthukn+9BN/VXWcABVFPjOoelJ+koW8BuPZYk+h/L+lEeIp1fSzVRiWRPIjKVjPdg==" }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.2.0.tgz", + "integrity": "sha512-gJrBHsaI3lgBoGMW/jHZsQ/o/TIWiu5ENCJG1BB7fuCKzpFM8GaS2UoBVt9NO+oI+3FcrBNbUkl3ilDe09aY4A==", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/ret": { @@ -642,23 +757,9 @@ } }, "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/semver": { "version": "5.7.1", @@ -690,6 +791,25 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -770,32 +890,32 @@ }, "dependencies": { "@azure/msal-common": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.0.0.tgz", - "integrity": "sha512-EkaHGjv0kw1RljhboeffM91b+v9d5VtmyG+0a/gvdqjbLu3kDzEfoaS5BNM9QqMzbxgZylsjAjQDtxdHLX/ziA==" + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz", + "integrity": "sha512-eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==" }, "@azure/msal-node": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.10.0.tgz", - "integrity": "sha512-oSv9mg199FpRTe+fZ3o9NDYpKShOHqeceaNcCHJcKUaAaCojAbfbxD1Cvsti8BEsLKE6x0HcnjilnM1MKmZekA==", + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz", + "integrity": "sha512-NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==", "requires": { - "@azure/msal-common": "^7.0.0", + "@azure/msal-common": "^9.0.1", "jsonwebtoken": "^8.5.1", "uuid": "^8.3.0" } }, "@types/node": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz", - "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==" + "version": "18.11.16", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.16.tgz", + "integrity": "sha512-6T7P5bDkRhqRxrQtwj7vru+bWTpelgtcETAZEUSdq0YISKz8WKdoBukQLYQQ6DFHvU9JRsbFq0JH5C51X2ZdnA==" }, "@types/readable-stream": { - "version": "2.3.13", - "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.13.tgz", - "integrity": "sha512-4JSCx8EUzaW9Idevt+9lsRAt1lcSccoQfE+AouM1gk8sFxnnytKNIO3wTl9Dy+4m6jRJ1yXhboLHHT/LXBQiEw==", + "version": "2.3.15", + "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.15.tgz", + "integrity": "sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==", "requires": { "@types/node": "*", - "safe-buffer": "*" + "safe-buffer": "~5.1.1" } }, "@xboxreplay/errors": { @@ -812,6 +932,14 @@ "axios": "^0.21.1" } }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, "aes-js": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz", @@ -841,10 +969,24 @@ "follow-redirects": "^1.14.0" } }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "buffer-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", - "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", + "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==" }, "buffer-equal-constant-time": { "version": "1.0.1", @@ -882,6 +1024,16 @@ "resolved": "https://registry.npmjs.org/endian-toggle/-/endian-toggle-0.0.0.tgz", "integrity": "sha512-ShfqhXeHRE4TmggSlHXG8CMGIcsOsqDw/GcoPcosToE59Rm9e4aXaMhEQf2kPBsBRrKem1bbOAv5gOKnkliMFQ==" }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -893,9 +1045,14 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "inherits": { "version": "2.0.4", @@ -903,9 +1060,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "jose": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.8.3.tgz", - "integrity": "sha512-7rySkpW78d8LBp4YU70Wb7+OTgE3OwAALNVZxhoIhp4Kscp+p/fBkdpxGAMKxvCAMV4QfXBU9m6l9nX/vGwd2g==" + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz", + "integrity": "sha512-YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q==" }, "json-schema-traverse": { "version": "0.4.1", @@ -1004,9 +1161,9 @@ "integrity": "sha512-vGBKTA+jwM4KgjGZ+S/8/Mkj9rWzePyGY6jManXPGhiWu63RYwW8dKPyk5koP+8qNVhPhHgFa1y/MJ4wrjsNrg==" }, "minecraft-data": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.5.1.tgz", - "integrity": "sha512-6EZJwauZckCualacuAJ/RCP1Q+aTUCQuY23CsCQey/xRMYstlBnqdxaXptsRtSGLAjs56mR9K/N8FdTB5+Y3lQ==" + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.20.0.tgz", + "integrity": "sha512-xBQZwY0FoVq7jirFTD8mexNatSddP72CpDYweISHKE3J0co+CgfjtvQ94ykdQW+QPTMgrIIlATxVGIlk0Xjm8w==" }, "minecraft-folder-path": { "version": "1.2.0", @@ -1014,9 +1171,9 @@ "integrity": "sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==" }, "minecraft-protocol": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.35.0.tgz", - "integrity": "sha512-Ie4TQ/liooo77s58Xo68ywH998KW7Jemy8TkMjiqUrMpecNgpm7n/P2ddD85EvLS7EHVZLto7YmiTvVlSF6UGg==", + "version": "1.36.2", + "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.36.2.tgz", + "integrity": "sha512-Z7wNk1FTe0bnlmHxJEbpVnIpWLOsAfjoKDFR6DbUHVuL+rNuG9gR/Z3la3a20o4ZrlnToV6vbJkkPhvtn1rSYg==", "requires": { "@types/readable-stream": "^2.3.13", "aes-js": "^3.1.2", @@ -1025,36 +1182,36 @@ "endian-toggle": "^0.0.0", "lodash.get": "^4.1.2", "lodash.merge": "^4.3.0", - "minecraft-data": "^3.0.0", + "minecraft-data": "^3.8.0", "minecraft-folder-path": "^1.2.0", "node-fetch": "^2.6.1", "node-rsa": "^0.4.2", - "prismarine-auth": "^1.1.0", + "prismarine-auth": "^2.0.0", "prismarine-nbt": "^2.0.0", "protodef": "^1.8.0", - "readable-stream": "^3.0.6", + "readable-stream": "^4.1.0", "uuid-1345": "^1.0.1", "yggdrasil": "^1.4.0" } }, "mineflayer": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.3.0.tgz", - "integrity": "sha512-GOA/kjtwjw05/OQehei40YjJ215NrZaBjpK6jWshdo4KmJAs9cnSQ+3TmU838V5zb6wDDQ9XEnAJ55loTyYCPw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.5.1.tgz", + "integrity": "sha512-UBNGJ7pFdEP0COjOyZAAhFPS80vulipSZi+X+2HsP+RbY59R9xKAfU/f63LwAhG4So0mhU02aFMf3OZ+kZwdnw==", "requires": { - "minecraft-data": "^3.0.0", - "minecraft-protocol": "^1.31.0", + "minecraft-data": "^3.15.2", + "minecraft-protocol": "^1.36.0", "prismarine-biome": "^1.1.1", "prismarine-block": "^1.13.1", - "prismarine-chat": "^1.3.3", - "prismarine-chunk": "^1.29.0", - "prismarine-entity": "^2.0.0", - "prismarine-item": "^1.11.5", + "prismarine-chat": "^1.7.1", + "prismarine-chunk": "^1.32.0", + "prismarine-entity": "^2.2.0", + "prismarine-item": "^1.12.1", "prismarine-nbt": "^2.0.0", "prismarine-physics": "^1.3.1", - "prismarine-recipe": "^1.1.0", - "prismarine-registry": "^1.0.0", - "prismarine-windows": "^2.4.2", + "prismarine-recipe": "^1.3.0", + "prismarine-registry": "^1.5.0", + "prismarine-windows": "^2.5.0", "prismarine-world": "^3.6.0", "protodef": "^1.14.0", "typed-emitter": "^1.0.0", @@ -1070,9 +1227,9 @@ } }, "moo": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", - "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" }, "ms": { "version": "2.1.2", @@ -1107,9 +1264,9 @@ } }, "prismarine-auth": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/prismarine-auth/-/prismarine-auth-1.5.3.tgz", - "integrity": "sha512-MPkyJ0yXxL6r+aiOZV4PGlI47tXs13z3bA7rI+3vx2xpWEcmrGKP9m3sLJfGu9cOtmRz/4BGVkZ18XjD3cqjXA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/prismarine-auth/-/prismarine-auth-2.1.1.tgz", + "integrity": "sha512-KPWA2ZL4Tewl2gDKL2WT9yUSRKfE7MNgQ++RY+mSDUo+dJpRsqKnR7VZIhyRn8ai/iA8v/SFc/MmJiZ2TsZGmQ==", "requires": { "@azure/msal-node": "^1.1.0", "@xboxreplay/xboxlive-auth": "^3.3.3", @@ -1140,21 +1297,21 @@ } }, "prismarine-chat": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.6.1.tgz", - "integrity": "sha512-BvDR6Jzz9aoSKa7L5peOPzEp0MyrEj+N5nRaBT2VBpPtGXx+jQCxqAK7XDWF65Z5iRhjubfGdZZf65ayWG3oDA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.7.2.tgz", + "integrity": "sha512-+m03T/MFhsXyLF2lH+MF5BPjqDvpeyX/T6v7l6rncVLahMVq/0knr7FPyrYHHzqIpSW8tx4iwhdfDcmwzMVBEQ==", "requires": { - "minecraft-data": "^3.0.0", "mojangson": "^2.0.1", "prismarine-item": "^1.10.0", "prismarine-nbt": "^2.0.0", + "prismarine-registry": "^1.4.0", "sprintf-js": "^1.1.2" } }, "prismarine-chunk": { - "version": "1.31.0", - "resolved": "https://registry.npmjs.org/prismarine-chunk/-/prismarine-chunk-1.31.0.tgz", - "integrity": "sha512-Co5nE63yRabMaK2dRfflk5fGbNafFStz5zm8fsgUmG0g4d7qtPvIuQiB7kpl66pm+nv55rtQcW2UvxCo6u4w1A==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/prismarine-chunk/-/prismarine-chunk-1.32.0.tgz", + "integrity": "sha512-2Abh7M93BPbqRZEclmjIHC2RcETWN2/0zYsbPc5SgWXqe7u34kQaB2lv3YUS1xZ3vg9kdtR8mzElk8i84eX7PA==", "requires": { "minecraft-data": "^3.0.0", "prismarine-biome": "^1.2.0", @@ -1167,23 +1324,24 @@ } }, "prismarine-entity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/prismarine-entity/-/prismarine-entity-2.1.1.tgz", - "integrity": "sha512-79iWUYNf0KRhMvvVJ4TTCQQZItPanA5zWBstx+eu98480WrCWi9fCdCPtY0Bsl4+o+tnkcTb6oMLlndx4yPwLA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/prismarine-entity/-/prismarine-entity-2.2.0.tgz", + "integrity": "sha512-boqJbMpGHG2ddFUUo9aKkKPUHQbFMWkUCw8SRdZ+jrZxABsstL9619I8ujwPYoOMJjMyfYWgdEPNyHGiUqqukA==", "requires": { "minecraft-data": "^3.0.0", "prismarine-chat": "^1.4.1", "prismarine-item": "^1.11.2", + "prismarine-registry": "^1.4.0", "vec3": "^0.1.4" } }, "prismarine-item": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/prismarine-item/-/prismarine-item-1.11.5.tgz", - "integrity": "sha512-aWH1AXTiSDUUM0LVnFtJJ96If/sOiuM3DBZmSvtwFD+ufQsF3WndH2QW2Pv6FbabKByneF9xyPsq5dhUnvcG7g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/prismarine-item/-/prismarine-item-1.12.1.tgz", + "integrity": "sha512-Q+cV8WCM6gTO/K8gIpe4sTCVj0wdXy/IIctpQhgj4iRPoRY/rLCI88FAGsLNU1cabOFQDO3a0NIz+KLvhOvbQA==", "requires": { - "minecraft-data": "^3.0.0", - "prismarine-nbt": "^2.0.0" + "prismarine-nbt": "^2.0.0", + "prismarine-registry": "^1.4.0" } }, "prismarine-nbt": { @@ -1205,27 +1363,28 @@ } }, "prismarine-recipe": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/prismarine-recipe/-/prismarine-recipe-1.2.0.tgz", - "integrity": "sha512-ZkCtEi5xDS7tAJgDS/BxjvEYPAXusikcyIWYhPOpA6nslIUqWF5+QevC6FpNa3eQVdebgiNBQqHggcnI4xww5g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/prismarine-recipe/-/prismarine-recipe-1.3.0.tgz", + "integrity": "sha512-1Omu4rZr1HXIGuT7BCdFq2REkrSvm7qGx+aGspLvsGHLqJCI26ZNjqOUQ2PL16TfdEBIPwE6v5JNGRGbvXA9gQ==", "requires": {} }, "prismarine-registry": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.2.0.tgz", - "integrity": "sha512-c3aEnn9/KrHo0zv4KihX0caFilCw5VW8Kaj9LXtArGRk5NkncDCguhM0S1SEj4WqoXsFSY4yG5HM5G4F92SKHg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.6.0.tgz", + "integrity": "sha512-oduDRuwa5rXT8CkPeMSlBsuBzxZF9oRsDpFK0oBStpIoNwSuTqqGGGgLlyL20OS2O9pmqYpOMlmG80CW4uuKJw==", "requires": { "minecraft-data": "^3.0.0", "prismarine-nbt": "^2.0.0" } }, "prismarine-windows": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/prismarine-windows/-/prismarine-windows-2.4.4.tgz", - "integrity": "sha512-bjva7DtEu9V37SGgCqMiAgMRtwTypqyB95bS8VULUxoMPNhbcyTxdQhU6Fe2OFq4ufT9x3hGMKpMwJy+oepE0A==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/prismarine-windows/-/prismarine-windows-2.6.1.tgz", + "integrity": "sha512-5B8+W4Zb9MWaakd38I/WW564zEgat6bC23ftcv15yVYmHZTq8mtUfX2GsOUD3Pu/aFKarvXpyyJahFMUTUVoXg==", "requires": { - "minecraft-data": "^3.0.0", - "prismarine-item": "^1.5.0" + "prismarine-item": "^1.5.0", + "prismarine-registry": "^1.5.0", + "typed-emitter": "^1.0.0" } }, "prismarine-world": { @@ -1236,6 +1395,11 @@ "vec3": "^0.1.7" } }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" + }, "protodef": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/protodef/-/protodef-1.15.0.tgz", @@ -1245,6 +1409,18 @@ "lodash.reduce": "^4.6.0", "protodef-validator": "^1.3.0", "readable-stream": "^3.0.3" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "protodef-validator": { @@ -1290,13 +1466,14 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.2.0.tgz", + "integrity": "sha512-gJrBHsaI3lgBoGMW/jHZsQ/o/TIWiu5ENCJG1BB7fuCKzpFM8GaS2UoBVt9NO+oI+3FcrBNbUkl3ilDe09aY4A==", "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10" } }, "ret": { @@ -1305,9 +1482,9 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "semver": { "version": "5.7.1", @@ -1330,6 +1507,13 @@ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "requires": { "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, "tr46": { diff --git a/automata/package.json b/automata/package.json index bc0a862..ea2be74 100644 --- a/automata/package.json +++ b/automata/package.json @@ -6,7 +6,7 @@ "start": "node index.js" }, "dependencies": { - "mineflayer": "^4.3.0", + "mineflayer": "^4.5.1", "rcon-client": "^4.2.3" } } diff --git a/pom.xml b/pom.xml index bd08782..12f9ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.josemmo.bukkit.plugin YamipaPlugin - 1.2.6 + 1.2.7 8 @@ -41,13 +41,13 @@ org.spigotmc spigot-api - 1.19.2-R0.1-SNAPSHOT + 1.19.3-R0.1-SNAPSHOT provided - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib - 5.0.0-SNAPSHOT + eebb99fa37 provided diff --git a/src/main/java/io/josemmo/bukkit/plugin/packets/EntityMetadataPacket.java b/src/main/java/io/josemmo/bukkit/plugin/packets/EntityMetadataPacket.java index f5ab3ef..02860e8 100644 --- a/src/main/java/io/josemmo/bukkit/plugin/packets/EntityMetadataPacket.java +++ b/src/main/java/io/josemmo/bukkit/plugin/packets/EntityMetadataPacket.java @@ -2,18 +2,25 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; +import com.comphenix.protocol.wrappers.BukkitConverters; +import com.comphenix.protocol.wrappers.WrappedDataValue; import com.comphenix.protocol.wrappers.WrappedDataWatcher; import io.josemmo.bukkit.plugin.utils.Internals; import org.bukkit.Rotation; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.List; public class EntityMetadataPacket extends PacketContainer { + private static final boolean USE_DATA_WATCHER; private static final int ITEM_INDEX; private static final int ROTATION_INDEX; - private final WrappedDataWatcher dataWatcher = new WrappedDataWatcher(); + private final WrappedDataWatcher dataWatcher = new WrappedDataWatcher(); // For <= 1.19.2 + private final List values = new ArrayList<>(); // For >= 1.19.3 static { + USE_DATA_WATCHER = (Internals.MINECRAFT_VERSION < 19.3f); ITEM_INDEX = (Internals.MINECRAFT_VERSION < 17) ? 7 : 8; ROTATION_INDEX = ITEM_INDEX + 1; } @@ -29,7 +36,11 @@ public EntityMetadataPacket() { public @NotNull EntityMetadataPacket setFlags(byte flags) { WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.get(Byte.class); - dataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, serializer), flags); + if (USE_DATA_WATCHER) { + dataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, serializer), flags); + } else { + values.add(new WrappedDataValue(0, serializer, flags)); + } return this; } @@ -40,18 +51,37 @@ public EntityMetadataPacket() { public @NotNull EntityMetadataPacket setItem(@NotNull ItemStack item) { WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.getItemStackSerializer(false); - dataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(ITEM_INDEX, serializer), item); + if (USE_DATA_WATCHER) { + dataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(ITEM_INDEX, serializer), item); + } else { + values.add(new WrappedDataValue( + ITEM_INDEX, + serializer, + BukkitConverters.getItemStackConverter().getGeneric(item) + )); + } return this; } public @NotNull EntityMetadataPacket setRotation(@NotNull Rotation rotation) { WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.get(Integer.class); - dataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(ROTATION_INDEX, serializer), rotation.ordinal()); + if (USE_DATA_WATCHER) { + dataWatcher.setObject( + new WrappedDataWatcher.WrappedDataWatcherObject(ROTATION_INDEX, serializer), + rotation.ordinal() + ); + } else { + values.add(new WrappedDataValue(ROTATION_INDEX, serializer, rotation.ordinal())); + } return this; } public @NotNull EntityMetadataPacket build() { - getWatchableCollectionModifier().write(0, dataWatcher.getWatchableObjects()); + if (USE_DATA_WATCHER) { + getWatchableCollectionModifier().write(0, dataWatcher.getWatchableObjects()); + } else { + getDataValueCollectionModifier().write(0, values); + } return this; } } diff --git a/src/main/java/io/josemmo/bukkit/plugin/renderer/ImageRenderer.java b/src/main/java/io/josemmo/bukkit/plugin/renderer/ImageRenderer.java index 4617878..693529f 100644 --- a/src/main/java/io/josemmo/bukkit/plugin/renderer/ImageRenderer.java +++ b/src/main/java/io/josemmo/bukkit/plugin/renderer/ImageRenderer.java @@ -362,6 +362,12 @@ public int size() { * @param location New player location */ private void onPlayerLocationChange(@NotNull Player player, @NotNull Location location) { + // Ignore NPC events from other plugins + if (player.hasMetadata("NPC")) { + plugin.fine("Ignored NPC event from Player#" + player.getName()); + return; + } + // Has player moved to another world area? WorldAreaId worldAreaId = WorldAreaId.fromLocation(location); WorldAreaId prevWorldAreaId = playersLocation.get(player);