Merge branch 'main' into fix_#283_server

.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

LICENSE

@@ -1,6 +1,6 @@
 MIT License 1.0.0
 
-Copyright (C) Loweredgames (Lorenzo Giannini) 
+Copyright (C) Loweredgames (Lorenzo Giannini)
 <https://github.com/Loweredgames>,
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -25,7 +25,7 @@ _Steve, Alex, Noor, Sunny, Ari, Zuri, Makena, Kai and Efe, they woke up on an un
 
 # [FAQ - Troubleshooting and Help Requests](https://discord.com/channels/960603544480780308/1255129836494655488)
 
-# Credit
+# Credits:
 
 DrTrog (Custom World Gen):
 https://www.planetminecraft.com/member/drtrog/

Resources Pack/LICENSE

@@ -1,6 +1,6 @@
 MIT License 1.0.0
 
-Copyright (c) 2023 Loweredgames (Lorenzo Giannini) 
+Copyright (c) 2023 Loweredgames (Lorenzo Giannini)
 <https://github.com/Loweredgames>,
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

Resources Pack/assets/minecraft/custom_lang.txt

@@ -1,5 +1,5 @@
-- per le lingue custom: aggiungere in Crowdin
-- aggiungere ISO gia corretto, fa gia tutto da solo
-
-
+- per le lingue custom: aggiungere in Crowdin
+- aggiungere ISO gia corretto, fa gia tutto da solo
+
+
 NON TOCCARE MAI crowdin.yml

Resources Pack/assets/minecraft/lang/af_za.json

@@ -11,25 +11,25 @@
     "skyblock_classic_edition.skyblock_setup.default_normal.info": "Hierdie eiland is die klassieke eiland wat almal ken, maar gemoderniseer vir nuwe weergawes van Minecraft. Aanbeveel vir diegene wat nie vertroud is met die oorspronklike \"Skyblock\" nie.",
     "skyblock_classic_edition.skyblock_setup.small_hard": "Klein (Moeilik)",
     "skyblock_classic_edition.skyblock_setup.small_hard.info": "Hierdie eiland herinner mens baie aan die oorspronklike \"Skyblock 2.0\", maar is gemoderniseer vir nuwe weergawes van Minecraft. Gemaak vir diegene wat van moeilike uitdagings hou en al die truuks en tegniese idees van die vanielje-oorlewingsmodus ken.",
-    "skyblock_classic_edition.skyblock_setup.import": "▶Import World",
-    "skyblock_classic_edition.skyblock_setup.import.info": "Allows you to import a world other than the Skyblock Classic Edition, which can be another Skyblock. adds all the necessary scoreboards without damaging the world and pre-existing structures, also creates a small glass platform if there is nothing. USE WITH CAUTION: THE FUNCTION DOES NOT GENERATE ANY ISLAND, MAKING THE MAP ITSELF AND THE RESOURCES IMPOSSIBLE. IF NO BIOME/STRUCTURE IS GENERATED, IT IS A BUG: MAKE A BACKUP, PUT THE ITEMS IN A CHEST AND REPLACE THE LEVEL.DAT WITH THE OLD ONE.",
-    "skyblock_classic_edition.skyblock_test_setup": "You are currently using another version for internal testing and it is used when the custom world is not compatible with the main version. There may be several serious issues and critical bugs: this version contains an empty world with only one biome (snowy taiga), level.dat and level.dat_old store only one biome and contain pregenerated test structures, if you want to switch to a normal world with many biomes and structures generated with vanilla methods you need to replace the datapack with the compatible level.dat or reinstall the map again with a newer version. This version will be replaced with the custom world in the development of the release. It is recommended not to generate the world but to wait for the release.",
+    "skyblock_classic_edition.skyblock_setup.import": "invoer wêreld",
+    "skyblock_classic_edition.skyblock_setup.import.info": "Laat jou toe om 'n wêreld anders as die oorspronklike \"skyblock\" klassieke ediesie in te voer, Dit kan 'n ander \"Skyblock\" wêreld wees. Dit sit die leiers bord by sonder om die wêreld of klaar bestaande strukture te beskadig, Dit maak ook 'n klein glas platform as daar niks is nie. GEBRUIK MET WAARBORGING: DIE FUNKSIE MAAK NIE ENIGE EILAND NIE, DIT MAAK DIE KAART EN DIE \"RESOURCES\" ONTMOONTELIK. AS DAAR NIE 'N BIOME OF STRUKTUUR GEVORM WORD NIE, IS DIT 'N FOUT: MAAK 'N \"BACKUP\", SIT JOU ITEMS IN 'N KUS EN VERVANG DIE \"LEVEL.DAT\" MET DIE OU EEN.",
+    "skyblock_classic_edition.skyblock_test_setup": "Jy gebruik tans 'n ander weergawe vir interne toetsing en dit word gebruik wanneer die pasgemaakte wêreld nie met die hoofweergawe versoenbaar is nie. Daar kan verskeie ernstige probleme en kritieke foute wees: hierdie weergawe bevat 'n leë wêreld met slegs een bioom (sneeuagtige taiga), level.dat en level.dat_old stoor slegs een bioom en bevat voorafgegenereerde toetsstrukture, as jy wil oorskakel na 'n normale wêreld met baie biome en strukture gegenereer met vanielje-metodes wat jy nodig het om die datapack te vervang met die versoenbare level.dat of die kaart weer te installeer met 'n nuwer weergawe. Hierdie weergawe sal vervang word met die pasgemaakte wêreld in die ontwikkeling van die vrystelling. Dit word aanbeveel om nie die wêreld te genereer nie, maar om te wag vir die vrystelling.",
     "skyblock_classic_edition.skyblock_setup.legacy_version.compatible": "Van weergawe:",
     "skyblock_classic_edition.skyblock_setup.legacy_version.compatible.to_text": "na",
     "skyblock_classic_edition.skyblock_setup.legacy_version.compatible.datapack": "dit is versoenbaar met die datapak.",
     "skyblock_classic_edition.multiplayer.popup": "Die multiplayer is gedeaktiveer, aktiveer in die skyblock-lêergids hier: ",
-    "skyblock_classic_edition.version_update.compatible.minecraft_versions": "The Minecraft Versions: ",
-    "skyblock_classic_edition.version_update.compatible.info": " are old versions and may not be compatible with the current datapack: if the datapack is updated it may have compatibility problems, always update the datapack to the latest compatible version.",
-    "skyblock_classic_edition.version_update.welcome": "Welcome to the Skyblock Classic Edition:",
-    "skyblock_classic_edition.version_update.for_edition": "for the Minecraft Java Edition:",
-    "skyblock_classic_edition.version_update.check_news": "\n\n⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜\n\nCheck the news of the latest version here:\n",
-    "skyblock_classic_edition.version_update.changelog": "Changelog",
-    "skyblock_classic_edition.version_update.check_links": "Check the latest version on the various links here:",
-    "skyblock_classic_edition.version_update.crowdin": "➡Crowdin Translations Project",
+    "skyblock_classic_edition.version_update.compatible.minecraft_versions": "Die Minecraft edisies: ",
+    "skyblock_classic_edition.version_update.compatible.info": " is ou weergawes en is dalk nie versoenbaar met die huidige datapak nie: as die datapak opgedateer word, kan dit versoenbaarheidsprobleme hê, dateer altyd die datapak op na die nuutste versoenbare weergawe.",
+    "skyblock_classic_edition.version_update.welcome": "Welkom by die Skyblock Classic Edition:",
+    "skyblock_classic_edition.version_update.for_edition": "vir die Minecraft Java Edition",
+    "skyblock_classic_edition.version_update.check_news": "\n⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜\n\nKyk hier na die nuus van die jongste weergawe:",
+    "skyblock_classic_edition.version_update.changelog": "Veranderlogboek",
+    "skyblock_classic_edition.version_update.check_links": "Kyk na die nuutste weergawe op die verskillende skakels hier:",
+    "skyblock_classic_edition.version_update.crowdin": "➡Crowdin Transleerings Projek",
     "skyblock_classic_edition.version_update.crowdin.info": "Help my om in jou moedertaal te vertaal. Die tale moet getrou wees aan die Engelse taal, respekteer die leestekens en die hoofletters. (hierdie vertaling is nie volledig nie en is outomaties deur my vertaal, dit sal slegs reggestel word wanneer daar 'n toepaslike vertaling is)",
-    "skyblock_classic_edition.version_update.discord": "Also follow me on Discord server if you want to make a suggestion or you found a bug.",
-    "skyblock_classic_edition.version_update.development_version.warning": "⚠ATTENTION: You are using a development version, the world may become corrupted and damaged, always make backups and ",
-    "skyblock_classic_edition.version_update.development_version.report": "report bugs here",
+    "skyblock_classic_edition.version_update.discord": "Volg my ook op Discord-bediener as jy 'n voorstel wil maak of as jy 'n fout gevind het.",
+    "skyblock_classic_edition.version_update.development_version.warning": "⚠AANDAG: Jy gebruik 'n ontwikkelingsweergawe, die wêreld kan korrup en beskadig word, maak altyd rugsteun en",
+    "skyblock_classic_edition.version_update.development_version.report": "Rapporteer foute hier",
     "skyblock_classic_edition.loading.chat": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nLoading....",
     "skyblock_classic_edition.loading.title.chat": "Loading...",
     "skyblock_classic_edition.loading.subtitle.chat": "World",
@@ -51,5 +51,5 @@
     "skyblock_classic_edition.warning_level.dat.end": ", you should see the structures in the new chunks, in case repeat the steps again.",
     "skyblock_classic_edition.link.discord": "Discord-bediener",
     "skyblock_classic_edition.link.crowdin": "Crowdin-vertalingsprojek",
-    "skyblock_classic_edition.credits": "Vertaal deur Ruan Moolman-Dreyer"
+    "skyblock_classic_edition.credits": "Vertaal deur Ruan Moolman-Dreyer, Namelesskit0"
 }