Skip to content

Commit 0f88182

Browse files
committed
Use poisonous potato for zauber crystals
1 parent 8e90f05 commit 0f88182

File tree

20 files changed

+19
-222
lines changed

20 files changed

+19
-222
lines changed

gm4_zauber_cauldrons/assets/model_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ model_data:
88
- item: potion
99
reference: item/wormhole_in_a_bottle
1010
template: generated_overlay
11-
- item: [player_head, firework_star]
11+
- item: player_head
1212
template: generated
1313
broadcast:
1414
- reference: item/crystal/instant_damage

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/crystal/moved_into_offhand.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/crystal/moved_out_of_offhand.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/deactivate.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# @s = player with crystal in off-hand
1+
# @s = player
22
# at world spawn
33
# run from player/submain
44

5-
# play activation sound
5+
# play deactivation sound
66
playsound minecraft:block.beacon.deactivate player @a[distance=..8] ~ ~ ~ 0.3 1.7
77
playsound minecraft:block.amethyst_cluster.hit player @a[distance=..8] ~ ~ ~ 0.3 0.8
88

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/read_effect.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# run from player/crystal/process
33

44
# move to storage
5-
data modify storage gm4_zauber_cauldrons:temp/player/equipment/offhand gm4_zauber_cauldrons set from entity @s Inventory[{Slot:-106b}].components."minecraft:custom_data".gm4_zauber_cauldrons
5+
data modify storage gm4_zauber_cauldrons:temp/player/equipment/offhand gm4_zauber_cauldrons set from entity @s equipment.offhand.components."minecraft:custom_data".gm4_zauber_cauldrons
66

77
execute if data storage gm4_zauber_cauldrons:temp/player/equipment/offhand {gm4_zauber_cauldrons:{type:"instant_damage"}} run effect give @s instant_damage 1 1
88
execute if data storage gm4_zauber_cauldrons:temp/player/equipment/offhand {gm4_zauber_cauldrons:{type:"instant_health"}} run function gm4_zauber_cauldrons:player/crystal/effect/instant_health

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/swap/replace_offhand.mcfunction

Lines changed: 0 additions & 18 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/swap/restore_player_head.mcfunction

Lines changed: 0 additions & 35 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/swap/restore_player_head/hotbar.mcfunction

Lines changed: 0 additions & 14 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/swap/restore_player_head/inv_1.mcfunction

Lines changed: 0 additions & 14 deletions
This file was deleted.

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/player/crystal/swap/restore_player_head/inv_2.mcfunction

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)