fix: migrate PaperMC to v3 API, fix NeoForge beta fallback, add test suite
- Migrate Paper loader from sunset v2 API to v3 (fill.papermc.io) - Fix NeoForge: fall back to beta versions when no stable exists (set -e + grep) - Fix setEula/setperms ordering (was writing eula.txt before /data was writable) - Fix setEula/serverInfoWrite to use absolute paths (/data/server/) - Add VOLUME directive removal (was shadowing bind mounts) - Add comprehensive API test suite (110 tests across 6 suites) - Move test.sh to tests/integration.sh, switch to named volumes - Add Docker build cache to CI workflows - Add .editorconfig, expand .gitignore, improve README docs
This commit is contained in:
+62
-69
@@ -1,10 +1,10 @@
|
||||
serverSelect() {
|
||||
mkdir -p /data/server
|
||||
cd /data/server || exit
|
||||
cd /data/server || die "Cannot access /data/server"
|
||||
if [[ -f "server.jar" ]] || [[ -f "run.sh" ]] || [[ -f "bedrock_server" ]]; then
|
||||
echo "Found what appears to be a server, sending it"
|
||||
log "Found existing server files, skipping download."
|
||||
else
|
||||
case $MC_LOADER in
|
||||
case "$MC_LOADER" in
|
||||
vanilla)
|
||||
getVanilla
|
||||
;;
|
||||
@@ -24,8 +24,7 @@ serverSelect() {
|
||||
getBedrock
|
||||
;;
|
||||
*)
|
||||
echo "Server of type ${MC_LOADER} is not recognized."
|
||||
crash
|
||||
die "Server type '${MC_LOADER}' is not recognized. Valid: vanilla, paper, fabric, forge, neoforge, bedrock"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -33,78 +32,72 @@ serverSelect() {
|
||||
|
||||
buildCommand() {
|
||||
JAVA_ARGS="-Xms${XMS} -Xmx${XMX}"
|
||||
if [[ -n $ADD_ARGS ]]; then
|
||||
if [[ -n "${ADD_ARGS}" ]]; then
|
||||
RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui"
|
||||
else
|
||||
RUN_STRING="${JAVA_ARGS} -jar ${JAR} nogui"
|
||||
fi
|
||||
}
|
||||
|
||||
serverStart() {
|
||||
detectForgeVersion() {
|
||||
# Detect the forge/neoforge version from the installed jar names
|
||||
VER_LOADER="${VER_LOADER:-}"
|
||||
if [[ -z "$VER_LOADER" ]]; then
|
||||
if [[ "$MC_LOADER" == "neoforge" ]] && [[ -L "/data/server/server.jar" ]]; then
|
||||
VER_LOADER=$(readlink "/data/server/server.jar" | sed 's/^neoforge-//;s/\.jar$//')
|
||||
elif [[ "$MC_LOADER" == "forge" ]]; then
|
||||
local forge_jar
|
||||
forge_jar=$(ls /data/server/forge-${MC_VERSION}-*.jar 2>/dev/null | head -1)
|
||||
if [[ -n "$forge_jar" ]]; then
|
||||
VER_LOADER=${forge_jar#/data/server/forge-${MC_VERSION}-}
|
||||
VER_LOADER=${VER_LOADER%.jar}
|
||||
fi
|
||||
fi
|
||||
if [[ -n "$VER_LOADER" ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
while true; do
|
||||
cd /data/server || exit
|
||||
if [[ ! -f "server.properties" ]]; then touch "server.properties"; fi
|
||||
|
||||
if [[ -f $JAR || -f "run.sh" || -f "bedrock_server" ]]; then
|
||||
echo -e "|_______________________________________________________|"
|
||||
echo -e "|##----------------- Server Starting -----------------##|"
|
||||
echo -e "|#| Minecraft Version: $MC_VERSION"
|
||||
echo -e "|#| "
|
||||
echo -e "|#| Loader Type: ${SERVER_TYPE:-$MC_LOADER}"
|
||||
echo -e "|#| Loader Version: $MC_LOADER_VERSION"
|
||||
echo -e "|#| "
|
||||
if [[ "$MC_LOADER" != "bedrock" ]]; then
|
||||
echo -e "|#| Java Version: $JAVA_VERSION"
|
||||
echo -e "|#| Jar: $JAR"
|
||||
echo -e "|#| Memory Allocated: "
|
||||
echo -e "|#| Xms: $XMS"
|
||||
echo -e "|#| Xmx: $XMX"
|
||||
echo -e "|#| Additional Args: ${ADD_ARGS:-"NONE"}"
|
||||
fi
|
||||
echo -e "|#| "
|
||||
echo -e "|#| Running as:"
|
||||
echo -e "|#| User: $PUID"
|
||||
echo -e "|#| Group: $PGID"
|
||||
echo -e "|#| "
|
||||
if [[ "$MC_LOADER" == "bedrock" ]]; then
|
||||
echo -e "|#| Run Command:"
|
||||
echo -e "|#| LD_LIBRARY_PATH=. ./bedrock_server"
|
||||
elif [[ ${NEW_FORGE:-false} != "true" ]]; then
|
||||
echo -e "|#| Run Command:"
|
||||
echo -e "|#| java $RUN_STRING"
|
||||
fi
|
||||
echo -e "|##---------------------------------------------------##|"
|
||||
echo -e "|-------------------------------------------------------|"
|
||||
echo -e " "
|
||||
serverInfoWrite
|
||||
newForge
|
||||
if [[ "$MC_LOADER" == "bedrock" ]]; then
|
||||
exec env LD_LIBRARY_PATH=. ./bedrock_server
|
||||
elif [[ "$MC_LOADER" == "neoforge" ]]; then
|
||||
exec java @user_jvm_args.txt @libraries/net/neoforged/neoforge/"${VER_LOADER}"/unix_args.txt "$@"
|
||||
elif [[ "$MC_LOADER" == "forge" ]] && [[ ${NEW_FORGE:-false} == "true" ]]; then
|
||||
exec java @user_jvm_args.txt @libraries/net/minecraftforge/forge/"$MC_VERSION"-"${VER_LOADER}"/unix_args.txt "$@"
|
||||
else
|
||||
echo "java $RUN_STRING"
|
||||
exec java $RUN_STRING
|
||||
fi
|
||||
else
|
||||
echo "Server Not Found."
|
||||
crash
|
||||
if [[ "$MC_LOADER" == "neoforge" ]] && [[ -L "/data/server/server.jar" ]]; then
|
||||
VER_LOADER=$(readlink "/data/server/server.jar" | sed 's/^neoforge-//;s/\.jar$//')
|
||||
elif [[ "$MC_LOADER" == "forge" ]]; then
|
||||
local forge_jar
|
||||
forge_jar=$(ls /data/server/forge-"${MC_VERSION}"-*.jar 2>/dev/null | head -1)
|
||||
if [[ -n "$forge_jar" ]]; then
|
||||
VER_LOADER="${forge_jar#/data/server/forge-${MC_VERSION}-}"
|
||||
VER_LOADER="${VER_LOADER%.jar}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
serverStart() {
|
||||
detectForgeVersion
|
||||
newForge
|
||||
|
||||
cd /data/server || die "Cannot access /data/server"
|
||||
if [[ ! -f "server.properties" ]]; then
|
||||
touch "server.properties"
|
||||
fi
|
||||
|
||||
if [[ ! -f "$JAR" ]] && [[ ! -f "run.sh" ]] && [[ ! -f "bedrock_server" ]]; then
|
||||
die "Server binary not found in /data/server"
|
||||
fi
|
||||
|
||||
log "--- Server Starting ---"
|
||||
log "Minecraft Version: ${MC_VERSION}"
|
||||
log "Loader Type: ${SERVER_TYPE:-$MC_LOADER}"
|
||||
log "Loader Version: ${MC_LOADER_VERSION:-auto}"
|
||||
if [[ "$MC_LOADER" != "bedrock" ]]; then
|
||||
log "Java Version: ${JAVA_VERSION}"
|
||||
log "Jar: ${JAR}"
|
||||
log "Memory: Xms=${XMS} Xmx=${XMX}"
|
||||
if [[ -n "${ADD_ARGS}" ]]; then
|
||||
log "Additional Args: ${ADD_ARGS}"
|
||||
fi
|
||||
fi
|
||||
log "Running as UID:${PUID} GID:${PGID}"
|
||||
|
||||
serverInfoWrite
|
||||
|
||||
if [[ "$MC_LOADER" == "bedrock" ]]; then
|
||||
log "Starting Bedrock server..."
|
||||
exec env LD_LIBRARY_PATH=. ./bedrock_server
|
||||
elif [[ "$MC_LOADER" == "neoforge" ]]; then
|
||||
log "Starting NeoForge server..."
|
||||
exec java @user_jvm_args.txt @libraries/net/neoforged/neoforge/"${VER_LOADER}"/unix_args.txt "$@"
|
||||
elif [[ "$MC_LOADER" == "forge" ]] && [[ "${NEW_FORGE:-false}" == "true" ]]; then
|
||||
log "Starting Forge server (new-style)..."
|
||||
exec java @user_jvm_args.txt @libraries/net/minecraftforge/forge/"${MC_VERSION}"-"${VER_LOADER}"/unix_args.txt "$@"
|
||||
else
|
||||
log "Starting ${SERVER_TYPE:-$MC_LOADER} server..."
|
||||
exec java $RUN_STRING
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user