diff --git a/.worlds/.worlds-structures/Skyblock Classic Edition Structures.zip b/.worlds/.worlds-structures/Skyblock Classic Edition Structures.zip index 7db273da1..abf93d336 100644 Binary files a/.worlds/.worlds-structures/Skyblock Classic Edition Structures.zip and b/.worlds/.worlds-structures/Skyblock Classic Edition Structures.zip differ diff --git a/Resources Pack/pack.mcmeta b/Resources Pack/pack.mcmeta index 53544ec41..5c71e3e1f 100644 --- a/Resources Pack/pack.mcmeta +++ b/Resources Pack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { - "pack_format": 42, - "supported_formats": {"min_inclusive": 34, "max_inclusive": 42}, + "pack_format": 46, + "supported_formats": {"min_inclusive": 34, "max_inclusive": 46}, "description": "Skyblock Classic Edition By Lorenzo Giannini" }, "language":{ diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/import.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/import.mcfunction index 81483ac20..4a6859c34 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/import.mcfunction +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/import.mcfunction @@ -6,8 +6,8 @@ ##Skyblock Classic Edition Import -execute as @a[scores={SkyblockCE_islands=4}] run scoreboard objectives add SkyblockCE_import minecraft.custom:minecraft.play_time -execute as @a[scores={SkyblockCE_islands=4}] run tellraw @a {"translate":"skyblock_classic_edition.loading.chat"} +execute as @a[scores={SkyblockCE_islands=5}] run scoreboard objectives add SkyblockCE_import minecraft.custom:minecraft.play_time +execute as @a[scores={SkyblockCE_islands=5}] run tellraw @a {"translate":"skyblock_classic_edition.loading.chat"} execute as @a[scores={SkyblockCE_import=1..}] run clear @a written_book[custom_data={tag:generated_book}] execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_install -2 execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_install_test -2 @@ -20,6 +20,7 @@ execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a Skyb execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_large 24000 execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_default 24000 execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_small 24000 +execute as @a[scores={SkyblockCE_import=1..}] run scoreboard players set @a SkyblockCE_very_small 24000 execute as @a[scores={SkyblockCE_import=1..100}] run summon minecraft:area_effect_cloud ~ ~1 ~ diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/islands/very_small.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/islands/very_small.mcfunction new file mode 100644 index 000000000..a1cd69bfb --- /dev/null +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/islands/very_small.mcfunction @@ -0,0 +1,70 @@ +#Copyright (C) Loweredgames (Lorenzo Giannini) +#Contacted: +#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): + + +##Small (Hard) + + +execute as @a[scores={SkyblockCE_islands=4}] run scoreboard objectives add SkyblockCE_very_small minecraft.custom:minecraft.play_time +execute as @a[scores={SkyblockCE_islands=4}] run tellraw @a {"translate":"skyblock_classic_edition.loading.chat"} +execute as @a[scores={SkyblockCE_very_small=1..}] run scoreboard players set @a SkyblockCE_install -2 +execute as @a[scores={SkyblockCE_very_small=1..}] run scoreboard players set @a SkyblockCE_install_test -2 +execute as @a[scores={SkyblockCE_very_small=1..}] run scoreboard players set @a SkyblockCE_islands -2 +execute as @a[scores={SkyblockCE_very_small=1..2400}] run summon minecraft:area_effect_cloud ~ ~1 ~ + + +##START GENERATED FUNCTION +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run kill @e[type=!minecraft:player] +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1..5}] run difficulty hard +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run gamerule commandBlockOutput false +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run gamerule doImmediateRespawn true +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run title @a title {"translate":"skyblock_classic_edition.loading.title.chat"} +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run title @a subtitle {"translate":"skyblock_classic_edition.loading.subtitle.chat"} +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run title @a times 30 200 20 +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run gamerule announceAdvancements false + + +##Overworld + + +#Very Small Classic +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run scoreboard players set @a SkyblockCE_tp 1 +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=1}] run fill 7 110 -13 -7 -60 5 minecraft:air +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=3}] run place template skyblock:very_small_classic -1 62 -1 +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=10}] run setblock -1 65 0 birch_wall_sign[facing=west,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.21/1.21.1"}']}} replace + + +#Very Small Classic Desert +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=40}] run scoreboard players set @a SkyblockCE_tp 2 +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=40}] run fill 58 110 7 79 -60 -18 minecraft:air +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=41}] run place template skyblock:very_small_classic_desert 66 60 -4 + + +#Mushroom House +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=50}] run scoreboard players set @a SkyblockCE_tp 6 +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=100}] run fill -3 110 999 28 -7 1026 minecraft:air +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=105}] run place template skyblock:mushroom_house 0 61 1000 + + +##The Nether + + +#Very Small Nether +execute in minecraft:overworld as @a[scores={SkyblockCE_very_small=130}] run scoreboard players set @a SkyblockCE_tp 3 +execute in minecraft:the_nether as @a[scores={SkyblockCE_very_small=135}] run fill 17 1 43 -12 255 -8 minecraft:air +execute in minecraft:the_nether as @a[scores={SkyblockCE_very_small=140}] run place template skyblock:nether_very_small 2 50 3 + + +##The End (???) + + +##FINAL GENERATED FUNCTION +execute as @a[scores={SkyblockCE_very_small=150}] run scoreboard players set @a SkyblockCE_tp 1 +execute as @a[scores={SkyblockCE_very_small=150..}] run scoreboard objectives add SkyblockCE_structures_id dummy +execute as @a[scores={SkyblockCE_very_small=300}] run spawnpoint @a -1 65 0 +execute as @a[scores={SkyblockCE_very_small=300}] run weather clear 1000s +execute as @a[scores={SkyblockCE_very_small=300}] run scoreboard objectives add kills deathCount +execute as @a[scores={SkyblockCE_very_small=300}] run scoreboard objectives setdisplay list kills \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/multiplayer_setup.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/multiplayer_setup.mcfunction index 4be67c3d9..d9b87b37c 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/multiplayer_setup.mcfunction +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/multiplayer_setup.mcfunction @@ -23,6 +23,7 @@ execute as @a[scores={SkyblockCE_multiplayer_join=2..}] run clear @a written_boo execute as @a[scores={SkyblockCE_multiplayer_join=2..}] run scoreboard players set @a SkyblockCE_large 24000 execute as @a[scores={SkyblockCE_multiplayer_join=2..}] run scoreboard players set @a SkyblockCE_default 24000 execute as @a[scores={SkyblockCE_multiplayer_join=2..}] run scoreboard players set @a SkyblockCE_small 24000 +execute as @a[scores={SkyblockCE_multiplayer_join=2..}] run scoreboard players set @a SkyblockCE_very_small 24000 ##MULTIPLAYER JOIN PLAYERS diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction index 4c6127103..0bc10834a 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction @@ -10,6 +10,7 @@ execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock_leg 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 +execute as @a[scores={SkyblockCE_multiplayer_reset=1}] run function skyblock:islands/very_small ##Function Padlock @@ -46,6 +47,7 @@ execute as @a[scores={SkyblockCE_id=2000000..}] run scoreboard players set @a Sk execute as @a[scores={SkyblockCE_large=2000000..}] run scoreboard players set @a SkyblockCE_large 10000 execute as @a[scores={SkyblockCE_default=2000000..}] run scoreboard players set @a SkyblockCE_default 10000 execute as @a[scores={SkyblockCE_small=2000000..}] run scoreboard players set @a SkyblockCE_small 10000 +execute as @a[scores={SkyblockCE_very_small=2000000..}] run scoreboard players set @a SkyblockCE_very_small 10000 execute as @a[scores={SkyblockCE_import=2000000..}] run scoreboard players set @a SkyblockCE_import 10000 @@ -84,7 +86,7 @@ gamerule doTraderSpawning true ##Islands Choices Setup execute as @a[scores={SkyblockCE_install=2}] run tellraw @a {"text":"\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\n"} -execute as @a[scores={SkyblockCE_install=3}] run tellraw @a ["",{"translate":"skyblock_classic_edition.skyblock_setup.welcome","bold":true},{"text":" - "},{"translate":"skyblock_classic_edition.skyblock_setup.version","bold":true},{"text":" 6.0.0 The Removal Update - JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.for_text","bold":true},{"text":" Minecraft Java Edition: ","bold":true},{"text":"1.21/1.21.1 Tricky Trials Update","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_languages","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.credits","italic":true,"color":"#FFE28B"},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_islands","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.large_easy","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 1"}},{"text":" ","color":"dark_green"},{"text":"[?]","color":"dark_green","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.large_easy.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.default_normal","color":"gold","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 2"}},{"text":" ","color":"gold"},{"text":"[?]","color":"gold","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.default_normal.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.small_hard","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 3"}},{"text":" ","color":"red"},{"text":"[?]","color":"red","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.small_hard.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.import","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 4"}},{"text":" ","color":"blue"},{"text":"[?]","color":"blue","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.import.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible","italic":true},{"text":" "},{"text":"5.3.X LTS","italic":true},{"text":" "},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible.to_text","italic":true},{"text":" "},{"text":"6.0.0","italic":true},{"text":" "},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible.datapack","italic":true}] +execute as @a[scores={SkyblockCE_install=3}] run tellraw @a ["",{"translate":"skyblock_classic_edition.skyblock_setup.welcome","bold":true},{"text":" - "},{"translate":"skyblock_classic_edition.skyblock_setup.version","bold":true},{"text":" 6.0.0 The Removal Update - JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:6.0.0","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.for_text","bold":true},{"text":" Minecraft Java Edition: ","bold":true},{"text":"1.21/1.21.1 Tricky Trials Update","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_languages","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.credits","italic":true,"color":"#FFE28B"},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_islands","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.large_easy","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 1"}},{"text":" ","color":"dark_green"},{"text":"[?]","color":"dark_green","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.large_easy.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.default_normal","color":"gold","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 2"}},{"text":" ","color":"gold"},{"text":"[?]","color":"gold","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.default_normal.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.small_hard","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 3"}},{"text":" ","color":"red"},[{"text":"[?]","color":"red","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.small_hard.info"}]}}],{"text":"\n\n"},{"text":"▶Very Small (Extreme)","color":"dark_red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 4"}},{"text":" ","color":"dark_red"},{"text":"[?]","color":"dark_red","hoverEvent":{"action":"show_text","contents":[{"text":"This island is extreme and not suitable for new players, but only for those who are looking for the thrill of pure vanilla technical and who know Minecraft to the extreme of technical. It is recommended to play with hardcore mode turned on."}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.import","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 5"}},{"text":" ","color":"blue"},{"text":"[?]","color":"blue","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.import.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible","italic":true},{"text":" "},{"text":"5.3.X LTS","italic":true},{"text":" "},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible.to_text","italic":true},{"text":" "},{"text":"6.0.0","italic":true},{"text":" "},{"translate":"skyblock_classic_edition.skyblock_setup.legacy_version.compatible.datapack","italic":true},""] execute as @a[scores={SkyblockCE_install=1000..}] run scoreboard players set @a SkyblockCE_install 1 execute as @a[scores={SkyblockCE_install=1..}] run gamemode spectator @a execute as @a[scores={SkyblockCE_install=1..}] run tp @a 0 0 0 0 90 diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json index c04d4df61..069237bcd 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json @@ -5,9 +5,9 @@ "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", +"Release Building": "JE-1.21/1.21.1-6.1.0-Skyblock_Classic_Edition:BUILDING:???", -"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_25.01.2025.21903a_[main]", +"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_21.02.2025.11735a_[main]", "Data_pack": "TRUE", diff --git a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/debug.mcfunction b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/debug.mcfunction index 0e7419661..f2927fe8f 100644 --- a/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/debug.mcfunction +++ b/datapacks/Skyblock CE datapacks/data/skyblock/function/versions/debug.mcfunction @@ -47,10 +47,11 @@ execute as @a[scores={SkyblockCE_debug=11}] run scoreboard objectives setdisplay execute as @a[scores={SkyblockCE_debug=12}] run scoreboard objectives setdisplay sidebar SkyblockCE_default execute as @a[scores={SkyblockCE_debug=13}] run scoreboard objectives setdisplay sidebar SkyblockCE_large execute as @a[scores={SkyblockCE_debug=14}] run scoreboard objectives setdisplay sidebar SkyblockCE_small +execute as @a[scores={SkyblockCE_debug=15}] run scoreboard objectives setdisplay sidebar SkyblockCE_very_small ##DISPLAY DI DEBUG - MULTIPLAYER -execute as @a[scores={SkyblockCE_debug=15}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer -execute as @a[scores={SkyblockCE_debug=16}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_reset -execute as @a[scores={SkyblockCE_debug=17}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_tick -execute as @a[scores={SkyblockCE_debug=18}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer_join \ No newline at end of file +execute as @a[scores={SkyblockCE_debug=16}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer +execute as @a[scores={SkyblockCE_debug=17}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_reset +execute as @a[scores={SkyblockCE_debug=18}] run scoreboard objectives setdisplay sidebar SkyblockCE_multiplayer_tick +execute as @a[scores={SkyblockCE_debug=19}] run scoreboard objectives setdisplay list SkyblockCE_multiplayer_join \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/legacy_pid_skyblock/data/skyblock_legacy_pid/function/legacy_pid.mcfunction b/datapacks/Skyblock CE datapacks/legacy_pid_skyblock/data/skyblock_legacy_pid/function/legacy_pid.mcfunction index 3db94f9f6..edf259442 100644 --- a/datapacks/Skyblock CE datapacks/legacy_pid_skyblock/data/skyblock_legacy_pid/function/legacy_pid.mcfunction +++ b/datapacks/Skyblock CE datapacks/legacy_pid_skyblock/data/skyblock_legacy_pid/function/legacy_pid.mcfunction @@ -34,7 +34,7 @@ scoreboard objectives add PID_legacy_v2 dummy ##The Nether -execute as @a[scores={PID_legacy_v1=100..500}] run scoreboard players set @a SkyblockCE_islands 4 +execute as @a[scores={PID_legacy_v1=100..500}] run scoreboard players set @a SkyblockCE_islands 5 execute in minecraft:the_nether as @a[scores={PID_legacy_v1=300}] run tp @a 0 -3 30 execute in minecraft:the_nether as @a[scores={PID_legacy_v1=350}] run fill 2 2 33 -2 2 29 minecraft:infested_cobblestone destroy execute in minecraft:the_nether as @a[scores={PID_legacy_v1=400}] run setblock 0 3 31 oak_sign[rotation=8,waterlogged=false]{front_text:{color:"black",has_glowing_text:1b,messages:['{"text":"The portal is"}','{"text":"broken sorry.."}','{"text":";("}','{"text":"since: 1.0.0"}']}} destroy diff --git a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_version.mcfunction b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_version.mcfunction index ff227bbd1..12b3a6c49 100644 --- a/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_version.mcfunction +++ b/datapacks/Skyblock CE datapacks/legacy_skyblock/data/skyblock_legacy/function/legacy_version.mcfunction @@ -10,7 +10,7 @@ scoreboard players add @a SkyblockCE_legacy_old 1 execute as @a[scores={skyblock=1..}] run scoreboard objectives add SkyblockCE_legacy_old dummy execute as @a[scores={SkyblockCE_legacy_old=1..}] run tellraw @a {"translate":"skyblock_classic_edition.loading.chat"} execute as @a[scores={SkyblockCE_legacy_old=1..}] run tellraw @a {"text":"The compatibility update for this version is no longer available. Download a version older than 1.21.X to convert it.","italic":true} -execute as @a[scores={SkyblockCE_legacy_old=5..10}] run scoreboard players set @a SkyblockCE_islands 4 +execute as @a[scores={SkyblockCE_legacy_old=5..10}] run scoreboard players set @a SkyblockCE_islands 5 execute as @a[scores={SkyblockCE_legacy_old=5..}] run scoreboard objectives remove skyblock execute as @a[scores={SkyblockCE_legacy_old=5..}] run scoreboard objectives remove SkyblockCE_legacy_version execute as @a[scores={SkyblockCE_legacy_old=500}] run scoreboard objectives add PID_0 dummy diff --git a/datapacks/Skyblock CE datapacks/pack.mcmeta b/datapacks/Skyblock CE datapacks/pack.mcmeta index 416d304ea..757de9d73 100644 --- a/datapacks/Skyblock CE datapacks/pack.mcmeta +++ b/datapacks/Skyblock CE datapacks/pack.mcmeta @@ -1,9 +1,9 @@ { "pack": { - "pack_format": 57, + "pack_format": 61, "supported_formats": { "min_inclusive": 48, - "max_inclusive": 57 + "max_inclusive": 61 }, "description": "Skyblock Classic Edition By Lorenzo Giannini" }, @@ -12,7 +12,7 @@ { "formats": { "min_inclusive": 48, - "max_inclusive": 57 + "max_inclusive": 61 }, "directory": "skyblock_setup_update" }, @@ -26,28 +26,28 @@ { "formats": { "min_inclusive": 48, - "max_inclusive": 57 + "max_inclusive": 61 }, "directory": "legacy_pid_skyblock" }, { "formats": { "min_inclusive": 48, - "max_inclusive": 57 + "max_inclusive": 61 }, "directory": "legacy_skyblock" }, { "formats": { "min_inclusive": 48, - "max_inclusive": 57 + "max_inclusive": 61 }, "directory": "skyblock_custom_world" }, { "formats": { "min_inclusive": 25, - "max_inclusive": 41 + "max_inclusive": 25 }, "directory": "skyblock_test" } diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/desert_well.json deleted file mode 100644 index f0f1ba227..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/desert_well.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:desert_well", - "config": {} -} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/monster_room.json deleted file mode 100644 index 6cf3d0b78..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/configured_feature/monster_room.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:monster_room", - "config": {} -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/desert_well.json deleted file mode 100644 index 9e6c1e4e2..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/desert_well.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "minecraft:desert_well", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 1000 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room.json deleted file mode 100644 index 47b01547f..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "minecraft:monster_room", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "below_top": 0 - }, - "min_inclusive": { - "absolute": 0 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room_deep.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room_deep.json deleted file mode 100644 index 93b3977ac..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/placed_feature/monster_room_deep.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "minecraft:monster_room", - "placement": [ - { - "type": "minecraft:count", - "count": 5 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": -1 - }, - "min_inclusive": { - "above_bottom": 6 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/buried_treasure.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/buried_treasure.json index a816bf651..59537ddd5 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/buried_treasure.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/buried_treasure.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/buried_treasure", "size": 1, "start_height": { - "absolute": 0 + "absolute": -25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/desert_pyramid.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/desert_pyramid.json index 8e76042f0..5957de474 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/desert_pyramid.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/desert_pyramid.json @@ -19,7 +19,7 @@ "start_pool": "skyblock:worldgen/desert_pyramid", "size": 1, "start_height": { - "absolute": 0 + "absolute": 30 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/igloo.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/igloo.json index ff7af7a69..522e3898d 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/igloo.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/igloo.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/igloo", "size": 1, "start_height": { - "absolute": 0 + "absolute": 10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/jungle_pyramid.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/jungle_pyramid.json index bdb183c68..c1a463583 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/jungle_pyramid.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/jungle_pyramid.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/jungle_pyramid", "size": 1, "start_height": { - "absolute": 0 + "absolute": 25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_cold.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_cold.json index 6577ff802..151fd8aea 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_cold.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_cold.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/ocean_ruins_cold", "size": 1, "start_height": { - "absolute": 0 + "absolute": -10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_warm.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_warm.json index 53f3b094c..72ccac864 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_warm.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/ocean_ruin_warm.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/ocean_ruins_warm", "size": 1, "start_height": { - "absolute": 0 + "absolute": -10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/pillager_outpost.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/pillager_outpost.json index 8fc2e667c..f30488a3a 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/pillager_outpost.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/pillager_outpost.json @@ -19,7 +19,7 @@ "start_pool": "skyblock:worldgen/pillager_outpost", "size": 1, "start_height": { - "absolute": 0 + "absolute": 25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/stronghold.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/stronghold.json index 754b9860a..2d0e94ea3 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/stronghold.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/stronghold.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/stronghold", "size": 1, "start_height": { - "absolute": 0 + "absolute": -80 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/swamp_hut.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/swamp_hut.json index 2a631ab1f..d5252b0ac 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/swamp_hut.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure/swamp_hut.json @@ -30,7 +30,7 @@ "start_pool": "skyblock:worldgen/swamp_hut", "size": 1, "start_height": { - "absolute": 0 + "absolute": 15 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/buried_treasure.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/buried_treasure.json index f52954bd3..038c7536e 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/buried_treasure.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/buried_treasure.json @@ -2,8 +2,15 @@ "placement": { "type": "minecraft:random_spread", "salt": 14357618, - "separation": 8, - "spacing": 32 + "separation": 0, + "spacing": 1, + "frequency": 0.01, + "frequency_reduction_method": "legacy_type_2", + "locate_offset": [ + 9, + 0, + 9 + ] }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/igloo.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/igloo.json index 11171f681..f2e610fb9 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/igloo.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/igloo.json @@ -2,8 +2,8 @@ "placement": { "type": "minecraft:random_spread", "salt": 14357618, - "separation": 10, - "spacing": 33 + "separation": 8, + "spacing": 32 }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/pillager_outpost.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/pillager_outpost.json index 9d9c79186..6064da368 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/pillager_outpost.json +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/minecraft/worldgen/structure_set/pillager_outpost.json @@ -3,7 +3,12 @@ "type": "minecraft:random_spread", "salt": 14357618, "separation": 8, - "spacing": 30 + "spacing": 32, + "frequency_reduction_method": "legacy_type_1", + "exclusion_zone": { + "other_set": "minecraft:villages", + "chunk_count": 10 + } }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/nether_very_small.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/nether_very_small.nbt new file mode 100644 index 000000000..0675829f4 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/nether_very_small.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/structures_test/cherry_grove.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/structures_test/cherry_grove.nbt deleted file mode 100644 index f61986847..000000000 Binary files a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/structures_test/cherry_grove.nbt and /dev/null differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic.nbt new file mode 100644 index 000000000..ac94de03d Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic_desert.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic_desert.nbt new file mode 100644 index 000000000..668bfc33d Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/very_small_classic_desert.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/badland.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/badland.nbt new file mode 100644 index 000000000..9dfd53107 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/badland.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/birch_forest.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/birch_forest.nbt new file mode 100644 index 000000000..7aa08da34 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/birch_forest.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/cherry_grove.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/cherry_grove.nbt new file mode 100644 index 000000000..a8743fb03 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/cherry_grove.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/dark_forest.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/dark_forest.nbt new file mode 100644 index 000000000..61ceb5ab3 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/dark_forest.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/jungle.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/jungle.nbt new file mode 100644 index 000000000..4d77b36ac Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/jungle.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/mangrove_swamp.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/mangrove_swamp.nbt new file mode 100644 index 000000000..b9fb4a039 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/mangrove_swamp.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/pale_garden.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/pale_garden.nbt new file mode 100644 index 000000000..f9944c5dc Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/pale_garden.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/savanna.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/savanna.nbt new file mode 100644 index 000000000..69e842d8b Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/savanna.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/taiga.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/taiga.nbt new file mode 100644 index 000000000..53d94e0c1 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/custom_islands/taiga.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_pyramid.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_pyramid.nbt index 63ff00535..71fb464c5 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_pyramid.nbt and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_pyramid.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_well.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_well.nbt new file mode 100644 index 000000000..131001494 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/desert_well.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/igloo.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/igloo.nbt index 63a52b986..75b679d54 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/igloo.nbt and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/igloo.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/jungle_pyramid.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/jungle_pyramid.nbt index 0c73cba1f..fb57c7da4 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/jungle_pyramid.nbt and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/jungle_pyramid.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/monster_room.nbt b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/monster_room.nbt new file mode 100644 index 000000000..5cc532295 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/structure/worldgen/monster_room.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/badland.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/badland.json new file mode 100644 index 000000000..7a8537428 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/badland.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/birch_forest.json new file mode 100644 index 000000000..1d080779b --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/birch_forest.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/cherry_grove.json new file mode 100644 index 000000000..4c834357d --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/cherry_grove.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cherry_grove" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/dark_forest.json new file mode 100644 index 000000000..2d31b9e8e --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/dark_forest.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:dark_forest" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/desert_well.json new file mode 100644 index 000000000..f1a8ccb64 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/desert_well.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:desert" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/jungle.json new file mode 100644 index 000000000..212ff3d2a --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/jungle.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/mangrove_swamp.json new file mode 100644 index 000000000..d862033bb --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/mangrove_swamp.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/monster_room.json new file mode 100644 index 000000000..45560e985 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/monster_room.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:dripstone_caves", + "minecraft:lush_caves", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/pale_garden.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/pale_garden.json new file mode 100644 index 000000000..16abb77c7 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/pale_garden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pale_garden" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/savanna.json new file mode 100644 index 000000000..fc71cb523 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/savanna.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/taiga.json new file mode 100644 index 000000000..42944dcb5 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/biome/has_structure/taiga.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:taiga", + "minecraft:snowy_taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/structure/biome_island.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/structure/biome_island.json new file mode 100644 index 000000000..d27b51171 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/tags/worldgen/structure/biome_island.json @@ -0,0 +1,15 @@ +{ + "values": [ + "skyblock:badland", + "skyblock:birch_forest", + "skyblock:cherry_grove", + "skyblock:dark_forest", + "skyblock:desert_well", + "skyblock:jungle", + "skyblock:mangrove_swamp", + "skyblock:monster_room", + "skyblock:savanna", + "skyblock:taiga", + "skyblock:pale_garden" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/processor_list/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/processor_list/monster_room.json new file mode 100644 index 000000000..a31a12590 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/processor_list/monster_room.json @@ -0,0 +1,93 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:skeleton" + } + } + } + } + }, + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:creeper" + } + } + } + } + }, + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:spider" + } + } + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/badland.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/badland.json new file mode 100644 index 000000000..ef2c24215 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/badland.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/badland", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/badland", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/birch_forest.json new file mode 100644 index 000000000..85531e278 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/birch_forest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/birch_forest", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/birch_forest", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/cherry_grove.json new file mode 100644 index 000000000..f889c78aa --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/cherry_grove.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/cherry_grove", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/cherry_grove", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/dark_forest.json new file mode 100644 index 000000000..fb78d5b45 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/dark_forest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/dark_forest", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/dark_forest", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/desert_well.json new file mode 100644 index 000000000..074b61476 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/desert_well.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/desert_well", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/desert_well", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/jungle.json new file mode 100644 index 000000000..3aa249b1f --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/jungle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/jungle", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/jungle", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/mangrove_swamp.json new file mode 100644 index 000000000..5db61b01c --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/mangrove_swamp.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/mangrove_swamp", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/mangrove_swamp", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/monster_room.json new file mode 100644 index 000000000..a89c8a5d9 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/monster_room.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/monster_room", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/monster_room", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/pale_garden.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/pale_garden.json new file mode 100644 index 000000000..fc4223da0 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/pale_garden.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/pale_garden", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/pale_garden", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/savanna.json new file mode 100644 index 000000000..a2ef09c63 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/savanna.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/savanna", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/savanna", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/taiga.json new file mode 100644 index 000000000..a9f41b54c --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure/taiga.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/taiga", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/taiga", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure_set/biome_islands.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure_set/biome_islands.json new file mode 100644 index 000000000..3b1ae4d8e --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/structure_set/biome_islands.json @@ -0,0 +1,55 @@ +{ + "structures": [ + { + "structure": "skyblock:badland", + "weight": 1 + }, + { + "structure": "skyblock:birch_forest", + "weight": 1 + }, + { + "structure": "skyblock:cherry_grove", + "weight": 1 + }, + { + "structure": "skyblock:dark_forest", + "weight": 1 + }, + { + "structure": "skyblock:desert_well", + "weight": 1 + }, + { + "structure": "skyblock:jungle", + "weight": 1 + }, + { + "structure": "skyblock:mangrove_swamp", + "weight": 1 + }, + { + "structure": "skyblock:monster_room", + "weight": 1 + }, + { + "structure": "skyblock:savanna", + "weight": 1 + }, + { + "structure": "skyblock:taiga", + "weight": 1 + }, + { + "structure": "skyblock:pale_garden", + "weight": 1 + } + ], + "placement": { + "type": "minecraft:random_spread", + "salt": 10387312, + "spread_type": "triangular", + "spacing": 38, + "separation": 16 + } +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/desert_well.json new file mode 100644 index 000000000..fcecd5acb --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/desert_well.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/desert_well", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/badland.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/badland.json new file mode 100644 index 000000000..3682e6dc2 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/badland.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/badland", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/birch_forest.json new file mode 100644 index 000000000..e786e5019 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/birch_forest.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/birch_forest", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/cherry_grove.json new file mode 100644 index 000000000..5020a2915 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/cherry_grove.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/cherry_grove", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/dark_forest.json new file mode 100644 index 000000000..193430ab0 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/dark_forest.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/dark_forest", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/jungle.json new file mode 100644 index 000000000..a8d2110d7 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/jungle.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/jungle", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/mangrove_swamp.json new file mode 100644 index 000000000..ef5b1b3e7 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/mangrove_swamp.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/mangrove_swamp", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/pale_garden.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/pale_garden.json new file mode 100644 index 000000000..ffbefa3e9 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/pale_garden.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/pale_garden", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/savanna.json new file mode 100644 index 000000000..2505de8a5 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/savanna.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/savanna", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/taiga.json new file mode 100644 index 000000000..6100a52a2 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/islands/taiga.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/taiga", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/monster_room.json new file mode 100644 index 000000000..c1594e362 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_custom_world/data/skyblock/worldgen/template_pool/worldgen/monster_room.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/monster_room", + "processors": "skyblock:monster_room" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/desert_well.json deleted file mode 100644 index f0f1ba227..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/desert_well.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:desert_well", - "config": {} -} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/monster_room.json deleted file mode 100644 index 6cf3d0b78..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/configured_feature/monster_room.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:monster_room", - "config": {} -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/desert_well.json deleted file mode 100644 index 9e6c1e4e2..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/desert_well.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "minecraft:desert_well", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 1000 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room.json deleted file mode 100644 index 47b01547f..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "minecraft:monster_room", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "below_top": 0 - }, - "min_inclusive": { - "absolute": 0 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room_deep.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room_deep.json deleted file mode 100644 index 93b3977ac..000000000 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/placed_feature/monster_room_deep.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "minecraft:monster_room", - "placement": [ - { - "type": "minecraft:count", - "count": 5 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": -1 - }, - "min_inclusive": { - "above_bottom": 6 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/buried_treasure.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/buried_treasure.json index a816bf651..59537ddd5 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/buried_treasure.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/buried_treasure.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/buried_treasure", "size": 1, "start_height": { - "absolute": 0 + "absolute": -25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/desert_pyramid.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/desert_pyramid.json index 8e76042f0..5957de474 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/desert_pyramid.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/desert_pyramid.json @@ -19,7 +19,7 @@ "start_pool": "skyblock:worldgen/desert_pyramid", "size": 1, "start_height": { - "absolute": 0 + "absolute": 30 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/igloo.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/igloo.json index ff7af7a69..522e3898d 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/igloo.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/igloo.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/igloo", "size": 1, "start_height": { - "absolute": 0 + "absolute": 10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/jungle_pyramid.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/jungle_pyramid.json index bdb183c68..c1a463583 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/jungle_pyramid.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/jungle_pyramid.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/jungle_pyramid", "size": 1, "start_height": { - "absolute": 0 + "absolute": 25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_cold.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_cold.json index 6577ff802..151fd8aea 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_cold.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_cold.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/ocean_ruins_cold", "size": 1, "start_height": { - "absolute": 0 + "absolute": -10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_warm.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_warm.json index 53f3b094c..72ccac864 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_warm.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/ocean_ruin_warm.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/ocean_ruins_warm", "size": 1, "start_height": { - "absolute": 0 + "absolute": -10 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/pillager_outpost.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/pillager_outpost.json index 8fc2e667c..f30488a3a 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/pillager_outpost.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/pillager_outpost.json @@ -19,7 +19,7 @@ "start_pool": "skyblock:worldgen/pillager_outpost", "size": 1, "start_height": { - "absolute": 0 + "absolute": 25 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/stronghold.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/stronghold.json index 754b9860a..2d0e94ea3 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/stronghold.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/stronghold.json @@ -7,7 +7,7 @@ "start_pool": "skyblock:worldgen/stronghold", "size": 1, "start_height": { - "absolute": 0 + "absolute": -80 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/swamp_hut.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/swamp_hut.json index 2a631ab1f..d5252b0ac 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/swamp_hut.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure/swamp_hut.json @@ -30,7 +30,7 @@ "start_pool": "skyblock:worldgen/swamp_hut", "size": 1, "start_height": { - "absolute": 0 + "absolute": 15 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 80, diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/buried_treasure.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/buried_treasure.json index f52954bd3..038c7536e 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/buried_treasure.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/buried_treasure.json @@ -2,8 +2,15 @@ "placement": { "type": "minecraft:random_spread", "salt": 14357618, - "separation": 8, - "spacing": 32 + "separation": 0, + "spacing": 1, + "frequency": 0.01, + "frequency_reduction_method": "legacy_type_2", + "locate_offset": [ + 9, + 0, + 9 + ] }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/igloo.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/igloo.json index 11171f681..f2e610fb9 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/igloo.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/igloo.json @@ -2,8 +2,8 @@ "placement": { "type": "minecraft:random_spread", "salt": 14357618, - "separation": 10, - "spacing": 33 + "separation": 8, + "spacing": 32 }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/pillager_outpost.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/pillager_outpost.json index 9d9c79186..6064da368 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/pillager_outpost.json +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/minecraft/worldgen/structure_set/pillager_outpost.json @@ -3,7 +3,12 @@ "type": "minecraft:random_spread", "salt": 14357618, "separation": 8, - "spacing": 30 + "spacing": 32, + "frequency_reduction_method": "legacy_type_1", + "exclusion_zone": { + "other_set": "minecraft:villages", + "chunk_count": 10 + } }, "structures": [ { diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/nether_very_small.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/nether_very_small.nbt new file mode 100644 index 000000000..0675829f4 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/nether_very_small.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ancient_city.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ancient_city.nbt new file mode 100644 index 000000000..208faf596 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ancient_city.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/desert_pyramid.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/desert_pyramid.nbt new file mode 100644 index 000000000..d9d973300 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/desert_pyramid.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/igloo.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/igloo.nbt new file mode 100644 index 000000000..f9eff88d4 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/igloo.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/jungle_pyramids.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/jungle_pyramids.nbt new file mode 100644 index 000000000..a279a618b Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/jungle_pyramids.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ocean_ruins.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ocean_ruins.nbt new file mode 100644 index 000000000..6f201f55b Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/ocean_ruins.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/pillager_outpost.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/pillager_outpost.nbt new file mode 100644 index 000000000..2ff42d356 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/pillager_outpost.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/shipwrecks.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/shipwrecks.nbt new file mode 100644 index 000000000..5f9913c02 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/shipwrecks.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/stronghold.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/stronghold.nbt new file mode 100644 index 000000000..87eea5d38 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/stronghold.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/swamp_hut.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/swamp_hut.nbt new file mode 100644 index 000000000..71d87ee8e Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/swamp_hut.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/trail_ruins.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/trail_ruins.nbt new file mode 100644 index 000000000..47c5ff678 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/trail_ruins.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/village.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/village.nbt new file mode 100644 index 000000000..529c10f81 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/village.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/wolfs_pack.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/wolfs_pack.nbt new file mode 100644 index 000000000..fb49b4244 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/structures_test/wolfs_pack.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic.nbt new file mode 100644 index 000000000..ac94de03d Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic_desert.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic_desert.nbt new file mode 100644 index 000000000..668bfc33d Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/very_small_classic_desert.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/badland.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/badland.nbt new file mode 100644 index 000000000..9dfd53107 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/badland.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/birch_forest.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/birch_forest.nbt new file mode 100644 index 000000000..7aa08da34 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/birch_forest.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/cherry_grove.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/cherry_grove.nbt new file mode 100644 index 000000000..a8743fb03 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/cherry_grove.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/dark_forest.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/dark_forest.nbt new file mode 100644 index 000000000..61ceb5ab3 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/dark_forest.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/jungle.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/jungle.nbt new file mode 100644 index 000000000..4d77b36ac Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/jungle.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/mangrove_swamp.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/mangrove_swamp.nbt new file mode 100644 index 000000000..b9fb4a039 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/mangrove_swamp.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/savanna.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/savanna.nbt new file mode 100644 index 000000000..69e842d8b Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/savanna.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/taiga.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/taiga.nbt new file mode 100644 index 000000000..53d94e0c1 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/custom_islands/taiga.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_pyramid.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_pyramid.nbt index 63ff00535..71fb464c5 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_pyramid.nbt and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_pyramid.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_well.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_well.nbt new file mode 100644 index 000000000..131001494 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/desert_well.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/igloo.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/igloo.nbt index 63a52b986..75b679d54 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/igloo.nbt and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/igloo.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/jungle_pyramid.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/jungle_pyramid.nbt index 0c73cba1f..fb57c7da4 100644 Binary files a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/jungle_pyramid.nbt and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/jungle_pyramid.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/monster_room.nbt b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/monster_room.nbt new file mode 100644 index 000000000..5cc532295 Binary files /dev/null and b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/structure/worldgen/monster_room.nbt differ diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/badland.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/badland.json new file mode 100644 index 000000000..7a8537428 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/badland.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/birch_forest.json new file mode 100644 index 000000000..1d080779b --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/birch_forest.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/cherry_grove.json new file mode 100644 index 000000000..4c834357d --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/cherry_grove.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cherry_grove" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/dark_forest.json new file mode 100644 index 000000000..2d31b9e8e --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/dark_forest.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:dark_forest" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/desert_well.json new file mode 100644 index 000000000..f1a8ccb64 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/desert_well.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:desert" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/jungle.json new file mode 100644 index 000000000..212ff3d2a --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/jungle.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/mangrove_swamp.json new file mode 100644 index 000000000..d862033bb --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/mangrove_swamp.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/monster_room.json new file mode 100644 index 000000000..45560e985 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/monster_room.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:dripstone_caves", + "minecraft:lush_caves", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/savanna.json new file mode 100644 index 000000000..fc71cb523 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/savanna.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/taiga.json new file mode 100644 index 000000000..42944dcb5 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/biome/has_structure/taiga.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:taiga", + "minecraft:snowy_taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/structure/biome_island.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/structure/biome_island.json new file mode 100644 index 000000000..c36116f59 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/tags/worldgen/structure/biome_island.json @@ -0,0 +1,14 @@ +{ + "values": [ + "skyblock:badland", + "skyblock:birch_forest", + "skyblock:cherry_grove", + "skyblock:dark_forest", + "skyblock:desert_well", + "skyblock:jungle", + "skyblock:mangrove_swamp", + "skyblock:monster_room", + "skyblock:savanna", + "skyblock:taiga" + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/processor_list/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/processor_list/monster_room.json new file mode 100644 index 000000000..a31a12590 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/processor_list/monster_room.json @@ -0,0 +1,93 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:skeleton" + } + } + } + } + }, + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:creeper" + } + } + } + } + }, + { + "input_predicate": { + "block": "minecraft:spawner", + "predicate_type": "minecraft:random_block_match", + "probability": 0.30 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:spawner" + }, + "block_entity_modifier": { + "type": "minecraft:append_static", + "data": { + "id": "minecraft:mob_spawner", + "x": 104, + "y": -60, + "z": 424, + "SpawnPotentials": [], + "SpawnData": { + "entity": { + "id": "minecraft:spider" + } + } + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/badland.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/badland.json new file mode 100644 index 000000000..ef2c24215 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/badland.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/badland", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/badland", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/birch_forest.json new file mode 100644 index 000000000..85531e278 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/birch_forest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/birch_forest", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/birch_forest", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/cherry_grove.json new file mode 100644 index 000000000..f889c78aa --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/cherry_grove.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/cherry_grove", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/cherry_grove", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/dark_forest.json new file mode 100644 index 000000000..fb78d5b45 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/dark_forest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/dark_forest", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/dark_forest", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/desert_well.json new file mode 100644 index 000000000..074b61476 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/desert_well.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/desert_well", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/desert_well", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/jungle.json new file mode 100644 index 000000000..3aa249b1f --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/jungle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/jungle", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/jungle", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/mangrove_swamp.json new file mode 100644 index 000000000..5db61b01c --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/mangrove_swamp.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/mangrove_swamp", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/mangrove_swamp", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/monster_room.json new file mode 100644 index 000000000..a89c8a5d9 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/monster_room.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/monster_room", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/monster_room", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/savanna.json new file mode 100644 index 000000000..a2ef09c63 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/savanna.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/savanna", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/savanna", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/taiga.json new file mode 100644 index 000000000..a9f41b54c --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure/taiga.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#skyblock:has_structure/taiga", + "step": "top_layer_modification", + "spawn_overrides": {}, + "start_pool": "skyblock:worldgen/islands/taiga", + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 38 + } + }, + "max_distance_from_center": 80, + "use_expansion_hack": false, + "dimension_padding": 50, + "liquid_settings": "ignore_waterlogging" +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure_set/biome_islands.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure_set/biome_islands.json new file mode 100644 index 000000000..a1bf7fd89 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/structure_set/biome_islands.json @@ -0,0 +1,51 @@ +{ + "structures": [ + { + "structure": "skyblock:badland", + "weight": 1 + }, + { + "structure": "skyblock:birch_forest", + "weight": 1 + }, + { + "structure": "skyblock:cherry_grove", + "weight": 1 + }, + { + "structure": "skyblock:dark_forest", + "weight": 1 + }, + { + "structure": "skyblock:desert_well", + "weight": 1 + }, + { + "structure": "skyblock:jungle", + "weight": 1 + }, + { + "structure": "skyblock:mangrove_swamp", + "weight": 1 + }, + { + "structure": "skyblock:monster_room", + "weight": 1 + }, + { + "structure": "skyblock:savanna", + "weight": 1 + }, + { + "structure": "skyblock:taiga", + "weight": 1 + } + ], + "placement": { + "type": "minecraft:random_spread", + "salt": 10387312, + "spread_type": "triangular", + "spacing": 38, + "separation": 16 + } +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/desert_well.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/desert_well.json new file mode 100644 index 000000000..fcecd5acb --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/desert_well.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/desert_well", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/badland.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/badland.json new file mode 100644 index 000000000..3682e6dc2 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/badland.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/badland", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/birch_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/birch_forest.json new file mode 100644 index 000000000..e786e5019 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/birch_forest.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/birch_forest", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/cherry_grove.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/cherry_grove.json new file mode 100644 index 000000000..5020a2915 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/cherry_grove.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/cherry_grove", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/dark_forest.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/dark_forest.json new file mode 100644 index 000000000..193430ab0 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/dark_forest.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/dark_forest", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/jungle.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/jungle.json new file mode 100644 index 000000000..a8d2110d7 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/jungle.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/jungle", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/mangrove_swamp.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/mangrove_swamp.json new file mode 100644 index 000000000..ef5b1b3e7 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/mangrove_swamp.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/mangrove_swamp", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/savanna.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/savanna.json new file mode 100644 index 000000000..2505de8a5 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/savanna.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/savanna", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/taiga.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/taiga.json new file mode 100644 index 000000000..6100a52a2 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/islands/taiga.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/custom_islands/taiga", + "processors": "minecraft:empty" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/monster_room.json b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/monster_room.json new file mode 100644 index 000000000..c1594e362 --- /dev/null +++ b/datapacks/Skyblock CE datapacks/skyblock_mc121/data/skyblock_mc/worldgen/template_pool/worldgen/monster_room.json @@ -0,0 +1,14 @@ +{ + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "projection": "rigid", + "location": "skyblock:worldgen/monster_room", + "processors": "skyblock:monster_room" + } + } + ] +} \ No newline at end of file diff --git a/datapacks/Skyblock CE datapacks/skyblock_test/data/skyblock/function/skyblock_test_setup.mcfunction b/datapacks/Skyblock CE datapacks/skyblock_test/data/skyblock/function/skyblock_test_setup.mcfunction index 8878c72bb..289a432aa 100644 --- a/datapacks/Skyblock CE datapacks/skyblock_test/data/skyblock/function/skyblock_test_setup.mcfunction +++ b/datapacks/Skyblock CE datapacks/skyblock_test/data/skyblock/function/skyblock_test_setup.mcfunction @@ -21,7 +21,7 @@ execute as @a[scores={SkyblockCE_install_test=1..}] run scoreboard players set @ ##Islands Choices Setup Test execute as @a[scores={SkyblockCE_install_test=2}] run tellraw @a {"text":"\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\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"} -execute as @a[scores={SkyblockCE_install_test=3}] run tellraw @a ["",{"translate":"skyblock_classic_edition.skyblock_setup.welcome","bold":true},{"text":" - Dimensions Version","bold":true},{"text":":","bold":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_test_setup","italic":true},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_islands","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.large_easy","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 1"}},{"text":" ","color":"dark_green"},{"text":"[?]","color":"dark_green","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.large_easy.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.default_normal","color":"gold","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 2"}},{"text":" ","color":"gold"},{"text":"[?]","color":"gold","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.default_normal.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.small_hard","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 3"}},{"text":" ","color":"red"},{"text":"[?]","color":"red","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.small_hard.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.import","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 4"}},{"text":" ","color":"blue"},{"text":"[?]","color":"blue","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.import.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c"}] +execute as @a[scores={SkyblockCE_install_test=3}] run tellraw @a ["",{"translate":"skyblock_classic_edition.skyblock_setup.welcome","bold":true},{"text":" - Dimensions Version","bold":true},{"text":":","bold":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_test_setup","italic":true},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.choose_islands","italic":true},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.large_easy","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 1"}},{"text":" ","color":"dark_green"},{"text":"[?]","color":"dark_green","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.large_easy.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.default_normal","color":"gold","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 2"}},{"text":" ","color":"gold"},{"text":"[?]","color":"gold","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.default_normal.info"}]}},{"text":"\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.small_hard","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 3"}},{"text":" ","color":"red"},{"text":"[?]","color":"red","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.small_hard.info"}]}},{"text":"\n\n"},{"text":"▶Very Small (Extreme)","color":"dark_red","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 4"}},{"text":" ","color":"dark_red"},{"text":"[?]","color":"dark_red","hoverEvent":{"action":"show_text","contents":[{"text":"This island is extreme and not suitable for new players, but only for those who are looking for the thrill of pure vanilla technical and who know Minecraft to the extreme of technical. It is recommended to play with hardcore mode turned on."}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\n\n"},{"translate":"skyblock_classic_edition.skyblock_setup.import","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @a SkyblockCE_islands 4"}},{"text":" ","color":"blue"},{"text":"[?]","color":"blue","hoverEvent":{"action":"show_text","contents":[{"translate":"skyblock_classic_edition.skyblock_setup.import.info"}]}},{"text":"\n\n\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c\u2b1c"}] execute as @a[scores={SkyblockCE_install_test=1000..}] run scoreboard players set @a SkyblockCE_install_test 1 execute as @a[scores={SkyblockCE_install_test=1}] run difficulty normal execute as @a[scores={SkyblockCE_install_test=3}] run tellraw @a ["",{"text":"\n 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"}] diff --git a/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction b/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction index 65aa69079..09f234bd2 100644 --- a/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction +++ b/datapacks/Skyblock Classic Edition Hardcore/datapacks/Skyblock CE datapacks/data/skyblock/function/skyblock_setup.mcfunction @@ -46,6 +46,7 @@ execute as @a[scores={SkyblockCE_id=2000000..}] run scoreboard players set @a Sk execute as @a[scores={SkyblockCE_large=2000000..}] run scoreboard players set @a SkyblockCE_large 10000 execute as @a[scores={SkyblockCE_default=2000000..}] run scoreboard players set @a SkyblockCE_default 10000 execute as @a[scores={SkyblockCE_small=2000000..}] run scoreboard players set @a SkyblockCE_small 10000 +execute as @a[scores={SkyblockCE_very_small=2000000..}] run scoreboard players set @a SkyblockCE_very_small 10000 execute as @a[scores={SkyblockCE_import=2000000..}] run scoreboard players set @a SkyblockCE_import 10000 diff --git a/resources.zip b/resources.zip index 68ad7285a..b6cdb4de0 100644 Binary files a/resources.zip and b/resources.zip differ diff --git a/spyglass.json b/spyglass.json index 1b8c0428a..03506f351 100644 --- a/spyglass.json +++ b/spyglass.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "1.21.3", + "gameVersion": "1.21.4", "permissionLevel": 2 }, "format": {