amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-30 10:47:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "added crafting tweaks functionality to vanillatweaks json method"

Browse Source 
This reverts commit 286c104bdc.
This commit is contained in:
Floyd Everest
2022-01-25 13:05:21 +11:00
parent 286c104bdc
commit 965729a87d
2 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
-6
View File
@@ -899,12 +899,6 @@ Example of expected Vanillatweaks file format:
"coordinates hud" "coordinates hud"
], ],
"items": ["armored elytra"] "items": ["armored elytra"]
},
"craftingtweaks": {
"quality of life": [
"rotten flesh to leather",
"back to blocks"
]
} }
} }
``` ```
scripts/start-setupVanillaTweaks
+6 -24
View File
@@ -33,7 +33,7 @@ if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
fi fi
fi fi
# Use vanillatweaks file to specify VT and datapacks and crafting tweaks # Use vanillatweaks file to specify VT and datapacks
if [[ "$VANILLATWEAKS_FILE" ]]; then if [[ "$VANILLATWEAKS_FILE" ]]; then
if [ ! -f "$VANILLATWEAKS_FILE" ]; then if [ ! -f "$VANILLATWEAKS_FILE" ]; then
log "ERROR: given VANILLATWEAKS_FILE file does not exist" log "ERROR: given VANILLATWEAKS_FILE file does not exist"
@@ -41,10 +41,8 @@ if [[ "$VANILLATWEAKS_FILE" ]]; then
fi fi
PACKS=$(jq -jc '.packs' $VANILLATWEAKS_FILE) PACKS=$(jq -jc '.packs' $VANILLATWEAKS_FILE)
CRAFTING_TWEAKS=$(jq -jc '.craftingtweaks' $VANILLATWEAKS_FILE) if [ ! "$PACKS" ]; then
log "ERROR: unable to retrieve packs from $VANILLATWEAKS_FILE"
if [ ! "$PACKS" ] && [ ! "$CRAFTING_TWEAKS" ]; then
log "ERROR: unable to retrieve packs or crafting tweaks from $VANILLATWEAKS_FILE"
exit 2 exit 2
fi fi
@@ -60,19 +58,19 @@ if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
VT_ZIPDATA_URL=https://vanillatweaks.net/assets/server/zipdatapacks.php VT_ZIPDATA_URL=https://vanillatweaks.net/assets/server/zipdatapacks.php
DOWNLOAD_URL=$(curl -X POST -F "packs=${PACKS}" -F "version=${VT_VERSION}" $VT_ZIPDATA_URL | jq -r '.link') DOWNLOAD_URL=$(curl -X POST -F "packs=${PACKS}" -F "version=${VT_VERSION}" $VT_ZIPDATA_URL | jq -r '.link')
if [ ! "$DOWNLOAD_URL" ]; then if [ ! "$DOWNLOAD_URL" ]; then
log "ERROR: unable to retrieve datapack DOWNLOAD_URL from vanillatweaks.net!" log "ERROR: unable to retrieve DOWNLOAD_URL from vanillatweaks.net!"
exit 2 exit 2
fi fi
TEMPZIP=/tmp/vanillatweaks.zip TEMPZIP=/tmp/vanillatweaks.zip
if ! get -o $TEMPZIP "https://vanillatweaks.net${DOWNLOAD_URL}"; then if ! get -o $TEMPZIP "https://vanillatweaks.net${DOWNLOAD_URL}"; then
log "ERROR: failed to download datapacks from ${DOWNLOAD_URL}" log "ERROR: failed to download from ${DOWNLOAD_URL}"
exit 2 exit 2
fi fi
mkdir -p "$out_dir" mkdir -p "$out_dir"
if ! unzip -o -d "$out_dir" $TEMPZIP; then if ! unzip -o -d "$out_dir" $TEMPZIP; then
log "ERROR: failed to unzip the datapacks ${PACKS} from ${$TEMPZIP}" log "ERROR: failed to unzip the ${PACKS} from ${$TEMPZIP}"
fi fi
# clean up files time! # clean up files time!
@@ -83,20 +81,4 @@ if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
fi fi
fi fi
# Download and move crafting tweaks
if [[ "$CRAFTING_TWEAKS" ]] && [[ "$VT_VERSION" ]]; then
VT_ZIPDATA_URL=https://vanillatweaks.net/assets/server/zipcraftingtweaks.php
DOWNLOAD_URL=$(curl -X POST -F "packs=${CRAFTING_TWEAKS}" -F "version=${VT_VERSION}" $VT_ZIPDATA_URL | jq -r '.link')
if [ ! "$DOWNLOAD_URL" ]; then
log "ERROR: unable to retrieve crafting tweak DOWNLOAD_URL from vanillatweaks.net!"
exit 2
fi
mkdir -p "$out_dir"
if ! get -o $out_dir/crafting_tweaks.zip "https://vanillatweaks.net${DOWNLOAD_URL}"; then
log "ERROR: failed to download crafting tweaks from ${DOWNLOAD_URL}"
exit 2
fi
fi
exec "${SCRIPTS:-/}start-setupDatapack" "$@" exec "${SCRIPTS:-/}start-setupDatapack" "$@"