Ensure datapacks cleanup doesn't remove vanillatweaks

itzg · Jul 1, 2023 · 66a2394 · 66a2394
1 parent 4a942db
commit 66a2394
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/notes/.gitignore b/notes/.gitignore
@@ -0,0 +1 @@
+/*.bkp
diff --git a/notes/start-script-flow.drawio.png b/notes/start-script-flow.drawio.png
diff --git a/scripts/start-setupDatapack b/scripts/start-setupDatapack
@@ -2,6 +2,8 @@
 
 set -e -o pipefail
 
+: "${VANILLATWEAKS_FILE:=}"
+: "${VANILLATWEAKS_SHARECODE:=}"
 : "${REMOVE_OLD_DATAPACKS:=false}"
 : "${DATAPACKS_FILE:=}"
 : "${REMOVE_OLD_DATAPACKS_DEPTH:=1} "
@@ -11,6 +13,14 @@ set -e -o pipefail
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
+if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
+ mc-image-helper vanillatweaks \
+ --output-directory="/data" \
+ --world-subdir="${LEVEL:-world}" \
+ --share-codes="$VANILLATWEAKS_SHARECODE" \
+ --pack-files="$VANILLATWEAKS_FILE"
+fi
+
 out_dir=/data/${LEVEL:-world}/datapacks
 
 # Remove old datapacks

diff --git a/scripts/start-setupVanillaTweaks b/scripts/start-setupVanillaTweaks
diff --git a/scripts/start-setupWorld b/scripts/start-setupWorld
@@ -48,7 +48,7 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  count=$(echo "$baseDirs" | wc -l)
  if [[ $count -gt 1 ]]; then
  baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
- if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
+ if [ "$(echo "$baseDirsNoSpigotSuffix" | wc -l)" -eq 1 ]; then
  baseDir="$baseDirsNoSpigotSuffix"
  baseName=$(basename "$baseDir")
  log "Found Spigot naming conventions, taking $baseName as main dimension"
@@ -123,4 +123,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  fi
 fi
 
-exec "${SCRIPTS:-/}start-setupVanillaTweaks" "$@"
+exec "${SCRIPTS:-/}start-setupDatapack" "$@"