diff --git a/build/rp_skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip b/build/rp_skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip new file mode 100644 index 0000000..74a27c1 Binary files /dev/null and b/build/rp_skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip differ diff --git a/build/rp_skyvoid_advancements_standard_v2_0_0-MC_1_21.zip b/build/rp_skyvoid_advancements_standard_v2_0_0-MC_1_21.zip new file mode 100644 index 0000000..01ad2f3 Binary files /dev/null and b/build/rp_skyvoid_advancements_standard_v2_0_0-MC_1_21.zip differ diff --git a/build/skyvoid_additions_v1_2_7-MC_1_21.zip b/build/skyvoid_additions_v1_2_7-MC_1_21.zip index c51b658..c841edc 100644 Binary files a/build/skyvoid_additions_v1_2_7-MC_1_21.zip and b/build/skyvoid_additions_v1_2_7-MC_1_21.zip differ diff --git a/build/skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip b/build/skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip new file mode 100644 index 0000000..f8538b1 Binary files /dev/null and b/build/skyvoid_advancements_one_block_v1_0_0-MC_1_21.zip differ diff --git a/build/rp_skyvoid_advancements_v1_0_7-MC_1_21.zip b/build/skyvoid_advancements_standard_v2_0_0-MC_1_21.zip similarity index 61% rename from build/rp_skyvoid_advancements_v1_0_7-MC_1_21.zip rename to build/skyvoid_advancements_standard_v2_0_0-MC_1_21.zip index 38ba353..43a50d6 100644 Binary files a/build/rp_skyvoid_advancements_v1_0_7-MC_1_21.zip and b/build/skyvoid_advancements_standard_v2_0_0-MC_1_21.zip differ diff --git a/build/skyvoid_biome_islands_v1_0_3-MC_1_21.zip b/build/skyvoid_biome_islands_v1_0_3-MC_1_21.zip index 61f9aa1..14c1989 100644 Binary files a/build/skyvoid_biome_islands_v1_0_3-MC_1_21.zip and b/build/skyvoid_biome_islands_v1_0_3-MC_1_21.zip differ diff --git a/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_1_21.zip b/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_1_21.zip index 155df81..a9bab08 100644 Binary files a/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_1_21.zip and b/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_1_21.zip differ diff --git a/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_1_21.zip b/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_1_21.zip index 6fd416f..bdd78f6 100644 Binary files a/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_1_21.zip and b/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_1_21.zip differ diff --git a/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_1_21.zip b/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_1_21.zip index 2d8a73d..a5f96fd 100644 Binary files a/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_1_21.zip and b/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_1_21.zip differ diff --git a/build/skyvoid_island_oneblock_v1_3_2-MC_1_21.zip b/build/skyvoid_island_oneblock_v1_3_2-MC_1_21.zip index 43a0b3c..dd4bb7f 100644 Binary files a/build/skyvoid_island_oneblock_v1_3_2-MC_1_21.zip and b/build/skyvoid_island_oneblock_v1_3_2-MC_1_21.zip differ diff --git a/build/skyvoid_island_only_dirt_v1_1_2-MC_1_21.zip b/build/skyvoid_island_only_dirt_v1_1_2-MC_1_21.zip index e6b72ef..c95631b 100644 Binary files a/build/skyvoid_island_only_dirt_v1_1_2-MC_1_21.zip and b/build/skyvoid_island_only_dirt_v1_1_2-MC_1_21.zip differ diff --git a/build/skyvoid_island_standard_v1_1_2-MC_1_21.zip b/build/skyvoid_island_standard_v1_1_2-MC_1_21.zip index ef5c64f..d04e070 100644 Binary files a/build/skyvoid_island_standard_v1_1_2-MC_1_21.zip and b/build/skyvoid_island_standard_v1_1_2-MC_1_21.zip differ diff --git a/build/skyvoid_no_end_ship_v1_1_2-MC_1_21.zip b/build/skyvoid_no_end_ship_v1_1_2-MC_1_21.zip index c77045d..091026a 100644 Binary files a/build/skyvoid_no_end_ship_v1_1_2-MC_1_21.zip and b/build/skyvoid_no_end_ship_v1_1_2-MC_1_21.zip differ diff --git a/build/skyvoid_sand_island_v1_0_4-MC_1_21.zip b/build/skyvoid_sand_island_v1_0_4-MC_1_21.zip index a6d60e8..cdeeaa2 100644 Binary files a/build/skyvoid_sand_island_v1_0_4-MC_1_21.zip and b/build/skyvoid_sand_island_v1_0_4-MC_1_21.zip differ diff --git a/build/skyvoid_vanilla_oneblock_starter_v1_1_7-MC_1_21.zip b/build/skyvoid_vanilla_oneblock_starter_v1_1_7-MC_1_21.zip index 4f7515d..e4278cb 100644 Binary files a/build/skyvoid_vanilla_oneblock_starter_v1_1_7-MC_1_21.zip and b/build/skyvoid_vanilla_oneblock_starter_v1_1_7-MC_1_21.zip differ diff --git a/build/skyvoid_worldgen_structures_v1_0_6-MC_1_21.zip b/build/skyvoid_worldgen_structures_v1_0_6-MC_1_21.zip index 84f0db9..0fbc9da 100644 Binary files a/build/skyvoid_worldgen_structures_v1_0_6-MC_1_21.zip and b/build/skyvoid_worldgen_structures_v1_0_6-MC_1_21.zip differ diff --git a/src/packs/extras/skyvoid_advancements/assets/skyvoid/font/advancements.json b/src/packs/advancements/common/assets/skyvoid/font/advancements.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/assets/skyvoid/font/advancements.json rename to src/packs/advancements/common/assets/skyvoid/font/advancements.json diff --git a/src/packs/extras/skyvoid_advancements/assets/skyvoid/lang/en_us.json b/src/packs/advancements/common/assets/skyvoid/lang/en_us.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/assets/skyvoid/lang/en_us.json rename to src/packs/advancements/common/assets/skyvoid/lang/en_us.json diff --git a/src/packs/extras/skyvoid_advancements/assets/skyvoid/textures/gui/advancements/cobblestone_generator.png b/src/packs/advancements/common/assets/skyvoid/textures/gui/advancements/cobblestone_generator.png similarity index 100% rename from src/packs/extras/skyvoid_advancements/assets/skyvoid/textures/gui/advancements/cobblestone_generator.png rename to src/packs/advancements/common/assets/skyvoid/textures/gui/advancements/cobblestone_generator.png diff --git a/src/packs/extras/skyvoid_advancements/assets/skyvoid/textures/gui/advancements/nether_portal.png b/src/packs/advancements/common/assets/skyvoid/textures/gui/advancements/nether_portal.png similarity index 100% rename from src/packs/extras/skyvoid_advancements/assets/skyvoid/textures/gui/advancements/nether_portal.png rename to src/packs/advancements/common/assets/skyvoid/textures/gui/advancements/nether_portal.png diff --git a/src/packs/advancements/common/beet.yaml b/src/packs/advancements/common/beet.yaml new file mode 100644 index 0000000..a88530c --- /dev/null +++ b/src/packs/advancements/common/beet.yaml @@ -0,0 +1,10 @@ +id: 'skyvoid_advancements_common' +name: 'SkyBlock Advancements Base' +author: 'EpyonProjects' +version: 1.0.0 + +data_pack: + load: . + +resource_pack: + load: . diff --git a/src/packs/extras/skyvoid_advancements/data/load/function/_private/init.mcfunction b/src/packs/advancements/common/data/load/function/_private/init.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/load/function/_private/init.mcfunction rename to src/packs/advancements/common/data/load/function/_private/init.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/load/tags/function/_private/init.json b/src/packs/advancements/common/data/load/tags/function/_private/init.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/load/tags/function/_private/init.json rename to src/packs/advancements/common/data/load/tags/function/_private/init.json diff --git a/src/packs/extras/skyvoid_advancements/data/load/tags/function/_private/load.json b/src/packs/advancements/common/data/load/tags/function/_private/load.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/load/tags/function/_private/load.json rename to src/packs/advancements/common/data/load/tags/function/_private/load.json diff --git a/src/packs/extras/skyvoid_advancements/data/load/tags/function/load.json b/src/packs/advancements/common/data/load/tags/function/load.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/load/tags/function/load.json rename to src/packs/advancements/common/data/load/tags/function/load.json diff --git a/src/packs/extras/skyvoid_advancements/data/load/tags/function/skyvoid_advancements.json b/src/packs/advancements/common/data/load/tags/function/skyvoid_advancements.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/load/tags/function/skyvoid_advancements.json rename to src/packs/advancements/common/data/load/tags/function/skyvoid_advancements.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/nether/find_bastion.json b/src/packs/advancements/common/data/minecraft/advancement/nether/find_bastion.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/nether/find_bastion.json rename to src/packs/advancements/common/data/minecraft/advancement/nether/find_bastion.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/nether/find_fortress.json b/src/packs/advancements/common/data/minecraft/advancement/nether/find_fortress.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/nether/find_fortress.json rename to src/packs/advancements/common/data/minecraft/advancement/nether/find_fortress.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/cure_zombie_villager.json b/src/packs/advancements/common/data/minecraft/advancement/story/cure_zombie_villager.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/cure_zombie_villager.json rename to src/packs/advancements/common/data/minecraft/advancement/story/cure_zombie_villager.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/enchant_item.json b/src/packs/advancements/common/data/minecraft/advancement/story/enchant_item.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/enchant_item.json rename to src/packs/advancements/common/data/minecraft/advancement/story/enchant_item.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/enter_the_nether.json b/src/packs/advancements/common/data/minecraft/advancement/story/enter_the_nether.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/enter_the_nether.json rename to src/packs/advancements/common/data/minecraft/advancement/story/enter_the_nether.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/follow_ender_eye.json b/src/packs/advancements/common/data/minecraft/advancement/story/follow_ender_eye.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/follow_ender_eye.json rename to src/packs/advancements/common/data/minecraft/advancement/story/follow_ender_eye.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/lava_bucket.json b/src/packs/advancements/common/data/minecraft/advancement/story/lava_bucket.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/lava_bucket.json rename to src/packs/advancements/common/data/minecraft/advancement/story/lava_bucket.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/mine_diamond.json b/src/packs/advancements/common/data/minecraft/advancement/story/mine_diamond.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/mine_diamond.json rename to src/packs/advancements/common/data/minecraft/advancement/story/mine_diamond.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/mine_stone.json b/src/packs/advancements/common/data/minecraft/advancement/story/mine_stone.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/mine_stone.json rename to src/packs/advancements/common/data/minecraft/advancement/story/mine_stone.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/root.json b/src/packs/advancements/common/data/minecraft/advancement/story/root.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/root.json rename to src/packs/advancements/common/data/minecraft/advancement/story/root.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/shiny_gear.json b/src/packs/advancements/common/data/minecraft/advancement/story/shiny_gear.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/shiny_gear.json rename to src/packs/advancements/common/data/minecraft/advancement/story/shiny_gear.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/smelt_iron.json b/src/packs/advancements/common/data/minecraft/advancement/story/smelt_iron.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/smelt_iron.json rename to src/packs/advancements/common/data/minecraft/advancement/story/smelt_iron.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/upgrade_tools.json b/src/packs/advancements/common/data/minecraft/advancement/story/upgrade_tools.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/advancement/story/upgrade_tools.json rename to src/packs/advancements/common/data/minecraft/advancement/story/upgrade_tools.json diff --git a/src/packs/extras/skyvoid_advancements/data/minecraft/tags/function/load.json b/src/packs/advancements/common/data/minecraft/tags/function/load.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/minecraft/tags/function/load.json rename to src/packs/advancements/common/data/minecraft/tags/function/load.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/apple.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/apple.json similarity index 88% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/apple.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/apple.json index a62c7e1..aef69f8 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/apple.json +++ b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/apple.json @@ -16,7 +16,7 @@ "announce_to_chat": true, "hidden": false }, - "parent": "skyvoid_advancements:overworld/wood", + "parent": "skyvoid_advancements:overworld/sapling", "criteria": { "apple": { "trigger": "minecraft:inventory_changed", diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/bee.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/bee.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/bee.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/bee.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/breed_pigs.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/breed_pigs.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/cauldron.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/cauldron.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/cauldron.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/cauldron.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/charcoal.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/charcoal.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/charcoal.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/charcoal.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/clay.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/clay.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/clay.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/clay.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/copper.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/copper.json similarity index 92% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/copper.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/copper.json index b2ca4db..008f498 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/copper.json +++ b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/copper.json @@ -13,7 +13,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": true, + "announce_to_chat": false, "hidden": false }, "parent": "skyvoid_advancements:overworld/zombie_hunter", diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json similarity index 91% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json index 14e572b..ece5352 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json +++ b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json @@ -13,7 +13,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": true, + "announce_to_chat": false, "hidden": false }, "parent": "skyvoid_advancements:overworld/mob_farm", diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/emerald.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/emerald.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/emerald.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/emerald.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/enchanted_book.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/enchanted_book.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/enchanted_book.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/enchanted_book.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/ender_grass.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/ender_grass.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_pearl.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/ender_pearl.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_pearl.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/ender_pearl.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/farm.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/farm.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/farm.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/farm.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/furnace.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/furnace.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/furnace.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/furnace.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/lightning_pig.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/lightning_pig.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/mob_farm.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/mob_farm.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/obsidian.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/obsidian.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/obsidian.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/obsidian.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/passive_animals.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/passive_animals.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/passive_animals.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/passive_animals.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/pointed_dripstone.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/pointed_dripstone.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/pointed_dripstone.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/pointed_dripstone.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/sapling.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/sapling.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/sapling.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/sapling.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/second_sapling.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/second_sapling.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/second_sapling.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/second_sapling.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/spider_hunter.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/spider_hunter.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json_ similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json_ diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/lava_bucket_check.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/lava_bucket_check.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/lava_bucket_check.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/lava_bucket_check.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/water_gen_check.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/water_gen_check.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/water_gen_check.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/technical/water_gen_check.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/tnt.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/tnt.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/tnt.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/tnt.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/torch.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/torch.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/torch.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/torch.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/water_gen.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/water_gen.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/water_gen.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/water_gen.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/witch.json similarity index 93% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/witch.json index bad1106..2072553 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json +++ b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/witch.json @@ -16,7 +16,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": false, + "announce_to_chat": true, "hidden": false }, "parent": "skyvoid_advancements:overworld/mob_farm", diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/wood.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/wood.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/wood.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/wood.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_villager.json similarity index 93% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json rename to src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_villager.json index 04d3f78..e62d114 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json +++ b/src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_villager.json @@ -18,7 +18,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": false, + "announce_to_chat": true, "hidden": false }, "parent": "skyvoid_advancements:overworld/witch", diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/load.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/load.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/load.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/load.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/lava_bucket_check.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/overworld/lava_bucket_check.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/lava_bucket_check.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/overworld/lava_bucket_check.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/lava_source_check.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/overworld/lava_source_check.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/lava_source_check.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/overworld/lava_source_check.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/obsidian_delay.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/overworld/obsidian_delay.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/obsidian_delay.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/overworld/obsidian_delay.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/obsidian_reposition.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/overworld/obsidian_reposition.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/obsidian_reposition.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/overworld/obsidian_reposition.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/seagrass_check.mcfunction b/src/packs/advancements/common/data/skyvoid_advancements/function/overworld/seagrass_check.mcfunction similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/function/overworld/seagrass_check.mcfunction rename to src/packs/advancements/common/data/skyvoid_advancements/function/overworld/seagrass_check.mcfunction diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json b/src/packs/advancements/common/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json similarity index 100% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json rename to src/packs/advancements/common/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json diff --git a/src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json b/src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json similarity index 93% rename from src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json rename to src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json index ca5c9eb..8bc2d62 100755 --- a/src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json +++ b/src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json @@ -16,7 +16,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": false, + "announce_to_chat": true, "hidden": false }, "parent": "skyvoid_advancements:overworld/mob_farm", diff --git a/src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json b/src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json similarity index 93% rename from src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json rename to src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json index 55b9dc5..b6fa494 100755 --- a/src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json +++ b/src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json @@ -18,7 +18,7 @@ }, "frame": "task", "show_toast": true, - "announce_to_chat": false, + "announce_to_chat": true, "hidden": false }, "parent": "skyvoid_advancements:overworld/witch", diff --git a/src/packs/advancements/skyvoid_one_block/README.md b/src/packs/advancements/skyvoid_one_block/README.md new file mode 100644 index 0000000..117824c --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/README.md @@ -0,0 +1,21 @@ +Interact: [![Static Badge](https://img.shields.io/badge/_-Discord-black?logo=discord&logoColor=%235865F2&labelColor=black&color=%235865F2)](https://discord.gg/mzWSZuGatd) +[![Github Badge](https://img.shields.io/badge/_-GitHub-black?logo=github&logoColor=white&labelColor=%23181717&color=white&)](https://github.com/BPR02/SkyBlock_Collection) +Download: [![Smithed Badge](https://img.shields.io/badge/_-Smithed-black?logo=hackthebox&logoColor=%231b48c4&labelColor=black&color=%231b48c4)](https://smithed.net/packs/skyblock-advancements) +[![Modrinth Badge](https://img.shields.io/badge/_-Modrinth-black?logo=modrinth&logoColor=%2300AF5C&labelColor=black&color=%2300AF5C)](https://modrinth.com/datapack/skyblock-advancements) +Support: [![PayPal Badge](https://img.shields.io/badge/_%20-Paypal-black?logo=paypal&logoColor=%230079C1&labelColor=black&color=%230079C1)](https://www.paypal.com/paypalme/epyonprojects) +[![BisectHosting Badge](https://img.shields.io/badge/Rent%20a%20Server-black?logo=bisecthosting&logoColor=%2306ddff&labelColor=%23030525&color=%2337e3f3)](https://www.bisecthosting.com/skyvoid) + +# One Block Advancements +This data pack modifies the story and nether advancements to better guide the progression in a one block world. It rearranges vanilla advancements and adds extra advancements, it's perfect for skyblock maps such as [Vanilla One Block](https://smithed.net/packs/vanilla-one-block)! + +## Rearranged for One Block Progression +The advancements in the story tab are rearranged and rewritten to support the one block progression instead of the vanilla progression. Some examples include moving the iron ingot advancement after a new advancement to kill a zombie since the first iron doesn't come from iron ore, but instead from killing zombies. + +![Iron Ingot Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/iron_ingot_advancement.png) + +## Guided Experience +There are several added advancements that help players progress through the game without needing to already know random quirks in the game. Some examples include describing the first steps, how to obtain more blocks, and how to progress towards a normal SkyBlock experience. Most of these advancements give hints at these quirks instead of directly stating what they should do. + +![Cobblestone Generator Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/cobblestone_gen_advancement.png) + +![Cauldron Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/cauldron_advancement.png) diff --git a/src/packs/advancements/skyvoid_one_block/beet.yaml b/src/packs/advancements/skyvoid_one_block/beet.yaml new file mode 100644 index 0000000..b418da2 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/beet.yaml @@ -0,0 +1,10 @@ +id: 'skyvoid_advancements_one_block' +name: 'One Block Advancements' +author: 'EpyonProjects' +version: 1.0.0 + +require: + - src.plugins.advancements.generate + +data_pack: + load: . diff --git a/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/lava_bucket.json b/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/lava_bucket.json new file mode 100755 index 0000000..15d2749 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/lava_bucket.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "id": "minecraft:lava_bucket" + }, + "title": { + "translate": "advancements.story.lava_bucket.title" + }, + "description": { + "translate": "advancements.skyvoid.overworld.lava_bucket.description", + "fallback": "Obtain your first bucket of lava" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "minecraft:story/follow_ender_eye", + "criteria": { + "lava_bucket": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:lava_bucket" + ] + } + ] + } + } + }, + "sends_telemetry_event": true +} diff --git a/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/mine_stone.json b/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/mine_stone.json new file mode 100755 index 0000000..6a9e5f1 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/mine_stone.json @@ -0,0 +1,35 @@ +{ + "display": { + "icon": { + "id": "minecraft:wooden_pickaxe" + }, + "title": { + "translate": "advancements.skyvoid.overworld.wooden_pickaxe.title", + "fallback": "Time to Mine!" + }, + "description": { + "translate": "advancements.skyvoid.overworld.wooden_pickaxe.description", + "fallback": "Use planks and sticks to make a pickaxe" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "minecraft:story/root", + "criteria": { + "wooden_pickaxe": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:wooden_pickaxe" + ] + } + ] + } + } + }, + "sends_telemetry_event": true +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/cobble_gen.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/cobble_gen.json new file mode 100755 index 0000000..553aebf --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/cobble_gen.json @@ -0,0 +1,78 @@ +{ + "display": { + "icon": { + "id": "minecraft:cobblestone" + }, + "title": { + "translate": "advancements.skyvoid.overworld.cobblestone_generator.title", + "fallback": "Welcome to SkyBlock" + }, + "description": [ + { + "translate": "advancements.skyvoid.overworld.cobblestone_generator.description", + "fallback": "Build a Cobblestone Generator by placing Water and Lava 2 spaces apart and allow them to flow into each other\n\nExample:\n" + }, + { + "translate": "skyvoid.second", + "fallback": "%1$s", + "with": [ + [ + { + "text": " " + }, + { + "text": "W", + "color": "#3399FF" + }, + { + "text": " _ _ ", + "color": "white" + }, + { + "text": "L", + "color": "#FF7D33" + }, + { + "text": "\n " + }, + { + "text": "D", + "color": "#796052" + }, + { + "text": " _ ", + "color": "white" + }, + { + "text": "D D", + "color": "#796052" + } + ], + { + "translate": "gui.skyvoid.advancement.cobblestone_generator", + "color": "white", + "font": "skyvoid:advancements" + } + ] + } + ], + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "minecraft:story/mine_stone", + "criteria": { + "cobblestone": { + "conditions": { + "items": [ + { + "items": "minecraft:cobblestone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "sends_telemetry_event": true +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/emerald_foxes.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/emerald_foxes.json new file mode 100644 index 0000000..52a2c5d --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/emerald_foxes.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "id": "minecraft:emerald" + }, + "title": { + "translate": "advancements.skyvoid.overworld.emerald_foxes.title", + "fallback": "My First Emerald" + }, + "description": { + "translate": "advancements.skyvoid.overworld.emerald_foxes.description", + "fallback": "Obtain your first Emerald from a Fox" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/snow", + "criteria": { + "emerald": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald" + ] + } + ] + } + } + } + } diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/iron_shovel.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/iron_shovel.json new file mode 100644 index 0000000..8e8f967 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/iron_shovel.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "id": "minecraft:iron_shovel" + }, + "title": { + "translate": "advancements.skyvoid.overworld.iron_shovel.title", + "fallback": "Digging" + }, + "description": { + "translate": "advancements.skyvoid.overworld.iron_shovel.description", + "fallback": "Steal a shovel from a corpse" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/jump", + "criteria": { + "iron_shovel": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_shovel" + ] + } + ] + } + } + } + } diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/jump.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/jump.json new file mode 100644 index 0000000..f76ca29 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/jump.json @@ -0,0 +1,25 @@ +{ + "display": { + "icon": { + "id": "minecraft:potion" + }, + "title": { + "translate": "advancements.skyvoid.overworld.jump.title", + "fallback": "Geronimo!" + }, + "description": { + "translate": "advancements.skyvoid.overworld.jump.description", + "fallback": "Once you reach 2 hearts, jump off and try to spawn a zombie holding a shovel" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/save", + "criteria": { + "jump": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/moss.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/moss.json new file mode 100644 index 0000000..a7055a8 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/moss.json @@ -0,0 +1,30 @@ +{ + "display": { + "icon": { + "id": "minecraft:moss_block" + }, + "title": { + "translate": "advancements.skyvoid.overworld.moss.title", + "fallback": "Greener Grass" + }, + "description": { + "translate": "advancements.skyvoid.overworld.moss.description", + "fallback": "Purchase a Moss Block to grow your first tree" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/emerald_foxes", + "criteria": { + "moss_block": { + "trigger": "minecraft:villager_trade", + "conditions": { + "item": { + "items": "minecraft:moss_block" + } + } + } + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/root.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/root.json new file mode 100755 index 0000000..736bcea --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/root.json @@ -0,0 +1,25 @@ +{ + "display": { + "icon": { + "id": "minecraft:grass_block" + }, + "title": { + "translate": "advancements.skyvoid.overworld.root.title", + "fallback": "The Real One Block Challenge" + }, + "description": { + "translate": "advancements.skyvoid.overworld.root.description", + "fallback": "Don't break it; it doesn't come back" + }, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "requirement": { + "trigger": "minecraft:tick" + } + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/snow.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/snow.json new file mode 100644 index 0000000..e34bfad --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/snow.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "id": "minecraft:snow_block" + }, + "title": { + "translate": "advancements.skyvoid.overworld.snow.title", + "fallback": "A Compact Cloud" + }, + "description": { + "translate": "advancements.skyvoid.overworld.snow.description", + "fallback": "Craft your first type of block" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/iron_shovel", + "criteria": { + "snow_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:snow_block" + ] + } + ] + } + } + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/starve.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/starve.json new file mode 100644 index 0000000..0ebd163 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/starve.json @@ -0,0 +1,25 @@ +{ + "display": { + "icon": { + "id": "minecraft:porkchop" + }, + "title": { + "translate": "advancements.skyvoid.overworld.starve.title", + "fallback": "Geronimo!" + }, + "description": { + "translate": "advancements.skyvoid.overworld.starve.description", + "fallback": "Once you reach 2 hearts, jump off and try to spawn a zombie holding a shovel" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "skyvoid_advancements:overworld/save", + "criteria": { + "jump": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/technical/starve_check.json b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/technical/starve_check.json new file mode 100644 index 0000000..7fd8ffc --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/technical/starve_check.json @@ -0,0 +1,22 @@ +{ + "criteria": { + "starve": { + "trigger": "minecraft:entity_hurt_player", + "conditions": { + "damage": { + "type": { + "tags": [ + { + "id": "minecraft:bypasses_effects", + "expected": false + } + ] + } + } + } + } + }, + "rewards": { + "function": "skyvoid_advancements:overworld/starve_check" + } +} diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/load.mcfunction b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/load.mcfunction new file mode 100755 index 0000000..9b3ea02 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/load.mcfunction @@ -0,0 +1,4 @@ +scoreboard players set skyvoid_advancements load.status 1 + +scoreboard objectives add sva_data dummy +scoreboard objectives add sva_cobble_broken minecraft.mined:minecraft.cobblestone diff --git a/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/overworld/starve_check.mcfunction b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/overworld/starve_check.mcfunction new file mode 100644 index 0000000..7afa584 --- /dev/null +++ b/src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/function/overworld/starve_check.mcfunction @@ -0,0 +1,5 @@ +# run from advancement overworld/technical/starve_check + +execute store result score $health sva_data run data get entity @s Health +execute if score $health sva_data matches ..4 run advancement grant @s only skyvoid_advancements:overworld/jump +execute unless score $health sva_data matches ..4 run advancement revoke @s only skyvoid_advancements:overworld/technical/starve_check diff --git a/src/packs/extras/skyvoid_advancements/README.md b/src/packs/advancements/skyvoid_standard/README.md similarity index 100% rename from src/packs/extras/skyvoid_advancements/README.md rename to src/packs/advancements/skyvoid_standard/README.md diff --git a/src/packs/advancements/skyvoid_standard/beet.yaml b/src/packs/advancements/skyvoid_standard/beet.yaml new file mode 100644 index 0000000..4d3aaf0 --- /dev/null +++ b/src/packs/advancements/skyvoid_standard/beet.yaml @@ -0,0 +1,10 @@ +id: 'skyvoid_advancements_standard' +name: 'SkyBlock Advancements' +author: 'EpyonProjects' +version: 2.0.0 + +require: + - src.plugins.advancements.generate + +data_pack: + load: . diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/cobble_gen.json b/src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/cobble_gen.json similarity index 86% rename from src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/cobble_gen.json rename to src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/cobble_gen.json index 6398034..5a3ff72 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/cobble_gen.json +++ b/src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/cobble_gen.json @@ -64,7 +64,14 @@ "parent": "minecraft:story/mine_stone", "criteria": { "cobblestone": { - "trigger": "minecraft:impossible" + "conditions": { + "items": [ + { + "items": "minecraft:cobblestone" + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "sends_telemetry_event": true diff --git a/src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/root.json b/src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/root.json new file mode 100755 index 0000000..7025afd --- /dev/null +++ b/src/packs/advancements/skyvoid_standard/data/skyvoid_advancements/advancement/overworld/root.json @@ -0,0 +1,25 @@ +{ + "display": { + "icon": { + "id": "minecraft:grass_block" + }, + "title": { + "translate": "advancements.story.root.title", + "fallback": "SkyBlock" + }, + "description": { + "translate": "advancements.skyvoid.overworld.root.description", + "fallback": "Use your knowledge and skills to make a world out of nothing" + }, + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", + "frame": "task", + "show_toast": false, + "announce_to_chat": false, + "hidden": false + }, + "criteria": { + "requirement": { + "trigger": "minecraft:tick" + } + } +} diff --git a/src/packs/extras/skyvoid_advancements/pack.mcmeta b/src/packs/advancements/skyvoid_standard/pack.mcmeta similarity index 100% rename from src/packs/extras/skyvoid_advancements/pack.mcmeta rename to src/packs/advancements/skyvoid_standard/pack.mcmeta diff --git a/src/packs/extras/skyvoid_advancements/pack.png b/src/packs/advancements/skyvoid_standard/pack.png similarity index 100% rename from src/packs/extras/skyvoid_advancements/pack.png rename to src/packs/advancements/skyvoid_standard/pack.png diff --git a/src/packs/extras/skyvoid_advancements/beet.yaml b/src/packs/extras/skyvoid_advancements/beet.yaml deleted file mode 100644 index 22ec712..0000000 --- a/src/packs/extras/skyvoid_advancements/beet.yaml +++ /dev/null @@ -1,15 +0,0 @@ -id: 'skyvoid_advancements' -name: 'SkyBlock Advancements' -author: 'EpyonProjects' -version: 1.0.7 - -data_pack: - load: . - overlays: - - formats: - min_inclusive: 48 - max_inclusive: 48 - directory: skyvoid_1_21 - -resource_pack: - load: . diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/root.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/root.json deleted file mode 100755 index a82b682..0000000 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/root.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:grass_block" - }, - "title": { - "translate": "advancements.story.root.title" - }, - "description": { - "translate": "advancements.story.root.description" - }, - "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", - "frame": "task", - "show_toast": false, - "announce_to_chat": false, - "hidden": false - }, - "criteria": { - "dirt_or_log": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:dirt", - "minecraft:oak_log" - ] - } - ] - } - } - }, - "sends_telemetry_event": true -} diff --git a/src/plugins/advancements/generate.py b/src/plugins/advancements/generate.py new file mode 100644 index 0000000..c779c74 --- /dev/null +++ b/src/plugins/advancements/generate.py @@ -0,0 +1,4 @@ +from beet import Context, subproject + +def beet_default(ctx: Context): + ctx.require(subproject({'directory': f'../common', 'extend': 'beet.yaml'}))