Merge pull request #54 from Spongecade/patch-1

Update Minecraft wiki links to new domain

.gitlab-ci.yml

@@ -9,18 +9,16 @@ stages:
 
 # Variable defaults
 variables:
+  RUST_VERSION: stable
   TARGET: x86_64-unknown-linux-gnu
 
-# Rust build cache configuration
-.rust-build-cache: &rust-build-cache
-  key: "$CI_PIPELINE_ID"
-  paths:
-    - target/
-
 # Install build dependencies
 before_script:
   - apt-get update
   - apt-get install -y --no-install-recommends build-essential
+  - |
+    rustup install $RUST_VERSION
+    rustup default $RUST_VERSION
   - |
     rustc --version
     cargo --version
@@ -29,54 +27,39 @@ before_script:
 .before_script-windows: &before_script-windows
   before_script:
     # Install scoop
-    - Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+    - iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
 
     # Install Rust
-    - scoop install rustup
+    - scoop install rustup gcc
+    - rustup install $RUST_VERSION
+    - rustup default $RUST_VERSION
     - rustc --version
     - cargo --version
 
+    # Install proper Rust target
+    - rustup target install x86_64-pc-windows-msvc
+
 # Check on stable, beta and nightly 
 .check-base: &check-base
   stage: check
-  cache:
-    <<: *rust-build-cache
   script:
     - cargo check --verbose
     - cargo check --no-default-features --verbose
     - cargo check --no-default-features --features rcon --verbose
     - cargo check --no-default-features --features lobby --verbose
-check:
+check-stable:
   <<: *check-base
-check-macos:
+check-msrv:
-  tags:
+  <<: *check-base
-    - macos
+  variables:
+    RUST_VERSION: 1.64.0
   only:
     - master
-    - /^v(\d+\.)*\d+$/
-  before_script:
-    - rustup default stable
-    - |
-      rustc --version
-      cargo --version
-  <<: *check-base
-check-windows:
-  stage: check
-  tags:
-    - windows
-  cache: {}
-  <<: *before_script-windows
-  script:
-    - cargo check --locked --verbose
-    - cargo check --locked --no-default-features --features rcon --verbose
-    - cargo check --locked --no-default-features --features rcon,lobby --verbose
 
 # Build using Rust stable on Linux
 build-x86_64-linux-gnu:
   stage: build
   needs: []
-  cache:
-    <<: *rust-build-cache
   script:
     - cargo build --target=$TARGET --release --locked --verbose
     - mv target/$TARGET/release/lazymc ./lazymc-$TARGET
@@ -90,11 +73,12 @@ build-x86_64-linux-gnu:
 # Build a static version
 build-x86_64-linux-musl:
   stage: build
+  only:
+    - master
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   needs: []
   variables:
     TARGET: x86_64-unknown-linux-musl
-  cache:
-    <<: *rust-build-cache
   script:
     - rustup target add $TARGET
     - cargo build --target=$TARGET --release --locked --verbose
@@ -113,11 +97,12 @@ build-x86_64-linux-musl:
 build-armv7-linux-gnu:
   stage: build
   image: ubuntu
+  only:
+    - master
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   needs: []
   variables:
     TARGET: armv7-unknown-linux-gnueabihf
-  cache:
-    <<: *rust-build-cache
   before_script:
     - apt-get update
     - apt-get install -y --no-install-recommends build-essential
@@ -148,11 +133,12 @@ build-armv7-linux-gnu:
 build-aarch64-linux-gnu:
   stage: build
   image: ubuntu
+  only:
+    - master
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   needs: []
   variables:
     TARGET: aarch64-unknown-linux-gnu
-  cache:
-    <<: *rust-build-cache
   before_script:
     - apt-get update
     - apt-get install -y --no-install-recommends build-essential
@@ -179,36 +165,14 @@ build-aarch64-linux-gnu:
       - lazymc-$TARGET
     expire_in: 1 month
 
-# Build using Rust stable on macOS
-build-macos:
-  stage: build
-  tags:
-    - macos
-  only:
-    - master
-    - /^v(\d+\.)*\d+$/
-  needs: []
-  variables:
-    TARGET: x86_64-apple-darwin
-  before_script:
-    - rustup default stable
-    - |
-      rustc --version
-      cargo --version
-  script:
-    - cargo build --target=$TARGET --release --locked --verbose
-    - mv target/$TARGET/release/lazymc ./lazymc-$TARGET
-  artifacts:
-    name: lazymc-x86_64-macos
-    paths:
-      - lazymc-$TARGET
-    expire_in: 1 month
-
 # Build using Rust stable on Windows
 build-x86_64-windows:
   stage: build
   tags:
     - windows
+  only:
+    - master
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   needs: []
   variables:
     TARGET: x86_64-pc-windows-msvc
@@ -225,29 +189,28 @@ build-x86_64-windows:
 # Run the unit tests through Cargo on Linux
 test-cargo-x86_64-linux-gnu:
   stage: test
+  only:
+    - master
   needs: []
   dependencies: []
-  cache:
-    <<: *rust-build-cache
   script:
     - cargo test --locked --verbose
     - cargo test --locked --no-default-features --verbose
     - cargo test --locked --no-default-features --features rcon --verbose
     - cargo test --locked --no-default-features --features lobby --verbose
 
-# Run the unit tests through Cargo on Windows
+# # Run the unit tests through Cargo on Windows
-test-cargo-x86_64-windows:
+# test-cargo-x86_64-windows:
-  stage: test
+#   stage: test
-  tags:
+#   tags:
-    - windows
+#     - windows
-  needs: []
+#   needs: []
-  dependencies: []
+#   dependencies: []
-  cache: {}
+#   <<: *before_script-windows
-  <<: *before_script-windows
+#   script:
-  script:
+#     - cargo test --locked --verbose
-    - cargo test --locked --verbose
+#     - cargo test --locked --no-default-features --features rcon --verbose
-    - cargo test --locked --no-default-features --features rcon --verbose
+#     - cargo test --locked --no-default-features --features rcon,lobby --verbose
-    - cargo test --locked --no-default-features --features rcon,lobby --verbose
 
 # Release binaries on GitLab as generic package
 release-gitlab-generic-package:
@@ -258,16 +221,14 @@ release-gitlab-generic-package:
     - build-x86_64-linux-musl
     - build-armv7-linux-gnu
     - build-aarch64-linux-gnu
-    - build-macos
     - build-x86_64-windows
   only:
-    - /^v(\d+\.)*\d+$/
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   variables:
     LINUX_GNU_BIN: "lazymc-x86_64-unknown-linux-gnu"
     LINUX_MUSL_BIN: "lazymc-x86_64-unknown-linux-musl"
     LINUX_ARMV7_GNU_BIN: "lazymc-armv7-unknown-linux-gnueabihf"
     LINUX_AARCH64_GNU_BIN: "lazymc-aarch64-unknown-linux-gnu"
-    MACOS_BIN: "lazymc-x86_64-apple-darwin"
     WINDOWS_BIN: "lazymc-x86_64-pc-windows-msvc.exe"
   before_script: []
   script:
@@ -284,8 +245,6 @@ release-gitlab-generic-package:
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${LINUX_ARMV7_GNU_BIN} ${PACKAGE_REGISTRY_URL}/${LINUX_ARMV7_GNU_BIN}
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${LINUX_AARCH64_GNU_BIN} ${PACKAGE_REGISTRY_URL}/${LINUX_AARCH64_GNU_BIN}
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${MACOS_BIN} ${PACKAGE_REGISTRY_URL}/${MACOS_BIN}
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${WINDOWS_BIN} ${PACKAGE_REGISTRY_URL}/${WINDOWS_BIN}
 
@@ -294,13 +253,12 @@ release-gitlab-release:
   image: registry.gitlab.com/gitlab-org/release-cli
   stage: release
   only:
-    - /^v(\d+\.)*\d+$/
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   variables:
     LINUX_GNU_BIN: "lazymc-x86_64-unknown-linux-gnu"
     LINUX_MUSL_BIN: "lazymc-x86_64-unknown-linux-musl"
     LINUX_ARMV7_GNU_BIN: "lazymc-armv7-unknown-linux-gnueabihf"
     LINUX_AARCH64_GNU_BIN: "lazymc-aarch64-unknown-linux-gnu"
-    MACOS_BIN: "lazymc-x86_64-apple-darwin"
     WINDOWS_BIN: "lazymc-x86_64-pc-windows-msvc.exe"
   before_script: []
   script:
@@ -315,20 +273,18 @@ release-gitlab-release:
         --assets-link "{\"name\":\"${LINUX_MUSL_BIN}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_MUSL_BIN}\"}" \
         --assets-link "{\"name\":\"${LINUX_ARMV7_GNU_BIN}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_ARMV7_GNU_BIN}\"}" \
         --assets-link "{\"name\":\"${LINUX_AARCH64_GNU_BIN}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_AARCH64_GNU_BIN}\"}" \
-        --assets-link "{\"name\":\"${MACOS_BIN}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_BIN}\"}" \
         --assets-link "{\"name\":\"${WINDOWS_BIN}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WINDOWS_BIN}\"}"
 
 # Publish GitHub release
 release-github:
   stage: release
   only:
-    - /^v(\d+\.)*\d+$/
+    - /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
   dependencies:
     - build-x86_64-linux-gnu
     - build-x86_64-linux-musl
     - build-armv7-linux-gnu
     - build-aarch64-linux-gnu
-    - build-macos
     - build-x86_64-windows
   before_script: []
   script:
@@ -347,5 +303,4 @@ release-github:
     - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo lazymc --tag "$CI_COMMIT_REF_NAME" --file ./lazymc-x86_64-unknown-linux-musl --name lazymc-$CI_COMMIT_REF_NAME-linux-x64-static
     - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo lazymc --tag "$CI_COMMIT_REF_NAME" --file ./lazymc-armv7-unknown-linux-gnueabihf --name lazymc-$CI_COMMIT_REF_NAME-linux-armv7
     - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo lazymc --tag "$CI_COMMIT_REF_NAME" --file ./lazymc-aarch64-unknown-linux-gnu --name lazymc-$CI_COMMIT_REF_NAME-linux-aarch64
-    - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo lazymc --tag "$CI_COMMIT_REF_NAME" --file ./lazymc-x86_64-apple-darwin --name lazymc-$CI_COMMIT_REF_NAME-macos
     - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo lazymc --tag "$CI_COMMIT_REF_NAME" --file ./lazymc-x86_64-pc-windows-msvc.exe --name lazymc-$CI_COMMIT_REF_NAME-windows.exe

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.2.10 (2023-02-20)
+
+- Do not report an error when server exits with status code 143
+
+## 0.2.9 (2023-02-14)
+
+- Fix dropping all connections when `server.drop_banned_ips` was enabled
+- Update dependencies
+
+## 0.2.8 (2023-01-30)
+
+- Add `freeze_process` feature on Unix platforms to freeze a sleeping server
+  rather than shutting it down.
+- Update default Minecraft version to 1.19.3
+- Remove macOS builds from releases, users can compile from source
+- Update dependencies
+
+## 0.2.7 (2021-12-13)
+
+- Update default Minecraft version to 1.18.1
+- Update dependencies
+
 ## 0.2.6 (2021-11-28)
 
 - Add whitelist support, use server whitelist to prevent unknown users from waking server

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lazymc"
-version = "0.2.6"
+version = "0.2.10"
 authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"]
 license = "GPL-3.0"
 readme = "README.md"
@@ -8,16 +8,15 @@ homepage = "https://timvisee.com/projects/lazymc"
 repository = "https://gitlab.com/timvisee/lazymc"
 description = "Put your Minecraft server to rest when idle."
 keywords = ["minecraft", "server", "idle", "cli"]
-categories = [
+categories = ["command-line-interface", "games"]
-    "command-line-interface",
+exclude = ["/.github", "/contrib"]
-    "games",
-]
-exclude = [
-    "/.github",
-    "/contrib",
-]
 edition = "2021"
 
+[profile.release]
+codegen-units = 1
+lto = true
+strip = true
+
 [features]
 default = ["rcon", "lobby"]
 
@@ -32,18 +31,28 @@ lobby = ["md-5", "uuid"]
 
 [dependencies]
 anyhow = "1.0"
-base64 = "0.13"
+base64 = "0.21"
 bytes = "1.1"
 chrono = "0.4"
-clap = { version = "3.0.0-beta.5", default-features = false, features = [ "std", "cargo", "color", "env", "suggestions", "unicode" ]}
+clap = { version = "4.0.32", default-features = false, features = [
+    "std",
+    "help",
+    "suggestions",
+    "color",
+    "usage",
+    "cargo",
+    "env",
+    "unicode",
+] }
 colored = "2.0"
-derive_builder = "0.10"
+derive_builder = "0.12"
 dotenv = "0.15"
 flate2 = { version = "1.0", default-features = false, features = ["default"] }
 futures = { version = "0.3", default-features = false, features = ["executor"] }
 log = "0.4"
 minecraft-protocol = { git = "https://github.com/timvisee/rust-minecraft-protocol", rev = "edfdf87" }
 named-binary-tag = "0.6"
+nix = "0.26"
 notify = "4.0"
 pretty_env_logger = "0.4"
 proxy-protocol = "0.5"
@@ -53,7 +62,17 @@ serde = "1.0"
 serde_json = "1.0"
 shlex = "1.1"
 thiserror = "1.0"
-tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "io-util", "net", "macros", "time", "process", "signal", "sync", "fs"] }
+tokio = { version = "1", default-features = false, features = [
+    "rt-multi-thread",
+    "io-util",
+    "net",
+    "macros",
+    "time",
+    "process",
+    "signal",
+    "sync",
+    "fs",
+] }
 toml = "0.5"
 version-compare = "0.1"
 
@@ -62,11 +81,17 @@ rust_rcon = { package = "rcon", version = "0.5.2", optional = true }
 async-std = { version = "1.9.0", default-features = false, optional = true }
 
 # Feature: lobby
-md-5 = { version = "0.9", optional = true }
+md-5 = { version = "0.10", optional = true }
 uuid = { version = "0.7", optional = true, features = ["v3"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["winuser", "processthreadsapi", "handleapi", "ntdef", "minwindef"] }
+winapi = { version = "0.3", features = [
+    "winuser",
+    "processthreadsapi",
+    "handleapi",
+    "ntdef",
+    "minwindef",
+] }

README.md

@@ -55,6 +55,10 @@ https://user-images.githubusercontent.com/856222/141378688-882082be-9efa-4cfe-81
 - Minecraft Java Edition 1.6+
 - On Windows: RCON (automatically managed)
 
+Build requirements:
+
+- Rust 1.64 (MSRV)
+
 _Note: You must have access to the system to run the `lazymc` binary. If you're
 using a Minecraft shared hosting provider with a custom dashboard, you likely
 won't be able to set this up._
@@ -67,7 +71,8 @@ _Note: these instructions are for Linux & macOS, for Windows look
 Make sure you meet all [requirements](#requirements).
 
 Download the appropriate binary for your system from the [latest
-release][latest-release] page.
+release][latest-release] page. On macOS you must [compile from
+source](#compile-from-source).
 
 Place the binary in your Minecraft server directory, rename it if you like.
 Open a terminal, go to the directory, and make sure you can invoke it:

build.rs

@@ -0,0 +1,7 @@
+fn main() {
+    // rcon is required on Windows
+    #[cfg(all(windows, not(feature = "rcon")))]
+    {
+        compile_error!("required feature missing on Windows: rcon");
+    }
+}

clippy.toml

@@ -0,0 +1 @@
+msrv = "1.64.0"

docs/join-method-lobby.md

@@ -62,15 +62,18 @@ Then configure the lobby to your likings:
 # The client will be teleported to the real server once it is ready.
 # This may keep the client occupied forever if no timeout is set.
 # Consumes client, not allowing other join methods afterwards.
+# See: https://git.io/JMIi4
 
 # !!! WARNING !!!
-# This is highly experimental and unstable.
+# This is highly experimental, incomplete and unstable.
 # This may break the game and crash clients.
 # Don't enable this unless you know what you're doing.
 #
-# - Only works with offline mode
+# - Server must be in offline mode
-# - Only works with vanilla Minecraft clients, does not work with modded
+# - Server must use Minecraft version 1.16.3 to 1.17.1 (tested with 1.17.1)
-# - Only tested with Minecraft 1.17.1
+# - Server must use vanilla Minecraft
+#   - May work with Forge, enable in config, depends on used mods, test before use
+#   - Does not work with other mods, such as FTB
 
 # Maximum time in seconds in the lobby while the server starts.
 timeout = 600

docs/protocol-version.md

@@ -21,8 +21,8 @@ In lazymc you may configure what protocol version to use:
 # Server version & protocol hint.
 # Sent to clients until actual server version is known.
 # See: https://git.io/J1Fvx
-version = "1.17.1"
+version = "1.19.3"
-protocol = 756
+protocol = 761
 
 # -- snip --
 ```

docs/usage-windows.md

@@ -14,7 +14,7 @@ Open a terminal, go to the server directory, and make sure you can execute it:
 .\lazymc --help
 ```
 
-When lazymc is ready, set up the [configuration](./res/lazymc.toml) and start it
+When lazymc is ready, set up the [configuration](../res/lazymc.toml) and start it
 up:
 
 ```bash

res/lazymc.toml

@@ -18,8 +18,8 @@
 # Server version & protocol hint.
 # Sent to clients until actual server version is known.
 # See: https://git.io/J1Fvx
-#version = "1.17.1"
+#version = "1.19.3"
-#protocol = 756
+#protocol = 761
 
 [server]
 # Server address. Internal IP and port of server started by lazymc to proxy to.
@@ -33,6 +33,10 @@ directory = "."
 # Warning: if using a bash script read: https://git.io/JMIKH
 command = "java -Xmx1G -Xms1G -jar server.jar --nogui"
 
+# Freeze the server process instead of restarting it when no players online, making it resume faster.
+# Only works on Unix (Linux or MacOS), ignored on Windows
+#freeze_process = true
+
 # Immediately wake server when starting lazymc.
 #wake_on_start = false
 
@@ -183,4 +187,4 @@ command = "java -Xmx1G -Xms1G -jar server.jar --nogui"
 [config]
 # lazymc version this configuration is for.
 # Don't change unless you know what you're doing.
-version = "0.2.6"
+version = "0.2.10"

src/action/config_generate.rs

@@ -9,7 +9,7 @@ use crate::util::error::{quit, quit_error, ErrorHintsBuilder};
 /// Invoke config test command.
 pub fn invoke(matches: &ArgMatches) {
     // Get config path, attempt to canonicalize
-    let mut path = PathBuf::from(matches.value_of("config").unwrap());
+    let mut path = PathBuf::from(matches.get_one::<String>("config").unwrap());
     if let Ok(p) = path.canonicalize() {
         path = p;
     }

src/action/config_test.rs

@@ -8,7 +8,7 @@ use crate::util::error::{quit_error, quit_error_msg, ErrorHintsBuilder};
 /// Invoke config test command.
 pub fn invoke(matches: &ArgMatches) {
     // Get config path, attempt to canonicalize
-    let mut path = PathBuf::from(matches.value_of("config").unwrap());
+    let mut path = PathBuf::from(matches.get_one::<String>("config").unwrap());
     if let Ok(p) = path.canonicalize() {
         path = p;
     }

src/cli.rs

@@ -1,23 +1,28 @@
-use clap::{App, AppSettings, Arg};
+use clap::{Arg, Command};
 
 /// The clap app for CLI argument parsing.
-pub fn app() -> App<'static> {
+pub fn app() -> Command {
-    App::new(crate_name!())
+    Command::new(crate_name!())
         .version(crate_version!())
         .author(crate_authors!())
         .about(crate_description!())
         .subcommand(
-            App::new("start")
+            Command::new("start")
                 .alias("run")
                 .about("Start lazymc and server (default)"),
         )
         .subcommand(
-            App::new("config")
+            Command::new("config")
                 .alias("cfg")
                 .about("Config actions")
-                .setting(AppSettings::SubcommandRequiredElseHelp)
+                .arg_required_else_help(true)
-                .subcommand(App::new("generate").alias("gen").about("Generate config"))
+                .subcommand_required(true)
-                .subcommand(App::new("test").about("Test config")),
+                .subcommand(
+                    Command::new("generate")
+                        .alias("gen")
+                        .about("Generate config"),
+                )
+                .subcommand(Command::new("test").about("Test config")),
         )
         .arg(
             Arg::new("config")
@@ -27,7 +32,7 @@ pub fn app() -> App<'static> {
                 .global(true)
                 .value_name("FILE")
                 .default_value(crate::config::CONFIG_FILE)
-                .about("Use config file")
+                .help("Use config file")
-                .takes_value(true),
+                .num_args(1),
         )
 }

src/config.rs

@@ -15,14 +15,14 @@ use crate::util::serde::to_socket_addrs;
 pub const CONFIG_FILE: &str = "lazymc.toml";
 
 /// Configuration version user should be using, or warning will be shown.
-const CONFIG_VERSION: &str = "0.2.6";
+const CONFIG_VERSION: &str = "0.2.8";
 
 /// Load config from file, based on CLI arguments.
 ///
 /// Quits with an error message on failure.
 pub fn load(matches: &ArgMatches) -> Config {
     // Get config path, attempt to canonicalize
-    let mut path = PathBuf::from(matches.value_of("config").unwrap());
+    let mut path = PathBuf::from(matches.get_one::<String>("config").unwrap());
     if let Ok(p) = path.canonicalize() {
         path = p;
     }
@@ -174,6 +174,11 @@ pub struct Server {
     )]
     pub address: SocketAddr,
 
+    /// Freeze the server process instead of restarting it when no players online, making it start up faster.
+    /// Only works on Unix (Linux or MacOS)
+    #[serde(default = "bool_true")]
+    pub freeze_process: bool,
+
     /// Immediately wake server when starting lazymc.
     #[serde(default)]
     pub wake_on_start: bool,
@@ -478,19 +483,13 @@ impl Default for Advanced {
 }
 
 /// Config configuration.
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Default)]
 #[serde(default)]
 pub struct ConfigConfig {
     /// Configuration for lazymc version.
     pub version: Option<String>,
 }
 
-impl Default for ConfigConfig {
-    fn default() -> Self {
-        Self { version: None }
-    }
-}
-
 fn option_pathbuf_dot() -> Option<PathBuf> {
     Some(".".into())
 }

src/lobby.rs

@@ -42,7 +42,7 @@ const SERVER_JOIN_GAME_TIMEOUT: Duration = Duration::from_secs(20);
 ///
 /// Notchian servers are slow, we must wait a little before sending play packets, because the
 /// server needs time to transition the client into this state.
-/// See warning at: https://wiki.vg/Protocol#Login_Success
+/// See warning at: <https://wiki.vg/Protocol#Login_Success>
 const SERVER_WARMUP: Duration = Duration::from_secs(1);
 
 /// Serve lobby service for given client connection.

src/main.rs

@@ -29,7 +29,7 @@ pub(crate) mod util;
 
 use std::env;
 
-use clap::App;
+use clap::Command;
 
 // Compile time feature compatability check.
 #[cfg(all(windows, not(feature = "rcon")))]
@@ -63,7 +63,7 @@ fn init_log() {
 }
 
 /// Invoke an action.
-fn invoke_action(app: App) -> Result<(), ()> {
+fn invoke_action(app: Command) -> Result<(), ()> {
     let matches = app.get_matches();
 
     // Config operations

src/mc/favicon.rs

@@ -1,3 +1,5 @@
+use base64::Engine;
+
 use crate::proto::client::ClientInfo;
 
 /// Protocol version since when favicons are supported.
@@ -12,7 +14,11 @@ pub fn default_favicon() -> String {
 ///
 /// This assumes the favicon data to be a valid PNG image.
 pub fn encode_favicon(data: &[u8]) -> String {
-    format!("{}{}", "data:image/png;base64,", base64::encode(data))
+    format!(
+        "{}{}",
+        "data:image/png;base64,",
+        base64::engine::general_purpose::STANDARD.encode(data)
+    )
 }
 
 /// Check whether the status response favicon is supported based on the given client info.

src/mc/server_properties.rs

@@ -114,7 +114,7 @@ fn rewrite_contents(contents: String, mut changes: HashMap<&str, String>) -> Opt
             }
 
             // Try to split property
-            let (key, value) = match line.split_once("=") {
+            let (key, value) = match line.split_once('=') {
                 Some(result) => result,
                 None => return line,
             };
@@ -122,7 +122,7 @@ fn rewrite_contents(contents: String, mut changes: HashMap<&str, String>) -> Opt
             // Take any new value, and update it
             if let Some((_, new)) = changes.remove_entry(key.trim().to_lowercase().as_str()) {
                 if value != new {
-                    line = format!("{}={}", key, new);
+                    line = format!("{key}={new}");
                     changed = true;
                 }
             }
@@ -134,7 +134,7 @@ fn rewrite_contents(contents: String, mut changes: HashMap<&str, String>) -> Opt
 
     // Append any missed changes
     for (key, value) in changes {
-        new_contents += &format!("{}{}={}", EOL, key, value);
+        new_contents += &format!("{EOL}{key}={value}");
         changed = true;
     }
 

src/mc/uuid.rs

@@ -11,14 +11,14 @@ fn player_uuid(username: &str) -> Uuid {
 
 /// Get UUID for given offline player username.
 pub fn offline_player_uuid(username: &str) -> Uuid {
-    player_uuid(&format!("{}{}", OFFLINE_PLAYER_NAMESPACE, username))
+    player_uuid(&format!("{OFFLINE_PLAYER_NAMESPACE}{username}"))
 }
 
 /// Java's `UUID.nameUUIDFromBytes`
 ///
 /// Static factory to retrieve a type 3 (name based) `Uuid` based on the specified byte array.
 ///
-/// Ported from: https://git.io/J1b6A
+/// Ported from: <https://git.io/J1b6A>
 fn java_name_uuid_from_bytes(data: &[u8]) -> Uuid {
     let mut hasher = Md5::new();
     hasher.update(data);

src/monitor.rs

@@ -57,13 +57,13 @@ pub async fn monitor_server(config: Arc<Config>, server: Arc<Server>) {
 
         // Sleep server when it's bedtime
         if server.should_sleep(&config).await {
-            info!(target: "lazymc::montior", "Server has been idle, sleeping...");
+            info!(target: "lazymc::monitor", "Server has been idle, sleeping...");
             server.stop(&config).await;
         }
 
         // Check whether we should force kill server
         if server.should_kill().await {
-            error!(target: "lazymc::montior", "Force killing server, took too long to start or stop");
+            error!(target: "lazymc::monitor", "Force killing server, took too long to start or stop");
             if !server.force_kill().await {
                 warn!(target: "lazymc", "Failed to force kill server");
             }

src/os/mod.rs

@@ -1,17 +1,16 @@
-#[cfg(unix)]
-pub mod unix;
 #[cfg(windows)]
 pub mod windows;
 
+#[cfg(unix)]
+use nix::{sys::signal, unistd::Pid};
+
 /// Force kill process.
 ///
 /// Results in undefined behavior if PID is invalid.
 #[allow(unreachable_code)]
 pub fn force_kill(pid: u32) -> bool {
     #[cfg(unix)]
-    unsafe {
+    return unix_signal(pid, signal::SIGKILL);
-        return unix::force_kill(pid);
-    }
 
     #[cfg(windows)]
     unsafe {
@@ -22,20 +21,57 @@ pub fn force_kill(pid: u32) -> bool {
 }
 
 /// Gracefully kill process.
-///
 /// Results in undefined behavior if PID is invalid.
 ///
 /// # Panics
-///
 /// Panics on platforms other than Unix.
 #[allow(unreachable_code, dead_code, unused_variables)]
 pub fn kill_gracefully(pid: u32) -> bool {
     #[cfg(unix)]
-    unsafe {
+    return unix_signal(pid, signal::SIGTERM);
-        return unix::kill_gracefully(pid);
-    }
 
     unimplemented!(
         "gracefully killing Minecraft server process not implemented on non-Unix platforms"
     );
 }
+
+/// Freeze process.
+/// Results in undefined behavior if PID is invaild.
+///
+/// # Panics
+/// Panics on platforms other than Unix.
+#[allow(unreachable_code)]
+pub fn freeze(pid: u32) -> bool {
+    #[cfg(unix)]
+    return unix_signal(pid, signal::SIGSTOP);
+
+    unimplemented!(
+        "freezing the Minecraft server process is not implemented on non-Unix platforms"
+    );
+}
+
+/// Unfreeze process.
+/// Results in undefined behavior if PID is invaild.
+///
+/// # Panics
+/// Panics on platforms other than Unix.
+#[allow(unreachable_code)]
+pub fn unfreeze(pid: u32) -> bool {
+    #[cfg(unix)]
+    return unix_signal(pid, signal::SIGCONT);
+
+    unimplemented!(
+        "unfreezing the Minecraft server process is not implemented on non-Unix platforms"
+    );
+}
+
+#[cfg(unix)]
+pub fn unix_signal(pid: u32, signal: signal::Signal) -> bool {
+    return match signal::kill(Pid::from_raw(pid as i32), signal) {
+        Ok(()) => true,
+        Err(err) => {
+            warn!(target: "lazymc", "Sending {signal} signal to server failed: {err}");
+            false
+        }
+    };
+}

src/os/unix.rs

@@ -1,27 +0,0 @@
-/// Force kill process on Unix by sending SIGKILL.
-///
-/// This is unsafe because the PID isn't checked.
-pub unsafe fn force_kill(pid: u32) -> bool {
-    debug!(target: "lazymc", "Sending SIGKILL signal to {} to kill server", pid);
-    let result = libc::kill(pid as i32, libc::SIGKILL);
-
-    if result != 0 {
-        trace!(target: "lazymc", "SIGKILL failed: {}", result);
-    }
-
-    result == 0
-}
-
-/// Gracefully kill process on Unix by sending SIGTERM.
-///
-/// This is unsafe because the PID isn't checked.
-pub unsafe fn kill_gracefully(pid: u32) -> bool {
-    debug!(target: "lazymc", "Sending SIGTERM signal to {} to kill server", pid);
-    let result = libc::kill(pid as i32, libc::SIGTERM);
-
-    if result != 0 {
-        warn!(target: "lazymc", "Sending SIGTERM signal to server failed: {}", result);
-    }
-
-    result == 0
-}

src/probe.rs

@@ -157,11 +157,7 @@ async fn connect_to_server_no_timeout(
 
     // Select server address to use, add magic if Forge
     let server_addr = if config.server.forge {
-        format!(
+        format!("{}{}", config.server.address.ip(), forge::STATUS_MAGIC)
-            "{}{}",
-            config.server.address.ip().to_string(),
-            forge::STATUS_MAGIC,
-        )
     } else {
         config.server.address.ip().to_string()
     };

src/proto/mod.rs

@@ -9,7 +9,7 @@ pub mod packets;
 /// in the configuration.
 ///
 /// Should be kept up-to-date with latest supported Minecraft version by lazymc.
-pub const PROTO_DEFAULT_VERSION: &str = "1.17.1";
+pub const PROTO_DEFAULT_VERSION: &str = "1.19.3";
 
 /// Default minecraft protocol version.
 ///
@@ -17,7 +17,7 @@ pub const PROTO_DEFAULT_VERSION: &str = "1.17.1";
 /// in the configuration.
 ///
 /// Should be kept up-to-date with latest supported Minecraft version by lazymc.
-pub const PROTO_DEFAULT_PROTOCOL: u32 = 756;
+pub const PROTO_DEFAULT_PROTOCOL: u32 = 761;
 
 /// Compression threshold to use.
 // TODO: read this from server.properties instead

src/proto/packets/play/title.rs

@@ -70,7 +70,7 @@ async fn send_v1_16_3(
     packet::write_packet(
         Title {
             action: if title.is_empty() && subtitle.is_empty() {
-                // Defaults: https://minecraft.fandom.com/wiki/Commands/title#Detail
+                // Defaults: https://minecraft.wiki/w/Commands/title#Detail
                 TitleAction::SetTimesAndDisplay {
                     fade_in: 10,
                     stay: 70,
@@ -121,7 +121,7 @@ async fn send_v1_17(
     // Set title times
     packet::write_packet(
         if title.is_empty() && subtitle.is_empty() {
-            // Defaults: https://minecraft.fandom.com/wiki/Commands/title#Detail
+            // Defaults: https://minecraft.wiki/w/Commands/title#Detail
             SetTitleTimes {
                 fade_in: 10,
                 stay: 70,

src/server.rs

@@ -29,9 +29,11 @@ const SERVER_QUIT_COOLDOWN: Duration = Duration::from_millis(2500);
 #[cfg(feature = "rcon")]
 const RCON_COOLDOWN: Duration = Duration::from_secs(15);
 
-/// Exit code when SIGTERM is received on Unix.
+/// Exit codes that are allowed.
-#[cfg(unix)]
+///
-const UNIX_EXIT_SIGTERM: i32 = 130;
+/// - 143: https://github.com/timvisee/lazymc/issues/26#issuecomment-1435670029
+/// - 130: https://unix.stackexchange.com/q/386836/61092
+const ALLOWED_EXIT_CODES: [i32; 2] = [130, 143];
 
 /// Shared server state.
 #[derive(Debug)]
@@ -217,9 +219,14 @@ impl Server {
             None => info!(target: "lazymc", "Starting server..."),
         }
 
+        // Unfreeze server if it is frozen
+        #[cfg(unix)]
+        if config.server.freeze_process && unfreeze_server_signal(&config, &server).await {
+            return true;
+        }
+
         // Spawn server in new task
         Self::spawn_server_task(config, server);
-
         true
     }
 
@@ -235,6 +242,12 @@ impl Server {
     /// This will attempt to stop the server with all available methods.
     #[allow(unused_variables)]
     pub async fn stop(&self, config: &Config) -> bool {
+        // Try to freeze through signal
+        #[cfg(unix)]
+        if config.server.freeze_process && freeze_server_signal(config, self).await {
+            return true;
+        }
+
         // Try to stop through RCON if started
         #[cfg(feature = "rcon")]
         if self.state() == State::Started && stop_server_rcon(config, self).await {
@@ -485,8 +498,12 @@ pub async fn invoke_server_cmd(
             debug!(target: "lazymc", "Server process stopped successfully ({})", status);
             false
         }
-        #[cfg(unix)]
+        Ok(status)
-        Ok(status) if status.code() == Some(UNIX_EXIT_SIGTERM) => {
+            if status
+                .code()
+                .map(|ref code| ALLOWED_EXIT_CODES.contains(code))
+                .unwrap_or(false) =>
+        {
             debug!(target: "lazymc", "Server process stopped successfully by SIGTERM ({})", status);
             false
         }
@@ -586,13 +603,11 @@ async fn stop_server_signal(config: &Config, server: &Server) -> bool {
         }
     };
 
-    // Send kill signal
     if !crate::os::kill_gracefully(pid) {
         error!(target: "lazymc", "Failed to send stop signal to server process");
         return false;
     }
 
-    // Update from starting/started to stopping
     server
         .update_state_from(Some(State::Starting), State::Stopping, config)
         .await;
@@ -602,3 +617,59 @@ async fn stop_server_signal(config: &Config, server: &Server) -> bool {
 
     true
 }
+
+/// Freeze server by sending SIGSTOP signal.
+///
+/// Only available on Unix.
+#[cfg(unix)]
+async fn freeze_server_signal(config: &Config, server: &Server) -> bool {
+    // Grab PID
+    let pid = match *server.pid.lock().await {
+        Some(pid) => pid,
+        None => {
+            debug!(target: "lazymc", "Could not send freeze signal to server process, PID unknown");
+            return false;
+        }
+    };
+
+    if !os::freeze(pid) {
+        error!(target: "lazymc", "Failed to send freeze signal to server process.");
+    }
+
+    server
+        .update_state_from(Some(State::Starting), State::Stopped, config)
+        .await;
+    server
+        .update_state_from(Some(State::Started), State::Stopped, config)
+        .await;
+
+    true
+}
+
+/// Unfreeze server by sending SIGCONT signal.
+///
+/// Only available on Unix.
+#[cfg(unix)]
+async fn unfreeze_server_signal(config: &Config, server: &Server) -> bool {
+    // Grab PID
+    let pid = match *server.pid.lock().await {
+        Some(pid) => pid,
+        None => {
+            debug!(target: "lazymc", "Could not send unfreeze signal to server process, PID unknown");
+            return false;
+        }
+    };
+
+    if !os::unfreeze(pid) {
+        error!(target: "lazymc", "Failed to send unfreeze signal to server process.");
+    }
+
+    server
+        .update_state_from(Some(State::Stopping), State::Starting, config)
+        .await;
+    server
+        .update_state_from(Some(State::Stopped), State::Starting, config)
+        .await;
+
+    true
+}

src/service/file_watcher.rs

@@ -151,10 +151,9 @@ fn reload_whitelist(config: &Config, server: &Server, dir: &Path) {
     }
 
     // Must be enabled in server.properties
-    let enabled =
+    let enabled = server_properties::read_property(dir.join(server_properties::FILE), "white-list")
-        server_properties::read_property(&dir.join(server_properties::FILE), "white-list")
+        .map(|v| v.trim() == "true")
-            .map(|v| v.trim() == "true")
+        .unwrap_or(false);
-            .unwrap_or(false);
     if !enabled {
         server.set_whitelist_blocking(None);
         debug!(target: "lazymc", "Not using whitelist, not enabled in {}", server_properties::FILE);

src/service/server.rs

@@ -84,7 +84,7 @@ fn route(inbound: TcpStream, config: Arc<Config>, server: Arc<Server>) {
 
     // Check ban state, just drop connection if enabled
     let banned = server.is_banned_ip_blocking(&peer.ip());
-    if config.server.drop_banned_ips {
+    if banned && config.server.drop_banned_ips {
         info!(target: "lazymc", "Connection from banned IP {}, dropping", peer.ip());
         return;
     }

src/status.rs

@@ -152,12 +152,8 @@ pub async fn serve(
                         info!(target: "lazymc", "Login from banned IP {}, disconnecting", client.peer.ip());
                         DEFAULT_BAN_REASON.to_string()
                     };
-                    action::kick(
+                    action::kick(&client, &format!("{BAN_MESSAGE_PREFIX}{msg}"), &mut writer)
-                        &client,
+                        .await?;
-                        &format!("{}{}", BAN_MESSAGE_PREFIX, msg),
-                        &mut writer,
-                    )
-                    .await?;
                     break;
                 }
             }

src/util/cli.rs

@@ -10,7 +10,7 @@ use crate::util::error::{quit_error, ErrorHints};
 /// excluding the `:` suffix.
 pub fn prompt(msg: &str) -> String {
     // Show the prompt
-    eprint!("{}: ", msg);
+    eprint!("{msg}: ");
     let _ = stderr().flush();
 
     // Get the input
@@ -49,7 +49,7 @@ pub fn prompt_yes(msg: &str, def: Option<bool>) -> bool {
     );
 
     // Get the user input
-    let answer = prompt(&format!("{} {}", msg, options));
+    let answer = prompt(&format!("{msg} {options}"));
 
     // Assume the default if the answer is empty
     if answer.is_empty() {

src/util/error.rs

@@ -16,7 +16,7 @@ pub fn print_error(err: anyhow::Error) {
     // Report each printable error, count them
     let count = err
         .chain()
-        .map(|err| format!("{}", err))
+        .map(|err| err.to_string())
         .filter(|err| !err.is_empty())
         .enumerate()
         .map(|(i, err)| {
@@ -126,7 +126,7 @@ impl ErrorHints {
         if self.config_generate {
             eprintln!(
                 "Use '{}' to generate a new config file",
-                highlight(&format!("{} config generate", bin))
+                highlight(&format!("{bin} config generate"))
             );
         }
         if self.config {
@@ -138,7 +138,7 @@ impl ErrorHints {
         if self.config_test {
             eprintln!(
                 "Use '{}' to test a config file",
-                highlight(&format!("{} config test -c FILE", bin))
+                highlight(&format!("{bin} config test -c FILE"))
             );
         }
         if self.verbose {