diff --git a/build/skyvoid_additions_v1_5_2-MC_1_21_11.zip b/build/skyvoid_additions_v1_5_2-MC_1_21_11.zip new file mode 100644 index 00000000..7b6e29c9 Binary files /dev/null and b/build/skyvoid_additions_v1_5_2-MC_1_21_11.zip differ diff --git a/src/packs/extras/skyvoid_additions/beet.yaml b/src/packs/extras/skyvoid_additions/beet.yaml index 19ff6ade..8dd7c079 100644 --- 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: 'BPR' -version: 1.5.1 +version: 1.5.2 require: - bolt diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/clock.mcfunction b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/clock.mcfunction index 4f2c96cf..570d8291 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/clock.mcfunction +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/clock.mcfunction @@ -1,4 +1,7 @@ schedule function skyvoid_additions:mechanics/calcite_from_dead_coral/clock 10s - -execute as @e[type=marker,tag=skyvoid_additions_calcite_creation] at @s run function skyvoid_additions:mechanics/calcite_from_dead_coral/detect_coral_from_marker -execute as @e[type=marker,tag=skyvoid_additions_dead_coral_block] at @s run function skyvoid_additions:mechanics/calcite_from_dead_coral/check_surroundings +# kill if block no longer exists +execute as @e[type=marker, tag=skyvoid_additions_calcite_creation, tag=skyvoid_additions_lava] at @s unless block ~ ~ ~ lava run kill @s +execute as @e[type=marker, tag=skyvoid_additions_calcite_creation, tag=skyvoid_additions_dispenser] at @s unless block ~ ~ ~ dispenser run kill @s +# limit of 64 lava marker that can run at a time +execute as @e[type=marker, tag=skyvoid_additions_calcite_creation, limit=64, sort=random] at @s run function skyvoid_additions:mechanics/calcite_from_dead_coral/detect_coral_from_marker +execute as @e[type=marker, tag=skyvoid_additions_dead_coral_block] at @s run function skyvoid_additions:mechanics/calcite_from_dead_coral/check_surroundings diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/detect_coral_from_marker.mcfunction b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/detect_coral_from_marker.mcfunction index 656e3983..54a35e9b 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/detect_coral_from_marker.mcfunction +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/calcite_from_dead_coral/detect_coral_from_marker.mcfunction @@ -16,7 +16,3 @@ execute if entity @s[tag=skyvoid_additions_dispenser] positioned ^ ^ ^1 if block execute if entity @s[tag=skyvoid_additions_dispenser] positioned ^ ^ ^1 if block ~-1 ~ ~ #skyvoid_additions:calcite_from_dead_coral_blocks/converts_to_calcite positioned ~-1 ~ ~ unless entity @e[tag=skyvoid_additions_dead_coral_block,distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_dead_coral_block"',Tags:["skyvoid_additions_dead_coral_block"]} execute if entity @s[tag=skyvoid_additions_dispenser] positioned ^ ^ ^1 if block ~ ~ ~1 #skyvoid_additions:calcite_from_dead_coral_blocks/converts_to_calcite positioned ~ ~ ~1 unless entity @e[tag=skyvoid_additions_dead_coral_block,distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_dead_coral_block"',Tags:["skyvoid_additions_dead_coral_block"]} execute if entity @s[tag=skyvoid_additions_dispenser] positioned ^ ^ ^1 if block ~ ~ ~-1 #skyvoid_additions:calcite_from_dead_coral_blocks/converts_to_calcite positioned ~ ~ ~-1 unless entity @e[tag=skyvoid_additions_dead_coral_block,distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_dead_coral_block"',Tags:["skyvoid_additions_dead_coral_block"]} - -# kill if block no longer exists -execute if entity @s[tag=skyvoid_additions_lava] unless block ~ ~ ~ lava run kill @s -execute if entity @s[tag=skyvoid_additions_dispenser] unless block ~ ~ ~ dispenser run kill @s diff --git a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/tuff_from_magma/summon_marker.mcfunction b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/tuff_from_magma/summon_marker.mcfunction index 4cf93540..c2b22806 100644 --- a/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/tuff_from_magma/summon_marker.mcfunction +++ b/src/packs/extras/skyvoid_additions/data/skyvoid_additions/function/mechanics/tuff_from_magma/summon_marker.mcfunction @@ -3,8 +3,8 @@ # located at @s # run from skyvoid_additions:mechanics/tuff_from_magma/clock #Summon the marker -execute as @e[type=breeze_wind_charge] at @s unless entity @e[name="skyvoid_additions_wind_marker",distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_wind_marker"',Tags:["skyvoid_additions_wind_marker"]} -execute as @e[type=wind_charge] at @s unless entity @e[name="skyvoid_additions_wind_marker",distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_wind_marker"',Tags:["skyvoid_additions_wind_marker"]} +execute as @e[type=breeze_wind_charge] at @s unless entity @e[tag=skyvoid_additions_wind_marker,distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_wind_marker"',Tags:["skyvoid_additions_wind_marker"]} +execute as @e[type=wind_charge] at @s unless entity @e[tag=skyvoid_additions_wind_marker,distance=..0.5,limit=1] run summon marker ~ ~ ~ {CustomName:'"skyvoid_additions_wind_marker"',Tags:["skyvoid_additions_wind_marker"]} #tp the marker to the nearest entity that could have lauched it, to get the entity facing direction execute as @e[type=wind_charge] at @s if entity @e[type=player,distance=..2,limit=1] run execute as @n[type=player,limit=1] at @s unless entity @e[tag=skyvoid_additions_wind_marker_rotated,distance=..0.5,limit=1] run tp @n[type=marker,tag=skyvoid_additions_wind_marker,tag=!skyvoid_additions_wind_marker_rotated] ~ ~ ~ ~ ~