diff --git a/start-configuration b/start-configuration index faa0b0a3..bea25b40 100755 --- a/start-configuration +++ b/start-configuration @@ -142,10 +142,6 @@ case "${TYPE^^}" in exec ${SCRIPTS:-/}start-deployCustom "$@" ;; - CURSE_INSTANCE) - exec ${SCRIPTS:-/}start-validateCurseInstance "$@" - ;; - MAGMA) exec ${SCRIPTS:-/}start-deployMagma "$@" ;; @@ -187,7 +183,7 @@ case "${TYPE^^}" in *) log "Invalid type: '$TYPE'" log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only)," - log " CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM," + log " CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM," log " MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO, CRUCIBLE" exit 1 ;; diff --git a/start-finalExec b/start-finalExec index 3bb80e77..60e78d40 100755 --- a/start-finalExec +++ b/start-finalExec @@ -180,14 +180,7 @@ if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s") fi -if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then - if isTrue ${DEBUG_EXEC}; then - set -x - fi - exec mc-server-runner "${mcServerRunnerArgs[@]}" \ - --cf-instance-file "${CURSE_INSTANCE_JSON}" \ - java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS -elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then +if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then copyFilesForCurseForge cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1) diff --git a/start-validateCurseInstance b/start-validateCurseInstance deleted file mode 100755 index 33024d57..00000000 --- a/start-validateCurseInstance +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -. ${SCRIPTS:-/}start-utils - -if ! [[ -v CURSE_INSTANCE_JSON ]]; then - log "ERROR: CURSE_INSTANCE_JSON needs to be set" - exit 2 -elif ! [ -f "${CURSE_INSTANCE_JSON}" ] && [ -f "${CURSE_INSTANCE_JSON}/minecraftinstance.json" ]; then - CURSE_INSTANCE_JSON="${CURSE_INSTANCE_JSON}/minecraftinstance.json" -elif ! [ -f "${CURSE_INSTANCE_JSON}" ]; then - log "ERROR: CURSE_INSTANCE_JSON file does not exist: ${CURSE_INSTANCE_JSON}" - exit 2 -fi - -log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}" - -exec ${SCRIPTS:-/}start-setupWorld "$@"