Skip to content

1.21.5 heart canisters update #1122

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
misode merged 4 commits into from
May 10, 2025
Merged

1.21.5 heart canisters update #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6df0bd
update heart canisters
TheThanathor May 10, 2025
cfd9e0f
improve heart canisters counting
TheThanathor May 10, 2025
4c83557
update heart canister tests
TheThanathor May 10, 2025
99bcadc
meaningless change to make tests run
TheThanathor May 10, 2025
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
13 changes: 3 additions & 10 deletions gm4_heart_canisters/data/gm4_heart_canisters/function/apply_health_boost.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@
# run from check_heart_canisters
attribute @s minecraft:max_health modifier remove minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72

attribute @s[scores={gm4_heart_can=1}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 4 add_value
attribute @s[scores={gm4_heart_can=2}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 8 add_value
attribute @s[scores={gm4_heart_can=3}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 12 add_value
attribute @s[scores={gm4_heart_can=4}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 16 add_value
attribute @s[scores={gm4_heart_can=5}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 20 add_value
attribute @s[scores={gm4_heart_can=6}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 24 add_value
attribute @s[scores={gm4_heart_can=7}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 28 add_value
attribute @s[scores={gm4_heart_can=8}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 32 add_value
attribute @s[scores={gm4_heart_can=9}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 36 add_value
attribute @s[scores={gm4_heart_can=10}] minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 40 add_value
execute store result storage gm4_heart_cannisters:temp amount int 4 run scoreboard players get @s gm4_heart_can
function gm4_heart_canisters:eval_health_boost with storage gm4_heart_cannisters:temp
data remove storage gm4_heart_cannisters:temp amount

tag @s[predicate=gm4_heart_canisters:has_health_boost] add gm4_hc_has_effect
effect give @s[tag=!gm4_hc_has_effect] health_boost 1
Expand Down
23 changes: 12 additions & 11 deletions gm4_heart_canisters/data/gm4_heart_canisters/function/check_heart_canisters.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# gets called for every player with at least 1 heart canister tier 1 item
# gets called for every player with at least 1 heart canister item

scoreboard players set @s[nbt={Inventory:[{count:1,components:{"minecraft:custom_data":{gm4_heart_canister_tier:1b}}}]}] gm4_heart_can 1
scoreboard players set @s[nbt={Inventory:[{count:2,components:{"minecraft:custom_data":{gm4_heart_canister_tier:1b}}}]}] gm4_heart_can 2
scoreboard players set @s[nbt={Inventory:[{count:3,components:{"minecraft:custom_data":{gm4_heart_canister_tier:1b}}}]}] gm4_heart_can 3
scoreboard players set @s[nbt={Inventory:[{count:4,components:{"minecraft:custom_data":{gm4_heart_canister_tier:1b}}}]}] gm4_heart_can 4
scoreboard players set @s[nbt={Inventory:[{count:5,components:{"minecraft:custom_data":{gm4_heart_canister_tier:1b}}}]}] gm4_heart_can 5
# tier 1
execute store result score @s gm4_heart_can if items entity @s container.* player_head[custom_data~{gm4_heart_canister_tier:1b}]
execute store result score $count_add gm4_heart_can if items entity @s weapon.offhand player_head[custom_data~{gm4_heart_canister_tier:1b}]
scoreboard players operation @s gm4_heart_can += $count_add gm4_heart_can
scoreboard players operation @s gm4_heart_can < $heart_cannister_cap gm4_heart_can

scoreboard players set @s[scores={gm4_heart_can=5..},nbt={Inventory:[{count:1,components:{"minecraft:custom_data":{gm4_heart_canister_tier:2b}}}]}] gm4_heart_can 6
scoreboard players set @s[scores={gm4_heart_can=5..},nbt={Inventory:[{count:2,components:{"minecraft:custom_data":{gm4_heart_canister_tier:2b}}}]}] gm4_heart_can 7
scoreboard players set @s[scores={gm4_heart_can=5..},nbt={Inventory:[{count:3,components:{"minecraft:custom_data":{gm4_heart_canister_tier:2b}}}]}] gm4_heart_can 8
scoreboard players set @s[scores={gm4_heart_can=5..},nbt={Inventory:[{count:4,components:{"minecraft:custom_data":{gm4_heart_canister_tier:2b}}}]}] gm4_heart_can 9
scoreboard players set @s[scores={gm4_heart_can=5..},nbt={Inventory:[{count:5,components:{"minecraft:custom_data":{gm4_heart_canister_tier:2b}}}]}] gm4_heart_can 10
# tier 2
execute store result score $count_tier2 gm4_heart_can if items entity @s container.* player_head[custom_data~{gm4_heart_canister_tier:2b}]
execute store result score $count_add gm4_heart_can if items entity @s weapon.offhand player_head[custom_data~{gm4_heart_canister_tier:2b}]
scoreboard players operation $count_tier2 gm4_heart_can += $count_add gm4_heart_can
scoreboard players operation $count_tier2 gm4_heart_can < $heart_cannister_cap gm4_heart_can
scoreboard players operation @s gm4_heart_can += $count_tier2 gm4_heart_can
3 changes: 3 additions & 0 deletions gm4_heart_canisters/data/gm4_heart_canisters/function/eval_health_boost.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# apply the health boost

$attribute @s minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 $(amount) add_value
2 changes: 2 additions & 0 deletions gm4_heart_canisters/data/gm4_heart_canisters/function/init.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ execute unless score heart_canisters gm4_modules matches 1 run data modify stora
execute unless score heart_canisters gm4_earliest_version < heart_canisters gm4_modules run scoreboard players operation heart_canisters gm4_earliest_version = heart_canisters gm4_modules
scoreboard players set heart_canisters gm4_modules 1

scoreboard players set $heart_cannister_cap gm4_heart_can 5

schedule function gm4_heart_canisters:main 1t

#$moduleUpdateList
2 changes: 1 addition & 1 deletion gm4_heart_canisters/data/gm4_heart_canisters/function/player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# check how many heart canisters the player has
scoreboard players operation $heart_can_last gm4_heart_can = @s gm4_heart_can
scoreboard players set @s gm4_heart_can 0
execute if predicate gm4_heart_canisters:carries_tier_1 run function gm4_heart_canisters:check_heart_canisters
execute if predicate gm4_heart_canisters:carries_heart_canister run function gm4_heart_canisters:check_heart_canisters

execute unless score @s gm4_heart_can = $heart_can_last gm4_heart_can run function gm4_heart_canisters:apply_health_boost
9 changes: 8 additions & 1 deletion gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_1_heart_canister.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,20 @@
"function": "minecraft:set_components",
"components": {
"minecraft:custom_model_data": "item/heart_canister_tier_1",
"minecraft:profile": "$heart_canister_tier_1"
"minecraft:profile": "$heart_canister_tier_1"
}
},
{
"function": "minecraft:set_custom_data",
"tag": "{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}"
},
{
"function": "set_components",
"components": {
"max_stack_size": 5,
"!equippable": {}
}
},
{
"function": "minecraft:set_name",
"name": {
Expand Down
7 changes: 7 additions & 0 deletions gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_2_heart_canister.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
"function": "minecraft:set_custom_data",
"tag": "{gm4_heart_canister:1b,gm4_heart_canister_tier:2b}"
},
{
"function": "set_components",
"components": {
"max_stack_size": 5,
"!equippable": {}
}
},
{
"function": "minecraft:set_name",
"name": {
Expand Down
10 changes: 5 additions & 5 deletions ...t_canisters/predicate/carries_tier_1.json → ...ers/predicate/carries_heart_canister.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"container.*": {
"items": "minecraft:player_head",
"predicates": {
"minecraft:custom_data": "{gm4_heart_canister_tier:1b}"
"minecraft:custom_data": "{gm4_heart_canister:1b}"
}
}
}
Expand All @@ -23,7 +23,7 @@
"armor.*": {
"items": "minecraft:player_head",
"predicates": {
"minecraft:custom_data": "{gm4_heart_canister_tier:1b}"
"minecraft:custom_data": "{gm4_heart_canister:1b}"
}
}
}
Expand All @@ -37,7 +37,7 @@
"player.cursor": {
"items": "minecraft:player_head",
"predicates": {
"minecraft:custom_data": "{gm4_heart_canister_tier:1b}"
"minecraft:custom_data": "{gm4_heart_canister:1b}"
}
}
}
Expand All @@ -51,7 +51,7 @@
"player.crafting.*": {
"items": "minecraft:player_head",
"predicates": {
"minecraft:custom_data": "{gm4_heart_canister_tier:1b}"
"minecraft:custom_data": "{gm4_heart_canister:1b}"
}
}
}
Expand All @@ -65,7 +65,7 @@
"weapon.*": {
"items": "minecraft:player_head",
"predicates": {
"minecraft:custom_data": "{gm4_heart_canister_tier:1b}"
"minecraft:custom_data": "{gm4_heart_canister:1b}"
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions gm4_heart_canisters/data/gm4_heart_canisters/recipe/heart_canister_tier_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"id": "minecraft:player_head",
"components": {
"minecraft:custom_model_data": "item/heart_canister_tier_1",
"minecraft:max_stack_size": 5,
"!minecraft:equippable": {},
"minecraft:profile": "$heart_canister_tier_1",
"minecraft:custom_data": "{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}",
"minecraft:custom_name": {"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false},
Expand Down
3 changes: 1 addition & 2 deletions gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ scoreboard objectives add gm4_test dummy
execute store result score $max_health gm4_test run attribute @s minecraft:max_health get
assert score $max_health gm4_test matches 24

loot give @s loot gm4_heart_canisters:items/tier_2_heart_canister
loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister

await delay 1s
Expand All @@ -21,4 +20,4 @@ loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister

await delay 1s
execute store result score $max_health gm4_test run attribute @s minecraft:max_health get
assert score $max_health gm4_test matches 20
assert score $max_health gm4_test matches 40
Loading