Update to 1.21.3 (#30)

* set pack format

* 1.21.3 fixes

- renamed attributes
- update boat entity
- add `minecraft:empty` loot table
- clear carvers
- bump minor version of every pack

* add overlay to mcmeta of compat packs

pyproject.toml

@@ -8,7 +8,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-beet = ">=0.108.4"
+beet = { git = "https://github.com/misode/beet.git", rev = "fix-overlay-folders" }
 mecha = ">=0.95.2"
 bolt = ">=0.49.1"
 requests = "^2.32.3"

spyglass.json

@@ -0,0 +1,5 @@
+{
+  "env": {
+    "gameVersion": "1.21.3"
+  }
+}

src/bundles/skyvoid_skyblock_dirt/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_skyblock_dirt'
 name: 'SkyBlock Dirt Hardcore'
 author: 'BPR'
-version: 2.0.0
+version: 2.0.1
 
 pipeline:
   - src.plugins.bundle.skyblock_dirt

src/bundles/skyvoid_standard_skyblock/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_standard_skyblock'
 name: 'Standard SkyBlock'
 author: 'BPR'
-version: 2.0.0
+version: 2.0.1
 
 pipeline:
   - src.plugins.bundle.standard_skyblock

src/bundles/skyvoid_vanilla_oneblock/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_vanilla_oneblock'
 name: 'Vanilla One Block'
 author: 'BPR'
-version: 2.0.0
+version: 2.0.1
 
 pipeline:
   - src.plugins.bundle.vanilla_oneblock

src/packs/compat/skyvoid_amplified_nether_compat/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_compat_amplified_nether'
 name: 'SkyBlock Amplified Nether'
 author: 'BPR'
-version: 1.0.0+nullscape-1.2.5
+version: 1.0.1+nullscape-1.2.5
 
 pipeline:
   - src.plugins.worldgen.compat.amplified_nether

src/packs/compat/skyvoid_nullscape_compat/beet.yaml

@@ -1,10 +1,15 @@
 id: 'skyvoid_compat_nullscape'
 name: 'SkyBlock Nullscape Compat'
 author: 'BPR'
-version: 1.0.0+nullscape-1.2.8
+version: 1.0.1+nullscape-1.2.8
 
 pipeline:
   - src.plugins.worldgen.compat.nullscape
 
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 48
+        max_inclusive: 48
+      directory: skyvoid_1_21

src/packs/compat/skyvoid_nullscape_compat/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "overlays": {
+    "entries": [
+      {
+        "formats": {
+          "min_inclusive": 48,
+          "max_inclusive": 48
+        },
+        "directory": "skyvoid_1_21"
+      }
+    ]
+  }
+}

src/packs/compat/skyvoid_terralith_compat/beet.yaml

@@ -1,10 +1,15 @@
 id: 'skyvoid_compat_terralith'
 name: 'SkyBlock Terralith Compat'
 author: 'BPR'
-version: 1.0.1+terralith-2.5.5
+version: 1.0.2+terralith-2.5.5
 
 pipeline:
   - src.plugins.worldgen.compat.terralith
 
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 48
+        max_inclusive: 48
+      directory: skyvoid_1_21

src/packs/compat/skyvoid_terralith_compat/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "overlays": {
+    "entries": [
+      {
+        "formats": {
+          "min_inclusive": 48,
+          "max_inclusive": 48
+        },
+        "directory": "skyvoid_1_21"
+      }
+    ]
+  }
+}

src/packs/extras/skyvoid_additions/beet.yaml

@@ -1,14 +1,19 @@
 id: 'skyvoid_additions'
 name: 'Sky Void Additions'
 author: 'BPR'
-version: 1.2.4
+version: 1.2.5
 
 require:
   - bolt
   - mecha.contrib.relative_location
   - mecha.contrib.nesting
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 48
+        max_inclusive: 48
+      directory: skyvoid_1_21
 pipeline:
   - mecha
 

src/packs/extras/skyvoid_additions/data/minecraft/loot_table/empty.json

@@ -0,0 +1,3 @@
+{
+  "type": "minecraft:empty"
+}

src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/end_phantoms/attempt_spawn.mcfunction

@@ -4,4 +4,4 @@
 # run from skyvoid_additions:mechanices/end_phantoms/clock
 
 execute store result score $air_count skyvoid_additions run clone ~-1 ~-1 ~-1 ~1 ~1 ~1 ~-1 ~-1 ~-1 filtered air force
-execute if score $air_count skyvoid_additions matches 27 run summon phantom ~ ~ ~ {DeathLootTable:"skyvoid_additions:entities/end_phantoms/end_phantom",Health:60.0f,Size:3,Tags:["skyvoid_additions_end_phantom"],attributes:[{id:"minecraft:generic.max_health",base:60.0d}]}
+execute if score $air_count skyvoid_additions matches 27 run summon phantom ~ ~ ~ {DeathLootTable:"skyvoid_additions:entities/end_phantoms/end_phantom",Health:60.0f,Size:3,Tags:["skyvoid_additions_end_phantom"],attributes:[{id:"minecraft:max_health",base:60.0d}]}

src/packs/extras/skyvoid_additions/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "overlays": {
+    "entries": [
+      {
+        "formats": {
+          "min_inclusive": 48,
+          "max_inclusive": 48
+        },
+        "directory": "skyvoid_1_21"
+      }
+    ]
+  }
+}

src/packs/extras/skyvoid_additions/skyvoid_1_21/data/skyvoid_additions/function/mechanics/end_phantoms/attempt_spawn.mcfunction

@@ -0,0 +1,7 @@
+# spawns a phantom if there's enough space
+# @s = player in the end barrens
+# located 30 blocks above player
+# run from skyvoid_additions:mechanices/end_phantoms/clock
+
+execute store result score $air_count skyvoid_additions run clone ~-1 ~-1 ~-1 ~1 ~1 ~1 ~-1 ~-1 ~-1 filtered air force
+execute if score $air_count skyvoid_additions matches 27 run summon phantom ~ ~ ~ {DeathLootTable:"skyvoid_additions:entities/end_phantoms/end_phantom",Health:60.0f,Size:3,Tags:["skyvoid_additions_end_phantom"],attributes:[{id:"minecraft:generic.max_health",base:60.0d}]}

src/packs/extras/skyvoid_advancements/beet.yaml

@@ -1,9 +1,15 @@
 id: 'skyvoid_advancements'
 name: 'SkyBlock Advancements'
 author: 'EpyonProjects'
-version: 1.0.5
+version: 1.0.6
 
 data_pack:
   load: .
+  overlays:
+    - formats:
+        min_inclusive: 48
+        max_inclusive: 48
+      directory: skyvoid_1_21
+
 resource_pack:
   load: .

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json

@@ -30,7 +30,7 @@
             "entity": "this",
             "predicate": {
               "vehicle": {
-                "type": "minecraft:boat",
+                "type": "#minecraft:boat",
                 "passenger": {
                   "type": "minecraft:witch"
                 }

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json

@@ -32,7 +32,7 @@
             "entity": "this",
             "predicate": {
               "vehicle": {
-                "type": "minecraft:boat",
+                "type": "#minecraft:boat",
                 "passenger": {
                   "type": "minecraft:zombie_villager"
                 }

src/packs/extras/skyvoid_advancements/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "overlays": {
+    "entries": [
+      {
+        "formats": {
+          "min_inclusive": 48,
+          "max_inclusive": 48
+        },
+        "directory": "skyvoid_1_21"
+      }
+    ]
+  }
+}

src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json

@@ -0,0 +1,45 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:potion",
+      "components": {
+        "minecraft:potion_contents": "healing"
+      }
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.witch.title",
+      "fallback": "Dangerous Passenger"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.witch.description",
+      "fallback": "Capture a Witch in a Boat"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": false,
+    "hidden": false
+  },
+  "parent": "skyvoid_advancements:overworld/mob_farm",
+  "criteria": {
+    "witch_passenger": {
+      "trigger": "minecraft:started_riding",
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "vehicle": {
+                "type": "minecraft:boat",
+                "passenger": {
+                  "type": "minecraft:witch"
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "sends_telemetry_event": true
+}

src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json

@@ -0,0 +1,47 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:splash_potion",
+      "components": {
+        "minecraft:potion_contents": {
+          "potion": "minecraft:weakness"
+        }
+      }
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.zombie_villager.title",
+      "fallback": "(Slightly Less) Dangerous Passenger"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.zombie_villager.description",
+      "fallback": "Capture a Zombie Villager in a Boat"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": false,
+    "hidden": false
+  },
+  "parent": "skyvoid_advancements:overworld/witch",
+  "criteria": {
+    "zombie_villager_passenger": {
+      "trigger": "minecraft:started_riding",
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "vehicle": {
+                "type": "minecraft:boat",
+                "passenger": {
+                  "type": "minecraft:zombie_villager"
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "sends_telemetry_event": true
+}

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.1
+version: 1.0.2
 
 data_pack:
   load: .

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.0
+version: 1.1.1
 
 data_pack:
   load: .

src/packs/extras/skyvoid_sand_island/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_sand_island'
 name: 'Sky Void Sand Island'
 author: 'BPR'
-version: 1.0.2
+version: 1.0.3
 
 data_pack:
   load: .