Mirror/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2024-06-07 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure Modrinth support specifies paper/purpur loader as needed (#1990)

Browse Source
This commit is contained in:
Geoff Bourne 2023-03-05 08:55:19 -06:00 committed by GitHub
parent b7e93e56e5
commit 9b538267a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
--from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
ARG MC_HELPER_VERSION=1.25.6 ARG MC_HELPER_VERSION=1.25.9
ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
| tar -C /usr/share -zxf - \ | tar -C /usr/share -zxf - \

13
scripts/start-setupModpack
View File

@ -183,7 +183,7 @@ esac
fi fi
} }
function genericPacks() { function handleGenericPacks() {
: "${GENERIC_PACKS:=${GENERIC_PACK}}" : "${GENERIC_PACKS:=${GENERIC_PACK}}"
: "${GENERIC_PACKS_PREFIX:=}" : "${GENERIC_PACKS_PREFIX:=}"
: "${GENERIC_PACKS_SUFFIX:=}" : "${GENERIC_PACKS_SUFFIX:=}"
@ -267,7 +267,7 @@ function genericPacks() {
fi fi
} }
function modrinthProjects() { function handleModrinthProjects() {
: "${MODRINTH_PROJECTS:=}" : "${MODRINTH_PROJECTS:=}"
: "${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES:=true}" : "${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES:=true}"
: "${MODRINTH_ALLOWED_VERSION_TYPE:=release}" : "${MODRINTH_ALLOWED_VERSION_TYPE:=release}"
@ -275,8 +275,11 @@ function modrinthProjects() {
if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC SPIGOT; then if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC SPIGOT; then
if isFamily HYBRID FORGE; then if isFamily HYBRID FORGE; then
loader=forge loader=forge
elif isFaily FABRIC; then
loader=fabric
else else
loader="${FAMILY,,}" # we're left with Bukkit/Spigot down-lines where plugins seem to be
loader="${TYPE,,}"
fi fi
mc-image-helper modrinth \ mc-image-helper modrinth \
--output-directory=/data \ --output-directory=/data \
@ -294,8 +297,8 @@ handleModpackListOrFile
handleCurseForgeManifest handleCurseForgeManifest
genericPacks handleGenericPacks
modrinthProjects handleModrinthProjects
exec "${SCRIPTS:-/}start-setupModconfig" "$@" exec "${SCRIPTS:-/}start-setupModconfig" "$@"