1.21.3 error fixes

worldgen - fixes a bug where all blocks would be deleted instead of keeping a select few plus some structures from other packs in 1.21-1.21.1 - bump patch version additions - trader additions - fixes traders having no trades - fixes a bug where pumpkins, pufferfish, tropical fish, and disc fragment 5 can only be bought 3 times instead of 4 - bump patch version
BPR02 · Nov 20, 2024 · d226649 · d226649
1 parent ec66833
commit d226649
Show file tree

Hide file tree

Showing 34 changed files with 28 additions and 20 deletions.
diff --git a/.../skyvoid_skyblock_dirt_v2_0_1-MC_1_21.zip → .../skyvoid_skyblock_dirt_v2_0_2-MC_1_21.zip b/.../skyvoid_skyblock_dirt_v2_0_1-MC_1_21.zip → .../skyvoid_skyblock_dirt_v2_0_2-MC_1_21.zip
diff --git a/...void_standard_skyblock_v2_0_1-MC_1_21.zip → ...void_standard_skyblock_v2_0_2-MC_1_21.zip b/...void_standard_skyblock_v2_0_1-MC_1_21.zip → ...void_standard_skyblock_v2_0_2-MC_1_21.zip
diff --git a/...yvoid_vanilla_oneblock_v2_0_1-MC_1_21.zip → ...yvoid_vanilla_oneblock_v2_0_2-MC_1_21.zip b/...yvoid_vanilla_oneblock_v2_0_1-MC_1_21.zip → ...yvoid_vanilla_oneblock_v2_0_2-MC_1_21.zip
diff --git a/build/skyvoid_additions_v1_2_5-MC_1_21.zip → build/skyvoid_additions_v1_2_6-MC_1_21.zip b/build/skyvoid_additions_v1_2_5-MC_1_21.zip → build/skyvoid_additions_v1_2_6-MC_1_21.zip
diff --git a/build/skyvoid_advancements_v1_0_6-MC_1_21.zip b/build/skyvoid_advancements_v1_0_6-MC_1_21.zip
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
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
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
diff --git a/build/skyvoid_vanilla_oneblock_starter_v1_1_6-MC_1_21.zip b/build/skyvoid_vanilla_oneblock_starter_v1_1_6-MC_1_21.zip
diff --git a/...skyvoid_worldgen_empty_v2_0_1-MC_1_21.zip → ...skyvoid_worldgen_empty_v2_0_2-MC_1_21.zip b/...skyvoid_worldgen_empty_v2_0_1-MC_1_21.zip → ...skyvoid_worldgen_empty_v2_0_2-MC_1_21.zip
diff --git a/...oid_worldgen_full_lava_v2_0_1-MC_1_21.zip → ...oid_worldgen_full_lava_v2_0_2-MC_1_21.zip b/...oid_worldgen_full_lava_v2_0_1-MC_1_21.zip → ...oid_worldgen_full_lava_v2_0_2-MC_1_21.zip
diff --git a/...id_worldgen_normal_end_v2_0_1-MC_1_21.zip → ...id_worldgen_normal_end_v2_0_2-MC_1_21.zip b/...id_worldgen_normal_end_v2_0_1-MC_1_21.zip → ...id_worldgen_normal_end_v2_0_2-MC_1_21.zip
diff --git a/...id_worldgen_noxiousvex_v1_0_1-MC_1_21.zip → ...id_worldgen_noxiousvex_v1_0_2-MC_1_21.zip b/...id_worldgen_noxiousvex_v1_0_1-MC_1_21.zip → ...id_worldgen_noxiousvex_v1_0_2-MC_1_21.zip
diff --git a/.../skyvoid_worldgen_pinu_v2_0_1-MC_1_21.zip → .../skyvoid_worldgen_pinu_v2_0_2-MC_1_21.zip b/.../skyvoid_worldgen_pinu_v2_0_1-MC_1_21.zip → .../skyvoid_worldgen_pinu_v2_0_2-MC_1_21.zip
diff --git a/...d_worldgen_portal_room_v2_0_1-MC_1_21.zip → ...d_worldgen_portal_room_v2_0_2-MC_1_21.zip b/...d_worldgen_portal_room_v2_0_1-MC_1_21.zip → ...d_worldgen_portal_room_v2_0_2-MC_1_21.zip
diff --git a/...d_worldgen_single_lava_v2_0_1-MC_1_21.zip → ...d_worldgen_single_lava_v2_0_2-MC_1_21.zip b/...d_worldgen_single_lava_v2_0_1-MC_1_21.zip → ...d_worldgen_single_lava_v2_0_2-MC_1_21.zip
diff --git a/...id_worldgen_structures_v1_0_3-MC_1_21.zip → ...id_worldgen_structures_v1_0_4-MC_1_21.zip b/...id_worldgen_structures_v1_0_3-MC_1_21.zip → ...id_worldgen_structures_v1_0_4-MC_1_21.zip
diff --git a/build/skyvoid_worldgen_v2_0_1-MC_1_21.zip → build/skyvoid_worldgen_v2_0_2-MC_1_21.zip b/build/skyvoid_worldgen_v2_0_1-MC_1_21.zip → build/skyvoid_worldgen_v2_0_2-MC_1_21.zip
diff --git 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.1
+version: 2.0.2
 
 pipeline:
   - src.plugins.bundle.skyblock_dirt
diff --git 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.0.1
+version: 2.0.2
 
 pipeline:
   - src.plugins.bundle.standard_skyblock
diff --git 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.1
+version: 2.0.2
 
 pipeline:
   - src.plugins.bundle.vanilla_oneblock
diff --git 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.2.5
+version: 1.2.6
 
 require:
   - bolt

diff --git a/...cks/extras/skyvoid_additions/data/skyvoid_additions/tags/item/trader_additions/use_3.json b/...cks/extras/skyvoid_additions/data/skyvoid_additions/tags/item/trader_additions/use_3.json
@@ -1,8 +1,3 @@
 {
-  "values": [
-    "minecraft:pumpkin",
-    "minecraft:pufferfish_bucket",
-    "minecraft:tropical_fish_bucket",
-    "minecraft:disc_fragment_5"
-  ]
+  "values": []
 }
diff --git a/...cks/extras/skyvoid_additions/data/skyvoid_additions/tags/item/trader_additions/use_4.json b/...cks/extras/skyvoid_additions/data/skyvoid_additions/tags/item/trader_additions/use_4.json
@@ -0,0 +1,8 @@
+{
+  "values": [
+    "minecraft:pumpkin",
+    "minecraft:pufferfish_bucket",
+    "minecraft:tropical_fish_bucket",
+    "minecraft:disc_fragment_5"
+  ]
+}
diff --git 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.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_empty'
 name: 'Empty Sky Void'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_full_lava'
 name: 'Full Lava Sky Void'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_normal_end'
 name: 'Normal End Sky Void'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_noxiousvex'
 name: 'Sky Void'
 author: 'BPR'
-version: 1.0.1
+version: 1.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_pinu'
 name: 'Sky Void (Pinu Custom)'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_portal_room'
 name: 'Portal Room Sky Void'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_single_lava'
 name: 'Single Lava Sky Void'
 author: 'BPR'
-version: 2.0.1
+version: 2.0.2
 
 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
@@ -1,7 +1,7 @@
 id: 'skyvoid_worldgen_structures'
 name: 'Sky Void with Structures'
 author: 'BPR'
-version: 1.0.3
+version: 1.0.4
 
 require: 
   - src.plugins.worldgen.generate.base

diff --git a/src/plugins/worldgen/get_empty_biomes.py b/src/plugins/worldgen/get_empty_biomes.py
@@ -69,7 +69,12 @@ def gen(ctx: Context, cache_loc:str, ignored_dimensions: list[str] = [], full_re
 
     if "jigsaw" in final_purge: final_purge.remove("jigsaw") #type: ignore
     if "minecraft:jigsaw" in final_purge: final_purge.remove("minecraft:jigsaw") #type: ignore
-    draft.data[f"{NAME}:final_purge"] = BlockTag({"values": final_purge})
+
+    # create block tag for final purge
+    final_purge_tag: list[dict[str, str|bool]] = []
+    for block in final_purge:
+      final_purge_tag.append({ "id": block, "required": False })
+    draft.data[f"{NAME}:final_purge"] = BlockTag({"values": final_purge_tag})
 
     # remove all carvers and placed features
     vanilla = ctx.inject(Vanilla)