Fix coal blocks to diamond conversion and purpur conversion to shulke…

…r to be the same regardless of the source of the lightning
BPR02 · Nov 14, 2024 · ade96f2 · ade96f2
1 parent ec3e6ec
commit ade96f2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build/skyvoid_additions_v1_2_4-MC_1_21.zip b/build/skyvoid_additions_v1_2_4-MC_1_21.zip
diff --git a/src/packs/extras/skyvoid_additions/beet.yaml b/src/packs/extras/skyvoid_additions/beet.yaml
@@ -1,7 +1,7 @@
 id: 'skyvoid_additions'
 name: 'Sky Void Additions'
 author: 'BluePsychoRanger'
-version: 1.2.3
+version: 1.2.4
 
 require:
   - bolt

diff --git a/...oid_additions/function/mechanics/diamonds_from_coal_blocks/check_falling_block.mcfunction b/...oid_additions/function/mechanics/diamonds_from_coal_blocks/check_falling_block.mcfunction
@@ -10,4 +10,4 @@ execute unless entity @s[tag=skyvoid_additions_falling_anvil] if data entity @s
 tag @s[tag=!skyvoid_additions_falling_anvil] add skyvoid_additions_anvil_check
 
 # convert coal blocks to diamonds
-execute at @s[tag=skyvoid_additions_falling_anvil] positioned ~ ~-1 ~ as @e[type=item,nbt={Item:{id:"minecraft:coal_block",count:64b},OnGround:1b},nbt=!{Item:{components:{"minecraft:custom_data":{smithed:{ignore:{functionality:1b}}}}}},distance=..0.5] run data merge entity @s {Item:{id:"minecraft:diamond",count:1b}}
+execute at @s[tag=skyvoid_additions_falling_anvil] positioned ~ ~-1 ~ as @e[type=item,nbt={Item:{id:"minecraft:coal_block",count:64},OnGround:1b},nbt=!{Item:{components:{"minecraft:custom_data":{smithed:{ignore:{functionality:1b}}}}}},distance=..0.5] run data merge entity @s {Item:{id:"minecraft:diamond",count:1}}
diff --git a/.../data/skyvoid_additions/function/mechanics/lightning_conversion/convert_purpur.mcfunction b/.../data/skyvoid_additions/function/mechanics/lightning_conversion/convert_purpur.mcfunction
@@ -4,4 +4,4 @@
 # run from skyvoid_additions:mechanics/lightning_conversion/strike
 
 setblock ~ ~ ~ air
-summon shulker ~ ~-.49 ~ {active_effects:[{id:"minecraft:resistance",duration:30,amplifier:4b,show_particles:0b}],Color:16}
+summon shulker ~ ~-.5 ~ {active_effects:[{id:"minecraft:resistance",duration:30,amplifier:4b,show_particles:0b}],Color:16}
diff --git a/...dditions/data/skyvoid_additions/function/mechanics/lightning_conversion/strike.mcfunction b/...dditions/data/skyvoid_additions/function/mechanics/lightning_conversion/strike.mcfunction
@@ -3,9 +3,9 @@
 # located at @s
 # run from skyvoid_additions:mechanics/lightning_conversion/find_bolt
 
-execute if score elder_guardians_from_lightning skyvoid_config matches 1 align xyz positioned ~-3 ~-2 ~-3 as @e[type=guardian,tag=!smithed.entity,dx=6,dy=11,dz=6] at @s run function skyvoid_additions:mechanics/lightning_conversion/convert_guardian
+execute if score elder_guardians_from_lightning skyvoid_config matches 1 align xyz positioned ~-3 ~-2 ~-3 as @e[type=guardian, tag=!smithed.entity, dx=6, dy=11, dz=6] at @s run function skyvoid_additions:mechanics/lightning_conversion/convert_guardian
 
-execute if score shulkers_from_lightning skyvoid_config matches 1 align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ purpur_block unless entity @e[tag=smithed.block,distance=..0.5] run function skyvoid_additions:mechanics/lightning_conversion/convert_purpur
-execute if score shulkers_from_lightning skyvoid_config matches 1 align xyz positioned ~0.5 ~-0.5 ~0.5 if block ~ ~ ~ purpur_block unless entity @e[tag=smithed.block,distance=..0.5] run function skyvoid_additions:mechanics/lightning_conversion/convert_purpur
+execute if score shulkers_from_lightning skyvoid_config matches 1 align xyz positioned ~0.5 ~0.5 ~0.5 if block ~ ~ ~ lightning_rod unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~-1 ~0.5 if block ~ ~ ~ purpur_block unless entity @e[tag=smithed.block, distance=..0.5] run function skyvoid_additions:mechanics/lightning_conversion/convert_purpur
+execute if score shulkers_from_lightning skyvoid_config matches 1 align xyz positioned ~0.5 ~-0.5 ~0.5 if block ~ ~ ~ lightning_rod unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~-1 ~0.5 if block ~ ~ ~ purpur_block unless entity @e[tag=smithed.block, distance=..0.5] run function skyvoid_additions:mechanics/lightning_conversion/convert_purpur
 
-execute if score silverfish_from_lightning skyvoid_config matches 1 align xyz positioned ~-2 ~-4 ~-2 run function skyvoid_additions:mechanics/lightning_conversion/convert_stone
+execute if score silverfish_from_lightning skyvoid_config matches 1 align xyz positioned ~-2 ~-4 ~-2 run function skyvoid_additions:mechanics/lightning_conversion/convert_stone