v3.2 for Minecraft 1.21

Author: Nixinova

data/mb/funcs/init.mcf

@@ -1,18 +1,21 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #       World setup commands      #
 #                                 #
 #---------------------------------#
 
+_const version = "3.2"
+
 tellraw @a "If the map has not been set up properly, please run the command again."
 
 # Teleport players
 setworldspawn 968 5 1018
 spawnpoint @a 968 5 1018
 tp @a 968 5 1018
+clear @a
 
 # Teams
 team add lobby
@@ -24,16 +27,22 @@ team add dead
 team modify dead color red
 team modify playing friendlyFire false
 
+team join lobby @a
+
 # Scoreboards
 scoreboard objectives add Timer dummy "Timer"
 scoreboard objectives add Dead deathCount "Dead"
 scoreboard objectives add Health health "Health"
-scoreboard objectives add MB dummy {"text":"§1M§3U§5S§7I§9C§bA§dL §2B§4L§6O§8C§aK§cS§r"}
+scoreboard objectives add MB dummy "MB"
 scoreboard objectives add Map dummy "Map"
 scoreboard objectives add Wins dummy "§aWins"
 scoreboard objectives add Players dummy "Players"
 scoreboard objectives add Colour dummy "Colour"
 
+scoreboard players reset @a
+scoreboard objectives setdisplay sidebar Wins
+scoreboard objectives setdisplay below_name Wins
+
 # Command blocks
 setblock 965 4 1041 repeating_command_block{Command:"function mb:map/running",auto:true}
 
@@ -53,10 +62,10 @@ fill 962 3 1012 967 3 1017 redstone_lamp
 fill 973 3 1024 969 3 1019 redstone_lamp
 fill 969 3 1017 973 3 1012 redstone_lamp
 fill 973 2 1012 962 2 1024 redstone_block
-setblock 961 5 1018 player_wall_head[facing=east]{SkullOwner:{Name:"Nixinova"}}
-setblock 961 5 1019 birch_wall_sign[facing=east]{Text2:'"§1M§3U§5S§7I§9C§bA§dL"',Text3:'"§2B§4L§6O§8C§aK§cS"'}
-setblock 961 5 1017 birch_wall_sign[facing=east]{Text2:'{"text":"v3.0","color":"red"}'}
-setblock 974 5 1018 birch_wall_sign[facing=west]{Text1:'{"color":"green","clickEvent":{"action":"run_command","value":"function mb:map/play"},"text":"=========================="}',Text2:'{"bold":true,"color":"green","text":"Start"}',Text3:'{"bold":true,"color":"green","text":"Game"}',Text4:'{"color":"green","text":"=========================="}'}
+setblock 961 5 1018 player_wall_head[facing=east]{profile:{name:"Nixinova"}}
+setblock 961 5 1019 birch_wall_sign[facing=east]{front_text:{messages:['""','"§1M§3U§5S§7I§9C§bA§dL"','"§2B§4L§6O§8C§aK§cS"','""'],has_glowing_text:true}}
+setblock 961 5 1017 birch_wall_sign[facing=east]{front_text:{messages:['""','""','{"text":"v$(version)","color":"red"}','""'],has_glowing_text:true}}
+setblock 974 5 1018 birch_wall_sign[facing=west]{front_text:{messages:['{"color":"green","clickEvent":{"action":"run_command","value":"function mb:map/play"},"text":"=========================="}','{"bold":true,"color":"green","text":"Start"}','{"bold":true,"color":"green","text":"Game"}','{"color":"green","text":"=========================="}']}}
 setblock 976 4 1018 command_block{Command:"function mb:map/play"}
 setblock 974 4 1018 stone_button[facing=west]
 
@@ -101,3 +110,7 @@ execute unless score #const2 RNG_77 matches 1.. run scoreboard players set #cons
 scoreboard players add #prev_number RNG_77 0
 scoreboard players set #m1 RNG_77 -1
 scoreboard players add #clock_time RNG_77 1
+
+# Force refresh settings by having dummy game
+function mb:map/game_start
+stopsound @a

data/mb/funcs/map/.gl.mcf

@@ -1,12 +1,14 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #   Starting countdown commands   #
 #                                 #
 #---------------------------------#
 
+_const MUSICAL_BLOCKS = '{"text":"[","color":"white","bold":true},{"text":"M","color":"dark_blue","bold":true},{"text":"U","color":"dark_aqua","bold":true},{"text":"S","color":"dark_purple","bold":true},{"text":"I","color":"gray","bold":true},{"text":"C","color":"blue","bold":true},{"text":"A","color":"aqua","bold":true},{"text":"L ","color":"light_purple","bold":true},{"text":"B","color":"dark_green","bold":true},{"text":"L","color":"dark_red","bold":true},{"text":"O","color":"gold","bold":true},{"text":"C","color":"dark_gray","bold":true},{"text":"K","color":"green","bold":true},{"text":"S","color":"red","bold":true},{"text":"]","color":"white","bold":true}'
+
 _const starting_in = '{"text":" Starting in ","color":"white","bold":false}'
 _const timer = 'score starting Timer matches'
 _const target = '@a[team=lobby]'

data/mb/funcs/map/countdown.mcf

@@ -1,15 +1,18 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #      Game ending commands       #
 #                                 #
 #---------------------------------#
 
 # Declare winner
-title @a title [{"selector":"@a[team=playing]"}]
-title @a subtitle [{"text":" has won!","color":"green"}]
+_if ('entity @a[team=playing]') {
+  title @a title [{"selector":"@a[team=playing]"}]
+  title @a subtitle [{"text":" has won!","color":"green"}]
+  tellraw @a [{"selector":"@a[team=playing]"}, {"text":" has won!","color":"green"}]
+}
 
 # Update scoreboards
 scoreboard players add @a[team=playing] Wins 1
@@ -21,6 +24,6 @@ scoreboard objectives setdisplay sidebar Wins
 
 # Move players to lobby
 clear @a
-tp @a 967 5 1018
+tp @a 968 5 1018
 team join lobby @a
 gamemode adventure @a[team=lobby]

data/mb/funcs/map/game_end.mcf

@@ -1,6 +1,6 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #      Game starting commands     #
@@ -16,13 +16,19 @@ scoreboard players reset starting Map
 scoreboard players set playing Map 1
 scoreboard players set Round MB 0
 scoreboard players reset @a Dead
-scoreboard objectives setdisplay sidebar MB
+scoreboard objectives setdisplay sidebar
 
 # Move players to game map
 spreadplayers 1044 964 3 14 false @a[team=lobby]
-stopsound @a
-execute as @a at @s run playsound minecraft:music_disc.stal master @a
 team join playing @a[team=lobby]
 
-# Setup round
+# Music
+stopsound @a
+execute if score number RNG_77 matches 1 run execute as @a at @s run playsound minecraft:music_disc.stal master @a
+execute if score number RNG_77 matches 2 run execute as @a at @s run playsound minecraft:music_disc.blocks master @a
+execute if score number RNG_77 matches 3 run execute as @a at @s run playsound minecraft:music_disc.chirp master @a
+execute if score number RNG_77 matches 4 run execute as @a at @s run playsound minecraft:music_disc.pigstep master @a
+execute if score number RNG_77 matches 5 run execute as @a at @s run playsound minecraft:music_disc.otherside master @a
+
+# Set up round
 function mb:map/round_setup

data/mb/funcs/map/game_start.mcf

@@ -1,16 +1,16 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #   Game initialising commands    #
 #                                 #
 #---------------------------------#
 
-scoreboard players reset online Players
-execute as @a run scoreboard players add online Players 1
-_if ('score online Players matches 2..') {
+scoreboard players reset Online Players
+execute as @a run scoreboard players add Online Players 1
+_if ('score Online Players matches 2..') {
   scoreboard players reset starting Timer
   scoreboard players set starting Map 1
 _}
-execute unless score online Players matches 2.. run tellraw @p [{"text":"Not enough players!","color":"red"}]
+execute unless score Online Players matches 2.. run tellraw @p [{"text":"Not enough players!","color":"red"}]

data/mb/funcs/map/play.mcf

@@ -1,13 +1,15 @@
 #file: ./
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #         Round commands          #
 #                                 #
 #---------------------------------#
 
+_const MUSICAL_BLOCKS = '{"text":"[","color":"white","bold":true},{"text":"M","color":"dark_blue","bold":true},{"text":"U","color":"dark_aqua","bold":true},{"text":"S","color":"dark_purple","bold":true},{"text":"I","color":"gray","bold":true},{"text":"C","color":"blue","bold":true},{"text":"A","color":"aqua","bold":true},{"text":"L ","color":"light_purple","bold":true},{"text":"B","color":"dark_green","bold":true},{"text":"L","color":"dark_red","bold":true},{"text":"O","color":"gold","bold":true},{"text":"C","color":"dark_gray","bold":true},{"text":"K","color":"green","bold":true},{"text":"S","color":"red","bold":true},{"text":"]","color":"white","bold":true}'
+
 _const map = 'score randomiser Map matches'
 _const colour = 'score colour Map matches'
 _const area = '1058 5 978 1029 5 949'
@@ -49,8 +51,8 @@ _set_colours('13', 'yellow', 'lime', 'black', 'red', 'white', 'orange')
 
 # Give colour to each player
 _modal announce_colour (colour, chat_colour) {
-  _for(1, 9) {
-    execute if score $(colour) Colour matches 1 run give @a[team=playing] $(colour)_wool{_NoStack:$(i)}
+  _for(0, 8) {
+    execute if score $(colour) Colour matches 1 run item replace entity @a[team=playing] hotbar.$(i) with $(colour)_wool
   }
   execute if score $(colour) Colour matches 1 run tellraw @a[team=playing] [$(MUSICAL_BLOCKS),{"text":" Selected colour: ","bold":false},{"text":"$(colour)","color":"$(chat_colour)","bold":false}]
 }

data/mb/funcs/map/round.mcf

@@ -1,6 +1,6 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #        Map setup commands       #

data/mb/funcs/map/round_setup.mcf

@@ -1,6 +1,6 @@
 #---------------------------------#
 #                                 #
-#        MUSICAL BLOCKS v2        #
+#       MUSICAL BLOCKS v3.2       #
 #          by Nixinova            #
 #                                 #
 #     Always running commands     #
@@ -14,16 +14,19 @@ team join lobby @a[x=967,y=4,z=1018,distance=..10]
 gamemode adventure @a[team=lobby]
 effect give @a[team=lobby] instant_health 5 0 true
 effect give @a[team=lobby] saturation 5 0 true
+effect give @a[team=lobby] fire_resistance 1 0 true
 scoreboard players add running Timer 1
 execute if score running Timer matches 1000.. run scoreboard players set running Timer 0
+tp @a[x=968,y=9,z=1018,distance=..2] 968 5 1018
 
 # Death
-team join dead @a[scores={Health=..17}]
-execute if entity @a[scores={Health=..17}] run tellraw @a ["",{"selector":"@a[scores={Health=..17}]"},{"text":" burned to death","color":"yellow"}]
+_const deadPlayers = '@a[scores={Health=..17}]'
+team join dead $(deadPlayers)
+execute if entity $(deadPlayers) run tellraw @a ["",{"selector":"$(deadPlayers)"},{"text":" has been eliminated","color":"gold"}]
 gamemode spectator @a[team=dead]
 effect give @a[team=dead] instant_health
-execute store result score alive Players if entity @e[team=playing]
-execute if score online Players matches 2.. if score alive Players matches ..1 if score Round MB matches 1.. run function mb:map/game_end
+execute store result score Alive Players if entity @e[team=playing]
+execute if score Online Players matches 2.. if score Alive Players matches ..1 if score Round MB matches 1.. run function mb:map/game_end
 
 # Game start
 execute if score starting Map matches 1.. run function mb:map/countdown

data/mb/funcs/map/running.mcf

@@ -1,6 +1,7 @@
 {
     "pack": {
-        "pack_format": 6,
-        "description": "Musical Blocks v3.1 data pack for Minecraft 1.16 by Nixinova."
+        "pack_format": 45,
+        "supported_formats": [45, 63],
+        "description": "Musical Blocks v3.2 for Minecraft 1.21 - data pack by Nixinova."
     }
 }

pack.mcmeta

@@ -1,7 +1,7 @@
 {
   "name": "@nixinova/musical-blocks",
-  "version": "3.1",
-  "description": "Musical Blocks / Block Party minigame in vanilla Minecraft",
+  "version": "3.2",
+  "description": "Data pack for playing the Musical Blocks minigame in vanilla Minecraft",
   "author": "Nixinova (https://nixinova.com)",
   "private": true,
   "scripts": {