1.20.5 (#18)

* set version to 1.20.5

- datapack format 40 (as of pre-2)
- bump all minor versions

* Update loot tables

- change loot table entry to use `value` instead of `name`
- use components
- remove prefix from smithed rules/source

* Update functions

- particle item/block
- attribute modifier add

* Update advancements (and one loot table)

- icon: item -> id
- structure -> structures

* most stuf works

- waiting on GM4 lib_trades to update for Wandering Trader stuff
- bug fix involving spawning too many dispenser markers (no gameplay affect)

* update build folder

* bump patch version of advancements and additions

these both had patch bumps in the last commit

* update lightning pig overlay

* Complete(?) Compatibility Update

- bump pack versions to 41 and 32 (data and resource respectively)
- fix traders (update gm4 lib_traders)
- fix camel leash

* change version to 1.20.6 instead of .5

* Force-Update vanilla datapack

- manually updated beet cache to use 1.20.6 datapack

* make non-release separate RP format

src/bundles/skyvoid_skyblock_dirt/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_skyblock_dirt'
 name: 'SkyBlock Dirt Hardcore'
 author: 'BluePsychoRanger'
-version: 1.0.0
+version: 1.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: 'BluePsychoRanger'
-version: 1.0.4
+version: 1.0.5
 
 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: 'BluePsychoRanger'
-version: 1.2.1
+version: 1.2.2
 
 pipeline:
   - src.plugins.bundle.vanilla_oneblock

src/packs/extras/skyvoid_additions/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_additions'
 name: 'Sky Void Additions'
 author: 'BluePsychoRanger'
-version: 1.1.5
+version: 1.1.6
 
 require:
   - bolt

src/packs/extras/skyvoid_additions/data/gm4_trades-1.3/functions/resolve_load.mcfunction

@@ -1,2 +1,3 @@
-schedule clear gm4_trades-1.3:main
 execute if score gm4_trades load.status matches 1 if score gm4_trades_minor load.status matches 3 run function gm4_trades-1.3:load
+execute unless score gm4_trades load.status matches 1 run schedule clear gm4_trades-1.3:main
+execute unless score gm4_trades_minor load.status matches 3 run schedule clear gm4_trades-1.3:main

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/blocks/big_dripleaf.json

@@ -73,10 +73,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[1]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/entities/elder_guardian.json

@@ -196,10 +196,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[5]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/entities/ender_dragon.json

@@ -145,26 +145,26 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[1]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[2]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/entities/enderman.json

@@ -94,10 +94,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[1]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/entities/husk.json

@@ -262,26 +262,26 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[2]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[3]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[4]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/cat_morning_gift.json

@@ -82,10 +82,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[7]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/fishing/junk.json

@@ -275,26 +275,26 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[13]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[14]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[15]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/fishing/treasure.json

@@ -141,10 +141,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[6]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/hero_of_the_village/armorer_gift.json

@@ -63,10 +63,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[4]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/hero_of_the_village/librarian_gift.json

@@ -65,10 +65,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[1]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/hero_of_the_village/mason_gift.json

@@ -51,10 +51,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[1]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/hero_of_the_village/toolsmith_gift.json

@@ -63,10 +63,10 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[4]"
         }
       }

src/packs/extras/skyvoid_additions/data/minecraft/loot_tables/gameplay/piglin_bartering.json

@@ -399,34 +399,34 @@
   "__smithed__": {
     "rules": [
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[18]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[19]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[20]"
         }
       },
       {
-        "type": "smithed:append",
+        "type": "append",
         "target": "pools[0].entries",
         "source": {
-          "type": "smithed:reference",
+          "type": "reference",
           "path": "pools[0].entries[21]"
         }
       }

src/packs/extras/skyvoid_additions/data/skyvoid_additions/functions/mechanics/sniffer_eggs_from_drowneds/equip.mcfunction

@@ -5,7 +5,7 @@
 
 tag @s add skyvoid_drowned_check
 
-execute at @s unless predicate skyvoid_additions:sniffer_eggs_from_drowneds/sniffer_egg_chance run return 0
+execute unless predicate skyvoid_additions:sniffer_eggs_from_drowneds/sniffer_egg_chance run return 0
 
 tag @s add skyvoid_sniffer_drowned
 item replace entity @s weapon.offhand with minecraft:sniffer_egg

src/packs/extras/skyvoid_additions/pack.mcmeta

@@ -2,8 +2,12 @@
   "overlays": {
     "entries": [
       {
-        "formats": [18,26],
+        "formats": [18,41],
         "directory": "skyvoid_1_20_2"
+      },
+      {
+        "formats": 41,
+        "directory": "skyvoid_1_20_5"
       }
     ]
   }

src/packs/extras/skyvoid_additions/skyvoid_1_20_5/data/gm4_trades-1.3/functions/wandering_trader/append_trade.mcfunction

@@ -0,0 +1,25 @@
+# adds trades from storage into wandering traders
+# @s = a wandering trader without the gm4_trader tag (aka without the new trades)
+# at @s
+# run from gm4_trades-1.3:wandering_trader/create_pool
+
+# select random trade
+data modify storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data set from entity @e[type=trader_llama,tag=gm4_pooled_trade_option,limit=1,sort=random] {}
+
+# interpret trade data (body_armor_item: metadata; Items[{Slot:0b}]: sell; Items[{Slot:1b}]: buy; Items[{Slot:2b}]: buyB)
+data modify storage gm4_trades:temp/wandering_trader/next_trade trade set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.body_armor_item.components."minecraft:custom_data".gm4_trades.options
+data modify storage gm4_trades:temp/wandering_trader/next_trade trade.sell set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:0b}]
+data modify storage gm4_trades:temp/wandering_trader/next_trade trade.buy set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:1b}]
+data modify storage gm4_trades:temp/wandering_trader/next_trade trade.buyB set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:2b}]
+
+# kill llama without drops and clean up loot table
+execute as @e[type=trader_llama,tag=gm4_pooled_trade_option] run data merge entity @s {Health:0,DeathTime:19}
+data remove storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data
+
+# add trade
+data modify entity @s Offers.Recipes append from storage gm4_trades:temp/wandering_trader/next_trade trade
+data remove storage gm4_trades:temp/wandering_trader/next_trade trade
+
+# try to create another pool if more trade options exists
+scoreboard players reset $pools_differ gm4_trades_data
+execute if entity @e[type=trader_llama,tag=gm4_trade_option,limit=1] run function gm4_trades-1.3:wandering_trader/create_pool

src/packs/extras/skyvoid_additions/skyvoid_1_20_5/data/gm4_trades-1.3/functions/wandering_trader/pool/collect_trades.mcfunction

@@ -0,0 +1,17 @@
+# compares all trade options against this pools name and marks matching ones as belonging to this pool
+# @s = the next trade option in line
+# at position of wandering trader
+# run from gm4_trades-1.3:wandering_trader/pool/initialize, loops itself
+
+# remember this option was processed
+tag @s add gm4_processed_trade_option
+
+# compare current fixed pool id to pool id of next unprocessed trade option ($pools_differ == 1 if next trade does not exist or is in different trade pool ;;; == 0 if pool names match)
+scoreboard players set $pools_differ gm4_trades_data 1
+data modify storage gm4_trades:temp/wandering_trader/comparison pool set from storage gm4_trades:temp/wandering_trader/current_tradepool pool
+execute if data entity @s body_armor_item.components."minecraft:custom_data".gm4_trades.pool store success score $pools_differ gm4_trades_data run data modify storage gm4_trades:temp/wandering_trader/comparison pool set from entity @s body_armor_item.components."minecraft:custom_data".gm4_trades.pool
+data remove storage gm4_trades:temp/wandering_trader/comparison pool
+
+# if trade pools didnt differ, keep looping until they do.
+execute if score $pools_differ gm4_trades_data matches 0 run tag @s add gm4_pooled_trade_option
+execute as @e[type=trader_llama,tag=gm4_trade_option,tag=!gm4_processed_trade_option,limit=1,sort=arbitrary] run function gm4_trades-1.3:wandering_trader/pool/collect_trades

src/packs/extras/skyvoid_additions/skyvoid_1_20_5/data/gm4_trades-1.3/functions/wandering_trader/pool/initialize.mcfunction

@@ -0,0 +1,18 @@
+# initializes the newly created pool with a pool name
+# @s = the first trade option in the pool (arbitrary sorting)
+# at position of wandering trader
+# run from gm4_trades-1.3:wandering_trader/create_pool
+
+# mark trade option as pooled and processed, to prevent self comparison
+tag @s add gm4_pooled_trade_option
+tag @s add gm4_processed_trade_option
+
+# read current trade pool name space
+data modify storage gm4_trades:temp/wandering_trader/current_tradepool pool set from entity @s body_armor_item.components."minecraft:custom_data".gm4_trades.pool
+
+# compare to next trade option's pool
+execute as @e[type=trader_llama,tag=gm4_trade_option,tag=!gm4_pooled_trade_option,limit=1,sort=arbitrary] run function gm4_trades-1.3:wandering_trader/pool/collect_trades
+
+# clean up tag and storage (tag cleanup is very important here!)
+tag @e[type=trader_llama,tag=gm4_trade_option] remove gm4_processed_trade_option
+data remove storage gm4_trades:temp/wandering_trader/current_tradepool pool