Update to OpenJDK 21

Author: TheRemote

README.md

@@ -63,6 +63,12 @@ See the following links:<br>
 
 <h2>Update History</h2>
 
+<h3>May 19th 2024</h3>
+<ul>
+  <li>Upgraded Java to OpenJDK 21</li>
+  <li>32 bit ARM is no longer supported -- make sure you are running a 64 bit OS to use 64 bit ARM (aarch64)</li>
+</ul>
+
 <h3>April 27th 2024</h3>
 <ul>
   <li>Upgrade to 1.20.5 (make backups first, and make sure you've copied backup out of the main backups folder as they are rotated)</li>

SetupMinecraft.sh

@@ -212,44 +212,39 @@ Install_Java() {
   Print_Style "Installing OpenJDK..." "$YELLOW"
 
   CPUArch=$(uname -m)
-  if [[ "$CPUArch" == *"armv7"* || "$CPUArch" == *"armhf"* ]]; then
-    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_arm_linux_hotspot_19.0.1_10.tar.gz' -o jre19.tar.gz -L
-    tar -xf jre19.tar.gz
-    rm -f jre19.tar.gz
-    mv jdk-* jre
-  elif [[ "$CPUArch" == *"aarch64"* || "$CPUArch" == *"arm64"* ]]; then
-    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.1_10.tar.gz' -o jre19.tar.gz -L
-    tar -xf jre19.tar.gz
-    rm -f jre19.tar.gz
+  if [[ "$CPUArch" == *"aarch64"* || "$CPUArch" == *"arm64"* ]]; then
+    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.3_9.tar.gz' -o jre21.tar.gz -L
+    tar -xf jre21.tar.gz
+    rm -f jre21.tar.gz
     mv jdk-* jre
   elif [[ "$CPUArch" == *"x86_64"* ]]; then
-    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_linux_hotspot_19.0.1_10.tar.gz' -o jre19.tar.gz -L
-    tar -xf jre19.tar.gz
-    rm -f jre19.tar.gz
+    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz' -o jre21.tar.gz -L
+    tar -xf jre21.tar.gz
+    rm -f jre21.tar.gz
     mv jdk-* jre
   elif [[ "$CPUArch" == *"s390x"* ]]; then
-    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_s390x_linux_hotspot_19.0.1_10.tar.gz' -o jre19.tar.gz -L
-    tar -xf jre19.tar.gz
-    rm -f jre19.tar.gz
+    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_s390x_linux_hotspot_21.0.3_9.tar.gz' -o jre21.tar.gz -L
+    tar -xf jre21.tar.gz
+    rm -f jre21.tar.gz
     mv jdk-* jre
   elif [[ "$CPUArch" == *"ppc64le"* ]]; then
-    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.1_10.tar.gz' -o jre19.tar.gz -L
-    tar -xf jre19.tar.gz
-    rm -f jre19.tar.gz
+    curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.3_9.tar.gz' -o jre21.tar.gz -L
+    tar -xf jre21.tar.gz
+    rm -f jre21.tar.gz
     mv jdk-* jre
   fi
 
   if [ -e "$DirName/minecraft/jre/bin/java" ]; then
     CurrentJava=$($DirName/minecraft/jre/bin/java -version 2>&1 | head -1 | cut -d '"' -f 2 | cut -d '.' -f 1)
-    if [[ $CurrentJava -lt 18 ]]; then
-      Print_Style "Required OpenJDK version 18 could not be installed." "$RED"
+    if [[ $CurrentJava -lt 21 ]]; then
+      Print_Style "Required OpenJDK version 21 could not be installed." "$RED"
       exit 1
     else
       Print_Style "OpenJDK installation completed." "$GREEN"
     fi
   else
     rm -rf "$DirName/minecraft/jre"
-    Print_Style "Required OpenJDK version 18 could not be installed." "$RED"
+    Print_Style "Required OpenJDK version 21 could not be installed." "$RED"
     exit 1
   fi
 }