diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c61c3674..7cc83932 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: workflow_dispatch: env: - MC_VERSION: '26.1' + MC_VERSION: '26.2' COMMIT_MSG: ${{ github.event.head_commit.message }} jobs: diff --git a/smithed_libraries/packs/actionbar/beet.yaml b/smithed_libraries/packs/actionbar/beet.yaml index 2ce57e86..3ab30d27 100644 --- a/smithed_libraries/packs/actionbar/beet.yaml +++ b/smithed_libraries/packs/actionbar/beet.yaml @@ -2,7 +2,7 @@ extend: "@smithed_libraries/common.yaml" id: smithed.actionbar name: Smithed Actionbar -version: "0.7.0" +version: "0.8.0" description: Native Actionbar Library for Smithed data_pack: diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json index 6c9184d3..11c7e9f7 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json @@ -1,7 +1,7 @@ { "criteria": { "unoccupied": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:any_block_use", "conditions": { "player": [ { @@ -25,7 +25,7 @@ "predicate": { "dimension": "minecraft:overworld", "block": { - "tag": "minecraft:beds", + "blocks": "#minecraft:beds", "state": { "occupied": "false" } @@ -36,7 +36,7 @@ } }, "occupied": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:any_block_use", "conditions": { "player": [ { @@ -60,81 +60,7 @@ "predicate": { "dimension": "minecraft:overworld", "block": { - "tag": "minecraft:beds", - "state": { - "occupied": "true" - } - } - } - } - ] - } - }, - "unoccupied_empty": { - "trigger": "minecraft:item_used_on_block", - "conditions": { - "player": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": "this", - "score": "smithed.actionbar.sneaking" - }, - "range": { - "min": 1 - } - } - ], - "item": { - "items": [ - "minecraft:air" - ] - }, - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:overworld", - "block": { - "tag": "minecraft:beds", - "state": { - "occupied": "false" - } - } - } - } - ] - } - }, - "occupied_empty": { - "trigger": "minecraft:item_used_on_block", - "conditions": { - "player": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": "this", - "score": "smithed.actionbar.sneaking" - }, - "range": { - "min": 1 - } - } - ], - "item": { - "items": [ - "minecraft:air" - ] - }, - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:overworld", - "block": { - "tag": "minecraft:beds", + "blocks": "#minecraft:beds", "state": { "occupied": "true" } @@ -148,9 +74,7 @@ "requirements": [ [ "unoccupied", - "occupied", - "unoccupied_empty", - "occupied_empty" + "occupied" ] ], "rewards": { diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json index ab75e54f..3e4aacc5 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json @@ -3,11 +3,14 @@ "requirement": { "trigger": "minecraft:slept_in_bed", "conditions": { - "location": [ + "player": [ { - "condition": "minecraft:location_check", + "condition": "minecraft:entity_properties", + "entity": "this", "predicate": { - "dimension": "minecraft:overworld" + "minecraft:location": { + "dimension": "minecraft:overworld" + } } } ] diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json index e75aa6dc..6f083c8b 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json @@ -1,7 +1,7 @@ { "criteria": { "click_no_sneak": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:any_block_use", "conditions": { "player": [ { @@ -24,7 +24,7 @@ "condition": "minecraft:location_check", "predicate": { "block": { - "tag": "smithed.actionbar:impl/lockable" + "blocks": "#smithed.actionbar:impl/lockable" } } } @@ -32,21 +32,15 @@ } }, "click_empty": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:default_block_use", "conditions": { - "player": [ - ], - "item": { - "items": [ - "minecraft:air" - ] - }, + "player": [], "location": [ { "condition": "minecraft:location_check", "predicate": { "block": { - "tag": "smithed.actionbar:impl/lockable" + "blocks": "#smithed.actionbar:impl/lockable" } } } @@ -54,12 +48,6 @@ } } }, - "requirements": [ - [ - "click_no_sneak", - "click_empty" - ] - ], "rewards": { "function": "smithed.actionbar:impl/vanilla/container/clicked_lockable_block" } diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/display.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/display.mcfunction index 13547226..6e036772 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/display.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/display.mcfunction @@ -5,7 +5,7 @@ # yes, if you define raw and json, you'll get 2 messages # i left this "bug" in so that folks catch this in testing -execute if data storage smithed.actionbar:input message.raw run title @s actionbar {"storage": "smithed.actionbar:input", "nbt": "message.raw"} +execute if data storage smithed.actionbar:input message.raw run title @s actionbar {"storage": "smithed.actionbar:input", "nbt": "message.raw", "interpret": true} execute if data storage smithed.actionbar:input message.json run title @s actionbar {"storage": "smithed.actionbar:input", "nbt": "message.json", "interpret": true} # copy freeze w/ bounds checking diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/bed/clicked_bed.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/bed/clicked_bed.mcfunction index 283a8ac0..d1320ea2 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/bed/clicked_bed.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/bed/clicked_bed.mcfunction @@ -5,7 +5,6 @@ # check if the player entered the bed tag @s[advancements={smithed.actionbar:impl/vanilla/bed/clicked_bed={occupied=true}}] add smithed.actionbar.occupied -tag @s[advancements={smithed.actionbar:impl/vanilla/bed/clicked_bed={occupied_empty=true}}] add smithed.actionbar.occupied tag @s[advancements={smithed.actionbar:impl/vanilla/bed/slept_in_bed={requirement=true}}] add smithed.actionbar.sleeping advancement revoke @s only smithed.actionbar:impl/vanilla/bed/clicked_bed diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/east.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/east.mcfunction index a7927a6c..615c6a32 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/east.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/east.mcfunction @@ -4,8 +4,8 @@ # run from vanilla/container/check_double_chest_lock # check if the other chest is locked -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~ ~ ~-1 Lock -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~ ~ ~1 Lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~ ~ ~-1 lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~ ~ ~1 lock # store info for locked container execute if score $locked smithed.actionbar.temp matches 1 if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] run data modify storage smithed.actionbar:data block set from block ~ ~ ~-1 {} diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/north.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/north.mcfunction index 03431cc1..b993bc49 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/north.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/north.mcfunction @@ -4,8 +4,8 @@ # run from vanilla/container/check_double_chest_lock # check if the other chest is locked -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~-1 ~ ~ Lock -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~1 ~ ~ Lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~-1 ~ ~ lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~1 ~ ~ lock # store info for locked container execute if score $locked smithed.actionbar.temp matches 1 if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] run data modify storage smithed.actionbar:data block set from block ~-1 ~ ~ {} diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/south.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/south.mcfunction index f5d7b18a..73993561 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/south.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/south.mcfunction @@ -4,8 +4,8 @@ # run from vanilla/container/check_double_chest_lock # check if the other chest is locked -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~1 ~ ~ Lock -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~-1 ~ ~ Lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~1 ~ ~ lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~-1 ~ ~ lock # store info for locked container execute if score $locked smithed.actionbar.temp matches 1 if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] run data modify storage smithed.actionbar:data block set from block ~1 ~ ~ {} diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/west.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/west.mcfunction index c989aad9..5eb3cbcc 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/west.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/west.mcfunction @@ -4,8 +4,8 @@ # run from vanilla/container/check_double_chest_lock # check if the other chest is locked -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~ ~ ~1 Lock -execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~ ~ ~-1 Lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] store success score $locked smithed.actionbar.temp if data block ~ ~ ~1 lock +execute if block ~ ~ ~ #smithed.actionbar:impl/chests[type=left] store success score $locked smithed.actionbar.temp if data block ~ ~ ~-1 lock # store info for locked container execute if score $locked smithed.actionbar.temp matches 1 if block ~ ~ ~ #smithed.actionbar:impl/chests[type=right] run data modify storage smithed.actionbar:data block set from block ~ ~ ~1 {} diff --git a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_lock.mcfunction b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_lock.mcfunction index eef4fbbf..b6a7786f 100644 --- a/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_lock.mcfunction +++ b/smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_lock.mcfunction @@ -5,7 +5,7 @@ # check if the block is locked scoreboard players set $locked smithed.actionbar.temp 0 -execute store success score $locked smithed.actionbar.temp if data block ~ ~ ~ Lock +execute store success score $locked smithed.actionbar.temp if data block ~ ~ ~ lock execute if score $locked smithed.actionbar.temp matches 1 run data modify storage smithed.actionbar:data block set from block ~ ~ ~ {} execute if score $locked smithed.actionbar.temp matches 0 if block ~ ~ ~ #smithed.actionbar:impl/chests unless block ~ ~ ~ #smithed.actionbar:impl/chests[type=single] run function smithed.actionbar:impl/vanilla/container/check_double_chest_lock diff --git a/smithed_libraries/packs/crafter/beet.yaml b/smithed_libraries/packs/crafter/beet.yaml index 2de2e94b..fa826a5b 100644 --- a/smithed_libraries/packs/crafter/beet.yaml +++ b/smithed_libraries/packs/crafter/beet.yaml @@ -2,7 +2,7 @@ extend: "@smithed_libraries/common.yaml" id: smithed.crafter name: Smithed Crafter -version: "0.10.0" +version: "0.11.0" description: Native Library for Smithed author: TheNuclearNexus minecraft: "1.21" @@ -38,5 +38,5 @@ output: dist meta: depends_on: # used for metadata - custom-block: "0.10.0" - minecraft_version: "26.1" + custom-block: "0.11.0" + minecraft_version: "26.2" diff --git a/smithed_libraries/packs/custom-block/beet.yaml b/smithed_libraries/packs/custom-block/beet.yaml index 512394b2..7f60edf4 100644 --- a/smithed_libraries/packs/custom-block/beet.yaml +++ b/smithed_libraries/packs/custom-block/beet.yaml @@ -2,7 +2,7 @@ extend: "@smithed_libraries/common.yaml" id: smithed.custom_block name: Smithed Custom Block -version: "0.10.0" +version: "0.11.0" description: Native Custom Block Library for Smithed data_pack: