Combine stderr

This reverts commit 286c104bdc.

README.md

@@ -899,6 +899,12 @@ Example of expected Vanillatweaks file format:
       "coordinates hud"
     ],
     "items": ["armored elytra"]
+  },
+  "craftingtweaks": {
+    "quality of life": [
+      "rotten flesh to leather",
+      "back to blocks"
+    ]
   }
 }
 ```

scripts/start-setupVanillaTweaks

@@ -33,7 +33,7 @@ if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
   fi
 fi
 
-# Use vanillatweaks file to specify VT and datapacks
+# Use vanillatweaks file to specify VT and datapacks and crafting tweaks
 if [[ "$VANILLATWEAKS_FILE" ]]; then
   if [ ! -f "$VANILLATWEAKS_FILE" ]; then
     log "ERROR: given VANILLATWEAKS_FILE file does not exist"
@@ -41,8 +41,10 @@ if [[ "$VANILLATWEAKS_FILE" ]]; then
   fi
 
   PACKS=$(jq -jc '.packs' $VANILLATWEAKS_FILE)
-  if [ ! "$PACKS" ]; then
+  CRAFTING_TWEAKS=$(jq -jc '.craftingtweaks' $VANILLATWEAKS_FILE)
-    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
   fi
 
@@ -58,19 +60,19 @@ if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
   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')
   if [ ! "$DOWNLOAD_URL" ]; then
-    log "ERROR: unable to retrieve DOWNLOAD_URL from vanillatweaks.net!"
+    log "ERROR: unable to retrieve datapack DOWNLOAD_URL from vanillatweaks.net!"
     exit 2
   fi
 
   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 from ${DOWNLOAD_URL}"
+    log "ERROR: failed to download datapacks from ${DOWNLOAD_URL}"
     exit 2
   fi
 
   mkdir -p "$out_dir"
   if ! unzip -o -d "$out_dir" $TEMPZIP; then
-    log "ERROR: failed to unzip the ${PACKS} from ${$TEMPZIP}"
+    log "ERROR: failed to unzip the datapacks ${PACKS} from ${$TEMPZIP}"
   fi
 
   # clean up files time!
@@ -81,4 +83,20 @@ if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
   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" "$@"

tests/setuponlytests/test.sh

@@ -11,8 +11,8 @@ setupOnlyMinecraftTest(){
   cd "$folder"
   result=0
 
-  if ! logs=$(docker compose run --quiet-pull mc 2>&1); then
+  if ! logs=$(docker-compose run mc 2>&1); then
-    echo "${folder} setup FAILED"
+    echo "${folder} test scenario FAILED"
     echo ":::::::::::: LOGS ::::::::::::::::
 $logs
 ::::::::::::::::::::::::::::::::::
@@ -29,7 +29,7 @@ $logs
     echo "${folder} PASS"
   fi
 
-  docker compose down -v --remove-orphans
+  docker-compose down -v --remove-orphans
   cd ..
 
   return $result