Merge branch 'main' into new_recipes_fix

Loweredgames · Jan 20, 2025 · 6161273 · 6161273
2 parents 87974bc + 2ab600e
commit 6161273
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,113 @@
+# 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"
+            echo "nightly_changed=true" >> "$GITHUB_OUTPUT"
+            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/
+            !.github/
+            !.gitignore
+            !Resources Pack/
+            !crowdin.yml
+            !spyglass.json
+            !*.zip
+            !.DS_Store
+          if-no-files-found: error
+          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/
+            !.github/
+            !.gitignore
+            !Resources Pack/
+            !crowdin.yml
+            !spyglass.json
+            !*.zip
+            !.DS_Store
+          if-no-files-found: error
+          retention-days: 60
diff --git 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/...cks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/...cks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json
@@ -5,7 +5,9 @@
 
 "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.0_CItest-2",
+
+"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21900a_[main]",
 
 "Data_pack": "TRUE",
 

diff --git a/...yblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction b/...yblock CE datapacks/data/skyblock/function/versions/changelog/nightly_building.mcfunction
diff --git a/...s/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction b/...s/legacy_skyblock/data/skyblock_legacy/function/legacy_remove/nightly_building.mcfunction
@@ -0,0 +1,10 @@
+#Copyright (C) Loweredgames (Lorenzo Giannini) 
+#Contacted:<https://github.com/Loweredgames>
+#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): <https://www.minecraft.net/en-us/terms>
+
+
+##NIGHTLY BUILDING VERSION SYSTEM (DA RIMUOVERE TUTTO NELLA 1.22)
+bossbar set minecraft:nightly_building visible true
+bossbar remove minecraft:nightly_building
diff --git a/... datapacks/legacy_skyblock/data/skyblock_legacy/function/skyblock_legacy_setup.mcfunction b/... 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/...Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction b/...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

diff --git a/spyglass.json b/spyglass.json
@@ -1,6 +1,6 @@
 {
 	"env": {
-		"gameVersion": "1.21.1",
+		"gameVersion": "1.21.3",
 		"permissionLevel": 2
 	},
 	"format": {