Skip to content

Support Modrinth Plugins for Velocity and BungeeCord, make $PLUGINS logic use mcopy #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 9, 2023
Merged

Support Modrinth Plugins for Velocity and BungeeCord, make $PLUGINS logic use mcopy #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dbb567
Update to add support for modrinth and use mcopy for $PLUGINS
Jade-TheCat Aug 9, 2023
be03bab
Add default values for modrinth projects
Jade-TheCat Aug 9, 2023
5babfbe
Update Dockerfile for new version of mc-image-helper
Jade-TheCat Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \

COPY --chmod=444 templates/ /templates/

ARG MC_HELPER_VERSION=1.32.4
ARG MC_HELPER_VERSION=1.33.3
ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
# used for cache busting local copy of mc-image-helper
ARG MC_HELPER_REV=1
Expand Down
22 changes: 18 additions & 4 deletions scripts/run-bungeecord.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
: "${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}"
: "${REPLACE_ENV_VARIABLES_EXCLUDES:=}"
: "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
: "${MODRINTH_PROJECTS:=}"
: "${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES:=true}"
: "${MODRINTH_ALLOWED_VERSION_TYPE:=release}"

BUNGEE_HOME=/server
RCON_JAR_URL=https://github.com/orblazer/bungee-rcon/releases/download/v${RCON_JAR_VERSION}/bungee-rcon-${RCON_JAR_VERSION}.jar
Expand Down Expand Up @@ -358,10 +361,11 @@ fi
# If supplied with a URL for a plugin download it.
if [[ "$PLUGINS" ]]; then
mkdir -p "$BUNGEE_HOME/plugins"
if ! get --skip-existing -o "$BUNGEE_HOME/plugins" "$PLUGINS"; then
echo "ERROR: failed to download plugin(s)"
exit 1
fi
mc-image-helper mcopy \
--glob=*.jar \
--scope=var-list \
--to="$BUNGEE_HOME/plugins" \
"$PLUGINS"
fi

if [[ ${SPIGET_PLUGINS} ]]; then
Expand All @@ -377,6 +381,16 @@ if [[ ${SPIGET_PLUGINS} ]]; then
done
fi

if [[ $MODRINTH_PROJECTS ]] then
mc-image-helper modrinth \
--output-directory=/data \
--projects="${MODRINTH_PROJECTS}" \
--game-version="${VERSION}" \
--loader="${family}" \
--download-optional-dependencies="${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES}" \
--allowed-version-type="${MODRINTH_ALLOWED_VERSION_TYPE}"
fi

# Download rcon plugin
if [[ "${family}" == "velocity" ]] || isTrue "${APPLY_VELOCITY_RCON:-false}"; then # Download UnioDex/VelocityRcon plugin
if isTrue "${ENABLE_RCON}"; then
Expand Down