From e2d6888a68e139dd327b3a4831040d5b00509fa2 Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 25 Mar 2026 15:43:39 +0900 Subject: [PATCH 1/3] Rope Ladders `response:1b` -> `/swing` --- gm4_rope_ladders/beet.yaml | 3 +++ .../mechanics/ladder_placement/successful_place.mcfunction | 3 +++ .../right_click_detection/rcd_manager/create_rcd.mcfunction | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gm4_rope_ladders/beet.yaml b/gm4_rope_ladders/beet.yaml index 2fa1dd664a..b57be1ddd0 100644 --- a/gm4_rope_ladders/beet.yaml +++ b/gm4_rope_ladders/beet.yaml @@ -8,6 +8,9 @@ data_pack: pipeline: - gm4.plugins.extend.module +require: + - bolt + meta: gm4: versioning: diff --git a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction index 964ee5c515..6917329887 100644 --- a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction +++ b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction @@ -7,9 +7,12 @@ playsound minecraft:block.ladder.place ambient @a[distance=..15] ~ ~ ~ # remove 1 ladder from players hand +# TODO: remove raw and bolt require when mecha is updated execute store success score $mainhand gm4_rol_data if items entity @s weapon.mainhand ladder execute if score $mainhand gm4_rol_data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {"function": "minecraft:set_count","count": -1,"add": true} +raw execute if score $mainhand gm4_rol_data matches 1 run swing @s mainhand execute if score $mainhand gm4_rol_data matches 0 run item modify entity @s[gamemode=!creative] weapon.offhand {"function": "minecraft:set_count","count": -1,"add": true} +raw execute if score $mainhand gm4_rol_data matches 0 run swing @s offhand # grant advancement advancement grant @s only gm4:rope_ladders diff --git a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/create_rcd.mcfunction b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/create_rcd.mcfunction index af73280f97..273e88509f 100644 --- a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/create_rcd.mcfunction +++ b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/create_rcd.mcfunction @@ -4,7 +4,7 @@ # run from function: gm4_rope_ladders:mechanics/right_click_detection/detect_ladder_raycast/found # init -data merge entity @s {width:0.2f,height:1.05f,response:1b,Tags:["gm4_rol_rcd_ladder","smithed.entity","smithed.strict"]} +data merge entity @s {width:0.2f,height:1.05f,Tags:["gm4_rol_rcd_ladder","smithed.entity","smithed.strict"]} scoreboard players operation @s gm4_rol_id = $player gm4_rol_id # start loop From 446252fc15646df9e1e8071867fa8dec6a6e843e Mon Sep 17 00:00:00 2001 From: runcows Date: Wed, 25 Mar 2026 16:17:18 +0900 Subject: [PATCH 2/3] Lively Lily Pads `response:1b` -> `/swing` --- gm4_lively_lily_pads/beet.yaml | 5 ++++- .../mechanics/interactions/candle/interact_rcd.mcfunction | 7 +++++++ .../candle/used_mainhand_fire_charge.mcfunction | 2 ++ .../candle/used_mainhand_flint_and_steel.mcfunction | 2 ++ .../candle/used_offhand_fire_charge.mcfunction | 2 ++ .../candle/used_offhand_flint_and_steel.mcfunction | 2 ++ .../mechanics/interactions/placement/candles.mcfunction | 2 +- .../interactions/placement/copper_lantern.mcfunction | 2 +- .../interactions/placement/interact_rcd.mcfunction | 3 +++ .../interactions/placement/waxed_copper_lantern.mcfunction | 2 +- .../unwaxed_copper_lantern/interact_rcd.mcfunction | 6 ++++++ .../waxed_copper_lantern/interact_rcd.mcfunction | 3 +++ .../mechanics/right_click_detection/create.mcfunction | 2 +- .../function/upgrade_paths/3.3.mcfunction | 6 ++++++ 14 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/upgrade_paths/3.3.mcfunction diff --git a/gm4_lively_lily_pads/beet.yaml b/gm4_lively_lily_pads/beet.yaml index b5db60accf..a0fd9a363a 100644 --- a/gm4_lively_lily_pads/beet.yaml +++ b/gm4_lively_lily_pads/beet.yaml @@ -1,6 +1,6 @@ id: gm4_lively_lily_pads name: Lively Lily Pads -version: 3.2.X +version: 3.3.X data_pack: load: . @@ -8,6 +8,9 @@ data_pack: pipeline: - gm4.plugins.extend.module +require: + - bolt + meta: gm4: versioning: diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction index af1f26bfcd..678f50798e 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction @@ -11,6 +11,7 @@ scoreboard players set $offhand gm4_llp.data 0 scoreboard players set $holding_lighter gm4_llp.data 0 scoreboard players set $holding_candle gm4_llp.data 0 scoreboard players set $ignited gm4_llp.data 0 +scoreboard players set $extinguished gm4_llp.data 0 # item information execute if items entity @s weapon.mainhand #gm4_lively_lily_pads:candle_interactable run function gm4_lively_lily_pads:mechanics/interactions/candle/get_mainhand_data @@ -20,9 +21,15 @@ execute unless score $mainhand gm4_llp.data matches 1 if items entity @s weapon. execute as @e[type=interaction,tag=gm4_llp_candle_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/candle/process_interaction # player effects +# TODO: remove raw and bolt require when mecha is updated +raw execute if score $extinguished gm4_llp.data matches 1 run swing @s mainhand + execute if score $ignited gm4_llp.data matches 1 run function gm4_lively_lily_pads:mechanics/interactions/candle/find_igniter + execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand # reset scoreboard players reset $placement_success gm4_llp.data diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction index b5775170ce..0573377db6 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction @@ -3,6 +3,8 @@ # at @s # run from mechanics/interactions/candle/find_igniter +# TODO: remove raw and bolt require when mecha is updated +raw swing @s mainhand # sound playsound minecraft:item.firecharge.use player @a[distance=..16] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction index 224ce35f06..25a339f482 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction @@ -3,6 +3,8 @@ # at @s # run from mechanics/interactions/candle/find_igniter +# TODO: remove raw and bolt require when mecha is updated +raw swing @s mainhand # sound playsound minecraft:item.flintandsteel.use player @a[distance=..16] ~ ~ ~ diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction index ed13e0f03a..9a6cd859bb 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction @@ -3,6 +3,8 @@ # at @s # run from mechanics/interactions/candle/find_igniter +# TODO: remove raw and bolt require when mecha is updated +raw swing @s offhand # sound playsound minecraft:item.firecharge.use player @a[distance=..16] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction index 4f9346caf4..57e973c4c3 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction @@ -3,6 +3,8 @@ # at @s # run from mechanics/interactions/candle/find_igniter +# TODO: remove raw and bolt require when mecha is updated +raw swing @s offhand # sound playsound minecraft:item.flintandsteel.use player @a[distance=..16] ~ ~ ~ diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/candles.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/candles.mcfunction index 17dea5ba05..ed134163f1 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/candles.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/candles.mcfunction @@ -19,7 +19,7 @@ $summon minecraft:block_display ~ ~ ~ {\ right_rotation:[0f,0f,0f,1f]\ }\ } -summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,response:1b,Tags:["gm4_llp_candle_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} +summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,Tags:["gm4_llp_candle_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} # sound playsound minecraft:block.candle.place block @a[distance=..16] ~ ~ ~ diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/copper_lantern.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/copper_lantern.mcfunction index 24c35344dc..195d7a7395 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/copper_lantern.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/copper_lantern.mcfunction @@ -16,7 +16,7 @@ $summon minecraft:block_display ~ ~ ~ {\ right_rotation:[0f,0f,0f,1f]\ }\ } -summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,response:1b,Tags:["gm4_llp_unwaxed_copper_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} +summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,Tags:["gm4_llp_unwaxed_copper_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} # light block setblock ~ ~1 ~ light[level=14] keep diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction index 32cf55fa4b..f4ea3d8f3b 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction @@ -20,8 +20,11 @@ execute unless score $mainhand gm4_llp.data matches 1 if predicate gm4_lively_li execute as @e[type=interaction,tag=gm4_llp_placement_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/placement/process_interaction # remove item if successful +# TODO: remove raw and bolt require when mecha is updated execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand # reset scoreboard players reset $placement_success gm4_llp.data diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/waxed_copper_lantern.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/waxed_copper_lantern.mcfunction index 252f592042..90ab0910be 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/waxed_copper_lantern.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/waxed_copper_lantern.mcfunction @@ -16,7 +16,7 @@ $summon minecraft:block_display ~ ~ ~ {\ right_rotation:[0f,0f,0f,1f]\ }\ } -summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,response:1b,Tags:["gm4_llp_waxed_copper_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} +summon minecraft:interaction ~ ~ ~ {width:0.4f,height:0.4f,Tags:["gm4_llp_waxed_copper_rcd","gm4_llp_perma_rcd","smithed.entity","smithed.strict"]} # light block setblock ~ ~1 ~ light[level=14] keep diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction index 5512604df4..86eaf92201 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction @@ -21,7 +21,13 @@ execute if items entity @s weapon.offhand honeycomb run scoreboard players set $ execute as @e[type=interaction,tag=gm4_llp_unwaxed_copper_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/unwaxed_copper_lantern/process_interaction # item usage +# TODO: remove raw and bolt require when mecha is updated execute if score $wax_used gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $wax_used gm4_llp.data matches 1 run swing @s mainhand execute if score $wax_used gm4_llp.data matches 2 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} +raw execute if score $wax_used gm4_llp.data matches 2 run swing @s offhand + execute if score $axe_used gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_mainhand_axe +raw execute if score $axe_used gm4_llp.data matches 1 run swing @s mainhand execute if score $axe_used gm4_llp.data matches 2 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_offhand_axe +raw execute if score $axe_used gm4_llp.data matches 2 run swing @s offhand diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction index 9d287252fe..ea31305a25 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction @@ -22,5 +22,8 @@ execute as @e[type=interaction,tag=gm4_llp_waxed_copper_rcd,distance=..8] if dat execute if score $scraped gm4_llp.data matches 0 run return fail # update axe durability +# TODO: remove raw and bolt require when mecha is updated execute if score $mainhand gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_mainhand_axe +raw execute if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $offhand gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_offhand_axe +raw execute if score $offhand gm4_llp.data matches 1 run swing @s offhand diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/right_click_detection/create.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/right_click_detection/create.mcfunction index 9e54f0bf14..1684e5306c 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/right_click_detection/create.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/right_click_detection/create.mcfunction @@ -3,5 +3,5 @@ # at @s # run from mechanics/right_click_detection/found -data merge entity @s {width:0.4f,height:0.3f,response:1b,Tags:["gm4_llp_placement_rcd","smithed.entity","smithed.strict"]} +data merge entity @s {width:0.4f,height:0.3f,Tags:["gm4_llp_placement_rcd","smithed.entity","smithed.strict"]} scoreboard players operation @s gm4_llp.id = $player gm4_llp.id diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/upgrade_paths/3.3.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/upgrade_paths/3.3.mcfunction new file mode 100644 index 0000000000..5ae072f9b2 --- /dev/null +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/upgrade_paths/3.3.mcfunction @@ -0,0 +1,6 @@ +# remove `response:1b` from gm4_llp_perma_rcd interactions +# @s = player +# at @s +# run via upgrade paths util + +execute as @e[type=interaction,tag=gm4_llp_perma_rcd,nbt={response:1b}] run data modify entity @s response set value 0b From bb8bf13364f572ded68d8b57416636d376b4d3f8 Mon Sep 17 00:00:00 2001 From: runcows Date: Sat, 28 Mar 2026 18:28:57 +0900 Subject: [PATCH 3/3] remove `raw ` and bolt --- gm4_lively_lily_pads/beet.yaml | 3 --- .../interactions/candle/interact_rcd.mcfunction | 7 +++---- .../candle/used_mainhand_fire_charge.mcfunction | 3 +-- .../candle/used_mainhand_flint_and_steel.mcfunction | 3 +-- .../candle/used_offhand_fire_charge.mcfunction | 3 +-- .../candle/used_offhand_flint_and_steel.mcfunction | 3 +-- .../interactions/placement/interact_rcd.mcfunction | 5 ++--- .../unwaxed_copper_lantern/interact_rcd.mcfunction | 9 ++++----- .../waxed_copper_lantern/interact_rcd.mcfunction | 5 ++--- gm4_rope_ladders/beet.yaml | 3 --- .../ladder_placement/successful_place.mcfunction | 5 ++--- 11 files changed, 17 insertions(+), 32 deletions(-) diff --git a/gm4_lively_lily_pads/beet.yaml b/gm4_lively_lily_pads/beet.yaml index a0fd9a363a..d1fbfe9600 100644 --- a/gm4_lively_lily_pads/beet.yaml +++ b/gm4_lively_lily_pads/beet.yaml @@ -8,9 +8,6 @@ data_pack: pipeline: - gm4.plugins.extend.module -require: - - bolt - meta: gm4: versioning: diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction index 678f50798e..6aa59fda3e 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/interact_rcd.mcfunction @@ -21,15 +21,14 @@ execute unless score $mainhand gm4_llp.data matches 1 if items entity @s weapon. execute as @e[type=interaction,tag=gm4_llp_candle_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/candle/process_interaction # player effects -# TODO: remove raw and bolt require when mecha is updated -raw execute if score $extinguished gm4_llp.data matches 1 run swing @s mainhand +execute if score $extinguished gm4_llp.data matches 1 run swing @s mainhand execute if score $ignited gm4_llp.data matches 1 run function gm4_lively_lily_pads:mechanics/interactions/candle/find_igniter execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand +execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand +execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand # reset scoreboard players reset $placement_success gm4_llp.data diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction index 0573377db6..af4ac9b144 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_fire_charge.mcfunction @@ -3,8 +3,7 @@ # at @s # run from mechanics/interactions/candle/find_igniter -# TODO: remove raw and bolt require when mecha is updated -raw swing @s mainhand +swing @s mainhand # sound playsound minecraft:item.firecharge.use player @a[distance=..16] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction index 25a339f482..80a86b0314 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_mainhand_flint_and_steel.mcfunction @@ -3,8 +3,7 @@ # at @s # run from mechanics/interactions/candle/find_igniter -# TODO: remove raw and bolt require when mecha is updated -raw swing @s mainhand +swing @s mainhand # sound playsound minecraft:item.flintandsteel.use player @a[distance=..16] ~ ~ ~ diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction index 9a6cd859bb..a5415bcec6 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_fire_charge.mcfunction @@ -3,8 +3,7 @@ # at @s # run from mechanics/interactions/candle/find_igniter -# TODO: remove raw and bolt require when mecha is updated -raw swing @s offhand +swing @s offhand # sound playsound minecraft:item.firecharge.use player @a[distance=..16] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction index 57e973c4c3..b0b31757dd 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/candle/used_offhand_flint_and_steel.mcfunction @@ -3,8 +3,7 @@ # at @s # run from mechanics/interactions/candle/find_igniter -# TODO: remove raw and bolt require when mecha is updated -raw swing @s offhand +swing @s offhand # sound playsound minecraft:item.flintandsteel.use player @a[distance=..16] ~ ~ ~ diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction index f4ea3d8f3b..26037f7fd8 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/interact_rcd.mcfunction @@ -20,11 +20,10 @@ execute unless score $mainhand gm4_llp.data matches 1 if predicate gm4_lively_li execute as @e[type=interaction,tag=gm4_llp_placement_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/placement/process_interaction # remove item if successful -# TODO: remove raw and bolt require when mecha is updated execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand +execute if score $placement_success gm4_llp.data matches 1 if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand +execute if score $placement_success gm4_llp.data matches 1 if score $offhand gm4_llp.data matches 1 run swing @s offhand # reset scoreboard players reset $placement_success gm4_llp.data diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction index 86eaf92201..3a7f3bfd3d 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/unwaxed_copper_lantern/interact_rcd.mcfunction @@ -21,13 +21,12 @@ execute if items entity @s weapon.offhand honeycomb run scoreboard players set $ execute as @e[type=interaction,tag=gm4_llp_unwaxed_copper_rcd,distance=..8] if data entity @s interaction at @s run function gm4_lively_lily_pads:mechanics/interactions/unwaxed_copper_lantern/process_interaction # item usage -# TODO: remove raw and bolt require when mecha is updated execute if score $wax_used gm4_llp.data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $wax_used gm4_llp.data matches 1 run swing @s mainhand +execute if score $wax_used gm4_llp.data matches 1 run swing @s mainhand execute if score $wax_used gm4_llp.data matches 2 run item modify entity @s[gamemode=!creative] weapon.offhand {function:"minecraft:set_count",count:-1,add:1b} -raw execute if score $wax_used gm4_llp.data matches 2 run swing @s offhand +execute if score $wax_used gm4_llp.data matches 2 run swing @s offhand execute if score $axe_used gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_mainhand_axe -raw execute if score $axe_used gm4_llp.data matches 1 run swing @s mainhand +execute if score $axe_used gm4_llp.data matches 1 run swing @s mainhand execute if score $axe_used gm4_llp.data matches 2 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_offhand_axe -raw execute if score $axe_used gm4_llp.data matches 2 run swing @s offhand +execute if score $axe_used gm4_llp.data matches 2 run swing @s offhand diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction index ea31305a25..27d71f9e0a 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/interact_rcd.mcfunction @@ -22,8 +22,7 @@ execute as @e[type=interaction,tag=gm4_llp_waxed_copper_rcd,distance=..8] if dat execute if score $scraped gm4_llp.data matches 0 run return fail # update axe durability -# TODO: remove raw and bolt require when mecha is updated execute if score $mainhand gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_mainhand_axe -raw execute if score $mainhand gm4_llp.data matches 1 run swing @s mainhand +execute if score $mainhand gm4_llp.data matches 1 run swing @s mainhand execute if score $offhand gm4_llp.data matches 1 if entity @s[gamemode=!creative] run function gm4_lively_lily_pads:mechanics/interactions/waxed_copper_lantern/used_offhand_axe -raw execute if score $offhand gm4_llp.data matches 1 run swing @s offhand +execute if score $offhand gm4_llp.data matches 1 run swing @s offhand diff --git a/gm4_rope_ladders/beet.yaml b/gm4_rope_ladders/beet.yaml index b57be1ddd0..2fa1dd664a 100644 --- a/gm4_rope_ladders/beet.yaml +++ b/gm4_rope_ladders/beet.yaml @@ -8,9 +8,6 @@ data_pack: pipeline: - gm4.plugins.extend.module -require: - - bolt - meta: gm4: versioning: diff --git a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction index 6917329887..3e5e8766f7 100644 --- a/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction +++ b/gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/successful_place.mcfunction @@ -7,12 +7,11 @@ playsound minecraft:block.ladder.place ambient @a[distance=..15] ~ ~ ~ # remove 1 ladder from players hand -# TODO: remove raw and bolt require when mecha is updated execute store success score $mainhand gm4_rol_data if items entity @s weapon.mainhand ladder execute if score $mainhand gm4_rol_data matches 1 run item modify entity @s[gamemode=!creative] weapon.mainhand {"function": "minecraft:set_count","count": -1,"add": true} -raw execute if score $mainhand gm4_rol_data matches 1 run swing @s mainhand +execute if score $mainhand gm4_rol_data matches 1 run swing @s mainhand execute if score $mainhand gm4_rol_data matches 0 run item modify entity @s[gamemode=!creative] weapon.offhand {"function": "minecraft:set_count","count": -1,"add": true} -raw execute if score $mainhand gm4_rol_data matches 0 run swing @s offhand +execute if score $mainhand gm4_rol_data matches 0 run swing @s offhand # grant advancement advancement grant @s only gm4:rope_ladders