From b766baf9acb23a9116aa69817d5fc3464853e7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= Date: Mon, 21 Oct 2024 19:58:36 +0200 Subject: [PATCH] fix start auto-server scripts --- automation/start-automated-server.bat | 8 ++++---- automation/start-automated-server.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/automation/start-automated-server.bat b/automation/start-automated-server.bat index 6799093d..28d420cb 100644 --- a/automation/start-automated-server.bat +++ b/automation/start-automated-server.bat @@ -239,12 +239,12 @@ ECHO INFO: Starting Server... 1>> "%~dp0logs\serverstart.log" 2>&1 COLOR 07 REM Batch will wait here indefinitely while MC server is running -ECHO DEBUG: Attempting to execute [ java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%-beta/win_args.txt nogui %* ] -ECHO DEBUG: Attempting to execute [ java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%-beta/win_args.txt nogui %* ] 1>> "%~dp0logs\serverstart.log" 2>&1 +ECHO DEBUG: Attempting to execute [ java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%/win_args.txt nogui %* ] +ECHO DEBUG: Attempting to execute [ java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%/win_args.txt nogui %* ] 1>> "%~dp0logs\serverstart.log" 2>&1 COLOR REM This is what actually starts the server. -java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%-beta/win_args.txt nogui %* +java %MC_SERVER_JVM_ARGS% @user_jvm_args.txt @libraries/net/neoforged/neoforge/%MC_SERVER_FORGEVER%/win_args.txt nogui %* REM If server is exited or crashes, restart... REM CLS @@ -291,7 +291,7 @@ ECHO. ECHO. ECHO Downloading FORGE (step 1 of 2). This can take several minutes, please be patient... -SET MC_SERVER_FORGEURL="https://maven.neoforged.net/releases/net/neoforged/neoforge/%MC_SERVER_FORGEVER%-beta/neoforge-%MC_SERVER_FORGEVER%-beta-installer.jar" +SET MC_SERVER_FORGEURL="https://maven.neoforged.net/releases/net/neoforged/neoforge/%MC_SERVER_FORGEVER%/neoforge-%MC_SERVER_FORGEVER%-installer.jar" GOTO DOWNLOADINSTALLER SET MC_SERVER_TMP_FLAG=0 diff --git a/automation/start-automated-server.sh b/automation/start-automated-server.sh index 323b0613..a5e9e128 100644 --- a/automation/start-automated-server.sh +++ b/automation/start-automated-server.sh @@ -55,7 +55,7 @@ install_server(){ echo "Skipping download. Using existing installer.jar" fi else - export URL="https://maven.neoforged.net/releases/net/neoforged/neoforge/${FORGEVER}-beta/neoforge-${FORGEVER}-beta-installer.jar" + export URL="https://maven.neoforged.net/releases/net/neoforged/neoforge/${FORGEVER}/neoforge-${FORGEVER}-installer.jar" echo $URL which wget >> /dev/null if [ $? -eq 0 ]; then @@ -102,7 +102,7 @@ start_server() { echo "" echo "Starting server" echo "INFO: Starting Server at " $(date -u +%Y-%m-%d_%H:%M:%S) >>serverstart.log 2>&1 - java -Xmx${MAX_RAM} ${JAVA_ARGS} @user_jvm_args.txt @libraries/net/neoforged/neoforge/${FORGEVER}-beta/unix_args.txt nogui %* + java -Xmx${MAX_RAM} ${JAVA_ARGS} @user_jvm_args.txt @libraries/net/neoforged/neoforge/${FORGEVER}/unix_args.txt nogui %* } # routine for basic directory checks