From 8ea86189b5e8739160331b87eadef9d99f64da3f Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 11 Mar 2024 18:31:12 -0500
Subject: [PATCH] Remove Java 8 warning and 5 second delay
---
scripts/start-configuration | 5 -----
scripts/start-utils | 11 -----------
2 files changed, 16 deletions(-)
diff --git a/scripts/start-configuration b/scripts/start-configuration
index b8586c328a6..4faf1b35510 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -225,17 +225,14 @@ case "${TYPE^^}" in
;;
CUSTOM)
- evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployCustom" "$@"
;;
MAGMA)
- evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMagma" "$@"
;;
MAGMA_MAINTAINED)
- evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMagmaMaintained" "$@"
;;
@@ -244,12 +241,10 @@ case "${TYPE^^}" in
;;
MOHIST)
- evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMohist" "$@"
;;
CATSERVER)
- evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployCatserver" "$@"
;;
diff --git a/scripts/start-utils b/scripts/start-utils
index ac525dfd658..61b7bfd1082 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -253,17 +253,6 @@ function isType() {
return 1
}
-function evaluateJavaCompatibilityForForge() {
- javaRelease=$(mc-image-helper java-release)
- if versionLessThan 1.18 && (( javaRelease > 8 )); then
- log "**********************************************************************"
- log "WARNING: Some mods and modpacks may require Java 8."
- log " Please use itzg/minecraft-server:java8"
- log "**********************************************************************"
- sleep 5
- fi
-}
-
function extract() {
src=${1?}
destDir=${2?}