Merge branch '1.21.4' into 1.21.11

# Conflicts:
#	build.gradle.kts

Author: rfresh2

.github/workflows/act-build-launcher.yml

@@ -70,6 +70,73 @@ jobs:
           path: ZenithProxy-${{ matrix.artifact-name }}.sha1
           if-no-files-found: error
 
+  build-alpine:
+    env:
+      pyinstaller_version: "6.18.0"
+      UV_PYTHON: '3.14.2'
+    runs-on: ${{ matrix.os }}
+    container:
+      image: ${{ matrix.image || '' }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ 'ubuntu-latest']
+        include:
+          - os: 'ubuntu-latest'
+            image: 'node:24-alpine3.23'
+            artifact-name: 'launcher-alpine-amd64'
+            sha1-command: 'sha1sum -b dist/launch | cut -d" " -f 1'
+    steps:
+      - name: Install Deps
+        run: apk add zip bash build-base ca-certificates curl gcc git libc-dev libffi-dev libgcc make musl-dev openssl openssl-dev zlib-dev
+
+      - name: Check out repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Install PyInstaller
+        run: |
+          uv tool install pyinstaller@${{ env.pyinstaller_version }}
+
+      - name: Build launcher
+        run: >
+          uv tool run --with-requirements src/launcher/requirements.txt --upgrade
+          pyinstaller@${{ env.pyinstaller_version }} --specpath ./build
+          -p ./src/launcher --onefile
+          --runtime-tmpdir .launcher.tmp
+          --noconfirm
+          -i ../src/launcher/icon.ico
+          ./src/launcher/__main__.py
+
+      - name: Rename executable
+        run: |
+          mv dist/__main__ dist/launch
+
+      - name: Create zip
+        run: |
+          zip -j dist/ZenithProxy-${{ matrix.artifact-name }}.zip dist/launch
+
+      - name: Upload Binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: dist/ZenithProxy-${{ matrix.artifact-name }}.zip
+          if-no-files-found: error
+
+      - name: Get Binary Hash
+        run: ${{ matrix.sha1-command }} > ZenithProxy-${{ matrix.artifact-name }}.sha1
+
+      - name: Upload Launcher Hash Version
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}.sha1
+          path: ZenithProxy-${{ matrix.artifact-name }}.sha1
+          if-no-files-found: error
+
   package-python:
     runs-on: ubuntu-latest
     steps:
@@ -139,6 +206,7 @@ jobs:
   release-artifacts:
     needs:
       - build-matrix
+      - build-alpine
       - package-python
       - package-windows-python
     runs-on: ubuntu-latest

.github/workflows/act-local.yml

@@ -63,7 +63,7 @@ jobs:
         run: zip -j ZenithProxy.zip build/native/nativeCompile/*
 
       - name: Upload Binary
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-native
           path: ZenithProxy.zip

.github/workflows/release-launcher.yml

@@ -100,6 +100,95 @@ jobs:
           path: ZenithProxy-${{ matrix.artifact-name }}.sha1
           if-no-files-found: error
 
+  build-alpine:
+    env:
+      pyinstaller_version: "6.18.0"
+      UV_PYTHON: '3.14.2'
+    runs-on: ${{ matrix.os }}
+    container:
+      image: ${{ matrix.image || '' }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ 'ubuntu-latest', 'ubuntu-24.04-arm']
+        include:
+          - os: 'ubuntu-latest'
+            image: 'node:24-alpine3.23'
+            artifact-name: 'launcher-alpine-amd64'
+            sha1-command: 'sha1sum -b dist/launch | cut -d" " -f 1'
+          - os: 'ubuntu-24.04-arm'
+            image: 'node:24-alpine3.23'
+            artifact-name: 'launcher-alpine-aarch64'
+            sha1-command: 'sha1sum -b dist/launch | cut -d" " -f 1'
+    steps:
+      # https://github.com/dart-musl/setup-node-alpine-for-javascript-actions
+      - if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
+        run: |
+          if grep -q '^ID=alpine$' /etc/os-release; then
+            ROOT=$(TMPDIR="$RUNNER_TEMP" mktemp -d)
+            apk add --root "$ROOT" --repositories-file /etc/apk/repositories --allow-untrusted --no-cache --no-scripts --initdb -- docker-cli
+            "$ROOT/usr/bin/docker" run --rm --net host --user 0:0 --volume /:/hostfs --entrypoint /usr/sbin/chroot "$("$ROOT/usr/bin/docker" inspect '${{ job.container.id }}' --format "{{ .Image }}")" /hostfs /bin/bash -xc \
+              'exec sudo -u "$(stat -c "%U" -- "$7")" -- /bin/bash -xc "$@"' -- \
+              'find "$5" -type f -executable -name node -not -path "*_alpine/*" -print0 | exec xargs -0 -n 1 -- /bin/bash -xc "$@"' -- \
+              'exec docker run --rm --volume /:/hostfs --entrypoint /bin/sh "docker.io/library/node:$("$4" -e "console.log(process.versions.node)")-alpine" -xc "$@"' -- \
+              'apk add --no-cache -- patchelf && apk info --quiet --contents -- libgcc libstdc++ | xargs -- tar -cC / -T- | tar -xvC "$(dirname "/hostfs$2")/../lib" --strip-components 2 && cp "$(which node)" "/hostfs$2" && patchelf --set-rpath \$ORIGIN/../lib "/hostfs$2" && ldd "/hostfs$2"' -- \
+              "$("$ROOT/usr/bin/docker" inspect '${{ job.container.id }}' --format '{{ range.Mounts }}{{ if eq .Destination "/__e" }}{{ .Source }}{{ end }}{{ end }}')"
+            rm -rf -- "$ROOT"
+            sed -i -e 's/^ID=alpine$/ID=linux/' /etc/os-release
+          fi
+        shell: sh
+
+      - name: Install Deps
+        run: apk add zip bash build-base ca-certificates curl gcc git libc-dev libffi-dev libgcc make musl-dev openssl openssl-dev zlib-dev
+
+      - name: Check out repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Install PyInstaller
+        run: |
+          uv tool install pyinstaller@${{ env.pyinstaller_version }}
+
+      - name: Build launcher
+        run: >
+          uv tool run --with-requirements src/launcher/requirements.txt --upgrade
+          pyinstaller@${{ env.pyinstaller_version }} --specpath ./build
+          -p ./src/launcher --onefile
+          --runtime-tmpdir .launcher.tmp
+          --noconfirm
+          -i ../src/launcher/icon.ico
+          ./src/launcher/__main__.py
+
+      - name: Rename executable
+        run: |
+          mv dist/__main__ dist/launch
+
+      - name: Create zip
+        run: |
+          zip -j dist/ZenithProxy-${{ matrix.artifact-name }}.zip dist/launch
+
+      - name: Upload Binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: dist/ZenithProxy-${{ matrix.artifact-name }}.zip
+          if-no-files-found: error
+
+      - name: Get Binary Hash
+        run: ${{ matrix.sha1-command }} > ZenithProxy-${{ matrix.artifact-name }}.sha1
+
+      - name: Upload Launcher Hash Version
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ matrix.artifact-name }}.sha1
+          path: ZenithProxy-${{ matrix.artifact-name }}.sha1
+          if-no-files-found: error
+
+
   package-python:
     runs-on: ubuntu-latest
     steps:
@@ -173,6 +262,7 @@ jobs:
   release-artifacts:
     needs:
       - build-pyinstaller
+      - build-alpine
       - package-python
       - package-windows-python
     runs-on: ubuntu-latest

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
     `java-library`
-    id("org.graalvm.buildtools.native") version "0.11.3"
+    id("org.graalvm.buildtools.native") version "0.11.4"
     id("com.gradleup.shadow") version "9.3.1"
-    id("io.freefair.lombok") version "9.1.0"
+    id("io.freefair.lombok") version "9.2.0"
     `maven-publish`
 }
 
@@ -26,7 +26,7 @@ repositories {
     mavenLocal()
 }
 
-val mcplVersion = "1.21.11.4"
+val mcplVersion = "1.21.11.7"
 dependencies {
     api("com.github.rfresh2:JDA:6.3.27") {
         exclude(group = "club.minnced")
@@ -68,31 +68,30 @@ dependencies {
     api("com.github.rfresh2.fastutil.maps:reference-object-maps:$fastutilVersion")
     api("com.github.rfresh2.fastutil.maps:long-double-maps:$fastutilVersion")
     api("com.github.rfresh2.fastutil.queues:int-queues:$fastutilVersion")
-    api("com.viaversion:vialoader:4.0.6")
-    api("com.viaversion:viaversion-common:5.7.0")
-    api("com.viaversion:viabackwards-common:5.7.0")
-    api("com.viaversion:viarewind-common:4.0.13")
+    api("com.viaversion:viaversion-common:5.7.1")
+    api("com.viaversion:viabackwards-common:5.7.1")
+    api("com.viaversion:viarewind-common:4.0.14")
     api("org.jline:jline:3.30.6")
     api("ar.com.hjg:pngj:2.1.0")
     api("com.zaxxer:HikariCP:7.0.2")
-    api("org.postgresql:postgresql:42.7.8")
+    api("org.postgresql:postgresql:42.7.9")
     api("org.jdbi:jdbi3-postgres:3.51.0")
     api("com.google.guava:guava:33.5.0-jre")
-    api("ch.qos.logback:logback-classic:1.5.24")
+    api("ch.qos.logback:logback-classic:1.5.26")
     api("org.slf4j:slf4j-api:2.0.17")
     api("org.slf4j:jul-to-slf4j:2.0.17")
     api("com.mojang:brigadier:1.3.10")
     api("net.kyori:adventure-text-logger-slf4j")
     api("dev.omega24:upnp4j:1.0")
-    api(platform("tools.jackson:jackson-bom:3.0.3"))
+    api(platform("tools.jackson:jackson-bom:3.0.4"))
     api("tools.jackson.core:jackson-databind")
 
     testImplementation(platform("org.junit:junit-bom:6.0.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     compileOnly("com.google.auto.service:auto-service-annotations:1.1.1")
     annotationProcessor("com.google.auto.service:auto-service:1.1.1")
-    compileOnly("org.graalvm.sdk:nativeimage:25.0.1")
+    compileOnly("org.graalvm.sdk:nativeimage:25.0.2")
 }
 
 lombok {

docs/wiki/Commands.md

@@ -735,6 +735,8 @@ The `timeout` arguments configures how long until players are kicked due no pack
 
   ```serverConnection chatSigning mode <disguised/passthrough/system>```
 
+  ```serverConnection preferLoginAsController on/off```
+
 
 ### shutdown
 
@@ -1431,11 +1433,11 @@ Dropping can be configured based on modes:
 
 
 
-    * `all`: any item
+* `all`: any item
 
-    * `whitelist`: only added items
+* `whitelist`: only added items
 
-    * `blacklist`: any item not added
+* `blacklist`: any item not added
 
 **Usage**
 

docs/wiki/FAQ.md

@@ -163,19 +163,19 @@ More info in my discord: https://discord.com/channels/1127460556710883391/112746
 
 ## Who are these unknown people pinging or trying to connect to my proxy?
 
-if you host something on your home PC, that is not exposed to the public internet by default in most cases
+if you host something on your home PC, in most cases, it is _not_ exposed to the public internet by default
 
-Windows comes with a firewall, and your router would need to have port forwarding configured to expose it
+Windows has a firewall, and your router needs to have port forwarding configured
 
 but if you host something on the public internet, anyone on the public internet can find it
 
-there's only around 4b possible ip's, and it's very feasible to scan 4b ip's in under an hour
+there are only ~4 billion possible ip's. And it's possible to scan 4b ip's in under an hour
 
-people have been doing this for many years for every minecraft server, e.g. 5c, serverseeker, matscan, and many more
+people have been doing this for many years across every minecraft server. some groups involved are: 5c, serverseeker, matscan, and many more
 
 to be clear, finding a proxy's public ip does not let them get past the whitelist
 
-if you are hosting on the public internet, and it does make you uncomfortable there's many things you can do:
+if you are hosting on the public internet, and it makes you uncomfortable, there are some things you can do:
 
 * disable server list pings: `serverConnection ping off`
 * set up a DNS hostname, and then set `serverConnection enforceMatchingConnectingAddress on`

docs/wiki/Setup.md

@@ -24,7 +24,9 @@
 * [Windows x64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-windows-python-amd64.zip)
 * Linux: [x64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-linux-amd64.zip) or [aarch64 (ARM)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-linux-aarch64.zip)
 * Mac: [M-series CPU](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-macos-aarch64.zip) or [x64 (Intel)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-macos-amd64.zip)
+* Alpine Linux (musl): [x64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-alpine-amd64.zip) or [aarch64](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-alpine-aarch64.zip)
 * Other: [Python (Universal)](https://github.com/rfresh2/ZenithProxy/releases/download/launcher-v3/ZenithProxy-launcher-python.zip)
+  * Recommended with: [install uv](https://docs.astral.sh/uv/getting-started/installation/#installing-uv)
 
 Source: https://github.com/rfresh2/ZenithProxy/releases/tag/launcher-v3
 

src/launcher/__main__.py

@@ -88,7 +88,7 @@
             update_launcher_exec(config, api)
         update_zenith_exec(config, api)
         launcher_exec(config)
-        info("Restarting in 3 seconds...")
+        info("Restarting...")
         time.sleep(3)
 except KeyboardInterrupt:
     sys.exit(0)