diff --git a/build/bundled/skyvoid_skyblock_dirt_v2_0_11-MC_26_1.zip b/build/bundled/skyvoid_skyblock_dirt_v2_0_11-MC_26_1.zip deleted file mode 100644 index 3be618bc..00000000 Binary files a/build/bundled/skyvoid_skyblock_dirt_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/bundled/skyvoid_skyblock_dirt_v2_0_12-MC_26_2.zip b/build/bundled/skyvoid_skyblock_dirt_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..7741e23e Binary files /dev/null and b/build/bundled/skyvoid_skyblock_dirt_v2_0_12-MC_26_2.zip differ diff --git a/build/bundled/skyvoid_standard_skyblock_v2_1_6-MC_26_1.zip b/build/bundled/skyvoid_standard_skyblock_v2_1_6-MC_26_1.zip deleted file mode 100644 index 6bb639e6..00000000 Binary files a/build/bundled/skyvoid_standard_skyblock_v2_1_6-MC_26_1.zip and /dev/null differ diff --git a/build/bundled/skyvoid_standard_skyblock_v2_1_7-MC_26_2.zip b/build/bundled/skyvoid_standard_skyblock_v2_1_7-MC_26_2.zip new file mode 100644 index 00000000..027d7b0b Binary files /dev/null and b/build/bundled/skyvoid_standard_skyblock_v2_1_7-MC_26_2.zip differ diff --git a/build/bundled/skyvoid_vanilla_oneblock_v2_0_12-MC_26_1.zip b/build/bundled/skyvoid_vanilla_oneblock_v2_0_12-MC_26_1.zip deleted file mode 100644 index a58d43c1..00000000 Binary files a/build/bundled/skyvoid_vanilla_oneblock_v2_0_12-MC_26_1.zip and /dev/null differ diff --git a/build/bundled/skyvoid_vanilla_oneblock_v2_0_13-MC_26_2.zip b/build/bundled/skyvoid_vanilla_oneblock_v2_0_13-MC_26_2.zip new file mode 100644 index 00000000..6aff2609 Binary files /dev/null and b/build/bundled/skyvoid_vanilla_oneblock_v2_0_13-MC_26_2.zip differ diff --git a/build/rp_skyvoid_advancements_v1_0_12-MC_26_1.zip b/build/rp_skyvoid_advancements_v1_0_13-MC_26_2.zip similarity index 99% rename from build/rp_skyvoid_advancements_v1_0_12-MC_26_1.zip rename to build/rp_skyvoid_advancements_v1_0_13-MC_26_2.zip index 76fee23f..efdcd503 100644 Binary files a/build/rp_skyvoid_advancements_v1_0_12-MC_26_1.zip and b/build/rp_skyvoid_advancements_v1_0_13-MC_26_2.zip differ diff --git a/build/skyvoid_additions_v1_5_2-MC_26_1.zip b/build/skyvoid_additions_v1_5_3-MC_26_2.zip similarity index 86% rename from build/skyvoid_additions_v1_5_2-MC_26_1.zip rename to build/skyvoid_additions_v1_5_3-MC_26_2.zip index 4a2a15a2..0ede650e 100644 Binary files a/build/skyvoid_additions_v1_5_2-MC_26_1.zip and b/build/skyvoid_additions_v1_5_3-MC_26_2.zip differ diff --git a/build/skyvoid_advancements_v1_0_12-MC_26_1.zip b/build/skyvoid_advancements_v1_0_13-MC_26_2.zip similarity index 94% rename from build/skyvoid_advancements_v1_0_12-MC_26_1.zip rename to build/skyvoid_advancements_v1_0_13-MC_26_2.zip index f046c432..f47cdc78 100644 Binary files a/build/skyvoid_advancements_v1_0_12-MC_26_1.zip and b/build/skyvoid_advancements_v1_0_13-MC_26_2.zip differ diff --git a/build/skyvoid_biome_islands_v1_0_8-MC_26_1.zip b/build/skyvoid_biome_islands_v1_0_9-MC_26_2.zip similarity index 95% rename from build/skyvoid_biome_islands_v1_0_8-MC_26_1.zip rename to build/skyvoid_biome_islands_v1_0_9-MC_26_2.zip index 975b7656..db4bcab4 100644 Binary files a/build/skyvoid_biome_islands_v1_0_8-MC_26_1.zip and b/build/skyvoid_biome_islands_v1_0_9-MC_26_2.zip differ diff --git a/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_1.zip b/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_2.zip similarity index 99% rename from build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_1.zip rename to build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_2.zip index c02ea17d..97510a4c 100644 Binary files a/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_1.zip and b/build/skyvoid_compat_amplified_nether_v1_0_1+amplified_nether-1_2_5-MC_26_2.zip differ diff --git a/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_1.zip b/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_2.zip similarity index 95% rename from build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_1.zip rename to build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_2.zip index 16214db2..c1335ce5 100644 Binary files a/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_1.zip and b/build/skyvoid_compat_nullscape_v1_0_1+nullscape-1_2_8-MC_26_2.zip differ diff --git a/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_1.zip b/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_2.zip similarity index 87% rename from build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_1.zip rename to build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_2.zip index 35bbf60e..8b040ad8 100644 Binary files a/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_1.zip and b/build/skyvoid_compat_terralith_v1_0_2+terralith-2_5_5-MC_26_2.zip differ diff --git a/build/skyvoid_island_oneblock_v1_3_6-MC_26_1.zip b/build/skyvoid_island_oneblock_v1_3_7-MC_26_2.zip similarity index 97% rename from build/skyvoid_island_oneblock_v1_3_6-MC_26_1.zip rename to build/skyvoid_island_oneblock_v1_3_7-MC_26_2.zip index e05ef04e..de7857e1 100644 Binary files a/build/skyvoid_island_oneblock_v1_3_6-MC_26_1.zip and b/build/skyvoid_island_oneblock_v1_3_7-MC_26_2.zip differ diff --git a/build/skyvoid_island_only_dirt_v1_1_6-MC_26_1.zip b/build/skyvoid_island_only_dirt_v1_1_7-MC_26_2.zip similarity index 99% rename from build/skyvoid_island_only_dirt_v1_1_6-MC_26_1.zip rename to build/skyvoid_island_only_dirt_v1_1_7-MC_26_2.zip index 3c942d58..d902f9bd 100644 Binary files a/build/skyvoid_island_only_dirt_v1_1_6-MC_26_1.zip and b/build/skyvoid_island_only_dirt_v1_1_7-MC_26_2.zip differ diff --git a/build/skyvoid_island_standard_v1_1_6-MC_26_1.zip b/build/skyvoid_island_standard_v1_1_7-MC_26_2.zip similarity index 99% rename from build/skyvoid_island_standard_v1_1_6-MC_26_1.zip rename to build/skyvoid_island_standard_v1_1_7-MC_26_2.zip index 4b27682e..603906d3 100644 Binary files a/build/skyvoid_island_standard_v1_1_6-MC_26_1.zip and b/build/skyvoid_island_standard_v1_1_7-MC_26_2.zip differ diff --git a/build/skyvoid_no_end_ship_v1_1_7-MC_26_1.zip b/build/skyvoid_no_end_ship_v1_1_8-MC_26_2.zip similarity index 99% rename from build/skyvoid_no_end_ship_v1_1_7-MC_26_1.zip rename to build/skyvoid_no_end_ship_v1_1_8-MC_26_2.zip index 1f98d352..487ae587 100644 Binary files a/build/skyvoid_no_end_ship_v1_1_7-MC_26_1.zip and b/build/skyvoid_no_end_ship_v1_1_8-MC_26_2.zip differ diff --git a/build/skyvoid_sand_island_v2_0_4-MC_26_1.zip b/build/skyvoid_sand_island_v2_0_5-MC_26_2.zip similarity index 99% rename from build/skyvoid_sand_island_v2_0_4-MC_26_1.zip rename to build/skyvoid_sand_island_v2_0_5-MC_26_2.zip index e7410dff..2fab90b2 100644 Binary files a/build/skyvoid_sand_island_v2_0_4-MC_26_1.zip and b/build/skyvoid_sand_island_v2_0_5-MC_26_2.zip differ diff --git a/build/skyvoid_vanilla_oneblock_starter_v1_2_5-MC_26_1.zip b/build/skyvoid_vanilla_oneblock_starter_v1_2_6-MC_26_2.zip similarity index 93% rename from build/skyvoid_vanilla_oneblock_starter_v1_2_5-MC_26_1.zip rename to build/skyvoid_vanilla_oneblock_starter_v1_2_6-MC_26_2.zip index 19e3df35..a742a7c7 100644 Binary files a/build/skyvoid_vanilla_oneblock_starter_v1_2_5-MC_26_1.zip and b/build/skyvoid_vanilla_oneblock_starter_v1_2_6-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_empty_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_empty_v2_0_11-MC_26_1.zip deleted file mode 100644 index f53161b4..00000000 Binary files a/build/skyvoid_worldgen_empty_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_empty_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_empty_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..e114c34f Binary files /dev/null and b/build/skyvoid_worldgen_empty_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_full_lava_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_full_lava_v2_0_11-MC_26_1.zip deleted file mode 100644 index 91f04dd2..00000000 Binary files a/build/skyvoid_worldgen_full_lava_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_full_lava_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_full_lava_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..726a78ef Binary files /dev/null and b/build/skyvoid_worldgen_full_lava_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_normal_end_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_normal_end_v2_0_11-MC_26_1.zip deleted file mode 100644 index 31938b59..00000000 Binary files a/build/skyvoid_worldgen_normal_end_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_normal_end_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_normal_end_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..63785173 Binary files /dev/null and b/build/skyvoid_worldgen_normal_end_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_noxiousvex_v1_0_11-MC_26_1.zip b/build/skyvoid_worldgen_noxiousvex_v1_0_11-MC_26_1.zip deleted file mode 100644 index 83e75db2..00000000 Binary files a/build/skyvoid_worldgen_noxiousvex_v1_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_noxiousvex_v1_0_12-MC_26_2.zip b/build/skyvoid_worldgen_noxiousvex_v1_0_12-MC_26_2.zip new file mode 100644 index 00000000..2151c1a1 Binary files /dev/null and b/build/skyvoid_worldgen_noxiousvex_v1_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_pinu_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_pinu_v2_0_11-MC_26_1.zip deleted file mode 100644 index 54ced1ba..00000000 Binary files a/build/skyvoid_worldgen_pinu_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_pinu_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_pinu_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..6c4747da Binary files /dev/null and b/build/skyvoid_worldgen_pinu_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_portal_room_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_portal_room_v2_0_11-MC_26_1.zip deleted file mode 100644 index 739dd457..00000000 Binary files a/build/skyvoid_worldgen_portal_room_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_portal_room_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_portal_room_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..f2e2855b Binary files /dev/null and b/build/skyvoid_worldgen_portal_room_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_single_lava_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_single_lava_v2_0_11-MC_26_1.zip deleted file mode 100644 index 96a6b9a9..00000000 Binary files a/build/skyvoid_worldgen_single_lava_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_single_lava_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_single_lava_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..d8104e37 Binary files /dev/null and b/build/skyvoid_worldgen_single_lava_v2_0_12-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_structures_v1_0_13-MC_26_1.zip b/build/skyvoid_worldgen_structures_v1_0_14-MC_26_2.zip similarity index 79% rename from build/skyvoid_worldgen_structures_v1_0_13-MC_26_1.zip rename to build/skyvoid_worldgen_structures_v1_0_14-MC_26_2.zip index 41ac2cb8..1c77bbfc 100644 Binary files a/build/skyvoid_worldgen_structures_v1_0_13-MC_26_1.zip and b/build/skyvoid_worldgen_structures_v1_0_14-MC_26_2.zip differ diff --git a/build/skyvoid_worldgen_v2_0_11-MC_26_1.zip b/build/skyvoid_worldgen_v2_0_11-MC_26_1.zip deleted file mode 100644 index 5fc8dfee..00000000 Binary files a/build/skyvoid_worldgen_v2_0_11-MC_26_1.zip and /dev/null differ diff --git a/build/skyvoid_worldgen_v2_0_12-MC_26_2.zip b/build/skyvoid_worldgen_v2_0_12-MC_26_2.zip new file mode 100644 index 00000000..37cefcef Binary files /dev/null and b/build/skyvoid_worldgen_v2_0_12-MC_26_2.zip differ diff --git a/spyglass.json b/spyglass.json index 4624af92..886178a5 100644 --- a/spyglass.json +++ b/spyglass.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "26.1", + "gameVersion": "26.2", "exclude": [ ".*/**", "out/**", diff --git a/src/bundles/skyvoid_skyblock_dirt/beet.yaml b/src/bundles/skyvoid_skyblock_dirt/beet.yaml index f93315ca..9173bb2b 100644 --- a/src/bundles/skyvoid_skyblock_dirt/beet.yaml +++ b/src/bundles/skyvoid_skyblock_dirt/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_skyblock_dirt' name: 'SkyBlock Dirt Hardcore' author: 'BPR' -version: 2.0.11 +version: 2.0.12 pipeline: - src.plugins.bundle.skyblock_dirt diff --git a/src/bundles/skyvoid_standard_skyblock/beet.yaml b/src/bundles/skyvoid_standard_skyblock/beet.yaml index 65380151..546c79eb 100644 --- a/src/bundles/skyvoid_standard_skyblock/beet.yaml +++ b/src/bundles/skyvoid_standard_skyblock/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_standard_skyblock' name: 'Standard SkyBlock' author: 'BPR' -version: 2.1.6 +version: 2.1.7 pipeline: - src.plugins.bundle.standard_skyblock diff --git a/src/bundles/skyvoid_vanilla_oneblock/beet.yaml b/src/bundles/skyvoid_vanilla_oneblock/beet.yaml index bdebf1c6..1a553437 100644 --- a/src/bundles/skyvoid_vanilla_oneblock/beet.yaml +++ b/src/bundles/skyvoid_vanilla_oneblock/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_vanilla_oneblock' name: 'Vanilla One Block' author: 'BPR' -version: 2.0.12 +version: 2.0.13 pipeline: - src.plugins.bundle.vanilla_oneblock diff --git a/src/packs/extras/skyvoid_additions/beet.yaml b/src/packs/extras/skyvoid_additions/beet.yaml index 8dd7c079..eda276d7 100644 --- a/src/packs/extras/skyvoid_additions/beet.yaml +++ b/src/packs/extras/skyvoid_additions/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_additions' name: 'Sky Void Additions' author: 'BPR' -version: 1.5.2 +version: 1.5.3 require: - bolt diff --git a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/ender_dragon.json b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/ender_dragon.json index 6d980ca4..534e5a6c 100644 --- a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/ender_dragon.json +++ b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/ender_dragon.json @@ -42,7 +42,7 @@ } ], "source_entity": { - "type": "minecraft:creeper", + "entity_type": "minecraft:creeper", "nbt": "{powered:1b}" } } diff --git a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/enderman.json b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/enderman.json index 0ab4657e..aaec7f48 100755 --- a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/enderman.json +++ b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/enderman.json @@ -58,7 +58,7 @@ } ], "source_entity": { - "type": "minecraft:warden" + "entity_type": "minecraft:warden" } } }, diff --git a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/evoker.json b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/evoker.json index b781a150..08fd82f2 100644 --- a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/evoker.json +++ b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/evoker.json @@ -68,7 +68,7 @@ "condition": "minecraft:damage_source_properties", "predicate": { "source_entity": { - "type": "minecraft:player", + "entity_type": "minecraft:player", "effects": { "minecraft:bad_omen": { "amplifier": 4 @@ -109,8 +109,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:raider", + "type_specific/raider": { "has_raid": true, "is_captain": true } diff --git a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/pillager.json b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/pillager.json index f00f669d..ebe3d8e9 100644 --- a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/pillager.json +++ b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/pillager.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:raider", + "type_specific/raider": { "is_captain": true } } @@ -60,7 +59,7 @@ "condition": "minecraft:damage_source_properties", "predicate": { "source_entity": { - "type": "minecraft:player", + "entity_type": "minecraft:player", "effects": { "minecraft:bad_omen": { "amplifier": 4 @@ -101,8 +100,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:raider", + "type_specific/raider": { "has_raid": true, "is_captain": true } diff --git a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/vindicator.json b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/vindicator.json index ac06aef1..5c4a67f5 100644 --- a/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/vindicator.json +++ b/src/packs/extras/skyvoid_additions/data/minecraft/loot_table/entities/vindicator.json @@ -58,7 +58,7 @@ "condition": "minecraft:damage_source_properties", "predicate": { "source_entity": { - "type": "minecraft:player", + "entity_type": "minecraft:player", "effects": { "minecraft:bad_omen": { "amplifier": 4 @@ -99,8 +99,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:raider", + "type_specific/raider": { "has_raid": true, "is_captain": true } diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/advancement/trial_spawner_from_sculk/kill_mob_near_sculk_catalyst.json b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/advancement/trial_spawner_from_sculk/kill_mob_near_sculk_catalyst.json index 2adfd4d3..8ea893c1 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/advancement/trial_spawner_from_sculk/kill_mob_near_sculk_catalyst.json +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/advancement/trial_spawner_from_sculk/kill_mob_near_sculk_catalyst.json @@ -41,7 +41,7 @@ } ], "entity": { - "type": "minecraft:breeze", + "entity_type": "minecraft:breeze", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -92,7 +92,7 @@ } ], "entity": { - "type": "minecraft:zombie", + "entity_type": "minecraft:zombie", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -143,7 +143,7 @@ } ], "entity": { - "type": "minecraft:husk", + "entity_type": "minecraft:husk", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -194,7 +194,7 @@ } ], "entity": { - "type": "minecraft:spider", + "entity_type": "minecraft:spider", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -245,7 +245,7 @@ } ], "entity": { - "type": "minecraft:slime", + "entity_type": "minecraft:slime", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -296,7 +296,7 @@ } ], "entity": { - "type": "minecraft:silverfish", + "entity_type": "minecraft:silverfish", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -347,7 +347,7 @@ } ], "entity": { - "type": "minecraft:zombie", + "entity_type": "minecraft:zombie", "flags": { "is_baby": true } @@ -395,7 +395,7 @@ } ], "entity": { - "type": "minecraft:cave_spider", + "entity_type": "minecraft:cave_spider", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -446,7 +446,7 @@ } ], "entity": { - "type": "minecraft:stray", + "entity_type": "minecraft:stray", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -497,7 +497,7 @@ } ], "entity": { - "type": "minecraft:skeleton", + "entity_type": "minecraft:skeleton", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { @@ -548,7 +548,7 @@ } ], "entity": { - "type": "minecraft:bogged", + "entity_type": "minecraft:bogged", "stepping_on": { "structures": "minecraft:trial_chambers", "block": { diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/armored_nautilus_jockeys/armor_chance.json b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/armored_nautilus_jockeys/armor_chance.json index 6c0c2720..9cb2c4e5 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/armored_nautilus_jockeys/armor_chance.json +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/armored_nautilus_jockeys/armor_chance.json @@ -8,7 +8,7 @@ "entity": "this", "predicate": { "passenger": { - "type": "minecraft:drowned" + "entity_type": "minecraft:drowned" } } }, diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/ominous_raid_captains/captain_riding_ravager.json b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/ominous_raid_captains/captain_riding_ravager.json index 2b356772..778516e3 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/ominous_raid_captains/captain_riding_ravager.json +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/predicate/ominous_raid_captains/captain_riding_ravager.json @@ -2,8 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:raider", + "type_specific/raider": { "has_raid": true, "is_captain": true }, @@ -11,7 +10,7 @@ "structures": "minecraft:trial_chambers" }, "vehicle": { - "type": "minecraft:ravager" + "entity_type": "minecraft:ravager" } } } diff --git a/src/packs/extras/skyvoid_advancements/beet.yaml b/src/packs/extras/skyvoid_advancements/beet.yaml index 3014e3bd..64407645 100644 --- a/src/packs/extras/skyvoid_advancements/beet.yaml +++ b/src/packs/extras/skyvoid_advancements/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_advancements' name: 'SkyBlock Advancements' author: 'EpyonProjects' -version: 1.0.12 +version: 1.0.13 data_pack: load: . diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json index 31535805..8692eee5 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/breed_pigs.json @@ -26,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:pig" + "entity_type": "minecraft:pig" } } ] diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json index 791ffc80..8f536fcb 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/ender_grass.json @@ -37,7 +37,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:enderman", + "entity_type": "minecraft:enderman", "nbt": "{carriedBlockState:{Name:\"minecraft:grass_block\"}}" } } diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json index dff13f2b..e6ad3d23 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/lightning_pig.json @@ -22,10 +22,9 @@ "trigger": "minecraft:lightning_strike", "conditions": { "player": { - "type_specific": { - "type": "minecraft:player", + "type_specific/player": { "looking_at": { - "type": "minecraft:zombified_piglin" + "entity_type": "minecraft:zombified_piglin" } } }, diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json index bb1a89ca..355bbbd4 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/mob_farm.json @@ -30,42 +30,42 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:creeper" + "entity_type": "minecraft:creeper" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:enderman" + "entity_type": "minecraft:enderman" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:skeleton" + "entity_type": "minecraft:skeleton" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:spider" + "entity_type": "minecraft:spider" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:witch" + "entity_type": "minecraft:witch" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:zombie" + "entity_type": "minecraft:zombie" } } ] diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json index 85603556..ef29a84e 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/skeleton_hunter.json @@ -26,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:skeleton" + "entity_type": "minecraft:skeleton" } } ] diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json index a0bb59cd..6b053be1 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/spider_hunter.json @@ -26,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:spider" + "entity_type": "minecraft:spider" } } ] diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json index 28affeb5..b6c9d9bd 100644 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/technical/cobble_gen_check.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "type_specific/player": { "advancements": { "skyvoid_advancements:overworld/obsidian": true, "skyvoid_advancements:overworld/cobble_gen": true diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json index bad1106a..4c18d65f 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json @@ -30,9 +30,9 @@ "entity": "this", "predicate": { "vehicle": { - "type": "#minecraft:boat", + "entity_type": "#minecraft:boat", "passenger": { - "type": "minecraft:witch" + "entity_type": "minecraft:witch" } } } diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json index 0d5df89f..91115470 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_hunter.json @@ -26,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:zombie" + "entity_type": "minecraft:zombie" } } ] diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json index 04d3f78a..3d575d25 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json @@ -32,9 +32,9 @@ "entity": "this", "predicate": { "vehicle": { - "type": "#minecraft:boat", + "entity_type": "#minecraft:boat", "passenger": { - "type": "minecraft:zombie_villager" + "entity_type": "minecraft:zombie_villager" } } } diff --git a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json index ac17517f..56a0483f 100755 --- a/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json +++ b/src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/predicate/cobble_or_obsidian_advancement_check.json @@ -9,8 +9,7 @@ "entity": "this", "predicate": { "targeted_entity": { - "type_specific": { - "type": "player", + "type_specific/player": { "advancements": { "skyvoid_advancements:overworld/obsidian": true } @@ -23,8 +22,7 @@ "entity": "this", "predicate": { "targeted_entity": { - "type_specific": { - "type": "player", + "type_specific/player": { "advancements": { "skyvoid_advancements:overworld/cobble_gen": true } diff --git a/src/packs/extras/skyvoid_biome_islands/beet.yaml b/src/packs/extras/skyvoid_biome_islands/beet.yaml index c1e2e1ae..5eda4f3e 100644 --- a/src/packs/extras/skyvoid_biome_islands/beet.yaml +++ b/src/packs/extras/skyvoid_biome_islands/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_biome_islands' name: 'SkyBlock Biome Islands' author: 'BPR' -version: 1.0.8 +version: 1.0.9 data_pack: load: . diff --git a/src/packs/extras/skyvoid_no_end_ship/beet.yaml b/src/packs/extras/skyvoid_no_end_ship/beet.yaml index 3cac6625..da034287 100644 --- a/src/packs/extras/skyvoid_no_end_ship/beet.yaml +++ b/src/packs/extras/skyvoid_no_end_ship/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_no_end_ship' name: 'Sky Void No End Ship' author: 'BPR' -version: 1.1.7 +version: 1.1.8 data_pack: load: . diff --git a/src/packs/extras/skyvoid_sand_island/beet.yaml b/src/packs/extras/skyvoid_sand_island/beet.yaml index 497552cd..ac4e0bc2 100644 --- a/src/packs/extras/skyvoid_sand_island/beet.yaml +++ b/src/packs/extras/skyvoid_sand_island/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_sand_island' name: 'Sky Void Sand Island' author: 'BPR' -version: 2.0.4 +version: 2.0.5 data_pack: load: . diff --git a/src/packs/extras/skyvoid_vanilla_oneblock_starter/beet.yaml b/src/packs/extras/skyvoid_vanilla_oneblock_starter/beet.yaml index 0536d585..2efc64de 100644 --- a/src/packs/extras/skyvoid_vanilla_oneblock_starter/beet.yaml +++ b/src/packs/extras/skyvoid_vanilla_oneblock_starter/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_vanilla_oneblock_starter' name: 'Vanilla One Block Starter' author: 'BPR' -version: 1.2.5 +version: 1.2.6 data_pack: load: . diff --git a/src/packs/starter_islands/skyvoid_only_dirt/beet.yaml b/src/packs/starter_islands/skyvoid_only_dirt/beet.yaml index a8514960..9f5e3c20 100644 --- a/src/packs/starter_islands/skyvoid_only_dirt/beet.yaml +++ b/src/packs/starter_islands/skyvoid_only_dirt/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_island_only_dirt' name: 'Dirt SkyBlock Island' author: 'BPR' -version: 1.1.6 +version: 1.1.7 require: - src.packs.starter_islands.skyvoid_only_dirt.generate_predicate diff --git a/src/packs/starter_islands/skyvoid_standard_skyblock/beet.yaml b/src/packs/starter_islands/skyvoid_standard_skyblock/beet.yaml index 2a2c96ed..f3c6b893 100644 --- a/src/packs/starter_islands/skyvoid_standard_skyblock/beet.yaml +++ b/src/packs/starter_islands/skyvoid_standard_skyblock/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_island_standard' name: 'Standard SkyBlock Island' author: 'BPR' -version: 1.1.6 +version: 1.1.7 data_pack: load: . diff --git a/src/packs/starter_islands/skyvoid_vanilla_oneblock/beet.yaml b/src/packs/starter_islands/skyvoid_vanilla_oneblock/beet.yaml index 061c85b7..953f2052 100644 --- a/src/packs/starter_islands/skyvoid_vanilla_oneblock/beet.yaml +++ b/src/packs/starter_islands/skyvoid_vanilla_oneblock/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_island_oneblock' name: 'One Block Island' author: 'BPR' -version: 1.3.6 +version: 1.3.7 require: - src.packs.starter_islands.skyvoid_vanilla_oneblock.generate_predicate diff --git a/src/packs/worldgen/base/data/minecraft/worldgen/noise_settings/end.json b/src/packs/worldgen/base/data/minecraft/worldgen/noise_settings/end.json index c8868b72..34eb5854 100644 --- a/src/packs/worldgen/base/data/minecraft/worldgen/noise_settings/end.json +++ b/src/packs/worldgen/base/data/minecraft/worldgen/noise_settings/end.json @@ -52,10 +52,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 0.0, "from_y": 4, - "to_value": 1.0, - "to_y": 32 + "to_y": 32, + "from_value": 0, + "to_value": 1 }, "argument2": { "type": "minecraft:add", @@ -67,10 +67,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 1.0, "from_y": 56, - "to_value": 0.0, - "to_y": 312 + "to_y": 312, + "from_value": 1, + "to_value": 0 }, "argument2": { "type": "minecraft:add", diff --git a/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/nether.json b/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/nether.json index 64cb7ccd..2b6acc87 100644 --- a/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/nether.json +++ b/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/nether.json @@ -1,5 +1,5 @@ { - "sea_level": 32, + "sea_level": 48, "disable_mob_generation": false, "aquifers_enabled": false, "ore_veins_enabled": false, @@ -29,21 +29,21 @@ "lava": 0, "temperature": { "type": "minecraft:shifted_noise", - "noise": "minecraft:nether/temperature", - "shift_x": 0.0, - "shift_y": 0.0, - "shift_z": 0.0, + "noise": "minecraft:temperature", "xz_scale": 0.25, - "y_scale": 0.0 + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" }, "vegetation": { "type": "minecraft:shifted_noise", - "noise": "minecraft:nether/vegetation", - "shift_x": 0.0, - "shift_y": 0.0, - "shift_z": 0.0, + "noise": "minecraft:vegetation", "xz_scale": 0.25, - "y_scale": 0.0 + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" }, "continents": 0, "erosion": 0, @@ -66,10 +66,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 0.0, "from_y": -8, - "to_value": 1.0, - "to_y": 24 + "to_y": 24, + "from_value": 0, + "to_value": 1 }, "argument2": { "type": "minecraft:add", @@ -81,10 +81,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 1.0, "from_y": 104, - "to_value": 0.0, - "to_y": 128 + "to_y": 128, + "from_value": 1, + "to_value": 0 }, "argument2": { "type": "minecraft:add", diff --git a/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/overworld.json b/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/overworld.json index dac31555..74dc9d16 100644 --- a/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/overworld.json +++ b/src/packs/worldgen/base_with_end/data/minecraft/worldgen/noise_settings/overworld.json @@ -23,10 +23,10 @@ "size_vertical": 2 }, "noise_router": { - "barrier": 0, - "fluid_level_floodedness": 0, - "fluid_level_spread": 0, - "lava": 0, + "barrier": -1, + "fluid_level_floodedness": -1, + "fluid_level_spread": -1, + "lava": -1, "temperature": { "type": "minecraft:shifted_noise", "noise": "minecraft:temperature", @@ -184,10 +184,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 0.0, "from_y": -64, - "to_value": 1.0, - "to_y": -40 + "to_y": -40, + "from_value": 0, + "to_value": 1 }, "argument2": { "type": "minecraft:add", @@ -199,10 +199,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_value": 1.0, "from_y": 240, - "to_value": 0.0, - "to_y": 256 + "to_y": 256, + "from_value": 1, + "to_value": 0 }, "argument2": { "type": "minecraft:add", @@ -210,88 +210,18 @@ "argument2": { "type": "minecraft:range_choice", "input": "minecraft:overworld/sloped_cheese", + "min_inclusive": -1000000, "max_exclusive": 1.5625, - "min_inclusive": -1000000.0, "when_in_range": { "type": "minecraft:min", "argument1": "minecraft:overworld/sloped_cheese", "argument2": { "type": "minecraft:mul", - "argument1": 5.0, + "argument1": 5, "argument2": "minecraft:overworld/caves/entrances" } }, - "when_out_of_range": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 4.0, - "argument2": { - "type": "minecraft:square", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:cave_layer", - "xz_scale": 1.0, - "y_scale": 8.0 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 0.27, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_cheese", - "xz_scale": 1.0, - "y_scale": 0.6666666666666666 - } - }, - "max": 1.0, - "min": -1.0 - }, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 1.5, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.64, - "argument2": "minecraft:overworld/sloped_cheese" - } - }, - "max": 0.5, - "min": 0.0 - } - } - }, - "argument2": "minecraft:overworld/caves/entrances" - }, - "argument2": { - "type": "minecraft:add", - "argument1": "minecraft:overworld/caves/spaghetti_2d", - "argument2": "minecraft:overworld/caves/spaghetti_roughness_function" - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/caves/pillars", - "max_exclusive": 0.03, - "min_inclusive": -1000000.0, - "when_in_range": -1000000.0, - "when_out_of_range": "minecraft:overworld/caves/pillars" - } - } + "when_out_of_range": 0.1 } } } @@ -303,7 +233,7 @@ } } }, - "argument2": "minecraft:overworld/caves/noodle" + "argument2": 0.1 }, "vein_toggle": 0, "vein_ridged": 0, diff --git a/src/packs/worldgen/skyvoid_worldgen/beet.yaml b/src/packs/worldgen/skyvoid_worldgen/beet.yaml index 666f29e8..a0fe7f2f 100644 --- a/src/packs/worldgen/skyvoid_worldgen/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen' name: 'Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate diff --git a/src/packs/worldgen/skyvoid_worldgen_empty/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_empty/beet.yaml index 9c3d71c6..dcb5121e 100644 --- a/src/packs/worldgen/skyvoid_worldgen_empty/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_empty/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_empty' name: 'Empty Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate.base diff --git a/src/packs/worldgen/skyvoid_worldgen_full_lava/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_full_lava/beet.yaml index 4759d16c..f85a4f8f 100644 --- a/src/packs/worldgen/skyvoid_worldgen_full_lava/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_full_lava/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_full_lava' name: 'Full Lava Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate diff --git a/src/packs/worldgen/skyvoid_worldgen_normal_end/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_normal_end/beet.yaml index a65912af..088501a2 100644 --- a/src/packs/worldgen/skyvoid_worldgen_normal_end/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_normal_end/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_normal_end' name: 'Normal End Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate.base_with_end diff --git a/src/packs/worldgen/skyvoid_worldgen_noxiousvex/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_noxiousvex/beet.yaml index 274ed564..9920cbc7 100644 --- a/src/packs/worldgen/skyvoid_worldgen_noxiousvex/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_noxiousvex/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_noxiousvex' name: 'Sky Void' author: 'BPR' -version: 1.0.11 +version: 1.0.12 require: - src.plugins.worldgen.generate.base_with_main_end_island diff --git a/src/packs/worldgen/skyvoid_worldgen_pinu/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_pinu/beet.yaml index 30eca59c..a6e88c3a 100644 --- a/src/packs/worldgen/skyvoid_worldgen_pinu/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_pinu/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_pinu' name: 'Sky Void (Pinu Custom)' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate.base_with_end diff --git a/src/packs/worldgen/skyvoid_worldgen_portal_room/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_portal_room/beet.yaml index 75dc801d..2c629a3b 100644 --- a/src/packs/worldgen/skyvoid_worldgen_portal_room/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_portal_room/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_portal_room' name: 'Portal Room Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate diff --git a/src/packs/worldgen/skyvoid_worldgen_single_lava/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_single_lava/beet.yaml index 624453b9..af8d5196 100644 --- a/src/packs/worldgen/skyvoid_worldgen_single_lava/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_single_lava/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_single_lava' name: 'Single Lava Sky Void' author: 'BPR' -version: 2.0.11 +version: 2.0.12 require: - src.plugins.worldgen.generate diff --git a/src/packs/worldgen/skyvoid_worldgen_structures/beet.yaml b/src/packs/worldgen/skyvoid_worldgen_structures/beet.yaml index 50499875..0bc3de15 100644 --- a/src/packs/worldgen/skyvoid_worldgen_structures/beet.yaml +++ b/src/packs/worldgen/skyvoid_worldgen_structures/beet.yaml @@ -1,7 +1,7 @@ id: 'skyvoid_worldgen_structures' name: 'Sky Void with Structures' author: 'BPR' -version: 1.0.13 +version: 1.0.14 require: - src.plugins.worldgen.generate.base diff --git a/src/plugins/output.py b/src/plugins/output.py index 64a5743e..2f2b1723 100644 --- a/src/plugins/output.py +++ b/src/plugins/output.py @@ -4,12 +4,12 @@ from beet import Context from bolt import Module -VERSION = os.getenv("VERSION", "26.1") -MAJOR_VERSION = "26_1" -FORMAT = 101.1 -FORMATS = [101.1,101.1] -RP_FORMAT = 84.0 -RP_FORMATS = [84.0,84.0] +VERSION = os.getenv("VERSION", "26.2") +MAJOR_VERSION = "26_2" +FORMAT = 107.1 +FORMATS = [107.1,107.1] +RP_FORMAT = 88.0 +RP_FORMATS = [88.0,88.0] dp_format = int(FORMAT) diff --git a/src/plugins/worldgen/get_empty_biomes.py b/src/plugins/worldgen/get_empty_biomes.py index e0632ded..ea5612bd 100644 --- a/src/plugins/worldgen/get_empty_biomes.py +++ b/src/plugins/worldgen/get_empty_biomes.py @@ -5,7 +5,7 @@ from beet.contrib.vanilla import Vanilla from beet.contrib.worldgen import WorldgenBiome, WorldgenPlacedFeature -VERSION = os.getenv("VERSION", "26.1") +VERSION = os.getenv("VERSION", "26.2") NAME = "skyvoid_worldgen" # name of the module DIR = f"worldgen/{NAME}/data" TEMP_PATH = f"worldgen/{NAME}/temp_files" diff --git a/src/plugins/worldgen/get_empty_structures.py b/src/plugins/worldgen/get_empty_structures.py index a2824750..f09c38a2 100644 --- a/src/plugins/worldgen/get_empty_structures.py +++ b/src/plugins/worldgen/get_empty_structures.py @@ -5,7 +5,7 @@ from beet.contrib.vanilla import Vanilla from nbtlib import * # type: ignore -VERSION = os.getenv("VERSION", "26.1") +VERSION = os.getenv("VERSION", "26.2") NAME = "skyvoid_worldgen" # name of the module DIR = f"worldgen/{NAME}/data" TEMP_PATH = f"worldgen/{NAME}/temp_files"