From 0bb371815e70fe364157bf530a3a9501e38f92df Mon Sep 17 00:00:00 2001 From: vwi Date: Fri, 24 Jan 2025 10:01:31 +0100 Subject: [PATCH] 1.11.3 - MC 1.21.x / Bedrock 1.21.40 : - update minecraft-protocol: 1.54.0 - https://github.com/vincss/mcsleepingserverstarter/pull/293 - https://github.com/vincss/mcsleepingserverstarter/pull/291 --- README.md | 4 ++++ config.yaml | 19 ------------------ package-lock.json | 12 +++++------ package.json | 4 ++-- sleepingSettings.yml | 44 ++++++++++++++++++++++++++++------------- src/sleepingSettings.ts | 2 +- 6 files changed, 43 insertions(+), 42 deletions(-) delete mode 100644 config.yaml diff --git a/README.md b/README.md index 00e5be8..d3c96dd 100644 --- a/README.md +++ b/README.md @@ -176,6 +176,10 @@ Give a ⭐️ if you like the project! [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/vincss) ## 📜 ChangeLog +- 1.11.3 - MC 1.21.x / Bedrock 1.21.40 : + - update minecraft-protocol: 1.54.0 + - https://github.com/vincss/mcsleepingserverstarter/pull/293 + - https://github.com/vincss/mcsleepingserverstarter/pull/291 - 1.11.2 - MC 1.21.x / Bedrock 1.21.40 : - Add alpine arm64 binary - 1.11.1 - MC 1.21.x / Bedrock 1.21.40 : diff --git a/config.yaml b/config.yaml deleted file mode 100644 index 278b983..0000000 --- a/config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -log-level: info -# Replaced by sleepingSettings.yml "bedrockPort" -# port: 19132 -server-ip: 0.0.0.0 -level-name: world -worlds: - world: - generator: Flat - provider: Filesystem - seed: 4673730961276932 -max-players: 20 -gamemode: survival -motd: Another JSPrismarine server! -view-distance: 10 -online-mode: false -packet-compression-level: 7 -enable-query: true -enable-process-title: true -enable-ticking: true \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e0cb5e2..a0f9047 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcsleepingserverstarter", - "version": "1.11.2", + "version": "1.11.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mcsleepingserverstarter", - "version": "1.11.2", + "version": "1.11.3", "license": "ISC", "dependencies": { "@jsprismarine/bedrock-data": "^0.12.1", @@ -16,7 +16,7 @@ "express": "^4.21.1", "express-handlebars": "^7.0.4", "js-yaml": "^4.1.0", - "minecraft-protocol": "^1.53.0", + "minecraft-protocol": "^1.54.0", "prismarine-chat": "^1.8.0", "properties-reader": "^2.3.0", "winston": "^3.8.2" @@ -6531,9 +6531,9 @@ "integrity": "sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==" }, "node_modules/minecraft-protocol": { - "version": "1.53.0", - "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.53.0.tgz", - "integrity": "sha512-V6zr91G5VUke4VLDtmlcBmP+f2tA4LkHiPOR4fYBS4ShUTRqxYw3KgKLhFSIMxGYrVsGHpgWf3Hm4O1hN2Enzw==", + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/minecraft-protocol/-/minecraft-protocol-1.54.0.tgz", + "integrity": "sha512-v8pWRVhD9kyd/X52j/XESxrNxkmz1OHzSXAJkPLOQUUTENEqisJhu1c3abS7ZI+MAXHAEA/vaCb/Eh6XFxw0lA==", "license": "BSD-3-Clause", "dependencies": { "@types/node-rsa": "^1.1.4", diff --git a/package.json b/package.json index 501f2d6..3e6be95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcsleepingserverstarter", - "version": "1.11.2", + "version": "1.11.3", "description": "Sleeps until someone connects", "main": "build/sleepingServerStarter.js", "bin": "build/sleepingServerStarter.js", @@ -24,7 +24,7 @@ "express": "^4.21.1", "express-handlebars": "^7.0.4", "js-yaml": "^4.1.0", - "minecraft-protocol": "^1.53.0", + "minecraft-protocol": "^1.54.0", "prismarine-chat": "^1.8.0", "properties-reader": "^2.3.0", "winston": "^3.8.2" diff --git a/sleepingSettings.yml b/sleepingSettings.yml index dfc85c1..95624a5 100644 --- a/sleepingSettings.yml +++ b/sleepingSettings.yml @@ -4,57 +4,70 @@ # The name of your server. # You can specify (https://motd.gg) by using the `§` prefix. serverName: "SleepingServer, waiting for his prince..." + # The server name to display in Minecraft, defaults to serverName if not set # serverMOTD: "SleepingServer, waiting for his prince... [MOTD]" # Use Minecraft `server.properties` to overwrite # `serverPort`, `maxPlayers`, `serverOnlineMode`, `useWhitelistFile`, # and `useBlacklistFiles` properties -useNativeFiles: false +#useNativeFiles: false # The port of your Java Edition server (0 to disable) serverPort: 25565 + # The port of your Bedrock Edition server (0 to disable or add `#`) -bedrockPort: 19132 +#bedrockPort: 19132 + # Message shown when the server is off and someone is trying to connect loginMessage: "...Waking server up, come back in a minute..." + # Like in the server.properties, to check the licence of player or not. serverOnlineMode: false + # Use legacy "login" method # https://github.com/PrismarineJS/node-minecraft-protocol/issues/1279#issuecomment-1878866611 -# useLegacyLogin: false +#useLegacyLogin: false + # Maximum amount of players maxPlayers: 20 # Web page port -# webPort: 8080 +#webPort: 8080 + # Stop the web-server when minecraft starts -# webStopOnStart: true +#webStopOnStart: true + # You can specify an absolute path to serve instead or an url to redirect to. # true or false to enable, by default it will serve ./plugins/dynmap/web/ # https://github.com/vincss/mcsleepingserverstarter/wiki/Use-internal-SSS-WebServer-for-dynmap -# webServeDynmap: false +#webServeDynmap: false + # Add a button in the web-ui to restart the minecraft server proxy -# webAllowRestart: false +#webAllowRestart: false # Start the Minecraft Server startMinecraft: true + # Server start command # paper.jar or whatever flavor you like minecraftCommand: "java -jar paper.jar --nogui" + # Set a custom Working Directory for the server (path to minecraft server folder) # Edit this setting only if you know what you are doing! # If you don't know what, don't to edit it. -# minecraftWorkingDirectory: "" +#minecraftWorkingDirectory: "" # Automatically start the real server instead of the sleeping one -minecraftAutostart: false +#minecraftAutostart: false + # Customise the delay between when the minecraft server stops # and the sleeping server restarts (to ensure conection are closed) # in milliseconds restartDelay: 5000 + # Prevent the user to stop the server (trought web-server or cli). -preventStop: false +#preventStop: false # Discord WebHook # https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks @@ -67,14 +80,16 @@ preventStop: false # Only allow these player name on the white list to wake the server up # example ["vincss"] -# whiteListedNames: [""] +#whiteListedNames: [""] + # Use Minecraft `whitelist.json` instead of the `whiteListedNames` property. # Checks both username and UUID useWhitelistFile: false # Prevent connections from those addresses to wake up the server # example ["149.102.143.151", "132.145.71.44", "45.128.232.206", "193.35.18."] -# blackListedAddress: [""] +#blackListedAddress: [""] + # Use Minecraft `banned-ips.json` and `banned-players.json` to prevent players from waking up the server. # Can be used together with `blackListedAddress` property useBlacklistFiles: false @@ -91,7 +106,8 @@ useBlacklistFiles: false # version: false # Hide the ip from the remote player in the logs -hideIpInLogs: true +#hideIpInLogs: true + # Hide pinging logs -hideOnConnectionLogs: true +#hideOnConnectionLogs: true diff --git a/src/sleepingSettings.ts b/src/sleepingSettings.ts index d128d2e..bed824f 100644 --- a/src/sleepingSettings.ts +++ b/src/sleepingSettings.ts @@ -62,7 +62,7 @@ export const DefaultSettings: Settings = { useLegacyLogin: true, startMinecraft: true, // false to disable - minecraftCommand: "java -jar paper.jar nogui", + minecraftCommand: "java -jar paper.jar --nogui", restartDelay: 5000, version: false, useWhitelistFile: false,