From 7b8ca0bc66fc86bdcc6c5981020420a96538f041 Mon Sep 17 00:00:00 2001 From: vincss Date: Thu, 5 Dec 2024 20:20:45 +0100 Subject: [PATCH] - change discord settings - change default useLegacyLogin & serverOnlineMode as a workarround - update minecraft-protocol: 1.51.0 --- README.md | 4 +- package-lock.json | 116 +++++++++++++++++++++++++++------------- package.json | 2 +- sleepingSettings.yml | 3 +- src/sleepingSettings.ts | 3 +- 5 files changed, 87 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 6c7bb5f..e5e696e 100644 --- a/README.md +++ b/README.md @@ -176,8 +176,10 @@ Give a ⭐️ if you like the project! [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/vincss) ## 📜 ChangeLog -- To be released +- 1.11.0 - MC 1.21.x / Bedrock 1.21.40 : - change discord settings + - change default useLegacyLogin & serverOnlineMode as a workarround + - update minecraft-protocol: 1.51.0 - 1.10.0 - MC 1.20.2 / Bedrock 1.21.40 : - update @jsprismarine/prismarine : 0.12.0 ( bedrock 1.21.40 ) - 1.9.1 - 1.20.2 : diff --git a/package-lock.json b/package-lock.json index 048727c..85b33e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "express": "^4.18.2", "express-handlebars": "^7.0.4", "js-yaml": "^4.1.0", - "minecraft-protocol": "^1.46.0", + "minecraft-protocol": "^1.51.0", "prismarine-chat": "^1.8.0", "properties-reader": "^2.3.0", "winston": "^3.8.2" @@ -1960,6 +1960,15 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" }, + "node_modules/@types/node-rsa": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@types/node-rsa/-/node-rsa-1.1.4.tgz", + "integrity": "sha512-dB0ECel6JpMnq5ULvpUTunx3yNm8e/dIkv8Zu9p2c8me70xIRUUG3q+qXRwcSf9rN3oqamv4116iHy90dJGRpA==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/prettier": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", @@ -6285,9 +6294,10 @@ } }, "node_modules/minecraft-data": { - "version": "3.61.0", - "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.61.0.tgz", - "integrity": "sha512-e7FMplGNjhAZvdxT66bP56ZqHymr+BrzCZlhNxRr1suFKueGSTQQA+DZ2ZU/vW/02dBFCrHfBEJh1sw5vOZ+Ew==" + "version": "3.80.0", + "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.80.0.tgz", + "integrity": "sha512-UYq+ADpS9K1+cqiJiz6tqkht4y4cRYF3qOYanG9eIiHY+VC+qIAC7/UcW6G3adayvj5YBOCurlqaw3E0TMAtHg==", + "license": "MIT" }, "node_modules/minecraft-folder-path": { "version": "1.2.0", @@ -6295,10 +6305,12 @@ "integrity": "sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==" }, "node_modules/minecraft-protocol": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.46.0.tgz", - "integrity": "sha512-MxFPg+YyucHLxT7t3kDGaIzLoeYtjiXuk3ledy6LZCQmUyPq8YlVeB9WgIGX4NzDx45N3gDNHcx+eh0x1uKsRw==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.51.0.tgz", + "integrity": "sha512-ACvquP6fI8TdPXfPNNGTTi9v12WW6LS4k2KmmUBSmNncM0KnUwywqTT6YQIfCff6dUMd9DZB1oaNZfEDto+QQw==", + "license": "BSD-3-Clause", "dependencies": { + "@types/node-rsa": "^1.1.4", "@types/readable-stream": "^4.0.0", "aes-js": "^3.1.2", "buffer-equal": "^1.0.0", @@ -6306,14 +6318,15 @@ "endian-toggle": "^0.0.0", "lodash.get": "^4.1.2", "lodash.merge": "^4.3.0", - "minecraft-data": "^3.53.0", + "minecraft-data": "^3.78.0", "minecraft-folder-path": "^1.2.0", "node-fetch": "^2.6.1", "node-rsa": "^0.4.2", "prismarine-auth": "^2.2.0", + "prismarine-chat": "^1.10.0", "prismarine-nbt": "^2.5.0", "prismarine-realms": "^1.2.0", - "protodef": "^1.8.0", + "protodef": "^1.17.0", "readable-stream": "^4.1.0", "uuid-1345": "^1.0.1", "yggdrasil": "^1.4.0" @@ -7455,21 +7468,12 @@ } }, "node_modules/prismarine-chat": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.8.0.tgz", - "integrity": "sha512-hEz47GESIEP0W1KSHrK7ZSy0PqbQW7khYWenv8d5wvyAYnBs1E4KXDBJSWqyGIYinKGN9aes8v3xpQhgURK/Fg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/prismarine-chat/-/prismarine-chat-1.10.1.tgz", + "integrity": "sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==", + "license": "MIT", "dependencies": { "mojangson": "^2.0.1", - "prismarine-item": "^1.10.0", - "prismarine-nbt": "^2.0.0", - "prismarine-registry": "^1.4.0" - } - }, - "node_modules/prismarine-item": { - "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": { "prismarine-nbt": "^2.0.0", "prismarine-registry": "^1.4.0" } @@ -7492,11 +7496,12 @@ } }, "node_modules/prismarine-registry": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.7.0.tgz", - "integrity": "sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/prismarine-registry/-/prismarine-registry-1.10.0.tgz", + "integrity": "sha512-6TYQiZHtsJ87HsB2E0yamCFp77ZyyLT16OmW5iXB5V30yCPflhHvR5TR2IqISmmiRc2093BkHfiIhsOZaMatmQ==", + "license": "MIT", "dependencies": { - "minecraft-data": "^3.0.0", + "minecraft-data": "^3.70.0", "prismarine-nbt": "^2.0.0" } }, @@ -7553,14 +7558,15 @@ } }, "node_modules/protodef": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/protodef/-/protodef-1.15.0.tgz", - "integrity": "sha512-bZ2Omw8dT+DACjJHLrBWZlqN4MlT9g9oSpJDdkUAJOStUzgJp+Zn42FJfPUdwutUxjaxA0PftN0PDlNa2XbneA==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/protodef/-/protodef-1.17.0.tgz", + "integrity": "sha512-mnpNPV3xwu63u3NwZuXM1RCp979vjHxUGHzVrb6dxbvof5Fx+b8Rs0G0c3xtEuFDreGAMWS7VrlNkDUDBMsFWQ==", + "license": "MIT", "dependencies": { "lodash.get": "^4.4.2", "lodash.reduce": "^4.6.0", "protodef-validator": "^1.3.0", - "readable-stream": "^3.0.3" + "readable-stream": "^4.4.0" }, "engines": { "node": ">=14" @@ -7577,17 +7583,53 @@ "protodef-validator": "cli.js" } }, + "node_modules/protodef/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" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "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==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", + "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "license": "MIT", "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", + "string_decoder": "^1.3.0" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/protodef/node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" } }, "node_modules/proxy-addr": { diff --git a/package.json b/package.json index 7567bc6..1c4bc2a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "express": "^4.18.2", "express-handlebars": "^7.0.4", "js-yaml": "^4.1.0", - "minecraft-protocol": "^1.46.0", + "minecraft-protocol": "^1.51.0", "prismarine-chat": "^1.8.0", "properties-reader": "^2.3.0", "winston": "^3.8.2" diff --git a/sleepingSettings.yml b/sleepingSettings.yml index c057076..f290698 100644 --- a/sleepingSettings.yml +++ b/sleepingSettings.yml @@ -6,7 +6,8 @@ serverName: "SleepingServer, waiting for his prince..." serverPort: 25565 # bedrockPort: 19132 loginMessage: "...Waking server up, come back in a minute..." -serverOnlineMode: true # like in the server.properties, to check the licence of player or not. +serverOnlineMode: false # like in the server.properties, to check the licence of player or not. +useLegacyLogin: true maxPlayers: 20 # useNativeFiles: true diff --git a/src/sleepingSettings.ts b/src/sleepingSettings.ts index 695cba7..3539d58 100644 --- a/src/sleepingSettings.ts +++ b/src/sleepingSettings.ts @@ -58,7 +58,8 @@ export const DefaultSettings: Settings = { maxPlayers: 20, loginMessage: "...Waking server up, come back in a minute...", - serverOnlineMode: true, + serverOnlineMode: false, + useLegacyLogin: true, startMinecraft: true, // false to disable minecraftCommand: "java -jar paper.jar nogui",