Skip to content

fix: update loot, predicate and advancement JSON to the 26.3 formats #64

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 5 commits into from
Oct 2, 2026
Merged

fix: update loot, predicate and advancement JSON to the 26.3 formats #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4221b40
fix: update loot, predicate and advancement JSON to the 26.3 formats
Stoupy51 Sep 17, 2026
52d1d94
fix: Sleep percentage message handling wasn't up to date
Stoupy51 Oct 1, 2026
801ce27
fix: count_from_score item_modifier and bump version
edayot Oct 2, 2026
abf36db
woosh
edayot Oct 2, 2026
a52bbd1
f
edayot Oct 2, 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.2'
MC_VERSION: '26.3'
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.8.0"
version: "0.9.0"
description: Native Actionbar Library for Smithed

data_pack:
Expand Down
92 changes: 42 additions & 50 deletions ...ries/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/clicked_bed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,71 +3,63 @@
"unoccupied": {
"trigger": "minecraft:any_block_use",
"conditions": {
"player": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"range": {
"min": 1
}
"player": {
"type": "minecraft:inverted",
"term": {
"type": "minecraft:int_value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"test": {
"min": 1
}
}
],
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"dimension": "minecraft:overworld",
"block": {
"blocks": "#minecraft:beds",
"state": {
"occupied": "false"
}
},
"location": {
"type": "minecraft:location_check",
"predicate": {
"dimension": "minecraft:overworld",
"block": {
"blocks": "#minecraft:beds",
"state": {
"occupied": "false"
}
}
}
]
}
}
},
"occupied": {
"trigger": "minecraft:any_block_use",
"conditions": {
"player": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"range": {
"min": 1
}
"player": {
"type": "minecraft:inverted",
"term": {
"type": "minecraft:int_value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"test": {
"min": 1
}
}
],
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"dimension": "minecraft:overworld",
"block": {
"blocks": "#minecraft:beds",
"state": {
"occupied": "true"
}
},
"location": {
"type": "minecraft:location_check",
"predicate": {
"dimension": "minecraft:overworld",
"block": {
"blocks": "#minecraft:beds",
"state": {
"occupied": "true"
}
}
}
]
}
}
}
},
Expand Down
16 changes: 7 additions & 9 deletions ...ies/packs/actionbar/data/smithed.actionbar/advancement/impl/vanilla/bed/slept_in_bed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
"requirement": {
"trigger": "minecraft:slept_in_bed",
"conditions": {
"player": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"minecraft:location": {
"dimension": "minecraft:overworld"
}
"player": {
"type": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"minecraft:location": {
"dimension": "minecraft:overworld"
}
}
]
}
}
}
}
Expand Down
55 changes: 24 additions & 31 deletions ...bar/data/smithed.actionbar/advancement/impl/vanilla/container/clicked_lockable_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,41 @@
"click_no_sneak": {
"trigger": "minecraft:any_block_use",
"conditions": {
"player": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"range": {
"min": 1
}
"player": {
"type": "minecraft:inverted",
"term": {
"type": "minecraft:int_value_check",
"value": {
"type": "minecraft:score",
"target": "this",
"score": "smithed.actionbar.sneaking"
},
"test": {
"min": 1
}
}
],
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#smithed.actionbar:impl/lockable"
}
},
"location": {
"type": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#smithed.actionbar:impl/lockable"
}
}
]
}
}
},
"click_empty": {
"trigger": "minecraft:default_block_use",
"conditions": {
"player": [],
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#smithed.actionbar:impl/lockable"
}
"location": {
"type": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#smithed.actionbar:impl/lockable"
}
}
]
}
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...tionbar/data/smithed.actionbar/function/impl/vanilla/bed/show_sleep_percentage.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ scoreboard players operation $required_sleeping_players smithed.actionbar.temp /
execute if score $required_sleeping_players smithed.actionbar.temp matches ..0 run scoreboard players set $required_sleeping_players smithed.actionbar.temp 1

# send message
execute unless score $sleeping_players smithed.actionbar.temp = $required_sleeping_players smithed.actionbar.temp run data modify storage smithed.actionbar:input message set value {json:'{"translate":"sleep.players_sleeping","with":[{"score":{"name":"$sleeping_players","objective":"smithed.actionbar.temp"}},{"score":{"name":"$required_sleeping_players","objective":"smithed.actionbar.temp"}}]}',priority:'notification',freeze:20}
execute if score $sleeping_players smithed.actionbar.temp = $required_sleeping_players smithed.actionbar.temp run data modify storage smithed.actionbar:input message set value {json:'{"translate":"sleep.skipping_night"}',priority:'notification',freeze:20}
execute unless score $sleeping_players smithed.actionbar.temp = $required_sleeping_players smithed.actionbar.temp run data modify storage smithed.actionbar:input message set value {json:{"translate":"sleep.players_sleeping","with":[{"score":{"name":"$sleeping_players","objective":"smithed.actionbar.temp"}},{"score":{"name":"$required_sleeping_players","objective":"smithed.actionbar.temp"}}]},priority:'notification',freeze:20}
execute if score $sleeping_players smithed.actionbar.temp = $required_sleeping_players smithed.actionbar.temp run data modify storage smithed.actionbar:input message set value {json:{"translate":"sleep.skipping_night"},priority:'notification',freeze:20}
function #smithed.actionbar:message

# update player counts
Expand Down
95 changes: 49 additions & 46 deletions smithed_libraries/packs/actionbar/data/smithed.actionbar/predicate/impl/is_day.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
[
{
"condition": "minecraft:weather_check",
"thundering": false
},
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:weather_check",
"raining": true
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:time_check",
"clock": "minecraft:overworld",
"value": {
"min": 12542,
"max": 23459
},
"period": 24000
{
"type": "minecraft:all_of",
"terms": [
{
"type": "minecraft:weather_check",
"thundering": false
},
{
"type": "minecraft:any_of",
"terms": [
{
"type": "minecraft:weather_check",
"raining": true
},
{
"type": "minecraft:inverted",
"term": {
"type": "minecraft:time_check",
"clock": "minecraft:overworld",
"value": {
"min": 12542,
"max": 23459
},
"period": 24000
}
}
}
]
},
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:weather_check",
"raining": false
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:time_check",
"clock": "minecraft:overworld",
"value": {
"min": 12010,
"max": 23991
},
"period": 24000
]
},
{
"type": "minecraft:any_of",
"terms": [
{
"type": "minecraft:weather_check",
"raining": false
},
{
"type": "minecraft:inverted",
"term": {
"type": "minecraft:time_check",
"clock": "minecraft:overworld",
"value": {
"min": 12010,
"max": 23991
},
"period": 24000
}
}
}
]
}
]
]
}
]
}
8 changes: 3 additions & 5 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.11.0"
version: "0.12.0"
description: Native Library for Smithed
author: TheNuclearNexus
minecraft: "1.21"
Expand Down Expand Up @@ -34,9 +34,7 @@ pipeline:
# "impl/technical/tick", "impl/technical/slow_tick"
# ]}

output: dist

meta:
depends_on: # used for metadata
custom-block: "0.11.0"
minecraft_version: "26.2"
custom-block: "0.12.0"
minecraft_version: "26.3"
18 changes: 8 additions & 10 deletions smithed_libraries/packs/crafter/data/smithed.crafter/advancement/technical/enter_gui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@
"click_paleontology_table": {
"trigger": "minecraft:default_block_use",
"conditions": {
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": [
"minecraft:barrel"
]
}
"location": {
"type": "minecraft:location_check",
"predicate": {
"block": {
"blocks": [
"minecraft:barrel"
]
}
}
]
}
}
}
},
Expand Down
7 changes: 6 additions & 1 deletion smithed_libraries/packs/crafter/data/smithed.crafter/function/impl/recipes/shaped.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# @public

execute store result score @s smithed.data if entity @s[scores={smithed.data=0}] if data storage smithed.crafter:input recipe{0:[{Slot:0b,item_tag:["#minecraft:logs"]},{Slot:1b,item_tag:["#minecraft:logs"]},{Slot:2b,item_tag:["#minecraft:logs"]}],1:[{Slot:0b,item_tag:["#minecraft:logs"]},{Slot:1b,id:"minecraft:crafting_table"},{Slot:2b,item_tag:["#minecraft:logs"]}],2:[{Slot:0b,id:"minecraft:smooth_stone"},{Slot:1b,id:"minecraft:smooth_stone"},{Slot:2b,id:"minecraft:smooth_stone"}]} run loot replace block ~ ~ ~ container.16 loot smithed.crafter:blocks/table

execute store result score @s smithed.data if entity @s[scores={smithed.data=0}] if data storage smithed.crafter:input recipe{
0:[{Slot:0b,item_tag:["#minecraft:logs"]},{Slot:1b,item_tag:["#minecraft:logs"]},{Slot:2b,item_tag:["#minecraft:logs"]}],
1:[{Slot:0b,item_tag:["#minecraft:logs"]},{Slot:1b,id:"minecraft:crafting_table"},{Slot:2b,item_tag:["#minecraft:logs"]}],
2:[{Slot:0b,id:"minecraft:smooth_stone"},{Slot:1b,id:"minecraft:smooth_stone"},{Slot:2b,id:"minecraft:smooth_stone"}]
} run loot replace block ~ ~ ~ container.16 loot smithed.crafter:blocks/table
Loading
Loading