Fix coal blocks to diamond conversion and purpur conversion to shulker (

#29)

* Fix coal blocks to diamond conversion and purpur conversion to shulker to be the same regardless of the source of the lightning

* minor adjustments

- delete skyvoid additions v1.2.3
- keep newline at end of strike.mcfunction

* Add conversion of the correct block for sideway lightning rod

---------

Co-authored-by: aymeric2001 <[email protected]>
Co-authored-by: BluePsychoRanger <[email protected]>

src/packs/extras/skyvoid_additions/beet.yaml

@@ -1,7 +1,7 @@
 id: 'skyvoid_additions'
 name: 'Sky Void Additions'
 author: 'BPR'
-version: 1.2.3
+version: 1.2.4
 
 require:
   - bolt

src/packs/extras/skyvoid_additions/data/skyvoid_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}}

src/packs/extras/skyvoid_additions/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}

src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/lightning_conversion/strike.mcfunction

@@ -3,9 +3,21 @@
 # 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[facing=up] 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[facing=up] 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[facing=north] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~0.5 ~1 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[facing=north] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~0.5 ~1 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[facing=south] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~0.5 ~-1 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[facing=south] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~0.5 ~0.5 ~-1 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[facing=east] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~-1 ~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[facing=east] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~-1 ~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[facing=west] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~1 ~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[facing=west] unless entity @e[tag=smithed.block, distance=..0.5] run execute align xyz positioned ~1 ~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 silverfish_from_lightning skyvoid_config matches 1 align xyz positioned ~-2 ~-4 ~-2 run function skyvoid_additions:mechanics/lightning_conversion/convert_stone