Merge branch 'main' into main_translations

.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

.github/workflows/crowdin.yml

@@ -0,0 +1,34 @@
+name: Crowdin Action
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: crowdin action
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: true
+          upload_translations: false
+          download_translations: true
+          localization_branch_name: main_translations
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          # A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
+          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+
+          # Visit https://crowdin.com/settings#api-key to create this token
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

Resources Pack/pack.mcmeta

@@ -1,7 +1,7 @@
 {
 	"pack": {
-		"pack_format": 34,
-		"supported_formats": {"min_inclusive": 34, "max_inclusive": 34},
+		"pack_format": 42,
+		"supported_formats": {"min_inclusive": 34, "max_inclusive": 42},
 		"description": "Skyblock Classic Edition By Lorenzo Giannini"
 	},
 	"language":{

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

datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json

@@ -3,10 +3,12 @@
 
 "Edition": "JAVA EDITION",
 
-"Release Versions": "6.0.0 [The Removal Update]",
+"Release Versions": "6.1.0 [The Removal Update]",
 
 "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0",
 
+"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_25.01.2025.11903a_[main]",
+
 "Data_pack": "TRUE",
 
 "Resource_pack": "TRUE",

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:<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

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

datapacks/Skyblock CE datapacks/pack.mcmeta

@@ -1,9 +1,9 @@
 {
 	"pack": {
-	  "pack_format": 48,
+	  "pack_format": 57,
 	  "supported_formats": {
 		"min_inclusive": 48,
-		"max_inclusive": 48
+		"max_inclusive": 57
 	  },
 	  "description": "Skyblock Classic Edition By Lorenzo Giannini"
 	},
@@ -12,7 +12,7 @@
 		{
 		  "formats": {
 			"min_inclusive": 48,
-			"max_inclusive": 48
+			"max_inclusive": 57
 		  },
 		  	"directory": "skyblock_setup_update"
 		},
@@ -26,21 +26,21 @@
 		{
 		  "formats": {
 			"min_inclusive": 48,
-			"max_inclusive": 48
+			"max_inclusive": 57
 		  },
 		  	"directory": "legacy_pid_skyblock"
 		},
 		{
 		   "formats": {
 			"min_inclusive": 48,
-			"max_inclusive": 48
+			"max_inclusive": 57
 			},
 			"directory": "legacy_skyblock"
 		},
 		{
 		   "formats": {
 			"min_inclusive": 48,
-			"max_inclusive": 48
+			"max_inclusive": 57
 		  	},
 		  	"directory": "skyblock_custom_world"
 		},

datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/recipe/skyblock_azalea.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "skyblock",
+  "pattern": [
+    "M#"
+  ],
+  "key": {
+    "#": [
+      "minecraft:oak_sapling"
+    ],
+    "M": [
+      "minecraft:moss_block"
+    ]
+  },
+  "result": {
+    "id": "minecraft:azalea",
+    "count": 1
+  }
+}

datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/recipe/skyblock_cobbled_deepslate.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "skyblock",
+  "pattern": [
+    "##",
+    "##"
+  ],
+  "key": {
+    "#": [
+      "minecraft:cobblestone"
+    ]
+  },
+  "result": {
+    "id": "minecraft:cobbled_deepslate",
+    "count": 4
+  }
+}

datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/recipe/skyblock_flowering_azalea.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "skyblock",
+  "pattern": [
+    "M#P"
+  ],
+  "key": {
+    "#": [
+      "minecraft:oak_sapling"
+    ],
+    "M": [
+      "minecraft:moss_block"
+    ],
+    "P": [
+      "minecraft:pink_petals"
+    ]
+  },
+  "result": {
+    "id": "minecraft:flowering_azalea",
+    "count": 1
+  }
+}

datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/recipe/skyblock_glow_berries.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "skyblock",
+  "pattern": [
+    "###",
+    "#T#",
+    "###"
+  ],
+  "key": {
+    "#": [
+      "minecraft:glow_ink_sac"
+    ],
+    "T": [
+      "minecraft:torchflower"
+    ]
+  },
+  "result": {
+    "id": "minecraft:glow_berries",
+    "count": 1
+  }
+}