From 99ed4f9dbcafd819650c92f4b90e86c0a6334c87 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 17:55:55 +0300 Subject: [PATCH 01/14] Update clicked_bed.json clicked_bed.json 26.2 porting and restrictive fix --- .../impl/vanilla/bed/clicked_bed.json | 138 +++++++++--------- 1 file changed, 67 insertions(+), 71 deletions(-) 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..0a602652 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": [ { @@ -17,6 +17,42 @@ "min": 1 } } + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.major" + }, + "score": "load.status" + }, + "range": 0 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.minor" + }, + "score": "load.status" + }, + "range": 7 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.patch" + }, + "score": "load.status" + }, + "range": 0 } ], "location": [ @@ -25,7 +61,7 @@ "predicate": { "dimension": "minecraft:overworld", "block": { - "tag": "minecraft:beds", + "blocks": "#minecraft:beds", "state": { "occupied": "false" } @@ -36,7 +72,7 @@ } }, "occupied": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:any_block_use", "conditions": { "player": [ { @@ -52,89 +88,51 @@ "min": 1 } } - } - ], - "location": [ - { - "condition": "minecraft:location_check", - "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" + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.major" + }, + "score": "load.status" }, - "range": { - "min": 1 - } - } - ], - "item": { - "items": [ - "minecraft:air" - ] - }, - "location": [ + "range": 0 + }, { - "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": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.minor" + }, + "score": "load.status" + }, + "range": 7 + }, { "condition": "minecraft:value_check", "value": { "type": "minecraft:score", - "target": "this", - "score": "smithed.actionbar.sneaking" + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.patch" + }, + "score": "load.status" }, - "range": { - "min": 1 - } + "range": 0 } ], - "item": { - "items": [ - "minecraft:air" - ] - }, "location": [ { "condition": "minecraft:location_check", "predicate": { "dimension": "minecraft:overworld", "block": { - "tag": "minecraft:beds", + "blocks": "#minecraft:beds", "state": { "occupied": "true" } @@ -148,12 +146,10 @@ "requirements": [ [ "unoccupied", - "occupied", - "unoccupied_empty", - "occupied_empty" + "occupied" ] ], "rewards": { - "function": "smithed.actionbar:impl/vanilla/bed/clicked_bed" + "function": "smithed.actionbar:v0.7.0/vanilla/bed/clicked_bed" } } From 74c89e1d393ab4728d3ab54a857ec8108d039ad6 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 17:56:37 +0300 Subject: [PATCH 02/14] Update slept_in_bed.json slept_in_bed.json 26.2 port and restrictive fix --- .../impl/vanilla/bed/slept_in_bed.json | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) 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..1e54dec9 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,12 +3,51 @@ "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" + } } + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.major" + }, + "score": "load.status" + }, + "range": 0 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.minor" + }, + "score": "load.status" + }, + "range": 7 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.patch" + }, + "score": "load.status" + }, + "range": 0 } ] } From 51eb818307b0fa2191293841781ab1049ff93a25 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:09:25 +0300 Subject: [PATCH 03/14] Update clicked_lockable_block.json clicked_lockable_block 26.2 port and restrictive fx --- .../container/clicked_lockable_block.json | 94 +++++++++++++++---- 1 file changed, 78 insertions(+), 16 deletions(-) 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..3810f16b 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": [ { @@ -17,6 +17,42 @@ "min": 1 } } + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.major" + }, + "score": "load.status" + }, + "range": 0 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.minor" + }, + "score": "load.status" + }, + "range": 7 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.patch" + }, + "score": "load.status" + }, + "range": 0 } ], "location": [ @@ -24,29 +60,61 @@ "condition": "minecraft:location_check", "predicate": { "block": { - "tag": "smithed.actionbar:impl/lockable" + "blocks": "#smithed.actionbar:v0.7.0/lockable" } } } ] } }, + "click_empty": { - "trigger": "minecraft:item_used_on_block", + "trigger": "minecraft:default_block_use", "conditions": { "player": [ + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.major" + }, + "score": "load.status" + }, + "range": 0 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.minor" + }, + "score": "load.status" + }, + "range": 7 + }, + { + "condition": "minecraft:value_check", + "value": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "#smithed.actionbar.patch" + }, + "score": "load.status" + }, + "range": 0 + } ], - "item": { - "items": [ - "minecraft:air" - ] - }, "location": [ { "condition": "minecraft:location_check", "predicate": { "block": { - "tag": "smithed.actionbar:impl/lockable" + "blocks": "#smithed.actionbar:v0.7.0/lockable" } } } @@ -54,13 +122,7 @@ } } }, - "requirements": [ - [ - "click_no_sneak", - "click_empty" - ] - ], "rewards": { - "function": "smithed.actionbar:impl/vanilla/container/clicked_lockable_block" + "function": "smithed.actionbar:v0.7.0/vanilla/container/clicked_lockable_block" } } From 8d2d27e5b78605a245f2f97f7ab8350e917166ac Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:32:46 +0300 Subject: [PATCH 04/14] Update check_lock.mcfunction check_lock.mcfunction 26.2 port and capitaization fix --- .../function/impl/vanilla/container/check_lock.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6f54602427138d1039e0b09a767348725a293fef Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:33:54 +0300 Subject: [PATCH 05/14] Update east.mcfunction east.mcfunction 26.2 port and capitalization fix --- .../vanilla/container/check_double_chest_lock/east.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 {} From 4bdfaae5bd68cb596d8a6dee6f699f227df073c8 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:34:44 +0300 Subject: [PATCH 06/14] Update north.mcfunction north.mcfunction 26.2 port and capitalization fix --- .../container/check_double_chest_lock/north.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ~ ~ {} From d71419b208fafbac5e16148fb184a70695da3c65 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:35:08 +0300 Subject: [PATCH 07/14] Update south.mcfunction south.mcfunction 26.2 port and capitalization fix --- .../container/check_double_chest_lock/south.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ~ ~ {} From 43d702ee9a3381723fe96fa767b13e144e3e6960 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:35:34 +0300 Subject: [PATCH 08/14] Update west.mcfunction west.mcfunction 26.2 port and capitalization fix --- .../vanilla/container/check_double_chest_lock/west.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 {} From 2d205911476751359154fe4554e46abe01e6e119 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sat, 15 Aug 2026 18:37:16 +0300 Subject: [PATCH 09/14] Update clicked_bed.mcfunction clicked_bed.mcfunction removed occupied_empty check due to optimizations in clicked_bed.json advancement file. --- .../function/impl/vanilla/bed/clicked_bed.mcfunction | 1 - 1 file changed, 1 deletion(-) 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 From ebc1b38455ca0576534614cb23ab7052b4b89306 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sun, 16 Aug 2026 09:47:28 +0300 Subject: [PATCH 10/14] Update clicked_bed.json --- .../impl/vanilla/bed/clicked_bed.json | 74 +------------------ 1 file changed, 1 insertion(+), 73 deletions(-) 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 0a602652..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 @@ -17,42 +17,6 @@ "min": 1 } } - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.major" - }, - "score": "load.status" - }, - "range": 0 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.minor" - }, - "score": "load.status" - }, - "range": 7 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.patch" - }, - "score": "load.status" - }, - "range": 0 } ], "location": [ @@ -88,42 +52,6 @@ "min": 1 } } - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.major" - }, - "score": "load.status" - }, - "range": 0 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.minor" - }, - "score": "load.status" - }, - "range": 7 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.patch" - }, - "score": "load.status" - }, - "range": 0 } ], "location": [ @@ -150,6 +78,6 @@ ] ], "rewards": { - "function": "smithed.actionbar:v0.7.0/vanilla/bed/clicked_bed" + "function": "smithed.actionbar:impl/vanilla/bed/clicked_bed" } } From d4711b8a4b36d1d2b34ad9e528ccbbe409f2b07c Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sun, 16 Aug 2026 09:49:51 +0300 Subject: [PATCH 11/14] Update slept_in_bed.json --- .../impl/vanilla/bed/slept_in_bed.json | 36 ------------------- 1 file changed, 36 deletions(-) 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 1e54dec9..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 @@ -12,42 +12,6 @@ "dimension": "minecraft:overworld" } } - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.major" - }, - "score": "load.status" - }, - "range": 0 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.minor" - }, - "score": "load.status" - }, - "range": 7 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.patch" - }, - "score": "load.status" - }, - "range": 0 } ] } From a77d5db960ceb0ce63290b21a20845d5dea1eca5 Mon Sep 17 00:00:00 2001 From: bigyasso730 Date: Sun, 16 Aug 2026 09:56:10 +0300 Subject: [PATCH 12/14] Update clicked_lockable_block.json --- .../container/clicked_lockable_block.json | 82 +------------------ 1 file changed, 4 insertions(+), 78 deletions(-) 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 3810f16b..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 @@ -17,42 +17,6 @@ "min": 1 } } - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.major" - }, - "score": "load.status" - }, - "range": 0 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.minor" - }, - "score": "load.status" - }, - "range": 7 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.patch" - }, - "score": "load.status" - }, - "range": 0 } ], "location": [ @@ -60,61 +24,23 @@ "condition": "minecraft:location_check", "predicate": { "block": { - "blocks": "#smithed.actionbar:v0.7.0/lockable" + "blocks": "#smithed.actionbar:impl/lockable" } } } ] } }, - "click_empty": { "trigger": "minecraft:default_block_use", "conditions": { - "player": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.major" - }, - "score": "load.status" - }, - "range": 0 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.minor" - }, - "score": "load.status" - }, - "range": 7 - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "#smithed.actionbar.patch" - }, - "score": "load.status" - }, - "range": 0 - } - ], + "player": [], "location": [ { "condition": "minecraft:location_check", "predicate": { "block": { - "blocks": "#smithed.actionbar:v0.7.0/lockable" + "blocks": "#smithed.actionbar:impl/lockable" } } } @@ -123,6 +49,6 @@ } }, "rewards": { - "function": "smithed.actionbar:v0.7.0/vanilla/container/clicked_lockable_block" + "function": "smithed.actionbar:impl/vanilla/container/clicked_lockable_block" } } From 2a00d89f0a928b2e5e9d954d93d4b7e48d53b8cc Mon Sep 17 00:00:00 2001 From: edayot Date: Sun, 16 Aug 2026 19:58:43 +0200 Subject: [PATCH 13/14] fix: raw message should not have quotes nor colors --- .../data/smithed.actionbar/function/impl/display.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 638a567f669d6c075bd3a4cfa88f041dcfad59d6 Mon Sep 17 00:00:00 2001 From: edayot Date: Sun, 16 Aug 2026 20:04:49 +0200 Subject: [PATCH 14/14] chore: bumping libs and minecraft version --- .github/workflows/release.yml | 2 +- smithed_libraries/packs/actionbar/beet.yaml | 2 +- smithed_libraries/packs/crafter/beet.yaml | 6 +++--- smithed_libraries/packs/custom-block/beet.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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/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: