Skip to content

Commit 4a86604

Browse files
committed
Add snow block support and update block tags
- Added native support for snow blocks when playing the dig up animation - Removed native support for container blocks and moved them to the exclude tag - Expanded and reorganized block tag lists to include c convention tags for improved mod compatibility - Updated CD workflow to remove the CurseForge Forge version upload step for now
1 parent 6682c72 commit 4a86604

File tree

17 files changed

+80
-114
lines changed

17 files changed

+80
-114
lines changed

.github/workflows/cd.yml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -331,35 +331,7 @@ jobs:
331331
files: |
332332
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
333333
334-
- name: Upload Forge mod version to CurseForge # Same reason as above
335-
id: upload_forge_curseforge_mod
336-
uses: Kir-Antipov/mc-publish@v3.3
337-
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
338-
with:
339-
curseforge-id: 1223719
340-
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
341-
game-versions: |
342-
>=1.17 <=1.21.5
343-
game-version-filter: any
344-
fail-mode: skip
345-
346-
name: "Release v${{ github.event.inputs.tag }}"
347-
version: ${{ github.event.inputs.tag }}+mod
348-
changelog-file: CHANGES.md
349-
350-
dependencies: |
351-
catalogue(optional){curseforge:459701}
352-
midnightlib(optional){curseforge:488090}
353-
pehkui(optional){curseforge:319596}
354-
java: |
355-
Java 21
356-
Java 17
357-
loaders: |
358-
forge
359-
files: |
360-
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
361-
362-
- name: Upload mod version to CurseForge
334+
- name: Upload mod version to CurseForge # Duplicate uploads sadly don't work on CurseForge
363335
id: upload_curseforge_mod
364336
uses: Kir-Antipov/mc-publish@v3.3
365337
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
- **Added support for Minecraft 1.21.9** 🥉
2+
- Updated to work with the new pack.mcmeta syntax
23
- Raised entity processing limits to resolve mob farm complications (Thanks @Fyoncle)
34
- Fixed Vanilla activation mode behaving the same way as Classic for activation distances below 25 (closes [#46](https://github.com/Tschipcraft/spawnanimations/issues/46))
5+
- Added native support for snow blocks when playing the dig up animation
6+
- Removed native support for some container blocks
7+
- Expanded and reorganized tag lists to include convention tags for improved mod compatibility

data/spawnanimations/function/internal/animation/dig_up/particles/particles.mcfunction

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ execute if block ~ ~ ~ minecraft:cobblestone run particle block{block_state:"min
2020
execute if block ~ ~ ~ minecraft:hay_block run particle block{block_state:"minecraft:hay_block"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2121
execute if block ~ ~ ~ minecraft:gravel run particle block{block_state:"minecraft:gravel"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2222
execute if block ~ ~0.3 ~ minecraft:snow run particle block{block_state:"minecraft:snow"} ~ ~0.4 ~ 0.1 0 0.1 1 9 normal
23+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run particle block{block_state:"minecraft:snow_block"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2324
execute if block ~ ~ ~ #minecraft:ice run particle block{block_state:"minecraft:ice"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2425
execute if block ~ ~ ~ minecraft:obsidian run particle block{block_state:"minecraft:obsidian"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2526
execute if block ~ ~ ~ minecraft:slime_block run particle block{block_state:"minecraft:slime_block"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2627

2728
# End
2829
execute if block ~ ~ ~ minecraft:end_stone run particle block{block_state:"minecraft:end_stone"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
29-
# Chorus
3030

3131
# Nether
3232
execute if block ~ ~ ~ #minecraft:base_stone_nether run particle block{block_state:"minecraft:netherrack"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
@@ -35,13 +35,6 @@ execute if block ~ ~ ~ minecraft:nether_bricks run particle block{block_state:"m
3535
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run particle block{block_state:"minecraft:soul_sand"} ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
3636
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run particle minecraft:soul ~ ~0.2 ~ 0.1 0.1 0.1 0.01 1 normal
3737

38-
# Containers
39-
execute if block ~ ~ ~ minecraft:chest run particle block{block_state:"minecraft:chest"} ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
40-
execute if block ~ ~ ~ minecraft:trapped_chest run particle block{block_state:"minecraft:trapped_chest"} ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
41-
execute if block ~ ~ ~ minecraft:ender_chest run particle block{block_state:"minecraft:ender_chest"} ~ ~0.2 ~ 0.1 0 0.1 1 1 normal
42-
execute if block ~ ~ ~ minecraft:hopper run particle block{block_state:"minecraft:hopper"} ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
43-
execute if block ~ ~ ~ minecraft:beacon run particle block{block_state:"minecraft:glass"} ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
44-
4538
# Extra mob-specific particles
4639
execute positioned ~ ~ ~ if entity @s[type=#spawnanimations:particles/nether_mob] run particle lava ~ ~0.4 ~ 0.1 0 0.1 0.01 1 normal
4740
execute positioned ~ ~ ~ if entity @s[type=#spawnanimations:particles/end_mob] run particle dragon_breath ~ ~0.2 ~ 0.1 0 0.1 0.01 5 normal

data/spawnanimations/function/internal/animation/dig_up/sound/play_sound.mcfunction

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ execute if block ~ ~ ~ minecraft:cobblestone run playsound minecraft:block.stone
1717
# Other
1818
execute if block ~ ~ ~ minecraft:hay_block run playsound minecraft:block.grass.break hostile @a ~ ~ ~ 0.85 0.6
1919
execute if block ~ ~ ~ #minecraft:wool run playsound minecraft:block.wool.break hostile @a ~ ~ ~ 0.85 0.6
20-
execute if block ~ ~0.2 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.6
20+
execute if block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.6
21+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.5
2122
execute if block ~ ~ ~ #minecraft:ice run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.7
2223
execute if block ~ ~ ~ minecraft:obsidian run playsound minecraft:block.stone.break hostile @a ~ ~ ~ 0.85 0.4
2324
execute if block ~ ~ ~ minecraft:slime_block run playsound minecraft:block.slime_block.break hostile @a ~ ~ ~ 0.85 0.4
@@ -31,12 +32,4 @@ execute if block ~ ~ ~ #minecraft:nylium run playsound minecraft:block.wart_bloc
3132
execute if block ~ ~ ~ minecraft:nether_bricks run playsound minecraft:block.nether_bricks.break hostile @a ~ ~ ~ 0.85 0.6
3233
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run playsound minecraft:block.soul_sand.break hostile @a ~ ~ ~ 0.85 0.6
3334

34-
# Containers
35-
execute if block ~ ~ ~ minecraft:chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.6
36-
execute if block ~ ~ ~ minecraft:trapped_chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.6
37-
execute if block ~ ~ ~ minecraft:ender_chest run playsound minecraft:block.ender_chest.open hostile @a ~ ~ ~ 0.85 0.4
38-
execute if block ~ ~ ~ minecraft:hopper run playsound minecraft:block.metal.break hostile @a ~ ~ ~ 0.85 0.6
39-
execute if block ~ ~ ~ minecraft:beacon run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.4
40-
41-
4235
execute if block ~ ~ ~ minecraft:lava run playsound minecraft:block.lava.pop hostile @a ~ ~ ~ 0.85 0.6

data/spawnanimations/function/internal/animation/dig_up/sound/play_sound2.mcfunction

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ execute if block ~ ~ ~ minecraft:cobblestone run playsound minecraft:block.stone
1717
# Other
1818
execute if block ~ ~ ~ minecraft:hay_block run playsound minecraft:block.grass.break hostile @a ~ ~ ~ 0.85 0.9
1919
execute if block ~ ~ ~ #minecraft:wool run playsound minecraft:block.wool.break hostile @a ~ ~ ~ 0.85 0.9
20-
execute if block ~ ~ ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.9
20+
execute if block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.9
21+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.8
2122
execute if block ~ ~ ~ #minecraft:ice run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.9
2223
execute if block ~ ~ ~ minecraft:obsidian run playsound minecraft:block.stone.break hostile @a ~ ~ ~ 0.85 0.6
2324
execute if block ~ ~ ~ minecraft:slime_block run playsound minecraft:block.slime_block.break hostile @a ~ ~ ~ 0.85 0.6
@@ -31,12 +32,4 @@ execute if block ~ ~ ~ minecraft:nether_bricks run playsound minecraft:block.net
3132
execute if block ~ ~ ~ #minecraft:nylium run playsound minecraft:block.wart_block.break hostile @a ~ ~ ~ 0.85 0.9
3233
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run playsound minecraft:block.soul_sand.break hostile @a ~ ~ ~ 0.85 0.9
3334

34-
# Containers
35-
execute if block ~ ~ ~ minecraft:chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.9
36-
execute if block ~ ~ ~ minecraft:trapped_chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.9
37-
execute if block ~ ~ ~ minecraft:ender_chest run playsound minecraft:block.ender_chest.open hostile @a ~ ~ ~ 0.85 0.6
38-
execute if block ~ ~ ~ minecraft:hopper run playsound minecraft:block.metal.break hostile @a ~ ~ ~ 0.85 0.9
39-
execute if block ~ ~ ~ minecraft:beacon run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.6
40-
41-
4235
execute if block ~ ~ ~ minecraft:lava run playsound minecraft:block.lava.pop hostile @a ~ ~ ~ 0.85 0.9

data/spawnanimations/function/internal/animation/dig_up/start.mcfunction

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ execute as @s[tag=ts.sa.verify] if entity @e[type=!#spawnanimations:exclude,dist
2828

2929
# Prevent animation on unsupported blocks if disabled
3030
execute as @s[tag=ts.sa.verify] if score $play_unsupport ts.sa.settings matches -1..0 unless block ~ ~-0.5 ~ #spawnanimations:supported run function spawnanimations:internal/animation/dig_up/verify_in_air
31+
execute as @s[tag=ts.sa.verify] if score $play_unsupport ts.sa.settings matches 1..2 if block ~ ~-0.5 ~ #spawnanimations:exclude run function spawnanimations:internal/animation/dig_up/verify_in_air

data/spawnanimations/functions/internal/animation/dig_up/particles/particles.mcfunction

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ execute if block ~ ~ ~ minecraft:cobblestone run particle minecraft:block minecr
2020
execute if block ~ ~ ~ minecraft:hay_block run particle minecraft:block minecraft:hay_block ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2121
execute if block ~ ~ ~ minecraft:gravel run particle minecraft:block minecraft:gravel ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2222
execute if block ~ ~0.3 ~ minecraft:snow run particle minecraft:block minecraft:snow ~ ~0.4 ~ 0.1 0 0.1 1 9 normal
23+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run particle minecraft:block minecraft:snow_block ~0.2 ~ 0.1 0 0.1 1 9 normal
2324
execute if block ~ ~ ~ #minecraft:ice run particle minecraft:block minecraft:ice ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2425
execute if block ~ ~ ~ minecraft:obsidian run particle minecraft:block minecraft:obsidian ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2526
execute if block ~ ~ ~ minecraft:slime_block run particle minecraft:block minecraft:slime_block ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
2627

2728
# End
2829
execute if block ~ ~ ~ minecraft:end_stone run particle minecraft:block minecraft:end_stone ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
29-
# Chorus
3030

3131
# Nether
3232
execute if block ~ ~ ~ #minecraft:base_stone_nether run particle minecraft:block minecraft:netherrack ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
@@ -35,13 +35,6 @@ execute if block ~ ~ ~ minecraft:nether_bricks run particle minecraft:block mine
3535
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run particle minecraft:block minecraft:soul_sand ~ ~0.2 ~ 0.1 0 0.1 1 9 normal
3636
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run particle minecraft:soul ~ ~0.2 ~ 0.1 0.1 0.1 0.01 1 normal
3737

38-
# Containers
39-
execute if block ~ ~ ~ minecraft:chest run particle minecraft:block minecraft:chest ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
40-
execute if block ~ ~ ~ minecraft:trapped_chest run particle minecraft:block minecraft:trapped_chest ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
41-
execute if block ~ ~ ~ minecraft:ender_chest run particle minecraft:block minecraft:ender_chest ~ ~0.2 ~ 0.1 0 0.1 1 1 normal
42-
execute if block ~ ~ ~ minecraft:hopper run particle minecraft:block minecraft:hopper ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
43-
execute if block ~ ~ ~ minecraft:beacon run particle minecraft:block minecraft:glass ~ ~0.2 ~ 0.1 0 0.1 1 3 normal
44-
4538
# Extra mob-specific particles
4639
execute positioned ~ ~ ~ if entity @s[type=#spawnanimations:particles/nether_mob] run particle lava ~ ~0.4 ~ 0.1 0 0.1 0.01 1 normal
4740
execute positioned ~ ~ ~ if entity @s[type=#spawnanimations:particles/end_mob] run particle dragon_breath ~ ~0.2 ~ 0.1 0 0.1 0.01 5 normal

data/spawnanimations/functions/internal/animation/dig_up/sound/play_sound.mcfunction

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ execute if block ~ ~ ~ minecraft:cobblestone run playsound minecraft:block.stone
1717
# Other
1818
execute if block ~ ~ ~ minecraft:hay_block run playsound minecraft:block.grass.break hostile @a ~ ~ ~ 0.85 0.6
1919
execute if block ~ ~ ~ #minecraft:wool run playsound minecraft:block.wool.break hostile @a ~ ~ ~ 0.85 0.6
20-
execute if block ~ ~0.2 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.6
20+
execute if block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.6
21+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.5
2122
execute if block ~ ~ ~ #minecraft:ice run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.7
2223
execute if block ~ ~ ~ minecraft:obsidian run playsound minecraft:block.stone.break hostile @a ~ ~ ~ 0.85 0.4
2324
execute if block ~ ~ ~ minecraft:slime_block run playsound minecraft:block.slime_block.break hostile @a ~ ~ ~ 0.85 0.4
@@ -31,12 +32,4 @@ execute if block ~ ~ ~ #minecraft:nylium run playsound minecraft:block.wart_bloc
3132
execute if block ~ ~ ~ minecraft:nether_bricks run playsound minecraft:block.nether_bricks.break hostile @a ~ ~ ~ 0.85 0.6
3233
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run playsound minecraft:block.soul_sand.break hostile @a ~ ~ ~ 0.85 0.6
3334

34-
# Containers
35-
execute if block ~ ~ ~ minecraft:chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.6
36-
execute if block ~ ~ ~ minecraft:trapped_chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.6
37-
execute if block ~ ~ ~ minecraft:ender_chest run playsound minecraft:block.ender_chest.open hostile @a ~ ~ ~ 0.85 0.4
38-
execute if block ~ ~ ~ minecraft:hopper run playsound minecraft:block.metal.break hostile @a ~ ~ ~ 0.85 0.6
39-
execute if block ~ ~ ~ minecraft:beacon run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.4
40-
41-
4235
execute if block ~ ~ ~ minecraft:lava run playsound minecraft:block.lava.pop hostile @a ~ ~ ~ 0.85 0.6

data/spawnanimations/functions/internal/animation/dig_up/sound/play_sound2.mcfunction

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ execute if block ~ ~ ~ minecraft:cobblestone run playsound minecraft:block.stone
1717
# Other
1818
execute if block ~ ~ ~ minecraft:hay_block run playsound minecraft:block.grass.break hostile @a ~ ~ ~ 0.85 0.9
1919
execute if block ~ ~ ~ #minecraft:wool run playsound minecraft:block.wool.break hostile @a ~ ~ ~ 0.85 0.9
20-
execute if block ~ ~ ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.9
20+
execute if block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.9
21+
execute if block ~ ~ ~ minecraft:snow_block unless block ~ ~0.3 ~ minecraft:snow run playsound minecraft:block.snow.break hostile @a ~ ~ ~ 0.85 0.8
2122
execute if block ~ ~ ~ #minecraft:ice run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.9
2223
execute if block ~ ~ ~ minecraft:obsidian run playsound minecraft:block.stone.break hostile @a ~ ~ ~ 0.85 0.6
2324
execute if block ~ ~ ~ minecraft:slime_block run playsound minecraft:block.slime_block.break hostile @a ~ ~ ~ 0.85 0.6
@@ -31,12 +32,4 @@ execute if block ~ ~ ~ minecraft:nether_bricks run playsound minecraft:block.net
3132
execute if block ~ ~ ~ #minecraft:nylium run playsound minecraft:block.wart_block.break hostile @a ~ ~ ~ 0.85 0.9
3233
execute if block ~ ~ ~ #minecraft:soul_fire_base_blocks run playsound minecraft:block.soul_sand.break hostile @a ~ ~ ~ 0.85 0.9
3334

34-
# Containers
35-
execute if block ~ ~ ~ minecraft:chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.9
36-
execute if block ~ ~ ~ minecraft:trapped_chest run playsound minecraft:block.wood.break hostile @a ~ ~ ~ 0.85 0.9
37-
execute if block ~ ~ ~ minecraft:ender_chest run playsound minecraft:block.ender_chest.open hostile @a ~ ~ ~ 0.85 0.6
38-
execute if block ~ ~ ~ minecraft:hopper run playsound minecraft:block.metal.break hostile @a ~ ~ ~ 0.85 0.9
39-
execute if block ~ ~ ~ minecraft:beacon run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.85 0.6
40-
41-
4235
execute if block ~ ~ ~ minecraft:lava run playsound minecraft:block.lava.pop hostile @a ~ ~ ~ 0.85 0.9

data/spawnanimations/functions/internal/animation/dig_up/start.mcfunction

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ execute as @s[tag=ts.sa.verify] if entity @e[type=!#spawnanimations:exclude,dist
2828

2929
# Prevent animation on unsupported blocks if disabled
3030
execute as @s[tag=ts.sa.verify] if score $play_unsupport ts.sa.settings matches -1..0 unless block ~ ~-0.5 ~ #spawnanimations:supported run function spawnanimations:internal/animation/dig_up/verify_in_air
31+
execute as @s[tag=ts.sa.verify] if score $play_unsupport ts.sa.settings matches 1..2 if block ~ ~-0.5 ~ #spawnanimations:exclude run function spawnanimations:internal/animation/dig_up/verify_in_air

0 commit comments

Comments
 (0)