From 03d2a888b75bc09fbbed825e977eb5afc871330c Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 09:58:33 +0100 Subject: [PATCH 01/32] test 1 --- .github/workflows/create-release.yml | 29 +++++++++++++++++++ .../versions/changelog/building_version.json | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/create-release.yml diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml new file mode 100644 index 000000000..ae0f2780a --- /dev/null +++ b/.github/workflows/create-release.yml @@ -0,0 +1,29 @@ +name: Create Release + +on: + push: + paths: + - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Get version + id: get_version + run: | + VERSION=$(jq -r '."Release Building"' "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") + CLEAN_VERSION=$(echo $VERSION | grep -oP 'Skyblock_Classic_Edition:\K[0-9]+\.[0-9]+\.[0-9]+') + echo "version=$CLEAN_VERSION" >> $GITHUB_OUTPUT + + - name: Create ZIP + run: | + zip -r "Skyblock-Classic-Edition_v${{ steps.get_version.outputs.version }}.zip" . + + - name: Upload ZIP as artifact + uses: actions/upload-artifact@v3 + with: + name: Skyblock-Classic-Edition + path: Skyblock-Classic-Edition_v${{ steps.get_version.outputs.version }}.zip \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 0000070b9..6da5d3429 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.1testCI", "Data_pack": "TRUE", From 29bc3885d18e181b3ec9701f04a6dc942970aa96 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:07:43 +0100 Subject: [PATCH 02/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.2testCI --- .github/workflows/create-release.yml | 11 ++--------- .../function/versions/changelog/building_version.json | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index ae0f2780a..1313b652e 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -11,19 +11,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Get version - id: get_version - run: | - VERSION=$(jq -r '."Release Building"' "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") - CLEAN_VERSION=$(echo $VERSION | grep -oP 'Skyblock_Classic_Edition:\K[0-9]+\.[0-9]+\.[0-9]+') - echo "version=$CLEAN_VERSION" >> $GITHUB_OUTPUT - - name: Create ZIP run: | - zip -r "Skyblock-Classic-Edition_v${{ steps.get_version.outputs.version }}.zip" . + zip -r "Skyblock-Classic-Edition.zip" . - name: Upload ZIP as artifact uses: actions/upload-artifact@v3 with: name: Skyblock-Classic-Edition - path: Skyblock-Classic-Edition_v${{ steps.get_version.outputs.version }}.zip \ No newline at end of file + path: Skyblock-Classic-Edition.zip \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 6da5d3429..75fdd6b69 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.1testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.2testCI", "Data_pack": "TRUE", From 72a56ae0b1c7a92f6fe697fdc881cc30bbaa5232 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:13:52 +0100 Subject: [PATCH 03/32] Update create-release.yml --- .github/workflows/create-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 1313b652e..b61d0fe7e 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,10 +13,10 @@ jobs: - name: Create ZIP run: | - zip -r "Skyblock-Classic-Edition.zip" . + zip -r "Skyblock-Classic-Edition.zip" . -x "*.zip" - name: Upload ZIP as artifact uses: actions/upload-artifact@v3 with: - name: Skyblock-Classic-Edition + name: Skyblock_CE_Latest path: Skyblock-Classic-Edition.zip \ No newline at end of file From 53b498bc2f4b64066d408f4bd695ea0aa3ead0d5 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:14:23 +0100 Subject: [PATCH 04/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 75fdd6b69..8e60b03fb 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -11,7 +11,7 @@ "Resource_pack": "TRUE", -"Custom Structures World": "4.0.0", +"Custom Structures World": "4.0.0test", "Protocol Version": "1.21_PVN_0", From 95a419a716bc73796126485916467b939ed0eee1 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:22:02 +0100 Subject: [PATCH 05/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.3testCI --- .github/workflows/create-release.yml | 8 +++++++- .../function/versions/changelog/building_version.json | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index b61d0fe7e..d11daca01 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,7 +13,13 @@ jobs: - name: Create ZIP run: | - zip -r "Skyblock-Classic-Edition.zip" . -x "*.zip" + zip -r "Skyblock-Classic-Edition.zip" . \ + -x "*.git/*" \ + -x "*.github/*" \ + -x "*crowdin.yml" \ + -x "*spyglass.json" \ + -x "*.zip" \ + -x "*.DS_Store" - name: Upload ZIP as artifact uses: actions/upload-artifact@v3 diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 8e60b03fb..a9f6e1c4d 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,13 +5,13 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.2testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.3testCI", "Data_pack": "TRUE", "Resource_pack": "TRUE", -"Custom Structures World": "4.0.0test", +"Custom Structures World": "4.0.0", "Protocol Version": "1.21_PVN_0", From c9912c6ff6cc648aa0001d5c0658042a4734c2de Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:28:43 +0100 Subject: [PATCH 06/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.4testCI --- .github/workflows/create-release.yml | 2 ++ .../skyblock/function/versions/changelog/building_version.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index d11daca01..3db880c2c 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,6 +16,8 @@ jobs: zip -r "Skyblock-Classic-Edition.zip" . \ -x "*.git/*" \ -x "*.github/*" \ + -x "*.worlds/" \ + -x "*Resources Pack/" \ -x "*crowdin.yml" \ -x "*spyglass.json" \ -x "*.zip" \ diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index a9f6e1c4d..94baf009b 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.3testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.4testCI", "Data_pack": "TRUE", From d9039c0edbe189e50d2e3f73facbd4eaa80e5eb0 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:35:00 +0100 Subject: [PATCH 07/32] test release --- .github/workflows/create-release.yml | 25 +++++++++++++++++-- .../versions/changelog/building_version.json | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 3db880c2c..ff6e26fa0 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -6,7 +6,28 @@ on: - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' jobs: + check_changes: + runs-on: ubuntu-latest + outputs: + should_build: ${{ steps.check.outputs.changed }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - name: Check if Release Building changed + id: check + run: | + CHANGED=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep '"Release Building"' || true) + if [ ! -z "$CHANGED" ]; then + echo "changed=true" >> $GITHUB_OUTPUT + else + echo "changed=false" >> $GITHUB_OUTPUT + fi + build: + needs: check_changes + if: needs.check_changes.outputs.should_build == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -16,8 +37,8 @@ jobs: zip -r "Skyblock-Classic-Edition.zip" . \ -x "*.git/*" \ -x "*.github/*" \ - -x "*.worlds/" \ - -x "*Resources Pack/" \ + -x "*.worlds/*" \ + -x "*Resources Pack/*" \ -x "*crowdin.yml" \ -x "*spyglass.json" \ -x "*.zip" \ diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 94baf009b..56ad75581 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -17,7 +17,7 @@ "Protocol Identifier Data": "1.21_PID_0", -"Sub Protocol Identifier Data": "1.21_SUBPID_0_0", +"Sub Protocol Identifier Data": "1.21_SUBPID_0_01", "Github_Tag": "1.21_JE-4a", From bf164c5f5f0a523227cd27a5ed2d44948676e7ba Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:35:55 +0100 Subject: [PATCH 08/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.5testCI --- .../function/versions/changelog/building_version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 56ad75581..d79e0327e 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.4testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.5testCI", "Data_pack": "TRUE", @@ -17,7 +17,7 @@ "Protocol Identifier Data": "1.21_PID_0", -"Sub Protocol Identifier Data": "1.21_SUBPID_0_01", +"Sub Protocol Identifier Data": "1.21_SUBPID_0_0", "Github_Tag": "1.21_JE-4a", From 0346a44eb2b00843efa1fd6cb69ae0e3e7b9961e Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:42:11 +0100 Subject: [PATCH 09/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6testCI --- .github/workflows/create-release.yml | 25 ++++++++----------- .../versions/changelog/building_version.json | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index ff6e26fa0..c8a0ae59c 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -32,20 +32,17 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Create ZIP - run: | - zip -r "Skyblock-Classic-Edition.zip" . \ - -x "*.git/*" \ - -x "*.github/*" \ - -x "*.worlds/*" \ - -x "*Resources Pack/*" \ - -x "*crowdin.yml" \ - -x "*spyglass.json" \ - -x "*.zip" \ - -x "*.DS_Store" - - - name: Upload ZIP as artifact + - name: Upload folder content as artifact uses: actions/upload-artifact@v3 with: name: Skyblock_CE_Latest - path: Skyblock-Classic-Edition.zip \ No newline at end of file + path: | + **/* + !.git/** + !.github/** + !.worlds/** + !Resources Pack/** + !crowdin.yml + !spyglass.json + !*.zip + !.DS_Store \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index d79e0327e..60bec246b 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.5testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6testCI", "Data_pack": "TRUE", From a4b52af3c776efaf60156227c0beb0ca395c39f6 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:48:46 +0100 Subject: [PATCH 10/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:7testCI - pulizia --- .github/workflows/create-release.yml | 16 +++++++++------- .../versions/changelog/building_version.json | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index c8a0ae59c..7bee6e938 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -17,9 +17,9 @@ jobs: - name: Check if Release Building changed id: check + shell: bash run: | - CHANGED=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep '"Release Building"' || true) - if [ ! -z "$CHANGED" ]; then + if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Release Building"'; then echo "changed=true" >> $GITHUB_OUTPUT else echo "changed=false" >> $GITHUB_OUTPUT @@ -38,11 +38,13 @@ jobs: name: Skyblock_CE_Latest path: | **/* - !.git/** - !.github/** - !.worlds/** - !Resources Pack/** + !.git/ + !.github/ + !.gitignore + !.worlds/ + !Resources Pack/ !crowdin.yml !spyglass.json !*.zip - !.DS_Store \ No newline at end of file + !.DS_Store + if-no-files-found: error \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 60bec246b..e5236e7c1 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:7testCI", "Data_pack": "TRUE", From e780a9528dde088706ca53c51d2b6e46867a5c6e Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:51:58 +0100 Subject: [PATCH 11/32] risolti avvisi --- .github/workflows/create-release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 7bee6e938..89e69ad01 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -7,11 +7,11 @@ on: jobs: check_changes: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: should_build: ${{ steps.check.outputs.changed }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 2 @@ -28,21 +28,21 @@ jobs: build: needs: check_changes if: needs.check_changes.outputs.should_build == 'true' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Upload folder content as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Latest path: | **/* - !.git/ - !.github/ + !.git/** + !.github/** !.gitignore - !.worlds/ - !Resources Pack/ + !.worlds/** + !Resources Pack/** !crowdin.yml !spyglass.json !*.zip From e27f3a648a5a56c2bd67a2e6884aedddb6aed213 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 10:53:05 +0100 Subject: [PATCH 12/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:8testCI --- .github/workflows/create-release.yml | 2 +- .../skyblock/function/versions/changelog/building_version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 89e69ad01..a984b55a5 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -1,4 +1,4 @@ -name: Create Release +name: Create Release Build on: push: diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index e5236e7c1..e9b2a176d 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:7testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:8testCI", "Data_pack": "TRUE", From f6f37a32d75b6251d64ab4763f04a41e63bfa064 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 11:02:46 +0100 Subject: [PATCH 13/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI --- ...create-release.yml => nightly_release.yml} | 0 .github/workflows/release.yml | 50 +++++++++++++++++++ .../versions/changelog/building_version.json | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) rename .github/workflows/{create-release.yml => nightly_release.yml} (100%) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/create-release.yml b/.github/workflows/nightly_release.yml similarity index 100% rename from .github/workflows/create-release.yml rename to .github/workflows/nightly_release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..a984b55a5 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,50 @@ +name: Create Release Build + +on: + push: + paths: + - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' + +jobs: + check_changes: + runs-on: ubuntu-24.04 + outputs: + should_build: ${{ steps.check.outputs.changed }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 2 + + - name: Check if Release Building changed + id: check + shell: bash + run: | + if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Release Building"'; then + echo "changed=true" >> $GITHUB_OUTPUT + else + echo "changed=false" >> $GITHUB_OUTPUT + fi + + build: + needs: check_changes + if: needs.check_changes.outputs.should_build == 'true' + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + + - name: Upload folder content as artifact + uses: actions/upload-artifact@v4 + with: + name: Skyblock_CE_Latest + path: | + **/* + !.git/** + !.github/** + !.gitignore + !.worlds/** + !Resources Pack/** + !crowdin.yml + !spyglass.json + !*.zip + !.DS_Store + if-no-files-found: error \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index e9b2a176d..9f96fd3fd 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:8testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", "Data_pack": "TRUE", From 53d090a0f95d197c1455ee6ec4eeca232f20a491 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 11:08:37 +0100 Subject: [PATCH 14/32] aggiunto Nightly Building --- .github/workflows/nightly_release.yml | 8 ++++---- .../function/versions/changelog/building_version.json | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index a984b55a5..f6bcb3eaf 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -1,4 +1,4 @@ -name: Create Release Build +name: Create Nightly Release Build on: push: @@ -15,11 +15,11 @@ jobs: with: fetch-depth: 2 - - name: Check if Release Building changed + - name: Check if Nightly Release Building changed id: check shell: bash run: | - if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Release Building"'; then + if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Nightly Building"'; then echo "changed=true" >> $GITHUB_OUTPUT else echo "changed=false" >> $GITHUB_OUTPUT @@ -35,7 +35,7 @@ jobs: - name: Upload folder content as artifact uses: actions/upload-artifact@v4 with: - name: Skyblock_CE_Latest + name: Skyblock_CE_Nightly_Snapshots path: | **/* !.git/** diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 9f96fd3fd..2589c0e90 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,6 +7,8 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_12.01.2025.11108a_[main]", + "Data_pack": "TRUE", "Resource_pack": "TRUE", From 8239ad73a64cc2a3303b91862fe39a6962e254a2 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Wed, 15 Jan 2025 11:11:31 +0100 Subject: [PATCH 15/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 2589c0e90..23215803c 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_12.01.2025.11108a_[main]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_12.01.2025.21108a_[main]", "Data_pack": "TRUE", From c8e05887255de7a2f2d97cf1191d777be57b3967 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 17:36:32 +0100 Subject: [PATCH 16/32] Update nightly_release.yml --- .github/workflows/nightly_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index f6bcb3eaf..c448db32c 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -35,7 +35,7 @@ jobs: - name: Upload folder content as artifact uses: actions/upload-artifact@v4 with: - name: Skyblock_CE_Nightly_Snapshots + name: Skyblock CE Nightly Snapshots path: | **/* !.git/** From a2fba40d3b06d3e062f0f273ba19e682740100e4 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 17:38:58 +0100 Subject: [PATCH 17/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11738a_[CItest] --- .github/workflows/nightly_release.yml | 2 +- .../skyblock/function/versions/changelog/building_version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index c448db32c..f6bcb3eaf 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -35,7 +35,7 @@ jobs: - name: Upload folder content as artifact uses: actions/upload-artifact@v4 with: - name: Skyblock CE Nightly Snapshots + name: Skyblock_CE_Nightly_Snapshots path: | **/* !.git/** diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 23215803c..7d7871492 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_12.01.2025.21108a_[main]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11738a_[CItest]", "Data_pack": "TRUE", From 482da5a95c42421e4fc30a12cbd8de85cb12af9d Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 17:44:45 +0100 Subject: [PATCH 18/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21738a_[CItest] --- .github/workflows/nightly_release.yml | 19 +++++++++++++++---- .github/workflows/release.yml | 17 ++++++++++++++--- .../versions/changelog/building_version.json | 2 +- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index f6bcb3eaf..cdd300d0f 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -15,12 +15,23 @@ jobs: with: fetch-depth: 2 - - name: Check if Nightly Release Building changed + - name: Get file changes + id: changed-files + run: | + DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") + echo "diff<> $GITHUB_OUTPUT + echo "$DIFF" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + + - name: Check if Nightly Building changed id: check - shell: bash run: | - if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Nightly Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT + if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then + if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then + echo "changed=true" >> $GITHUB_OUTPUT + else + echo "changed=false" >> $GITHUB_OUTPUT + fi else echo "changed=false" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a984b55a5..e7d3f0283 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,12 +15,23 @@ jobs: with: fetch-depth: 2 + - name: Get file changes + id: changed-files + run: | + DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") + echo "diff<> $GITHUB_OUTPUT + echo "$DIFF" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + - name: Check if Release Building changed id: check - shell: bash run: | - if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Release Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT + if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then + if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then + echo "changed=true" >> $GITHUB_OUTPUT + else + echo "changed=false" >> $GITHUB_OUTPUT + fi else echo "changed=false" >> $GITHUB_OUTPUT fi diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 7d7871492..dd8f56100 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11738a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21738a_[CItest]", "Data_pack": "TRUE", From 0a067afe2807c842083bb617ed5ab2f1d915bcfd Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 17:52:56 +0100 Subject: [PATCH 19/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:10testCI --- .github/workflows/nightly_release.yml | 6 +----- .github/workflows/release.yml | 6 +----- .../function/versions/changelog/building_version.json | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index cdd300d0f..a83117284 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -27,11 +27,7 @@ jobs: id: check run: | if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then - if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT - else - echo "changed=false" >> $GITHUB_OUTPUT - fi + echo "changed=true" >> $GITHUB_OUTPUT else echo "changed=false" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7d3f0283..2e9a47369 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,11 +27,7 @@ jobs: id: check run: | if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then - if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT - else - echo "changed=false" >> $GITHUB_OUTPUT - fi + echo "changed=true" >> $GITHUB_OUTPUT else echo "changed=false" >> $GITHUB_OUTPUT fi diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index dd8f56100..843ff590a 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:10testCI", "Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21738a_[CItest]", From 5397f5f76b52e70801454d663152c607b3480619 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 17:59:49 +0100 Subject: [PATCH 20/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11759a_[CItest] --- .../{nightly_release.yml => build.yml} | 44 +++++++++++--- .github/workflows/release.yml | 57 ------------------- .../versions/changelog/building_version.json | 2 +- 3 files changed, 37 insertions(+), 66 deletions(-) rename .github/workflows/{nightly_release.yml => build.yml} (50%) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/build.yml similarity index 50% rename from .github/workflows/nightly_release.yml rename to .github/workflows/build.yml index a83117284..a5e722ead 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Create Nightly Release Build +name: Create Builds on: push: @@ -9,7 +9,8 @@ jobs: check_changes: runs-on: ubuntu-24.04 outputs: - should_build: ${{ steps.check.outputs.changed }} + release_changed: ${{ steps.check.outputs.release_changed }} + nightly_changed: ${{ steps.check.outputs.nightly_changed }} steps: - uses: actions/checkout@v4 with: @@ -23,23 +24,50 @@ jobs: echo "$DIFF" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - name: Check if Nightly Building changed + - name: Check changes id: check run: | + if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then + echo "release_changed=true" >> $GITHUB_OUTPUT + else + echo "release_changed=false" >> $GITHUB_OUTPUT + fi if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT + echo "nightly_changed=true" >> $GITHUB_OUTPUT else - echo "changed=false" >> $GITHUB_OUTPUT + echo "nightly_changed=false" >> $GITHUB_OUTPUT fi - build: + release_build: needs: check_changes - if: needs.check_changes.outputs.should_build == 'true' + if: needs.check_changes.outputs.release_changed == 'true' runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 + - name: Upload release content + uses: actions/upload-artifact@v4 + with: + name: Skyblock_CE_Latest + path: | + **/* + !.git/** + !.github/** + !.gitignore + !.worlds/** + !Resources Pack/** + !crowdin.yml + !spyglass.json + !*.zip + !.DS_Store + if-no-files-found: error - - name: Upload folder content as artifact + nightly_build: + needs: check_changes + if: needs.check_changes.outputs.nightly_changed == 'true' + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + - name: Upload nightly content uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Nightly_Snapshots diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 2e9a47369..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Create Release Build - -on: - push: - paths: - - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' - -jobs: - check_changes: - runs-on: ubuntu-24.04 - outputs: - should_build: ${{ steps.check.outputs.changed }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - - name: Get file changes - id: changed-files - run: | - DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") - echo "diff<> $GITHUB_OUTPUT - echo "$DIFF" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - - - name: Check if Release Building changed - id: check - run: | - if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then - echo "changed=true" >> $GITHUB_OUTPUT - else - echo "changed=false" >> $GITHUB_OUTPUT - fi - - build: - needs: check_changes - if: needs.check_changes.outputs.should_build == 'true' - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - - name: Upload folder content as artifact - uses: actions/upload-artifact@v4 - with: - name: Skyblock_CE_Latest - path: | - **/* - !.git/** - !.github/** - !.gitignore - !.worlds/** - !Resources Pack/** - !crowdin.yml - !spyglass.json - !*.zip - !.DS_Store - if-no-files-found: error \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 843ff590a..93f0a54d0 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:10testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21738a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11759a_[CItest]", "Data_pack": "TRUE", From fc27c5a7dae779ea9e1c7b4372be400684077632 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:06:48 +0100 Subject: [PATCH 21/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:11testCI --- .github/workflows/build.yml | 13 ++++++++----- .../versions/changelog/building_version.json | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5e722ead..2c42ddc16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,12 +27,13 @@ jobs: - name: Check changes id: check run: | - if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then + DIFF="${{ steps.changed-files.outputs.diff }}" + if echo "$DIFF" | grep -q '"Release Building"'; then echo "release_changed=true" >> $GITHUB_OUTPUT else echo "release_changed=false" >> $GITHUB_OUTPUT fi - if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then + if echo "$DIFF" | grep -q '"Nightly Building"'; then echo "nightly_changed=true" >> $GITHUB_OUTPUT else echo "nightly_changed=false" >> $GITHUB_OUTPUT @@ -49,7 +50,7 @@ jobs: with: name: Skyblock_CE_Latest path: | - **/* + datapacks/**/* !.git/** !.github/** !.gitignore @@ -60,6 +61,7 @@ jobs: !*.zip !.DS_Store if-no-files-found: error + retention-days: 90 nightly_build: needs: check_changes @@ -72,7 +74,7 @@ jobs: with: name: Skyblock_CE_Nightly_Snapshots path: | - **/* + datapacks/**/* !.git/** !.github/** !.gitignore @@ -82,4 +84,5 @@ jobs: !spyglass.json !*.zip !.DS_Store - if-no-files-found: error \ No newline at end of file + if-no-files-found: error + retention-days: 90 \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 93f0a54d0..c7e62581d 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:10testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:11testCI", "Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11759a_[CItest]", From 21437d5f7e0354e90f2e1b5b4cd2913a2f884223 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:09:10 +0100 Subject: [PATCH 22/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21759a_[CItest] --- .github/workflows/build.yml | 23 +++++++------------ .../versions/changelog/building_version.json | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c42ddc16..22fb306aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,28 +15,21 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 2 - - - name: Get file changes - id: changed-files - run: | - DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json") - echo "diff<> $GITHUB_OUTPUT - echo "$DIFF" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - name: Check changes id: check + shell: bash run: | - DIFF="${{ steps.changed-files.outputs.diff }}" - if echo "$DIFF" | grep -q '"Release Building"'; then - echo "release_changed=true" >> $GITHUB_OUTPUT + FILE="datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" + if git diff HEAD^ HEAD -- "$FILE" | grep -q "Release Building"; then + echo "release_changed=true" >> "$GITHUB_OUTPUT" else - echo "release_changed=false" >> $GITHUB_OUTPUT + echo "release_changed=false" >> "$GITHUB_OUTPUT" fi - if echo "$DIFF" | grep -q '"Nightly Building"'; then - echo "nightly_changed=true" >> $GITHUB_OUTPUT + if git diff HEAD^ HEAD -- "$FILE" | grep -q "Nightly Building"; then + echo "nightly_changed=true" >> "$GITHUB_OUTPUT" else - echo "nightly_changed=false" >> $GITHUB_OUTPUT + echo "nightly_changed=false" >> "$GITHUB_OUTPUT" fi release_build: diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index c7e62581d..64baee9de 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:11testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11759a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21759a_[CItest]", "Data_pack": "TRUE", From 2001823b46f78e9e54b46a1fcb661b501b694921 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:19:35 +0100 Subject: [PATCH 23/32] JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.31759a_[CItest] --- .github/workflows/build.yml | 28 +++++++++++-------- .../versions/changelog/building_version.json | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22fb306aa..b5e83dad8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,18 @@ jobs: shell: bash run: | FILE="datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" - if git diff HEAD^ HEAD -- "$FILE" | grep -q "Release Building"; then + OLD_RELEASE=$(git show HEAD^:"$FILE" | grep "Release Building" || echo "") + NEW_RELEASE=$(git show HEAD:"$FILE" | grep "Release Building" || echo "") + OLD_NIGHTLY=$(git show HEAD^:"$FILE" | grep "Nightly Building" || echo "") + NEW_NIGHTLY=$(git show HEAD:"$FILE" | grep "Nightly Building" || echo "") + + if [ "$OLD_RELEASE" != "$NEW_RELEASE" ]; then echo "release_changed=true" >> "$GITHUB_OUTPUT" else echo "release_changed=false" >> "$GITHUB_OUTPUT" fi - if git diff HEAD^ HEAD -- "$FILE" | grep -q "Nightly Building"; then + + if [ "$OLD_NIGHTLY" != "$NEW_NIGHTLY" ]; then echo "nightly_changed=true" >> "$GITHUB_OUTPUT" else echo "nightly_changed=false" >> "$GITHUB_OUTPUT" @@ -43,12 +49,11 @@ jobs: with: name: Skyblock_CE_Latest path: | - datapacks/**/* - !.git/** - !.github/** + . + !.git/ + !.github/ !.gitignore - !.worlds/** - !Resources Pack/** + !Resources Pack/ !crowdin.yml !spyglass.json !*.zip @@ -67,12 +72,11 @@ jobs: with: name: Skyblock_CE_Nightly_Snapshots path: | - datapacks/**/* - !.git/** - !.github/** + . + !.git/ + !.github/ !.gitignore - !.worlds/** - !Resources Pack/** + !Resources Pack/ !crowdin.yml !spyglass.json !*.zip diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 64baee9de..c4412de1d 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:11testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21759a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.31759a_[CItest]", "Data_pack": "TRUE", From 99599113f5760316d3f19a7a85736beb188d7356 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:21:36 +0100 Subject: [PATCH 24/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index c4412de1d..59ba445b3 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:11testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:12testCI", "Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.31759a_[CItest]", From fd736a840552c45fc6544e5bd25bcb1e75d75381 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:23:33 +0100 Subject: [PATCH 25/32] Update building_version.json --- .../function/versions/changelog/building_version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 59ba445b3..4a9337c38 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,9 +5,9 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:12testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:13testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.31759a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.41759a_[CItest]", "Data_pack": "TRUE", From 8555220ed81b1c077292ed29270bba1005ef5933 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:27:01 +0100 Subject: [PATCH 26/32] Update build.yml --- .github/workflows/build.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5e83dad8..fb97b3261 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,17 @@ jobs: shell: bash run: | FILE="datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" - OLD_RELEASE=$(git show HEAD^:"$FILE" | grep "Release Building" || echo "") - NEW_RELEASE=$(git show HEAD:"$FILE" | grep "Release Building" || echo "") - OLD_NIGHTLY=$(git show HEAD^:"$FILE" | grep "Nightly Building" || echo "") - NEW_NIGHTLY=$(git show HEAD:"$FILE" | grep "Nightly Building" || echo "") + if ! git rev-parse HEAD^ >/dev/null 2>&1; then + echo "First commit - setting both as changed" + echo "release_changed=true" >> "$GITHUB_OUTPUT" + echo "nightly_changed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + OLD_RELEASE=$(git show HEAD^:"$FILE" | grep '"Release Building"' || echo "") + NEW_RELEASE=$(git show HEAD:"$FILE" | grep '"Release Building"' || echo "") + OLD_NIGHTLY=$(git show HEAD^:"$FILE" | grep '"Nightly Building"' || echo "") + NEW_NIGHTLY=$(git show HEAD:"$FILE" | grep '"Nightly Building"' || echo "") if [ "$OLD_RELEASE" != "$NEW_RELEASE" ]; then echo "release_changed=true" >> "$GITHUB_OUTPUT" From 9e4fc1a00fefa5f02fcb33ad282d0f33cc0bc15a Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 18:28:34 +0100 Subject: [PATCH 27/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 4a9337c38..d3a26bf0d 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:13testCI", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.41759a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.51759a_[CItest]", "Data_pack": "TRUE", From ac388e4ff5ab045cfe8fd65c085c86aaecfff4d4 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 19:16:19 +0100 Subject: [PATCH 28/32] aggiornato il CI e rimossa la bossbar nighty --- .github/workflows/build.yml | 25 +++++++++++++++++-- .../function/skyblock_setup.mcfunction | 1 - .../versions/changelog/building_version.json | 4 +-- .../changelog/nightly_building.mcfunction | 25 ------------------- .../legacy_remove/nightly_building.mcfunction | 10 ++++++++ .../function/skyblock_legacy_setup.mcfunction | 1 + .../function/skyblock_setup.mcfunction | 1 - 7 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction create mode 100644 datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb97b3261..b969dd244 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,26 +1,34 @@ +# Definisce il nome del workflow name: Create Builds +# Trigger del workflow quando viene modificato il file delle versioni on: push: paths: - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' jobs: + # Job per controllare quali versioni sono state modificate check_changes: runs-on: ubuntu-24.04 outputs: release_changed: ${{ steps.check.outputs.release_changed }} nightly_changed: ${{ steps.check.outputs.nightly_changed }} steps: + # Checkout del repository - uses: actions/checkout@v4 with: fetch-depth: 2 + # Script per verificare i cambiamenti nelle versioni - name: Check changes id: check shell: bash run: | + # Definisce il percorso del file da controllare FILE="datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" + + # Gestisce il caso del primo commit if ! git rev-parse HEAD^ >/dev/null 2>&1; then echo "First commit - setting both as changed" echo "release_changed=true" >> "$GITHUB_OUTPUT" @@ -28,33 +36,41 @@ jobs: exit 0 fi + # Confronta le versioni Release tra commit precedente e attuale OLD_RELEASE=$(git show HEAD^:"$FILE" | grep '"Release Building"' || echo "") NEW_RELEASE=$(git show HEAD:"$FILE" | grep '"Release Building"' || echo "") OLD_NIGHTLY=$(git show HEAD^:"$FILE" | grep '"Nightly Building"' || echo "") NEW_NIGHTLY=$(git show HEAD:"$FILE" | grep '"Nightly Building"' || echo "") + # Imposta i flag per i cambiamenti Release if [ "$OLD_RELEASE" != "$NEW_RELEASE" ]; then echo "release_changed=true" >> "$GITHUB_OUTPUT" else echo "release_changed=false" >> "$GITHUB_OUTPUT" fi + # Imposta i flag per i cambiamenti Nightly if [ "$OLD_NIGHTLY" != "$NEW_NIGHTLY" ]; then echo "nightly_changed=true" >> "$GITHUB_OUTPUT" else echo "nightly_changed=false" >> "$GITHUB_OUTPUT" fi + # Job per creare il build Release release_build: needs: check_changes if: needs.check_changes.outputs.release_changed == 'true' runs-on: ubuntu-24.04 steps: + # Checkout del repository - uses: actions/checkout@v4 + + # Carica i file della Release come artifact - name: Upload release content uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Latest + # Include tutti i file tranne quelli specificati path: | . !.git/ @@ -66,18 +82,23 @@ jobs: !*.zip !.DS_Store if-no-files-found: error - retention-days: 90 + retention-days: 60 + # Job per creare il build Nightly nightly_build: needs: check_changes if: needs.check_changes.outputs.nightly_changed == 'true' runs-on: ubuntu-24.04 steps: + # Checkout del repository - uses: actions/checkout@v4 + + # Carica i file Nightly come artifact - name: Upload nightly content uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Nightly_Snapshots + # Include tutti i file tranne quelli specificati path: | . !.git/ @@ -89,4 +110,4 @@ jobs: !*.zip !.DS_Store if-no-files-found: error - retention-days: 90 \ No newline at end of file + retention-days: 60 \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction index b1bae69f3..4c6127103 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction @@ -20,7 +20,6 @@ function skyblock:structures/generated_biome function skyblock_legacy:skyblock_legacy_setup function skyblock:skyblock_test_setup function skyblock:versions/changelog/building -function skyblock:versions/changelog/nightly_building function skyblock:versions/version_pvn function skyblock:versions/debug function skyblock:multiplayer_setup diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index d3a26bf0d..62ddbb510 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,9 +5,9 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:13testCI", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0_CItest-1", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.51759a_[CItest]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11900a_[main]", "Data_pack": "TRUE", diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction deleted file mode 100644 index d61bc9123..000000000 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -#Copyright (C) Loweredgames (Lorenzo Giannini) -#Contacted: -#This Source Code Form is subject to the terms of the License. -#NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG STUDIO. -#READING THE COPYRIGHT (C): - - -### NIGHTLY BUILDING VERSION SYSTEM - - -##SETUP FUNCTION NIGHTLY BUILDING (SETUP BOSSBAR) -bossbar add nightly_building {"text":"NIGHTLY_BUILDING","color":"white","bold":true} -bossbar set minecraft:nightly_building players @a -bossbar set minecraft:nightly_building color purple -bossbar set minecraft:nightly_building style progress -bossbar set minecraft:nightly_building max 100 -bossbar set minecraft:nightly_building value 100 - - -##NIGHTLY BUILDING VERSION NUMBER (NUMERO DELLA VERSIONE VISTO IN ALTRO, SOLO NELLE VERSIONI DI SVILUPPO) -bossbar set nightly_building name {"text":"JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_12.01.2025.31508a_[main]","color":"white","bold":true} - - -##NIGHTLY BUILDING VERSION (BOSSBAR VISIBILE: SOLO PER GIT, DISABILITARE PER I RILASCI) -bossbar set minecraft:nightly_building visible false \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction new file mode 100644 index 000000000..2a39e41de --- /dev/null +++ b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction @@ -0,0 +1,10 @@ +#Copyright (C) Loweredgames (Lorenzo Giannini) +#Contacted: +#This Source Code Form is subject to the terms of the License. +#NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG STUDIO. +#READING THE COPYRIGHT (C): + + +##NIGHTLY BUILDING VERSION SYSTEM (DA RIMUOVERE NELLA 1.22) +bossbar set minecraft:nightly_building visible true +bossbar remove minecraft:nightly_building \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/skyblock_legacy_setup.mcfunction b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/skyblock_legacy_setup.mcfunction index 60d44a543..39dc6dd60 100644 --- a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/skyblock_legacy_setup.mcfunction +++ b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/skyblock_legacy_setup.mcfunction @@ -11,6 +11,7 @@ function skyblock_legacy:legacy_remove/legacy_structures_system ##Function Remove Test (DA RIMUOVERE IN FUTURO) function skyblock_legacy:legacy_version +function skyblock_legacy:legacy_remove/nightly_building function skyblock_legacy:legacy_remove/refactoring_scoreboard function skyblock_legacy:legacy_remove/multiplayer_legacy scoreboard objectives remove fix_end diff --git a/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction b/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction index 00fa347a8..65aa69079 100644 --- a/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction +++ b/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction @@ -20,7 +20,6 @@ function skyblock:structures/generated_biome function skyblock_legacy:skyblock_legacy_setup function skyblock:skyblock_test_setup function skyblock:versions/changelog/building -function skyblock:versions/changelog/nightly_building function skyblock:versions/version_pvn function skyblock:versions/debug function skyblock:multiplayer_setup From 17451f50c49855f55ce740cc0d8d50d3c520af7b Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 19:21:40 +0100 Subject: [PATCH 29/32] Update build.yml --- .github/workflows/build.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b969dd244..182daa2c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,34 +1,34 @@ -# Definisce il nome del workflow +# Definisce il nome del workflow: name: Create Builds -# Trigger del workflow quando viene modificato il file delle versioni +# Trigger del workflow quando viene modificato il file delle versioni: on: push: paths: - 'datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json' jobs: - # Job per controllare quali versioni sono state modificate + # Job per controllare quali versioni sono state modificate: check_changes: runs-on: ubuntu-24.04 outputs: release_changed: ${{ steps.check.outputs.release_changed }} nightly_changed: ${{ steps.check.outputs.nightly_changed }} steps: - # Checkout del repository + # Checkout del repository: - uses: actions/checkout@v4 with: fetch-depth: 2 - # Script per verificare i cambiamenti nelle versioni + # Script per verificare i cambiamenti nelle versioni: - name: Check changes id: check shell: bash run: | - # Definisce il percorso del file da controllare + # Definisce il percorso del file da controllare: FILE="datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" - # Gestisce il caso del primo commit + # Gestisce il caso del primo commit: if ! git rev-parse HEAD^ >/dev/null 2>&1; then echo "First commit - setting both as changed" echo "release_changed=true" >> "$GITHUB_OUTPUT" @@ -36,41 +36,41 @@ jobs: exit 0 fi - # Confronta le versioni Release tra commit precedente e attuale + # Confronta le versioni Release tra commit precedente e attuale: OLD_RELEASE=$(git show HEAD^:"$FILE" | grep '"Release Building"' || echo "") NEW_RELEASE=$(git show HEAD:"$FILE" | grep '"Release Building"' || echo "") OLD_NIGHTLY=$(git show HEAD^:"$FILE" | grep '"Nightly Building"' || echo "") NEW_NIGHTLY=$(git show HEAD:"$FILE" | grep '"Nightly Building"' || echo "") - # Imposta i flag per i cambiamenti Release + # Imposta i flag per i cambiamenti Release: if [ "$OLD_RELEASE" != "$NEW_RELEASE" ]; then echo "release_changed=true" >> "$GITHUB_OUTPUT" else echo "release_changed=false" >> "$GITHUB_OUTPUT" fi - # Imposta i flag per i cambiamenti Nightly + # Imposta i flag per i cambiamenti Nightly: if [ "$OLD_NIGHTLY" != "$NEW_NIGHTLY" ]; then echo "nightly_changed=true" >> "$GITHUB_OUTPUT" else echo "nightly_changed=false" >> "$GITHUB_OUTPUT" fi - # Job per creare il build Release + # Job per creare il build Release: release_build: needs: check_changes if: needs.check_changes.outputs.release_changed == 'true' runs-on: ubuntu-24.04 steps: - # Checkout del repository + # Checkout del repository: - uses: actions/checkout@v4 - # Carica i file della Release come artifact + # Carica i file della Release come artifact: - name: Upload release content uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Latest - # Include tutti i file tranne quelli specificati + # Include tutti i file tranne quelli specificati: path: | . !.git/ @@ -84,21 +84,21 @@ jobs: if-no-files-found: error retention-days: 60 - # Job per creare il build Nightly + # Job per creare il build Nightly: nightly_build: needs: check_changes if: needs.check_changes.outputs.nightly_changed == 'true' runs-on: ubuntu-24.04 steps: - # Checkout del repository + # Checkout del repository: - uses: actions/checkout@v4 - # Carica i file Nightly come artifact + # Carica i file Nightly come artifact: - name: Upload nightly content uses: actions/upload-artifact@v4 with: name: Skyblock_CE_Nightly_Snapshots - # Include tutti i file tranne quelli specificati + # Include tutti i file tranne quelli specificati: path: | . !.git/ From 4184bcd9d3d7e860bc804f487ec52f0b6070a445 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 19:22:48 +0100 Subject: [PATCH 30/32] Update nightly_building.mcfunction --- .../function/legacy_remove/nightly_building.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction index 2a39e41de..43570e76c 100644 --- a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction +++ b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction @@ -5,6 +5,6 @@ #READING THE COPYRIGHT (C): -##NIGHTLY BUILDING VERSION SYSTEM (DA RIMUOVERE NELLA 1.22) +##NIGHTLY BUILDING VERSION SYSTEM (DA RIMUOVERE TUTTO NELLA 1.22) bossbar set minecraft:nightly_building visible true bossbar remove minecraft:nightly_building \ No newline at end of file From 4bf1da2ce8711c32d0956ecb7bba0f5dbdde2514 Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 19:23:27 +0100 Subject: [PATCH 31/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 62ddbb510..2a1996288 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -7,7 +7,7 @@ "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0_CItest-1", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11900a_[main]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21900a_[main]", "Data_pack": "TRUE", From d9249570787c3a7489c7b9fae527fe8c6ffd6a4f Mon Sep 17 00:00:00 2001 From: Loweredgames Date: Mon, 20 Jan 2025 19:27:12 +0100 Subject: [PATCH 32/32] Update building_version.json --- .../skyblock/function/versions/changelog/building_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index 2a1996288..fa11b71c5 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,7 +5,7 @@ "Release Versions": "6.0.0 [The Removal Update]", -"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0_CItest-1", +"Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0_CItest-2", "Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21900a_[main]",