From d1fbdb9a65ecde8315af05bed787d3ebeb10f614 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 24 Aug 2016 16:41:19 +0100
Subject: [PATCH] changed engine to lwjgl2

lwjgl2 is the actual engine used for minecraft
---
 Minecraft/mcserver                | 2 +-
 lgsm/functions/check_deps.sh      | 8 ++++----
 lgsm/functions/command_details.sh | 6 +++---
 lgsm/functions/command_stop.sh    | 2 +-
 lgsm/functions/command_update.sh  | 2 +-
 lgsm/functions/core_getopt.sh     | 2 +-
 lgsm/functions/info_config.sh     | 2 +-
 lgsm/functions/info_glibc.sh      | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Minecraft/mcserver b/Minecraft/mcserver
index 41b8828f6..2f9dffa98 100644
--- a/Minecraft/mcserver
+++ b/Minecraft/mcserver
@@ -45,7 +45,7 @@ githubbranch="mcserver"
 # Server Details
 servicename="mc-server"
 gamename="Minecraft"
-engine="minecraft"
+engine="lwjgl2"
 
 # Directories
 rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 32dcda1d2..90f4896ad 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -150,7 +150,7 @@ if [ -n "$(command -v dpkg-query)" ]; then
 	fi
 
 	# All servers except ts3,mumble and minecraft servers require libstdc++6 and lib32gcc1
-	if [ "${gamename}" != "TeamSpeak 3" ]||[ "${gamename}" != "Mumble" ]||[ "${engine}" != "minecraft" ]; then
+	if [ "${gamename}" != "TeamSpeak 3" ]||[ "${gamename}" != "Mumble" ]||[ "${engine}" != "lwjgl2" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 			array_deps_required+=( lib32gcc1 libstdc++6:i386 )
 		else
@@ -177,7 +177,7 @@ if [ -n "$(command -v dpkg-query)" ]; then
 	elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]; then
 		array_deps_required+=( libcurl4-gnutls-dev:i386 )
 	# Project Zomboid and Minecraft
-	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "minecraft" ]; then
+	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then
 		array_deps_required+=( default-jdk )
 	# Unreal Engine
 	elif [ "${executable}" ==  "./ucc-bin" ]; then
@@ -216,7 +216,7 @@ elif [ -n "$(command -v yum)" ]; then
 	fi
 
 	# All servers except ts3,mumble and minecraft servers require glibc.i686 and libstdc++.i686
-	if [ "${gamename}" != "TeamSpeak 3" ]||[ "${gamename}" != "Mumble" ]||[ "${engine}" != "minecraft" ]; then
+	if [ "${gamename}" != "TeamSpeak 3" ]||[ "${gamename}" != "Mumble" ]||[ "${engine}" != "lwjgl2" ]; then
 		array_deps_required+=( glibc.i686 libstdc++.i686 )
 	fi
 
@@ -235,7 +235,7 @@ elif [ -n "$(command -v yum)" ]; then
 	elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]; then
 		array_deps_required+=( libcurl.i686 )
 	# Project Zomboid and Minecraft
-	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "minecraft" ]; then
+	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then
 		array_deps_required+=( java-1.8.0-openjdk )
 	# Unreal Engine
 	elif [ "${executable}" ==  "./ucc-bin" ]; then
diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index cea2648fd..fb3531cc3 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -290,7 +290,7 @@ fn_details_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines that require editing in the config file
-	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "minecraft" "projectzomboid" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "TeamSpeak 3" "Mumble" "7 Days To Die" )
+	local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "TeamSpeak 3" "Mumble" "7 Days To Die" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then
@@ -592,7 +592,7 @@ fn_details_gameserver
 fn_details_script
 fn_details_backup
 # Some game servers do not have parms.
-if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "minecraft" ]; then
+if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]; then
 	fn_parms
 	fn_details_commandlineparms
 fi
@@ -603,7 +603,7 @@ if [ "${engine}" == "avalanche" ]; then
 	fn_details_avalanche
 elif [ "${engine}" == "dontstarve" ]; then
 	fn_details_dontstarve
-elif [ "${engine}" == "minecraft" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	fn_details_minecraft
 elif [ "${engine}" == "projectzomboid" ]; then
 	fn_details_projectzomboid
diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index ea7983428..a98246b63 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -179,7 +179,7 @@ fn_stop_graceful_select(){
 		fn_stop_graceful_source
 	elif [ "${engine}" == "goldsource" ]; then
 		fn_stop_graceful_goldsource
-	elif [ "${engine}" == "minecraft" ]; then
+	elif [ "${engine}" == "lwjgl2" ]; then
 		fn_stop_graceful_minecraft
 	else
 		fn_stop_tmux
diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh
index 9a004661b..bffa4e6ea 100644
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@@ -15,7 +15,7 @@ check.sh
 
 if [ "${gamename}" == "TeamSpeak 3" ]; then
 	update_ts3.sh
-elif [ "${engine}" == "minecraft" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	update_minecraft.sh
 elif [ "${gamename}" == "Mumble" ]; then
 	update_mumble.sh
diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 6e2e39ace..26aa8ec7c 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -524,7 +524,7 @@ case "${getopt}" in
 
 if [ "${gamename}" == "Mumble" ]; then
 	fn_getopt_mumble
-elif [ "${engine}" == "minecraft" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	fn_getopt_minecraft
 elif [ "${gamename}" == "TeamSpeak 3" ]; then
 	fn_getopt_teamspeak3
diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index a80540a9a..6c868d047 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -416,7 +416,7 @@ elif [ "${engine}" == "dontstarve" ]; then
 elif [ "${engine}" == "idtech3" ]; then
 	fn_info_config_idtech3
 # Minecraft
-elif [ "${engine}" == "minecraft" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	fn_info_config_minecraft
 # Project Zomboid
 elif [ "${engine}" == "projectzomboid" ]; then
diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index 8e4c1a4b8..d3662d08d 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -47,7 +47,7 @@ elif [ "${engine}" == "avalanche" ]; then
 elif [ "${engine}" == "dontstarve" ]; then
 	glibcrequired="2.15"
 	glibcfix="no"
-elif [ "${engine}" == "minecraft" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	glibcrequired="NOT REQUIRED"
 	glibcfix="no"
 elif [ "${engine}" == "projectzomboid" ]; then