Skip to content

fix(actionbar): port vanilla interactions to 26.2 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edayot merged 15 commits into from
Aug 16, 2026
Merged

fix(actionbar): port vanilla interactions to 26.2 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
99ed4f9
Update clicked_bed.json
bigyasso730 Aug 15, 2026
74c89e1
Update slept_in_bed.json
bigyasso730 Aug 15, 2026
51eb818
Update clicked_lockable_block.json
bigyasso730 Aug 15, 2026
8d2d27e
Update check_lock.mcfunction
bigyasso730 Aug 15, 2026
6f54602
Update east.mcfunction
bigyasso730 Aug 15, 2026
4bdfaae
Update north.mcfunction
bigyasso730 Aug 15, 2026
d71419b
Update south.mcfunction
bigyasso730 Aug 15, 2026
43d702e
Update west.mcfunction
bigyasso730 Aug 15, 2026
2d20591
Update clicked_bed.mcfunction
bigyasso730 Aug 15, 2026
160d92b
Merge pull request #1 from bigyasso730/action-bar-26.2
bigyasso730 Aug 15, 2026
ebc1b38
Update clicked_bed.json
bigyasso730 Aug 16, 2026
d4711b8
Update slept_in_bed.json
bigyasso730 Aug 16, 2026
a77d5db
Update clicked_lockable_block.json
bigyasso730 Aug 16, 2026
2a00d89
fix: raw message should not have quotes nor colors
edayot Aug 16, 2026
638a567
chore: bumping libs and minecraft version
edayot Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
workflow_dispatch:

env:
MC_VERSION: '26.1'
MC_VERSION: '26.2'
COMMIT_MSG: ${{ github.event.head_commit.message }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion smithed_libraries/packs/actionbar/beet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
86 changes: 5 additions & 81 deletions ...ries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"criteria": {
"unoccupied": {
"trigger": "minecraft:item_used_on_block",
"trigger": "minecraft:any_block_use",
Comment thread
bigyasso730 marked this conversation as resolved.
"conditions": {
"player": [
{
Expand All @@ -25,7 +25,7 @@
"predicate": {
"dimension": "minecraft:overworld",
"block": {
"tag": "minecraft:beds",
"blocks": "#minecraft:beds",
Comment thread
bigyasso730 marked this conversation as resolved.
"state": {
"occupied": "false"
}
Expand All @@ -36,7 +36,7 @@
}
},
"occupied": {
"trigger": "minecraft:item_used_on_block",
"trigger": "minecraft:any_block_use",
Comment thread
bigyasso730 marked this conversation as resolved.
"conditions": {
"player": [
{
Expand All @@ -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",
Comment thread
bigyasso730 marked this conversation as resolved.
"state": {
"occupied": "true"
}
Expand All @@ -148,9 +74,7 @@
"requirements": [
[
"unoccupied",
"occupied",

@edayot edayot Aug 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, no longer neccessary

"unoccupied_empty",
"occupied_empty"
"occupied"
]
],
"rewards": {
Expand Down
9 changes: 6 additions & 3 deletions ...ies/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
]
Expand Down
22 changes: 5 additions & 17 deletions ...bar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"criteria": {
"click_no_sneak": {
"trigger": "minecraft:item_used_on_block",
"trigger": "minecraft:any_block_use",
Comment thread
bigyasso730 marked this conversation as resolved.
"conditions": {
"player": [
{
Expand All @@ -24,42 +24,30 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "smithed.actionbar:impl/lockable"
"blocks": "#smithed.actionbar:impl/lockable"
}
}
}
]
}
},
"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"
}
}
}
]
}
}
},
"requirements": [
[
"click_no_sneak",
"click_empty"
]
],
"rewards": {
"function": "smithed.actionbar:impl/vanilla/container/clicked_lockable_block"
}
Expand Down
2 changes: 1 addition & 1 deletion smithed_libraries/packs/actionbar/data/smithed.actionbar/function/impl/display.mcfunction
View file
Open in desktop

@edayot edayot Aug 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only part for raw string, that should not be quoted or having colors, nobody use them, it's not a big deal

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...s/packs/actionbar/data/smithed.actionbar/function/impl/vanilla/bed/clicked_bed.mcfunction
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/east.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
4 changes: 2 additions & 2 deletions ...mithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/north.mcfunction
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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 ~ ~ {}
Expand Down
4 changes: 2 additions & 2 deletions ...mithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/south.mcfunction
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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 ~ ~ {}
Expand Down
4 changes: 2 additions & 2 deletions ...smithed.actionbar/function/impl/vanilla/container/check_double_chest_lock/west.mcfunction
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
2 changes: 1 addition & 1 deletion ...ks/actionbar/data/smithed.actionbar/function/impl/vanilla/container/check_lock.mcfunction
View file
Open in desktop
Comment thread
bigyasso730 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions smithed_libraries/packs/crafter/beet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion smithed_libraries/packs/custom-block/beet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading