JE-Skyblock_Classic_Edition:NIGHTLY_BUILDING:29.09.2023.11756a

- rimossa la funzione "fix_end" #223
- fatto #221
- fatto #224

datapacks/Skyblock Classic Edition Hardcore/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:versions/legacy_pid_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: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

datapacks/Skyblock Classic Edition/data/skyblock/functions/islands/default.mcfunction

@@ -34,7 +34,7 @@ execute in minecraft:overworld as @a[scores={SkyblockCE_default=1}] run scoreboa
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=1}] run fill -7 80 -12 7 55 5 minecraft:air
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=1}] run fill 75 80 11 61 55 -9 minecraft:air
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=20}] run place template skyblock:classic -4 61 -6
-execute in minecraft:overworld as @a[scores={SkyblockCE_default=33}] run setblock 1 66 -3 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.1"}']}} replace
+execute in minecraft:overworld as @a[scores={SkyblockCE_default=33}] run setblock 1 66 -3 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.2"}']}} replace
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=35}] run setblock 1 66 -2 minecraft:air
 
 
@@ -76,7 +76,6 @@ execute as @a[scores={SkyblockCE_default=1351}] run weather clear 1000s
 execute as @a[scores={SkyblockCE_default=1351}] run scoreboard objectives add kills deathCount
 execute as @a[scores={SkyblockCE_default=1351}] run scoreboard objectives setdisplay list kills
 execute as @a[scores={SkyblockCE_default=1355}] run scoreboard players set @a SkyblockCE_tp 0
-###execute as @a[scores={SkyblockCE_default=1356}] run scoreboard objectives add fix_end dummy (da rimuovere)
 execute as @a[scores={SkyblockCE_default=1356}] run title @a title ["",{"text":"Sky","bold":true,"color":"aqua"},{"text":"block","bold":true,"color":"dark_green"}]
 execute as @a[scores={SkyblockCE_default=1356}] run title @a subtitle {"text":"Classic Edition","bold":true,"color":"dark_blue"}
 execute as @a[scores={SkyblockCE_default=1356}] run title @a times 30 100 30
@@ -89,4 +88,4 @@ execute as @a[scores={SkyblockCE_default=1360}] run gamemode survival @a
 execute as @a[scores={SkyblockCE_default=1360}] run advancement revoke @a everything
 execute as @a[scores={SkyblockCE_default=1360}] run execute in minecraft:overworld run tp @p 0 66 0 90 0
 execute as @a[scores={SkyblockCE_default=1361}] run playsound minecraft:entity.player.levelup ambient @a 0 66 0 100 2
-execute as @a[scores={SkyblockCE_default=1360..2400}] run clear @a written_book{tag:generated_structures}
+execute as @a[scores={SkyblockCE_default=1360..2400}] run clear @a written_book{tag:generated_book}

datapacks/Skyblock Classic Edition/data/skyblock/functions/islands/large.mcfunction

@@ -34,7 +34,7 @@ execute in minecraft:overworld as @a[scores={SkyblockCE_large=1}] run scoreboard
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=1}] run fill -7 80 -12 7 40 5 minecraft:air
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=1}] run fill 75 80 11 61 54 -9 minecraft:air
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=20}] run place template skyblock:large_classic -5 45 -5
-execute in minecraft:overworld as @a[scores={SkyblockCE_large=33}] run setblock -1 68 -1 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.1"}']}} replace
+execute in minecraft:overworld as @a[scores={SkyblockCE_large=33}] run setblock -1 68 -1 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.2"}']}} replace
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=35}] run setblock -1 68 0 minecraft:air
 
 
@@ -75,7 +75,6 @@ execute as @a[scores={SkyblockCE_large=1351}] run weather clear 1000s
 execute as @a[scores={SkyblockCE_large=1351}] run scoreboard objectives add kills deathCount
 execute as @a[scores={SkyblockCE_large=1351}] run scoreboard objectives setdisplay list kills
 execute as @a[scores={SkyblockCE_large=1355}] run scoreboard players set @a SkyblockCE_tp 0
-###execute as @a[scores={SkyblockCE_large=1356}] run scoreboard objectives add fix_end dummy (da rimuovere)
 execute as @a[scores={SkyblockCE_large=1356}] run title @a title ["",{"text":"Sky","bold":true,"color":"aqua"},{"text":"block","bold":true,"color":"dark_green"}]
 execute as @a[scores={SkyblockCE_large=1356}] run title @a subtitle {"text":"Classic Edition","bold":true,"color":"dark_blue"}
 execute as @a[scores={SkyblockCE_large=1356}] run title @a times 30 100 30
@@ -88,4 +87,4 @@ execute as @a[scores={SkyblockCE_large=1360}] run gamemode survival @a
 execute as @a[scores={SkyblockCE_large=1360}] run advancement revoke @a everything
 execute as @a[scores={SkyblockCE_large=1360}] run execute in minecraft:overworld run tp @p 0 67 0 90 0
 execute as @a[scores={SkyblockCE_large=1361}] run playsound minecraft:entity.player.levelup ambient @a 0 66 0 100 2
-execute as @a[scores={SkyblockCE_large=1360..2400}] run clear @a written_book{tag:generated_structures}
+execute as @a[scores={SkyblockCE_large=1360..2400}] run clear @a written_book{tag:generated_book}

datapacks/Skyblock Classic Edition/data/skyblock/functions/islands/small.mcfunction

@@ -33,7 +33,7 @@ execute in minecraft:overworld as @a[scores={SkyblockCE_small=1}] run gamerule a
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=1}] run scoreboard players set @a SkyblockCE_tp 1
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=1}] run fill -7 80 -12 7 55 5 minecraft:air
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=3}] run place template skyblock:small_classic -1 62 -3
-execute in minecraft:overworld as @a[scores={SkyblockCE_small=10}] run setblock 1 66 0 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.1"}']}} replace
+execute in minecraft:overworld as @a[scores={SkyblockCE_small=10}] run setblock 1 66 0 birch_wall_sign[facing=south,waterlogged=false]{back_text:{messages:['{"text":"This"}','{"text":"is"}','{"text":"a"}','{"text":"secret!!!"}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"Skyblock"}','{"text":"Classic Edition"}','{"text":"---------------"}','{"text":"1.20.2"}']}} replace
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=35}] run setblock 0 62 1 minecraft:dirt destroy
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=35}] run setblock 1 66 1 minecraft:air
 
@@ -76,7 +76,6 @@ execute as @a[scores={SkyblockCE_small=1351}] run weather clear 1000s
 execute as @a[scores={SkyblockCE_small=1351}] run scoreboard objectives add kills deathCount
 execute as @a[scores={SkyblockCE_small=1351}] run scoreboard objectives setdisplay list kills
 execute as @a[scores={SkyblockCE_small=1355}] run scoreboard players set @a SkyblockCE_tp 0
-###execute as @a[scores={SkyblockCE_small=1355}] run scoreboard objectives add fix_end dummy (da rimuovere)
 execute as @a[scores={SkyblockCE_small=1356}] run title @a title ["",{"text":"Sky","bold":true,"color":"aqua"},{"text":"block","bold":true,"color":"dark_green"}]
 execute as @a[scores={SkyblockCE_small=1356}] run title @a subtitle {"text":"Classic Edition","bold":true,"color":"dark_blue"}
 execute as @a[scores={SkyblockCE_small=1356}] run title @a times 30 100 30
@@ -89,4 +88,4 @@ execute as @a[scores={SkyblockCE_small=1360}] run gamemode survival @a
 execute as @a[scores={SkyblockCE_small=1360}] run advancement revoke @a everything
 execute as @a[scores={SkyblockCE_small=1360}] run execute in minecraft:overworld run tp @p 0 66 1 90 0
 execute as @a[scores={SkyblockCE_small=1361}] run playsound minecraft:entity.player.levelup ambient @a 0 66 0 100 2
-execute as @a[scores={SkyblockCE_small=1360..2400}] run clear @a written_book{tag:generated_structures}
+execute as @a[scores={SkyblockCE_small=1360..2400}] run clear @a written_book{tag:generated_book}

datapacks/Skyblock Classic Edition/data/skyblock/functions/islands/structures/generated_structures.mcfunction

@@ -43,7 +43,7 @@ execute as @a[scores={PSN_0=450}] run place template skyblock:structures/trail_r
 ##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_structures}
+execute as @a[scores={PSN_0=500..2001}] run clear @a written_book{tag:generated_book}
 execute as @a[scores={PSN_0=500}] run tp @s 0 66 0 90 0
 execute as @a[scores={PSN_0=505}] run gamemode survival @a
 execute as @a[scores={PSN_0=505}] run title @a times 20 100 20

datapacks/Skyblock Classic Edition/data/skyblock/functions/islands/structures/legacy_structures.mcfunction

@@ -18,7 +18,7 @@ execute as @a[scores={PSN_legacy=2000000..}] run scoreboard players set @a PSN_l
 
 ##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_structures,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=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
 
 
@@ -89,7 +89,7 @@ execute as @a[scores={PSN_legacy=1005}] run gamemode survival @a
 execute as @a[scores={PSN_legacy=1005}] run title @a times 20 100 20
 execute as @a[scores={PSN_legacy=1005}] run title @a title {"translate":"skyblock_classic_edition.generated_structures.loading.title","italic":true}
 execute as @a[scores={PSN_legacy=1005}] run title @a subtitle {"translate":"skyblock_classic_edition.generated_structures.loading.subtitle","italic":true}
-execute as @a[scores={PSN_legacy=1..7000}] run clear @a written_book{tag:generated_structures}
+execute as @a[scores={PSN_legacy=1..7000}] run clear @a written_book{tag:generated_book}
 execute as @a[scores={PSN_legacy=1000..1900}] run place template skyblock:air 0 0 0
 execute as @a[scores={PSN_legacy=1800}] run setblock 0 0 0 minecraft:command_block[conditional=false,facing=west]{Command:'/tellraw @a [{"translate":"skyblock_classic_edition.generated_structures.generated.command_block.info","italic":true,"color":"red"},[""],{"translate":"skyblock_classic_edition.generated_structures.generated.command_block.download","italic":true,"underlined":true,"color":"red","clickEvent":{"action":"open_url","value":"https://github.com/Loweredgames/Skyblock-Classic-Edition/releases"}},{"text":".\\u26a0","italic":true,"color":"red"}]',CustomName:'{"text":"@"}',SuccessCount:0,TrackOutput:1b,UpdateLastExecution:1b,auto:0b,conditionMet:0b,powered:0b} destroy
 execute as @a[scores={PSN_legacy=1801}] run tellraw @a ["",{"text":"If the resource pack is not in the world and can cause damage to the text: add the resource pack in the world folder or ","italic":true,"color":"gray"},{"text":"reinstall the map here","italic":true,"underlined":true,"color":"gray","clickEvent":{"action":"open_url","value":"https://github.com/Loweredgames/Skyblock-Classic-Edition/releases"}},{"text":" and add manually in the world folder.","italic":true,"color":"gray"}]

datapacks/Skyblock Classic Edition/data/skyblock/functions/multiplayer_setup.mcfunction

@@ -12,8 +12,6 @@ execute if score SkyblockCE_PlayerOnline SkyblockCE_multiplayer matches 2.. run
 
 
 ##Multiplayer Reset (RESETTA LE SCOREBOARD E ALTRO)
-execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard objectives add fix_end dummy
-execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a fix_end 24000
 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