Merge branch 'master' into multiarch-latest

# Conflicts:
#	start-configuration

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jre
+FROM adoptopenjdk:latest
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 

start-configuration

@@ -95,7 +95,7 @@ case "${TYPE^^}" in
 
   FORGE)
     log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
     log "         since some mods require Java 8"
     log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployForge "$@"
@@ -111,7 +111,7 @@ case "${TYPE^^}" in
 
   FTB|CURSEFORGE)
     log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
     log "         since some mods require Java 8"
     log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployCF "$@"

start-minecraftFinalSetup

@@ -168,6 +168,11 @@ function copyFilesForCurseForge() {
   cp -f /data/eula.txt "${FTB_DIR}/"
 }
 
+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/opt/java/openjdk/bin"
+fi
+
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     if isTrue ${DEBUG_EXEC}; then