Merge pull request #263 from Loweredgames/reformat_stucture_system

Merge in Main (guardare changelog) -  PSN (Protocol Structures Number) è multiversione

datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock Classic Edition/data/skyblock/functions/skyblock_setup.mcfunction

@@ -17,7 +17,7 @@ function skyblock:skyblock_test_setup
 function skyblock:versions/changelog/building
 function skyblock:islands/structures/generated_biome
 function skyblock:islands/structures/generated_structures
-function skyblock:islands/structures/legacy_structures
+function skyblock:islands/structures/version_psn
 function skyblock:versions/version_pvn
 function skyblock:versions/debug
 function skyblock:multiplayer_setup

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

@@ -15,7 +15,7 @@ execute as @a[scores={SkyblockCE_default=1..}] run scoreboard players set @a Sky
 execute as @a[scores={SkyblockCE_default=1..2400}] run summon minecraft:area_effect_cloud ~ ~1 ~
 
 
-#Start
+##START GENERATED FUNCTION
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=1}] run kill @e[type=!minecraft:player]
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=1..5}] run difficulty normal
 execute in minecraft:overworld as @a[scores={SkyblockCE_default=1}] run gamerule commandBlockOutput false
@@ -64,28 +64,13 @@ execute as @a[scores={SkyblockCE_default=130}] run scoreboard players set @a Sky
 execute in minecraft:the_nether as @a[scores={SkyblockCE_default=131}] run place template skyblock:nether_classic_forest -2 50 -50
 
 
-#The End
-## ??? ##
+##The End (???)
 
 
-##Final Function
+##FINAL GENERATED FUNCTION
 execute as @a[scores={SkyblockCE_default=150}] run scoreboard players set @a SkyblockCE_tp 1
-execute as @a[scores={SkyblockCE_default=250}] run scoreboard objectives add SkyblockCE_structures dummy
+execute as @a[scores={SkyblockCE_default=250..}] run scoreboard objectives add SkyblockCE_structures_id dummy
 execute as @a[scores={SkyblockCE_default=1351}] run spawnpoint @a 0 65 0
 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 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
-execute as @a[scores={SkyblockCE_default=1357..}] run gamerule announceAdvancements true
-execute as @a[scores={SkyblockCE_default=1357..}] run gamerule doDaylightCycle true
-execute as @a[scores={SkyblockCE_default=1357..}] run gamerule doWeatherCycle true
-execute as @a[scores={SkyblockCE_default=1357..}] run gamerule doImmediateRespawn false
-execute as @a[scores={SkyblockCE_default=1357}] run time set 0
-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_book}
+execute as @a[scores={SkyblockCE_default=1351}] run scoreboard objectives setdisplay list kills

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

@@ -15,7 +15,7 @@ execute as @a[scores={SkyblockCE_large=1..}] run scoreboard players set @a Skybl
 execute as @a[scores={SkyblockCE_large=1..2400}] run summon minecraft:area_effect_cloud ~ ~1 ~
 
 
-#Start
+##START GENERATED FUNCTION
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=1}] run kill @e[type=!minecraft:player]
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=1..5}] run difficulty easy
 execute in minecraft:overworld as @a[scores={SkyblockCE_large=1}] run gamerule commandBlockOutput false
@@ -63,28 +63,13 @@ execute as @a[scores={SkyblockCE_large=130}] run scoreboard players set @a Skybl
 execute in minecraft:the_nether as @a[scores={SkyblockCE_large=131}] run place template skyblock:nether_classic_forest -2 50 -50
 
 
-#The End
-## ??? ##
+##The End (???)
 
 
-##Final Function
+##FINAL GENERATED FUNCTION
 execute as @a[scores={SkyblockCE_large=150}] run scoreboard players set @a SkyblockCE_tp 1
-execute as @a[scores={SkyblockCE_large=250}] run scoreboard objectives add SkyblockCE_structures dummy
+execute as @a[scores={SkyblockCE_large=250..}] run scoreboard objectives add SkyblockCE_structures_id dummy
 execute as @a[scores={SkyblockCE_large=1351}] run spawnpoint @a 0 65 0
 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 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
-execute as @a[scores={SkyblockCE_large=1357..}] run gamerule announceAdvancements true
-execute as @a[scores={SkyblockCE_large=1357..}] run gamerule doDaylightCycle true
-execute as @a[scores={SkyblockCE_large=1357..}] run gamerule doWeatherCycle true
-execute as @a[scores={SkyblockCE_large=1357..}] run gamerule doImmediateRespawn false
-execute as @a[scores={SkyblockCE_large=1357}] run time set 0
-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_book}
+execute as @a[scores={SkyblockCE_large=1351}] run scoreboard objectives setdisplay list kills

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

@@ -15,7 +15,7 @@ execute as @a[scores={SkyblockCE_small=1..}] run scoreboard players set @a Skybl
 execute as @a[scores={SkyblockCE_small=1..2400}] run summon minecraft:area_effect_cloud ~ ~1 ~
 
 
-#Start
+##START GENERATED FUNCTION
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=1}] run kill @e[type=!minecraft:player]
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=1..5}] run difficulty hard
 execute in minecraft:overworld as @a[scores={SkyblockCE_small=1}] run gamerule commandBlockOutput false
@@ -64,28 +64,13 @@ execute as @a[scores={SkyblockCE_small=130}] run scoreboard players set @a Skybl
 execute in minecraft:the_nether as @a[scores={SkyblockCE_small=131}] run place template skyblock:nether_classic_forest -2 50 -50
 
 
-##The End
-## ??? ##
+##The End (???)
 
 
-##Final Function
+##FINAL GENERATED FUNCTION
 execute as @a[scores={SkyblockCE_small=150}] run scoreboard players set @a SkyblockCE_tp 1
-execute as @a[scores={SkyblockCE_small=250}] run scoreboard objectives add SkyblockCE_structures dummy
+execute as @a[scores={SkyblockCE_small=250..}] run scoreboard objectives add SkyblockCE_structures_id dummy
 execute as @a[scores={SkyblockCE_small=1351}] run spawnpoint @a 0 65 1
 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=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
-execute as @a[scores={SkyblockCE_small=1357..}] run gamerule announceAdvancements true
-execute as @a[scores={SkyblockCE_small=1357..}] run gamerule doDaylightCycle true
-execute as @a[scores={SkyblockCE_small=1357..}] run gamerule doWeatherCycle true
-execute as @a[scores={SkyblockCE_small=1357..}] run gamerule doImmediateRespawn false
-execute as @a[scores={SkyblockCE_small=1357}] run time set 0
-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_book}
+execute as @a[scores={SkyblockCE_small=1351}] run scoreboard objectives setdisplay list kills

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

@@ -5,51 +5,82 @@
 #READING THE COPYRIGHT (C): <https://www.minecraft.net/en-us/terms>
 
 
-##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
-execute as @a[scores={PSN_0=5}] run effect give @a blindness 62 0 true
-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 ~
+##SETUP STRUCTURES ID (NON TOCCARE)
+execute as @a[scores={SkyblockCE_structures_id=30..}] run scoreboard objectives add SkyblockCE_structures dummy
+execute as @a[scores={SkyblockCE_structures_id=35..}] run scoreboard players add @a SkyblockCE_structures 1
+scoreboard players add @a SkyblockCE_structures_id 1
 
 
-##MULTIPLAYER PSN
-execute as @a[scores={SkyblockCE_multiplayer_reset=-1}] run scoreboard players set @a PSN_0 -1
+##SETUP STRUCTURES (NON TOCCARE)
+execute as @a[scores={SkyblockCE_structures=1155..}] run scoreboard players add @a 1.20.5_PSN_0 1
+execute as @a[scores={SkyblockCE_structures=5..2000}] run summon minecraft:area_effect_cloud ~ ~1 ~
+execute as @a[scores={SkyblockCE_structures=5}] run scoreboard players set @a SkyblockCE_tp 0
+execute as @a[scores={SkyblockCE_structures=5}] run gamemode spectator @a
+execute as @a[scores={SkyblockCE_structures=5}] run effect give @a blindness 62 0 true
+execute as @a[scores={SkyblockCE_structures=6}] run effect give @a night_vision 61 0 true
 
 
-##TELEPORT PLAYER IN THE NEW STRUCTURES
+##STRUCTURES DELAY PSN (DELAY PER IL PSN E CREAZIONE DELLA SCORE)
+execute as @a[scores={SkyblockCE_structures=1155}] run scoreboard objectives add 1.20.5_PSN_0 dummy
 
-#Mushroom House
-execute as @a[scores={PSN_0=100}] run tp @a 0 45 1000 0 0
 
-#Ocean Ruins
-execute as @a[scores={PSN_0=200}] run tp @a 488 45 -260 0 0
+##TELEPORT PLAYER IN THE STRUCTURES (AGGIUNGERE TUTTE LE STRUTTURE)
 
-#Cherry Grove
-execute as @a[scores={PSN_0=300}] run tp @a -198 45 -485 0 0
+#Pillager Outpost
+execute as @a[scores={SkyblockCE_structures=100}] run tp @a 500 45 55 0 0
 
-#Trail Ruins
-execute as @a[scores={PSN_0=400}] run tp @a -266 45 -484 0 0
+#Village
+execute as @a[scores={SkyblockCE_structures=200}] run tp @a 460 45 350 0 0
 
+#Swamp Hut
+execute as @a[scores={SkyblockCE_structures=300}] run tp @a -180 45 -180 0 0
 
-##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
+#Igloo
+execute as @a[scores={SkyblockCE_structures=400}] run tp @a 180 45 180 0 0
 
+#Jungle Pyramids
+execute as @a[scores={SkyblockCE_structures=500}] run tp @a -60 45 500 0 0
 
-##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}
-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
-execute as @a[scores={PSN_0=505}] run title @a title {"translate":"skyblock_classic_edition.generated_structures.loading.title","italic":true}
-execute as @a[scores={PSN_0=505}] run title @a subtitle {"translate":"skyblock_classic_edition.generated_structures.loading.subtitle","italic":true}
-execute as @a[scores={PSN_0=510}] run effect clear @a minecraft:blindness
-execute as @a[scores={PSN_0=510}] run effect clear @a minecraft:night_vision
-execute as @a[scores={PSN_0=515}] run playsound minecraft:entity.player.levelup ambient @a 0 66 0 100 2
-execute as @a[scores={PSN_0=600..}] run scoreboard objectives remove PSN_0
+#Desert Pyramid
+execute as @a[scores={SkyblockCE_structures=600}] run tp @a 60 45 -500 0 0
+
+#Shipwrecks
+execute as @a[scores={SkyblockCE_structures=700}] run tp @a 280 45 0 0 0
+
+#Stronghold
+execute as @a[scores={SkyblockCE_structures=800}] run tp @a 700 45 700 0 0
+
+#Ancient City
+execute as @a[scores={SkyblockCE_structures=900}] run tp @a -700 45 -700 0 0
+
+
+##GENERATED STRUCTURES (GENERA LE STRUTTURE QUANDO VIENE CREATO UN NUOVO MONDO)
+execute as @a[scores={SkyblockCE_structures=150}] run place template skyblock:structures/pillager_outpost 500 45 55
+execute as @a[scores={SkyblockCE_structures=250}] run place template skyblock:structures/village 460 45 350
+execute as @a[scores={SkyblockCE_structures=350}] run place template skyblock:structures/swamp_hut -180 45 -180
+execute as @a[scores={SkyblockCE_structures=450}] run place template skyblock:structures/igloo 180 45 180
+execute as @a[scores={SkyblockCE_structures=550}] run place template skyblock:structures/jungle_pyramids -60 45 500
+execute as @a[scores={SkyblockCE_structures=650}] run place template skyblock:structures/desert_pyramid 60 45 -500
+execute as @a[scores={SkyblockCE_structures=750}] run place template skyblock:structures/shipwrecks 280 45 0
+execute as @a[scores={SkyblockCE_structures=850}] run place template skyblock:structures/stronghold 700 45 700
+execute as @a[scores={SkyblockCE_structures=950}] run place template skyblock:structures/ancient_city -700 45 -700
+
+
+##FINAL FUNCTION STRUCTURES GENERATED
+execute as @a[scores={SkyblockCE_structures=1..1000}] run gamerule doImmediateRespawn true
+execute as @a[scores={SkyblockCE_structures=1000..1100}] run gamerule doImmediateRespawn false
+execute as @a[scores={SkyblockCE_structures=1000}] run tp @s 0 66 0 90 0
+execute as @a[scores={SkyblockCE_structures=1005}] run gamemode survival @a
+execute as @a[scores={SkyblockCE_structures=1005..1105}] run place template skyblock:air 0 0 0
+execute as @a[scores={SkyblockCE_structures=1010}] 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={SkyblockCE_structures=1015}] 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"}]
+execute as @a[scores={SkyblockCE_structures=1020}] run setblock 0 1 0 minecraft:redstone_block destroy
+execute as @a[scores={SkyblockCE_structures=1025}] run fill 0 0 0 0 1 0 minecraft:air destroy
+execute as @a[scores={SkyblockCE_structures=1040}] run effect clear @a minecraft:blindness
+execute as @a[scores={SkyblockCE_structures=1040}] run effect clear @a minecraft:night_vision
+
+
+##FUNCTION STRUCTURES LOOP
+execute as @a[scores={SkyblockCE_structures_id=2000000..}] run scoreboard players set @a SkyblockCE_structures_id 10000
+execute as @a[scores={SkyblockCE_structures=2000000..}] run scoreboard players set @a SkyblockCE_structures 10000
+execute as @a[scores={1.20.5_PSN_0=2000000..}] run scoreboard players set @a 1.20.5_PSN_0 10000