Skip to content

Commit e2fc8cf

Browse files
authored
Merge pull request #50 from Tschipcraft/dev
v1.11.3
2 parents 7720b3d + 7d8948c commit e2fc8cf

File tree

16 files changed

+38
-24
lines changed

16 files changed

+38
-24
lines changed

.spyglassrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"env": {
3-
"gameVersion": "1.21.10",
3+
"gameVersion": "1.21.11",
44
"exclude": []
55
}
66
}

CHANGES.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
- **Added support for Minecraft 1.21.10** 🧩
2-
- Fixed dig up animation particles no longer appearing in Minecraft 1.20.6 and below
1+
- **Added support for Minecraft 1.21.11** 🐎
2+
- Updated to work with the new gamerule names
3+
- Removed broken hide feedback code for 1.21+
4+
- Bumped pack format and protocol version

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
##by Tschipcraft
22

33
# Preserve gamerule
4-
execute store result score $gamerule.tile_drops ts.sa.settings run gamerule doTileDrops
5-
execute if score $gamerule.tile_drops ts.sa.settings matches 1 run gamerule doTileDrops false
4+
function spawnanimations:internal/animation/dig_up/sound/tile_drops/disable
65

76
# Preserve bedrock/air
87
scoreboard players set $block ts.sa.settings 0
@@ -47,4 +46,4 @@ execute if score $play_unsupport ts.sa.settings matches 1..2 if score $block ts.
4746
execute unless score $block ts.sa.settings matches 0 run kill @e[type=minecraft:item,nbt={Age:0s},distance=..2]
4847

4948
# Preserve gamerule
50-
execute if score $gamerule.tile_drops ts.sa.settings matches 1 run gamerule doTileDrops true
49+
function spawnanimations:internal/animation/dig_up/sound/tile_drops/enable
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
##by Tschipcraft
2+
# Temporarily disables tile drops to execute block break without drops
3+
4+
execute store result score $gamerule.tile_drops ts.sa.settings run gamerule block_drops
5+
execute if score $gamerule.tile_drops ts.sa.settings matches 1 run gamerule block_drops false
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
##by Tschipcraft
2+
# Re-enables tile drops if previously disabled
3+
4+
execute if score $gamerule.tile_drops ts.sa.settings matches 1 run gamerule block_drops true

data/spawnanimations/function/internal/version_checker/start.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##by Tschipcraft
22

33
execute store result score $version ts.sa.settings run data get entity @r DataVersion
4-
execute unless score $global tvc_ignore matches 1 if score $version ts.sa.settings matches 4600.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.10 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here","text":"Click here"}},{"text":")","color":"gold"}]
4+
execute unless score $global tvc_ignore matches 1 if score $version ts.sa.settings matches 4700.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.11 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here","text":"Click here"}},{"text":")","color":"gold"}]
55
# Note: 1.17x-1.20x uses the old folder names (function -> functions)
66

77
# Announce escape sequence handling changes

data/spawnanimations/function/settings/core.mcfunction

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,4 @@ execute if score $play_sounds ts.sa.settings matches 1..2 if score $play_unsuppo
4343
execute if score $play_sounds ts.sa.settings matches 1..2 if score $play_unsupport ts.sa.settings matches 2 run tellraw @s [{"text":"Play Animation on Unsupported Blocks [>✔<] | [❌]","bold":false,"color":"gray","hover_event":{"action":"show_text","value":"This setting is getting controlled globally and can't be changed here."}}]
4444
execute if score $play_sounds ts.sa.settings matches -1..0 run tellraw @s [{"text":"Play Animation on Unsupported Blocks [✔] | [>❌<]","bold":false,"color":"gray","hover_event":{"action":"show_text","value":[{"text":"Enable [Play Animation Sounds] first."}]}}]
4545

46-
function spawnanimations:settings/hide_feedback/main
4746
playsound minecraft:block.dispenser.dispense master @s ~ ~ ~ 0.2 2

data/spawnanimations/function/settings/hide_feedback/hide.mcfunction

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/spawnanimations/function/settings/hide_feedback/main.mcfunction

Lines changed: 0 additions & 5 deletions
This file was deleted.

data/spawnanimations/function/settings/hide_feedback/unhide.mcfunction

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)