refactor: modular init, add bedrock loader, dynamic java/healthcheck
Build dev image / build (push) Failing after 18m12s
Build dev image / build (push) Failing after 18m12s
- Split monolithic init into modular lib files under scripts/lib/
(common.sh, java.sh, server.sh, loaders/{vanilla,paper,fabric,forge,neoforge}.sh)
- Add bedrock loader: downloads from Minecraft Services API,
runs native binary with LD_LIBRARY_PATH, skips Java setup
- Add auto-detection for JAVA_VERSION from Mojang version manifest
(MC 1.20.5+ -> temurin@21, 1.17-1.20.4 -> temurin@17,
1.17 -> temurin@16, pre-1.17 -> temurin@8)
- Fix NEW_FORGE unbound variable when non-Forge loaders run
- Fix Fabric loader jq filter (-s slurp removed, null string check fixed)
- Fix Forge test detection (recursive find for forge-*-server.jar)
- Dynamic healthcheck: nc -z TCP 25565 for Java, nc -zu UDP 19132 for bedrock
- Add .gitea/workflows/build-dev.yml for dev branch CI builds
- Base image: debian:bookworm-slim (from ubuntu:noble)
- Add unzip, netcat-openbsd to Docker image
- Switch to shebangs, set -euo pipefail throughout
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
getForge() {
|
||||
SERVER_TYPE="Forge Server"
|
||||
|
||||
if [[ -n "$MC_VERSION" ]]; then
|
||||
VER_MINECRAFT=$MC_VERSION
|
||||
if [[ -n "${FORGE_VERSION}" ]]; then
|
||||
VER_LOADER="${FORGE_VERSION}"
|
||||
DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/${VER_MINECRAFT}-${VER_LOADER}/forge-${VER_MINECRAFT}-${VER_LOADER}-installer.jar
|
||||
else
|
||||
LATEST_BUILD=$(curl -s https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json | jq -r ".promos[\"${VER_MINECRAFT}-latest\"]")
|
||||
VER_LOADER=$LATEST_BUILD
|
||||
DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/${VER_MINECRAFT}-${VER_LOADER}/forge-${VER_MINECRAFT}-${VER_LOADER}-installer.jar
|
||||
fi
|
||||
else
|
||||
echo "Minecraft version not set"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -n "$DL_URL" ]]; then
|
||||
echo "$DL_URL"
|
||||
rm -rf server.jar
|
||||
curl -o forge-install.jar "${DL_URL}"
|
||||
echo "$JAVA -jar forge-install.jar --installServer"
|
||||
$JAVA -jar forge-install.jar --installServer
|
||||
|
||||
if [[ "$(printf '%s\n' "1.17.1" "$MC_VERSION" | sort -V | head -n1)" = "1.17.1" ]]; then
|
||||
NEW_FORGE=true
|
||||
rm -f forge-install.jar
|
||||
rm -f forge-install.jar.log
|
||||
else
|
||||
NEW_FORGE=false
|
||||
rm -f forge-install.jar
|
||||
rm -f forge-install.jar.log
|
||||
ln -s forge-"${VER_MINECRAFT}"-"${VER_LOADER}".jar server.jar
|
||||
fi
|
||||
|
||||
touch server.properties
|
||||
else
|
||||
echo "No Valid Download URL"
|
||||
crash
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user