From 2a7fd6f2dd6b2d5af817ba83ae465c784e2438b1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 9 Jun 2021 22:35:53 +0100
Subject: [PATCH] fix(mc): add Java 16 as a dependency requirement for Ubuntu
 20.04 and above (#3482)

* Added java info to details for game servers that require it
* added openjdk-16-jre option for Ubuntu server
---
 lgsm/functions/check_deps.sh    | 16 ++++++++++++++--
 lgsm/functions/info_distro.sh   |  4 ++++
 lgsm/functions/info_messages.sh |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 50109b2f64..722a0a4da9 100755
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -414,8 +414,20 @@ fn_deps_build_debian(){
 	# Hurtword/Rust
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 		array_deps_required+=( lib32z1 )
-	# Minecraft, Rising World, Wurm
-	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]||[ "${shortname}" == "rw" ]; then
+	# Minecraft, Rising World
+	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]; then
+		javaversion=$(java -version 2>&1 | grep "version")
+		if [ "${javaversion}" ]; then
+			# Added for users using Oracle JRE to bypass the check.
+			javacheck=1
+		else
+			if { [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "21.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "21.04" ]; }; then
+				array_deps_required+=( openjdk-16-jre )
+			else
+				array_deps_required+=( default-jre )
+			fi
+		fi
+	elif [ "${shortname}" == "rw" ]; then
 		javaversion=$(java -version 2>&1 | grep "version")
 		if [ "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass the check.
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 283d8ed394..7f0dc2b190 100755
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -83,6 +83,10 @@ else
 	fi
 fi
 
+if [ "$(command -V java 2>/dev/null)" ]; then
+	javaversion=$(java -version 2>&1 | grep "version")
+fi
+
 ## Uptime
 uptime=$(</proc/uptime)
 uptime=${uptime/[. ]*/}
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 391964c2a6..0c81175fe7 100755
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -100,6 +100,9 @@ fn_info_message_distro(){
 		echo -e "${lightblue}Uptime:\t${default}${days}d, ${hours}h, ${minutes}m"
 		echo -e "${lightblue}tmux:\t${default}${tmuxv}"
 		echo -e "${lightblue}glibc:\t${default}${glibcversion}"
+		if [ -n "${javaram}" ]; then
+			echo -e "${lightblue}Java:\t${default}${javaversion}"
+		fi
 	} | column -s $'\t' -t
 }