diff --git a/scripts/gc_download.cmd b/scripts/gc_download.cmd index 1b24f2b..6d822d2 100644 --- a/scripts/gc_download.cmd +++ b/scripts/gc_download.cmd @@ -34,6 +34,9 @@ echo Downloading keystore.p12... :: Download the keystore.p12 file powershell Invoke-WebRequest -Uri %ARTIFACT_URL% -OutFile "./%FOLDER_NAME%/keystore.p12" +:: Check java version, this will automatically output some tuff +call .\scripts\javaver.cmd %BRANCH% + :: Allow resource downloading to be optional, since it takes a while set REPLY=y set /p "REPLY=Download server resources? (This can take a while) [y|n]:" diff --git a/scripts/javaver.cmd b/scripts/javaver.cmd index dad849f..fc97d4d 100644 --- a/scripts/javaver.cmd +++ b/scripts/javaver.cmd @@ -21,16 +21,30 @@ if %BRANCH% EQU stable ( :: Ensure java 8 if %MAJOR% EQU 1 ( if %MINOR% LSS 8 ( - echo Java version is less than 8, please download Java 8 + echo ======================================================================================= + echo !! Java version is less than 8 !! + echo Please download Java 8 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= exit /b ) ) + + if %MAJOR% NEQ 1 ( + echo ======================================================================================= + echo !! Java version is not 8 !! + echo Please download Java 8 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= + exit /b + ) ) if %BRANCH% EQU development ( :: Ensure java 17 if %MAJOR% LSS 17 ( - echo Java version is less than 17, please download Java 17 + echo ======================================================================================= + echo !! Java version is less than 17 !! + echo Please download Java 17 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= exit /b ) )