JE-1.20.2-Skyblock_Classic_Edition:5.0.1_LTS

- rinominati i nomi - corretti e aggiornati alcuni commenti - aggiunto debug
Loweredgames · Sep 30, 2023 · ba1b17e · ba1b17e
1 parent a140c12
commit ba1b17e
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 70 deletions.
diff --git a/...core/datapacks/Skyblock Classic Edition/data/skyblock/functions/skyblock_setup.mcfunction b/...core/datapacks/Skyblock Classic Edition/data/skyblock/functions/skyblock_setup.mcfunction
@@ -6,7 +6,7 @@
 
 
 ##Function Setup Lock
-execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock_legacy_pid:legacy
+execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock_legacy_pid:legacy_pid
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/default
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/large
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/small
@@ -19,6 +19,7 @@ function skyblock:islands/structures/generated_biome
 function skyblock:islands/structures/generated_structures
 function skyblock:islands/structures/legacy_structures
 function skyblock:versions/version_pvn
+function skyblock:versions/debug
 function skyblock:multiplayer_setup
 
 

diff --git a/...lassic Edition/data/skyblock/functions/islands/structures/generated_structures.mcfunction b/...lassic Edition/data/skyblock/functions/islands/structures/generated_structures.mcfunction
@@ -5,7 +5,7 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##New Structure Setup
+##NEW STRUCTURES SETUP
 scoreboard players add @a PSN_0 1
 execute as @a[scores={PSN_0=5}] run scoreboard players set @a SkyblockCE_tp 0
 execute as @a[scores={PSN_0=5}] run gamemode spectator @a
@@ -14,11 +14,11 @@ execute as @a[scores={PSN_0=6}] run effect give @a night_vision 61 0 true
 execute as @a[scores={PSN_0=5..2000}] run summon minecraft:area_effect_cloud ~ ~1 ~
 
 
-##Multiplayer PSN
+##MULTIPLAYER PSN
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a PSN_0 -1
 
 
-##Teleport Players New Structures
+##TELEPORT PLAYER IN THE NEW STRUCTURES
 
 #Mushroom House
 execute as @a[scores={PSN_0=100}] run tp @a 0 45 1000 0 0
@@ -33,14 +33,14 @@ execute as @a[scores={PSN_0=300}] run tp @a -198 45 -485 0 0
 execute as @a[scores={PSN_0=400}] run tp @a -266 45 -484 0 0
 
 
-##Generated New Structures
+##GENERATED NEW STRUCTURES
 execute as @a[scores={PSN_0=150}] run place template skyblock:structures/mushroom_house 0 45 1000
 execute as @a[scores={PSN_0=250}] run place template skyblock:structures/ocean_ruins 488 45 -260
 execute as @a[scores={PSN_0=350}] run place template skyblock:structures/cherry_grove -198 45 -485
 execute as @a[scores={PSN_0=450}] run place template skyblock:structures/trail_ruins -266 45 -484
 
 
-##Final Function New Structures
+##FINAL FUNCTION NEW STRUCTURES
 execute as @a[scores={PSN_0=1}] run gamerule doImmediateRespawn true
 execute as @a[scores={PSN_0=500}] run gamerule doImmediateRespawn false
 execute as @a[scores={PSN_0=500..2001}] run clear @a written_book{tag:generated_book}

diff --git a/...k Classic Edition/data/skyblock/functions/islands/structures/legacy_structures.mcfunction b/...k Classic Edition/data/skyblock/functions/islands/structures/legacy_structures.mcfunction
@@ -5,7 +5,7 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##Structure Setup
+##STRUCTURES SETUP
 scoreboard players add @a PSN_legacy 1
 scoreboard players add @a SkyblockCE_structures 1
 execute as @a[scores={PSN_legacy=5}] run scoreboard players set @a SkyblockCE_tp 0
@@ -16,20 +16,20 @@ execute as @a[scores={PSN_legacy=5..2000}] run summon minecraft:area_effect_clou
 execute as @a[scores={PSN_legacy=2000000..}] run scoreboard players set @a PSN_legacy 10000
 
 
-##PSN_legacy (AGGIORNARE SEMPRE CON PID E AUMENTARE IL VALORE QUANDO VIENE AGGIUNTA UNA NUOVA STRUTTURA)
+##PSN LEGACY (AGGIORNARE SEMPRE CON PID E AUMENTARE IL VALORE QUANDO VIENE AGGIUNTA UNA NUOVA STRUTTURA)
 execute as @a[scores={SkyblockCE_structures=5}] run scoreboard objectives add PSN_legacy dummy
 execute as @a[scores={SkyblockCE_structures=10}] run give @s written_book{tag:generated_book,pages:['["",{"text":"Info:","bold":true,"underlined":true},{"text":"\\n\\nBefore adding the structures in the world, check if there are any constructions you have made within the custom structures area. add the (Generated) folder in the world."},{"text":" ","color":"reset"},{"text":"\\n\\u26a0 If not spawn the structures in the world \\u26a0","italic":true,"underlined":true,"color":"red"}]','["",{"text":"Go to the next pages to see all coordinates, remember activate the coordinated with F3.\\n\\n\\n\\n"},{"text":"Yes I understand and I\'m ready immediately.","bold":true,"italic":true,"color":"red","clickEvent":{"action":"change_page","value":"5"}}]','["",{"text":"Custom Structures:","bold":true,"underlined":true},{"text":"\\n\\nMushroom House: ","color":"reset"},{"text":"0 45 1000","underlined":true},{"text":"\\n\\nOcean Ruins: ","color":"reset"},{"text":"488 45 -260","underlined":true},{"text":"\\n\\nCherry Grove: ","color":"reset"},{"text":"-198 45 -485","underlined":true},{"text":"\\n\\nTrail Ruins: ","color":"reset"},{"text":"-266 45 -484","underlined":true}]','["",{"text":"Generated:\\n\\n","bold":true,"underlined":true},{"text":"\\u26a0I am ready to generate all structures\\u26a0","bold":true,"italic":true,"underlined":true,"color":"red","clickEvent":{"action":"run_command","value":"/scoreboard objectives add PSN_0 dummy"}}]'],title:"Custom Structures",author:"Custom Structures Version: 2.0.0"}
 execute as @a[scores={SkyblockCE_structures=15..20}] run scoreboard objectives remove SkyblockCE_structures
 
 
-##SkyblockCE_id (AGGIORNARE SEMPRE QUANDO VENGONO AGGIUNTE NUOVE STRUTTURE. DELAY PID_X PER LE FUNZIONI default/large/small)
-#>INTEGRARE IN FUTURO NELLA FUNZIONE Strutture. forse 1.21?
+##SkyblockCE ID (AGGIORNARE SEMPRE QUANDO VENGONO AGGIUNTE NUOVE STRUTTURE. DELAY PID_X PER LE FUNZIONI default/large/small)
+#>INTEGRARE IN FUTURO NELLA FUNZIONE Strutture.
 execute as @a[scores={SkyblockCE_large=1360}] run scoreboard objectives add SkyblockCE_id dummy
 execute as @a[scores={SkyblockCE_default=1360}] run scoreboard objectives add SkyblockCE_id dummy
 execute as @a[scores={SkyblockCE_small=1360}] run scoreboard objectives add SkyblockCE_id dummy
 
 
-##Teleport Players Structures (AGGIUNGERE LE VECCHIE STRUTTURE)
+##TELEPORT PLAYER IN THE STRUCTURES (AGGIUNGERE LE VECCHIE STRUTTURE)
 
 #Pillager Outpost
 execute as @a[scores={PSN_legacy=100}] run tp @a 500 45 55 0 0
@@ -59,7 +59,7 @@ execute as @a[scores={PSN_legacy=800}] run tp @a 700 45 700 0 0
 execute as @a[scores={PSN_legacy=900}] run tp @a -700 45 -700 0 0
 
 
-##Generated Structures
+##GENERATED STRUCTURES
 execute as @a[scores={PSN_legacy=150}] run place template skyblock:structures/pillager_outpost 500 45 55
 execute as @a[scores={PSN_legacy=250}] run place template skyblock:structures/village 460 45 350
 execute as @a[scores={PSN_legacy=350}] run place template skyblock:structures/swamp_hut -180 45 -180
@@ -71,17 +71,17 @@ execute as @a[scores={PSN_legacy=850}] run place template skyblock:structures/st
 execute as @a[scores={PSN_legacy=950}] run place template skyblock:structures/ancient_city -700 45 -700
 
 
-##Start PSN_0 (DELAY PER PID_0)
+##DELAY PSN (DELAY PER PID_0)
 execute as @a[scores={PSN_legacy=1000}] run scoreboard objectives add PSN_0 dummy
 execute as @a[scores={PSN_legacy=1005}] run scoreboard players set @a PSN_0 -250
 
 
-##Multiplayer PSN LEGACY
+##MULTIPLAYER PSN LEGACY
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a SkyblockCE_structures 25
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a PSN_legacy 24000
 
 
-##Final Function Structures
+##FINAL FUNCTION STRUCTURES
 execute as @a[scores={PSN_legacy=1}] run gamerule doImmediateRespawn true
 execute as @a[scores={PSN_legacy=1000}] run gamerule doImmediateRespawn false
 execute as @a[scores={PSN_legacy=1000}] run tp @s 0 66 0 90 0

diff --git a/datapacks/Skyblock Classic Edition/data/skyblock/functions/multiplayer_setup.mcfunction b/datapacks/Skyblock Classic Edition/data/skyblock/functions/multiplayer_setup.mcfunction
@@ -5,13 +5,13 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##Multiplayer Setup
+##MULTIPLAYER SETUP
 execute store result score SkyblockCE_PlayerOnline SkyblockCE_multiplayer if entity @a
 execute if score SkyblockCE_PlayerOnline SkyblockCE_multiplayer matches 1 run scoreboard players set @a SkyblockCE_multiplayer_reset 1
 execute if score SkyblockCE_PlayerOnline SkyblockCE_multiplayer matches 2.. run scoreboard players set @a SkyblockCE_multiplayer_reset -1
 
 
-##Multiplayer Reset (RESETTA LE SCOREBOARD E ALTRO)
+##MULTIPLAYER RESET (RESETTA LE SCOREBOARD E ALTRO)
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a SkyblockCE_install -2
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a SkyblockCE_islands -2
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a SkyblockCE_tp 0
@@ -21,16 +21,16 @@ execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players s
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a SkyblockCE_small 24000
 
 
-##Multiplayer Tick
-execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard objectives add SkyblockCE_multiplayer_tick dummy
-execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players add @a SkyblockCE_multiplayer_tick 1
-execute as @a[scores={SkyblockCE_multiplayer_tick=0..5}] run tp @s 0 65 0 0 0
-execute as @a[gamemode=spectator,scores={SkyblockCE_multiplayer_tick=1..5}] run gamemode survival @s
-execute as @a[scores={SkyblockCE_multiplayer_tick=0..5}] run fill 0 63 0 0 64 0 minecraft:air destroy
-execute as @a[scores={SkyblockCE_multiplayer_tick=0..5}] run spawnpoint @s 0 63 0
-execute as @a[scores={SkyblockCE_multiplayer_tick=0..5}] run setworldspawn 0 63 0
+##MULTIPLAYER JOIN PLAYERS
+execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard objectives add SkyblockCE_multiplayer_join dummy
+execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players add @a SkyblockCE_multiplayer_join 1
+execute as @a[scores={SkyblockCE_multiplayer_join=0..5}] run tp @s 0 65 0 0 0
+execute as @a[gamemode=spectator,scores={SkyblockCE_multiplayer_join=1..5}] run gamemode survival @s
+execute as @a[scores={SkyblockCE_multiplayer_join=0..5}] run fill 0 63 0 0 64 0 minecraft:air destroy
+execute as @a[scores={SkyblockCE_multiplayer_join=0..5}] run spawnpoint @s 0 63 0
+execute as @a[scores={SkyblockCE_multiplayer_join=0..5}] run setworldspawn 0 63 0
 
 
-##Multiplayer Loop
+##MULTIPLAYER LOOP
 execute as @a[scores={SkyblockCE_multiplayer=2000000..}] run scoreboard players set @s SkyblockCE_multiplayer 100
 execute as @a[scores={SkyblockCE_multiplayer_tick=2000000..}] run scoreboard players set @s SkyblockCE_multiplayer_tick 100
diff --git a/datapacks/Skyblock Classic Edition/data/skyblock/functions/skyblock_setup.mcfunction b/datapacks/Skyblock Classic Edition/data/skyblock/functions/skyblock_setup.mcfunction
@@ -6,7 +6,7 @@
 
 
 ##Function Setup
-execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock_legacy_pid:legacy
+execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock_legacy_pid:legacy_pid
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/default
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/large
 execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/small
@@ -19,6 +19,7 @@ function skyblock:islands/structures/generated_biome
 function skyblock:islands/structures/generated_structures
 function skyblock:islands/structures/legacy_structures
 function skyblock:versions/version_pvn
+function skyblock:versions/debug
 function skyblock:multiplayer_setup
 
 

diff --git a/datapacks/Skyblock Classic Edition/data/skyblock/functions/versions/debug.mcfunction b/datapacks/Skyblock Classic Edition/data/skyblock/functions/versions/debug.mcfunction
@@ -0,0 +1,61 @@
+#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>
+
+
+##DEBUG SETUP (SOLO SVILUPPATORI)
+scoreboard objectives add SkyblockCE_debug dummy
+execute as @a[scores={SkyblockCE_debug=0}] run scoreboard objectives setdisplay sidebar SkyblockCE_debug
+
+
+##DISPLAY DI DEBUG - SETUP SKYBLOCK
+execute as @a[scores={SkyblockCE_debug=1}] run scoreboard objectives setdisplay sidebar SkyblockCE_install
+execute as @a[scores={SkyblockCE_debug=2}] run scoreboard objectives setdisplay sidebar SkyblockCE_islands
+execute as @a[scores={SkyblockCE_debug=3}] run scoreboard objectives setdisplay sidebar SkyblockCE_id
+execute as @a[scores={SkyblockCE_debug=4}] run scoreboard objectives setdisplay sidebar SkyblockCE_tp
+execute as @a[scores={SkyblockCE_debug=5}] run scoreboard objectives setdisplay sidebar SkyblockCE_quit_game
+execute as @a[scores={SkyblockCE_debug=-5}] run scoreboard objectives setdisplay list kills
+
+
+##DISPLAY DI DEBUG - PVN
+execute as @a[scores={SkyblockCE_debug=6}] run scoreboard objectives setdisplay sidebar PVN_12
+
+
+##DISPLAY DI DEBUG - PID
+execute as @a[scores={SkyblockCE_debug=-7}] run scoreboard objectives setdisplay list PID_0
+execute as @a[scores={SkyblockCE_debug=7}] run scoreboard objectives setdisplay list PID_1
+#execute as @a[scores={SkyblockCE_debug=7}] run scoreboard objectives setdisplay list PID_X (DA ABILITARE IN FUTURO)
+execute as @a[scores={SkyblockCE_debug=8}] run scoreboard objectives setdisplay list PID_warning
+
+
+##DISPLAY DI DEBUG - GENERATED STRUCTURES
+execute as @a[scores={SkyblockCE_debug=9}] run scoreboard objectives setdisplay sidebar PSN_0
+
+
+##DISPLAY DI DEBUG - LEGACY STRUCTURES
+execute as @a[scores={SkyblockCE_debug=-10}] run scoreboard objectives setdisplay list PSN_legacy
+execute as @a[scores={SkyblockCE_debug=10}] run scoreboard objectives setdisplay sidebar SkyblockCE_structures
+
+
+##DISPLAY DI DEBUG - ISLANDS GENERATED
+execute as @a[scores={SkyblockCE_debug=11}] run scoreboard objectives setdisplay sidebar SkyblockCE_default
+execute as @a[scores={SkyblockCE_debug=12}] run scoreboard objectives setdisplay sidebar SkyblockCE_large
+execute as @a[scores={SkyblockCE_debug=13}] run scoreboard objectives setdisplay sidebar SkyblockCE_small
+
+
+##DISPLAY DI DEBUG - MULTIPLAYER
+execute as @a[scores={SkyblockCE_debug=-14}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer
+execute as @a[scores={SkyblockCE_debug=14}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_reset
+execute as @a[scores={SkyblockCE_debug=15}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_tick
+execute as @a[scores={SkyblockCE_debug=-15}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer_join
+
+
+##TRANSLATE TEST DEBUG
+execute as @a[scores={SkyblockCE_debug=16}] run tellraw @a [{"translate":"skyblock_classic_edition.folder.test"}]
+
+
+##DISPLAY DI DEBUG - TEST
+execute as @a[scores={SkyblockCE_debug=100}] run scoreboard objectives setdisplay sidebar refactoring_scoreboard
+execute as @a[scores={SkyblockCE_debug=200}] run scoreboard objectives setdisplay sidebar SkyblockCE_legacy_version
diff --git a/.../functions/versions/update_pid.mcfunction → ...k/functions/versions/pid_setup.mcfunction b/.../functions/versions/update_pid.mcfunction → ...k/functions/versions/pid_setup.mcfunction
@@ -5,13 +5,13 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##WORLD UPDATE AND CONVERSION FUNCTIONS (AGGIUNGERE SEMPRE I PID PER LE CONVERSIONI)
-function skyblock_pid:pid_1
+##WORLD UPDATE AND CONVERSION FUNCTIONS
+function skyblock_pid:update_pid
 
 
-#PID Legacy Remove (RIMUOVE LA SCORE DOPO LA CONVERSIONE. AGGIORNARE SEMPRE LA SCORE)
+##PID LEGACY REMOVE (RIMUOVE LA SCORE DOPO LA CONVERSIONE. AGGIORNARE SEMPRE LA SCORE)
 execute as @a[scores={PID_1=1000..}] run scoreboard objectives remove PID_legacy
 
 
-#Setup Version SkyblockCE_ID (CAMBIARE LA SCORE IN "SkyblockCE_id". VEDERE LA SCORE PID_X PER RIFERIMENTO)
+##SETUP VERSION SkyblockCE_ID (CAMBIARE LA SCORE IN "SkyblockCE_id". VEDERE LA SCORE PID_X PER RIFERIMENTO)
 execute as @a[scores={SkyblockCE_id=30}] run scoreboard players set @a PID_1 -1000
diff --git a/datapacks/Skyblock Classic Edition/data/skyblock/functions/versions/setup_version.mcfunction b/datapacks/Skyblock Classic Edition/data/skyblock/functions/versions/setup_version.mcfunction
@@ -5,21 +5,21 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##Skyblock PID INSTALL (AGGIORNARE SE IL PID NEL NUOVO NUMERO)
+##SKYBLOCK PID INSTALL (AGGIORNARE SE IL PID NEL NUOVO NUMERO)
 execute as @a[scores={SkyblockCE_install=1..}] run scoreboard players set @a PID_1 -10000
 execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a PID_1 24000
 
 
-##Skyblock PID VERSION WARNING (CAMBIARE SOLO SE NON CI SONO CONVERSIONI)
-execute as @a[scores={PID_1=30}] run tellraw @s {"translate":"skyblock_classic_edition.versions_id.warning_update.on","italic":true,"color":"#d5d5d5"}
-#execute as @a[scores={PID_1=40}] run tellraw @s {"translate":"skyblock_classic_edition.versions_id.warning_update.off","italic":true,"color":"#d5d5d5"}
+##SKYBLOCK PID VERSIONS (LASCIARE SEMPRE COSI)
+execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:versions/pid_setup
 
 
-##Skyblock PID VERSIONS (LASCIARE SEMPRE COSI)
-execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:versions/update_pid
+##SKYBLOCK PID VERSION WARNING (CAMBIARE SOLO SE NON CI SONO CONVERSIONI)
+execute as @a[scores={PID_1=30}] run tellraw @s {"translate":"skyblock_classic_edition.versions_id.warning_update.on","italic":true,"color":"#d5d5d5"}
+#execute as @a[scores={PID_1=30}] run tellraw @s {"translate":"skyblock_classic_edition.versions_id.warning_update.off","italic":true,"color":"#d5d5d5"}
 
 
-##Skyblock PID WARNING (SOLO VERSIONI NON PIU SUPPORTATE, ATTIVARE QUANDO LA VERSIONE NON è PIU SUPPORTATA)
+##SKYBLOCK PID WARNING (SOLO VERSIONI NON PIU SUPPORTATE, ATTIVARE QUANDO LA VERSIONE NON è PIU SUPPORTATA)
 #execute as @a[scores={SkyblockCE_id=2000..}] run scoreboard objectives add PID_warning dummy 
 scoreboard players add @a PID_warning 1
 execute as @a[scores={PID_warning=5}] run tellraw @a ["",{"text":"\u26a0Warning: this version is no longer supported!\u26a0","bold":true,"color":"red"},{"text":"\n\nPlease download the latest version of the custom map here.","bold":true,"italic":true,"underlined":true,"color":"red","clickEvent":{"action":"open_url","value":"https://github.com/Loweredgames/Skyblock-Classic-Edition/releases"}}]