From bc9023d4362d61bcc6ff4403ae8cab0ae5edc67c Mon Sep 17 00:00:00 2001 From: Kas-tle <26531652+Kas-tle@users.noreply.github.com> Date: Sun, 23 Jul 2023 02:21:41 -0700 Subject: [PATCH] Update conversion-request.yml --- .github/workflows/conversion-request.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conversion-request.yml b/.github/workflows/conversion-request.yml index 7bcd785..a9a04a7 100644 --- a/.github/workflows/conversion-request.yml +++ b/.github/workflows/conversion-request.yml @@ -19,6 +19,7 @@ jobs: block_material: ${{ steps.organize-inputs.outputs.BLOCK_MATERIAL }} attachable_material: ${{ steps.organize-inputs.outputs.ATTACHABLE_MATERIAL }} archive_scratch: ${{ steps.organize-inputs.outputs.ARCHIVE_SCRATCH }} + rename_model_files: ${{ steps.organize-inputs.outputs.RENAME_MODEL_FILES }} steps: - name: Issue Forms Body Parser id: parse-issue @@ -36,7 +37,8 @@ jobs: "default_assets_version": test_input(.["default-assets-version"].text; "1.19.3"), "block_material": test_input(.["block-material"].text; "alpha_test"), "attachable_material": test_input(.["attachable-material"].text; "entity_alphatest_one_sided"), - "archive_scratch": test_input(.["archive-scratch-files"].text; "false") + "archive_scratch": test_input(.["archive-scratch-files"].text; "false"), + "rename_model_files": test_input(.["rename-model-files"].text; "false") }' > inputs.json echo "PACK_URL=$(jq -r '.pack_url' inputs.json)" >> $GITHUB_OUTPUT echo "DEFAULT_PACK_URL=$(jq -r '.default_pack_url' inputs.json)" >> $GITHUB_OUTPUT @@ -45,6 +47,7 @@ jobs: echo "BLOCK_MATERIAL=$(jq -r '.block_material' inputs.json)" >> $GITHUB_OUTPUT echo "ATTACHABLE_MATERIAL=$(jq -r '.attachable_material' inputs.json)" >> $GITHUB_OUTPUT echo "ARCHIVE_SCRATCH=$(jq -r '.archive_scratch' inputs.json)" >> $GITHUB_OUTPUT + echo "RENAME_MODEL_FILES"=$(jq -r '.rename_model_files' inputs.json)" >> $GITHUB_OUTPUT convert-pack: runs-on: ubuntu-latest needs: get-pack-info @@ -82,6 +85,7 @@ jobs: BLOCK_MATERIAL: ${{ needs.get-pack-info.outputs.block_material }} ATTACHABLE_MATERIAL: ${{ needs.get-pack-info.outputs.attachable_material }} ARCHIVE_SCRATCH: ${{ needs.get-pack-info.outputs.archive_scratch }} + RENAME_MODEL_FILES: ${{ needs.get-pack-info.outputs.rename_model_files }} run: | mkdir -p staging cp converter.sh staging/ @@ -93,7 +97,7 @@ jobs: COLUMNS=$COLUMNS-1 curl --no-styled-output -#L -o merge_pack.zip "${MERGE_PACK_URL}" MERGE_PACK_FILE="merge_pack.zip" fi - ./converter.sh input_pack.zip -w "false" -m ${MERGE_PACK_FILE} -a ${ATTACHABLE_MATERIAL} -b ${BLOCK_MATERIAL} -f ${DEFAULT_PACK_URL} -v ${DEFAULT_ASSETS_VERSION} -s ${ARCHIVE_SCRATCH} -u "true" + ./converter.sh input_pack.zip -w "false" -m ${MERGE_PACK_FILE} -a ${ATTACHABLE_MATERIAL} -b ${BLOCK_MATERIAL} -f ${DEFAULT_PACK_URL} -v ${DEFAULT_ASSETS_VERSION} -r ${RENAME_MODEL_FILES} -s ${ARCHIVE_SCRATCH} -u "true" - name: Upload converted pack uses: actions/upload-artifact@v3 with: