From a0dec37f20c4651025206b8eae444fdec2ad3fae Mon Sep 17 00:00:00 2001 From: Thanathor Date: Sat, 10 May 2025 11:36:09 +0200 Subject: [PATCH] fix soul glass removing beacon data --- .../gm4_soul_glass/function/destroy.mcfunction | 8 -------- .../function/machine/destroy.mcfunction | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 gm4_soul_glass/data/gm4_soul_glass/function/destroy.mcfunction diff --git a/gm4_soul_glass/data/gm4_soul_glass/function/destroy.mcfunction b/gm4_soul_glass/data/gm4_soul_glass/function/destroy.mcfunction deleted file mode 100644 index 907716becd..0000000000 --- a/gm4_soul_glass/data/gm4_soul_glass/function/destroy.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#@s = soul glass AEC -#run from process - -setblock ~ ~ ~ air -summon item ~ ~ ~ {Motion:[0.0,0.2,0.0],PickupDelay:10s,Item:{id:"minecraft:brown_stained_glass",count:1,components:{"minecraft:custom_model_data":"item/soul_glass","minecraft:custom_data":{gm4_soul_glass:1b},"minecraft:enchantment_glint_override":true,"minecraft:custom_name":{"translate":"item.gm4.soul_glass","fallback":"Soul Glass","italic":false}}}} -playsound minecraft:block.fire.extinguish block @a[distance=..10] ~ ~ ~ .4 - -kill @s diff --git a/gm4_soul_glass/data/gm4_soul_glass/function/machine/destroy.mcfunction b/gm4_soul_glass/data/gm4_soul_glass/function/machine/destroy.mcfunction index 8905dd47e8..864ba7a135 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/function/machine/destroy.mcfunction +++ b/gm4_soul_glass/data/gm4_soul_glass/function/machine/destroy.mcfunction @@ -3,6 +3,20 @@ # located at @s # run from gm4_smelteries:machine/verify_destroy +# restore beacon effect +execute if score @s gm4_sg_primary matches 1 run data modify block ~ ~-1 ~ primary_effect set value "minecraft:speed" +execute if score @s gm4_sg_primary matches 3 run data modify block ~ ~-1 ~ primary_effect set value "minecraft:haste" +execute if score @s gm4_sg_primary matches 5 run data modify block ~ ~-1 ~ primary_effect set value "minecraft:strength" +execute if score @s gm4_sg_primary matches 8 run data modify block ~ ~-1 ~ primary_effect set value "minecraft:jump_boost" +execute if score @s gm4_sg_primary matches 11 run data modify block ~ ~-1 ~ primary_effect set value "minecraft:resistance" + +execute if score @s gm4_sg_secondary matches 1 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:speed" +execute if score @s gm4_sg_secondary matches 3 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:haste" +execute if score @s gm4_sg_secondary matches 5 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:strength" +execute if score @s gm4_sg_secondary matches 8 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:jump_boost" +execute if score @s gm4_sg_secondary matches 10 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:regeneration" +execute if score @s gm4_sg_secondary matches 11 run data modify block ~ ~-1 ~ secondary_effect set value "minecraft:resistance" + # kill entities related to machine block execute store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:brown_stained_glass",count:1}},nbt=!{Item:{components:{}}},limit=1,sort=nearest] kill @s