diff --git a/panel-start.sh b/panel-start.sh index 6782955..d4026bc 100755 --- a/panel-start.sh +++ b/panel-start.sh @@ -11,9 +11,31 @@ PT_SERVER="${PT_SERVER:-server-02-skygrid}" INSTALL_DIR="${INSTALL_DIR:-$(pwd)/pt-minecraft-modpack}" ARCHIVE_PATH="${ARCHIVE_PATH:-$(pwd)/pt-minecraft-modpack.tar.gz}" TMP_DIR="${TMP_DIR:-$(pwd)/pt-minecraft-modpack.__tmp}" -PT_JAVA_ARGS="${PT_JAVA_ARGS:--Xms1G -Xmx1G}" +PT_JAVA_VERSION="${PT_JAVA_VERSION:-17}" +SERVER_MEMORY="${SERVER_MEMORY:-2048}" PACKWIZ_INSTALLER_URL="${PACKWIZ_INSTALLER_URL:-https://github.com/packwiz/packwiz-installer/releases/latest/download/packwiz-installer.jar}" +openjdk8="/usr/bin/jdk/jdk1.8.0_361/bin/java" +openjdk11="/usr/bin/jdk/jdk-11.0.18/bin/java" +openjdk17="/usr/bin/jdk/jdk-17.0.6/bin/java" +openjdk19="/usr/bin/jdk/jdk-19.0.2/bin/java" +openjdk21="/usr/bin/jdk/jdk-21.0.2/bin/java" +openjdk25="/usr/bin/jdk/jdk-25.0.2/bin/java" + +maxmem=$((SERVER_MEMORY - 1000)) + +case "$PT_JAVA_VERSION" in + 8) JAVA_BIN="$openjdk8" ;; + 11) JAVA_BIN="$openjdk11" ;; + 17) JAVA_BIN="$openjdk17" ;; + 19) JAVA_BIN="$openjdk19" ;; + 21) JAVA_BIN="$openjdk21" ;; + 25) JAVA_BIN="$openjdk25" ;; + *) JAVA_BIN="java" ;; +esac + +PT_JAVA_ARGS="${PT_JAVA_ARGS:--Xms1024M -Xmx${maxmem}M}" + ############ # 辅助函数 # ############ @@ -79,6 +101,9 @@ PT_REPO_URL="$REPO_URL" \ PT_REPO_REF="$REPO_REF" \ PT_SERVER="$PT_SERVER" \ PT_JAVA_ARGS="$PT_JAVA_ARGS" \ +PT_JAVA_VERSION="$PT_JAVA_VERSION" \ +SERVER_MEMORY="$SERVER_MEMORY" \ +JAVA_BIN="$JAVA_BIN" \ PT_PACKWIZ_BOOTSTRAP_NO_UPDATE="${PT_PACKWIZ_BOOTSTRAP_NO_UPDATE:-1}" \ PT_PACKWIZ_BOOTSTRAP_MAIN_JAR="$(pwd)/.pt-panel-runtime/downloads/packwiz-installer.jar" \ bash ./start.sh