Update to 1.21.4

datapacks/advancements/data/minecraft/advancement/others/haekara.json

@@ -15,7 +15,11 @@
         "icon": {
             "id": "minecraft:carrot_on_a_stick",
             "components": {
-                "custom_model_data": 20
+                "custom_model_data": {
+                    "floats": [
+                        20
+                    ]
+                }
             }
         },
         "frame": "goal",

datapacks/map_all/data/minecraft/function/live/job/clock.mcfunction

@@ -7,6 +7,6 @@ item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color=
 item replace entity @s armor.head with minecraft:leather_helmet[dyed_color={rgb:13825332},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}]
 item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:13825332},unbreakable={},enchantment_glint_override=true]
 item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:13825332},unbreakable={},enchantment_glint_override=true]
-item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:7},custom_name='"\\u00a72\\u00a7l古老的钟"',lore=['"\\u00a7b右键使用"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=1] 1
+item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:7},custom_name='"\\u00a72\\u00a7l古老的钟"',lore=['"\\u00a7b右键使用"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data={floats:[1f]}] 1
 item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §rIron §bSword"]',lore=['["§f5§c♥"]'],attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:5d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1
 

datapacks/map_all/data/minecraft/function/live/job/creeper.mcfunction

@@ -9,4 +9,4 @@ item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:5
 item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:5764183},unbreakable={},enchantments={levels:{"minecraft:fire_protection":1}}]
 item replace entity @s container.0 with minecraft:green_dye[unbreakable={show_in_tooltip:false},custom_name='["§2Green §bSword"]',lore=['["§c5 HP"]'],enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:5d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1
 
-give @s carrot_on_a_stick[custom_data={job:4},custom_name='"\\u00a72苦力怕 \\u00a77- 右键使用"',lore=['"\\u00a7c小心！他可能会误伤你"'],custom_model_data=2]
+give @s carrot_on_a_stick[custom_data={job:4},custom_name='"\\u00a72苦力怕 \\u00a77- 右键使用"',lore=['"\\u00a7c小心！他可能会误伤你"'],custom_model_data={floats:[2f]}]

datapacks/map_all/data/minecraft/function/live/job/feather.mcfunction

@@ -7,6 +7,6 @@ item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color=
 item replace entity @s armor.head with minecraft:leather_helmet[dyed_color={rgb:16777215},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}]
 item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:16777215},unbreakable={},enchantments={levels:{"minecraft:feather_falling":3}}]
 item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:16777215},unbreakable={},enchantment_glint_override=true]
-item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:5},custom_name='"\\u00a72\\u00a7l羽毛 \\u00a77- 右键使用"',lore=['"\\u00a7b右键使用"','"\\u00a7a君を見てるといつもハートとき~とき"','"\\u00a7b每次看到你的样子 我心里总是怦怦直跳"','"\\u00a7a揺れる思いはマシュマロみたいにふわ~ふわ"','"\\u00a7b我微微颤动的思念 像棉花糖般轻轻飘飘"','"\\u00a7aいつもがんばる 君の横顔"','"\\u00a7b看着你的侧脸 总是那么努力"','"\\u00a7aずっと見てても気づかないよね"','"\\u00a7b对你注视再久 你也不会留意"','"\\u00a7a夢の中なら"','"\\u00a7b要是在梦里该多好"','"\\u00a7a二人の距離"','"\\u00a7b那样我就能"','"\\u00a7a縮められるのにな"','"\\u00a7b拉近你我之间的距离"','"\\u00a7aあぁ 神様 お願い"','"\\u00a7b啊 神啊求求你"','"\\u00a7a二人だけのDream Timeください"','"\\u00a7b赐予我一段 与你独处的美梦时光"','"\\u00a7aお気に入りのうさちゃん抱いで"','"\\u00a7b我要抱着我心爱的小兔"','"\\u00a7a今夜もお休み"','"\\u00a7b希望今夜早早步入梦乡"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=18] 1
+item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:5},custom_name='"\\u00a72\\u00a7l羽毛 \\u00a77- 右键使用"',lore=['"\\u00a7b右键使用"','"\\u00a7a君を見てるといつもハートとき~とき"','"\\u00a7b每次看到你的样子 我心里总是怦怦直跳"','"\\u00a7a揺れる思いはマシュマロみたいにふわ~ふわ"','"\\u00a7b我微微颤动的思念 像棉花糖般轻轻飘飘"','"\\u00a7aいつもがんばる 君の横顔"','"\\u00a7b看着你的侧脸 总是那么努力"','"\\u00a7aずっと見てても気づかないよね"','"\\u00a7b对你注视再久 你也不会留意"','"\\u00a7a夢の中なら"','"\\u00a7b要是在梦里该多好"','"\\u00a7a二人の距離"','"\\u00a7b那样我就能"','"\\u00a7a縮められるのにな"','"\\u00a7b拉近你我之间的距离"','"\\u00a7aあぁ 神様 お願い"','"\\u00a7b啊 神啊求求你"','"\\u00a7a二人だけのDream Timeください"','"\\u00a7b赐予我一段 与你独处的美梦时光"','"\\u00a7aお気に入りのうさちゃん抱いで"','"\\u00a7b我要抱着我心爱的小兔"','"\\u00a7a今夜もお休み"','"\\u00a7b希望今夜早早步入梦乡"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"','"\\u00a7aふわふわ時間 ふわふわ時間"','"\\u00a7b轻飘飘的时光 轻飘飘的时光"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data={floats:[18f]}] 1
 item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §rIron §bSword"]',lore=['["§f5§c♥"]'],attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:5d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1
 

datapacks/map_all/data/minecraft/function/live/job/fisherman.mcfunction

@@ -7,6 +7,6 @@ item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color=
 item replace entity @s armor.head with minecraft:leather_helmet[dyed_color={rgb:10554854},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}]
 item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:16711786},unbreakable={},enchantment_glint_override=true]
 item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:8852467},unbreakable={},enchantment_glint_override=true]
-item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:6},custom_name='"\\u00a76\\u00a7l交换位置 \\u00a77- 右键发射使用"',lore=['"\\u00a7b右键使用"','"\\u00a7aあの日見わたした渚"','"\\u00a7b那天所眺望的海岸"','"\\u00a7a今も思い出すんだ"','"\\u00a7b直至今日仍能想起"','"\\u00a7a砂の上に刻んだ言葉"','"\\u00a7b在沙滩上刻下的话语"','"\\u00a7a君の後ろ姿"','"\\u00a7b和你的背影"','"\\u00a7a寄り返す波が足元をよぎり"','"\\u00a7b涌动的波浪 掠过脚边"','"\\u00a7a何かをさらう"','"\\u00a7b究竟掠走了什么"','"\\u00a7a夕凪の中"','"\\u00a7b风平浪静之中"','"\\u00a7a日暮れだけが通り過ぎてゆく"','"\\u00a7b只有黄昏悄悄地流逝"','"\\u00a7aパッと光って咲いた"','"\\u00a7b光芒怦然绽放"','"\\u00a7a花火を見てた"','"\\u00a7b烟花映入眼帘"','"\\u00a7aきっとまだ終わらない夏が"','"\\u00a7b一定是夏天还未结束"','"\\u00a7a曖昧な心を"','"\\u00a7b将暧昧的心结       "','"\\u00a7a解かして繋いだ"','"\\u00a7b解开再紧紧相连"','"\\u00a7aこの夜が続いて欲しかった"','"\\u00a7b愿今夜永不结束"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=19] 1
+item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:6},custom_name='"\\u00a76\\u00a7l交换位置 \\u00a77- 右键发射使用"',lore=['"\\u00a7b右键使用"','"\\u00a7aあの日見わたした渚"','"\\u00a7b那天所眺望的海岸"','"\\u00a7a今も思い出すんだ"','"\\u00a7b直至今日仍能想起"','"\\u00a7a砂の上に刻んだ言葉"','"\\u00a7b在沙滩上刻下的话语"','"\\u00a7a君の後ろ姿"','"\\u00a7b和你的背影"','"\\u00a7a寄り返す波が足元をよぎり"','"\\u00a7b涌动的波浪 掠过脚边"','"\\u00a7a何かをさらう"','"\\u00a7b究竟掠走了什么"','"\\u00a7a夕凪の中"','"\\u00a7b风平浪静之中"','"\\u00a7a日暮れだけが通り過ぎてゆく"','"\\u00a7b只有黄昏悄悄地流逝"','"\\u00a7aパッと光って咲いた"','"\\u00a7b光芒怦然绽放"','"\\u00a7a花火を見てた"','"\\u00a7b烟花映入眼帘"','"\\u00a7aきっとまだ終わらない夏が"','"\\u00a7b一定是夏天还未结束"','"\\u00a7a曖昧な心を"','"\\u00a7b将暧昧的心结       "','"\\u00a7a解かして繋いだ"','"\\u00a7b解开再紧紧相连"','"\\u00a7aこの夜が続いて欲しかった"','"\\u00a7b愿今夜永不结束"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data={floats:[19f]}] 1
 item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §rIron §bSword"]',lore=['["§f5§c♥"]'],attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:5d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1
 

datapacks/map_all/data/minecraft/function/live/job/haerkala.mcfunction

@@ -19,7 +19,7 @@ item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rg
 # '"\\u00a7e（喝下后）"',
 # '"\\u00a7f啊！ 充满能量！"'
 
-item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:9},custom_name='"\\u00a76\\u00a7l哈尔克拉特制营养酒 \\u00a77- 右键饮用"',lore=['"\\u00a7d\\u00a7l饮下后，获得随机神奇效果。"','"\\u00a7b持续时间：\\u00a7a15s"','"\\u00a7b冷却时间：\\u00a7e45s"','""','"\\u00a7a累的时候来一瓶"','"\\u00a7b头脑清醒，身体健壮"','"\\u00a7c\\u00a7l哈尔克拉特制营养酒"','"\\u00a7d克服劳累的工作吧！"','"\\u00a7e（喝下后）"','"\\u00a7f啊！ 充满能量！"'],unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=20] 1
+item replace entity @s container.1 with minecraft:carrot_on_a_stick[custom_data={job:9},custom_name='"\\u00a76\\u00a7l哈尔克拉特制营养酒 \\u00a77- 右键饮用"',lore=['"\\u00a7d\\u00a7l饮下后，获得随机神奇效果。"','"\\u00a7b持续时间：\\u00a7a15s"','"\\u00a7b冷却时间：\\u00a7e45s"','""','"\\u00a7a累的时候来一瓶"','"\\u00a7b头脑清醒，身体健壮"','"\\u00a7c\\u00a7l哈尔克拉特制营养酒"','"\\u00a7d克服劳累的工作吧！"','"\\u00a7e（喝下后）"','"\\u00a7f啊！ 充满能量！"'],unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data={floats:[20f]}] 1
 item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§f§l小刀"]',lore=['["\\u00a7b默认伤害：§f5§c♥"]'],attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:5d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.6,operation:"add_value"}],show_in_tooltip:false}] 1
 
 advancement grant @s only others/haekara

datapacks/map_all/data/minecraft/function/live/job/old.mcfunction

@@ -7,6 +7,6 @@ item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color=
 item replace entity @s armor.head with minecraft:player_head[unbreakable={},profile="MHF_ArrowUp",enchantments={levels:{"minecraft:binding_curse":1}}]
 item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:16039255},unbreakable={},enchantment_glint_override=true]
 item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:16039255},unbreakable={},enchantment_glint_override=true]
-item replace entity @s container.0 with minecraft:carrot_on_a_stick[custom_data={job:1},custom_name='"\\u00a72\\u00a7l古老的剑"',lore=['"\\u00a7b右键释放剑气"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:2d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false},custom_model_data=3] 1
+item replace entity @s container.0 with minecraft:carrot_on_a_stick[custom_data={job:1},custom_name='"\\u00a72\\u00a7l古老的剑"',lore=['"\\u00a7b右键释放剑气"'],unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"attack_damage",slot:mainhand,id:"uuid_4894794278636495",amount:2d,operation:"add_value"},{type:"attack_speed",slot:"mainhand",id:"uuid_1145514511455145",amount:-2.4,operation:"add_value"}],show_in_tooltip:false},custom_model_data={floats:[3f]}] 1
 
 effect give @s slowness 99999 0 true

datapacks/map_all/data/minecraft/function/live/job/scientist.mcfunction

@@ -11,5 +11,5 @@ item replace entity @s armor.feet with minecraft:leather_boots[unbreakable={},dy
 item replace entity @s armor.legs with minecraft:leather_leggings[unbreakable={},dyed_color={rgb:8950395}]
 # effect give @s speed 99999 2 true
 # effect give @s jump_boost 99999 3 true
-give @s carrot_on_a_stick[custom_data={job:2},custom_name='"\\u00a7a肾      宝"',lore=['"\\u00a77右键使用"','""','"\\u00a7d肾宝，"','"\\u00a7b一瓶提神醒脑，"','"\\u00a76二瓶永不疲劳，"','"\\u00a7e三瓶长生不老"','"\\u00a78\\u00a7n\\u00a7m下次一定"'],custom_model_data=4]
+give @s carrot_on_a_stick[custom_data={job:2},custom_name='"\\u00a7a肾      宝"',lore=['"\\u00a77右键使用"','""','"\\u00a7d肾宝，"','"\\u00a7b一瓶提神醒脑，"','"\\u00a76二瓶永不疲劳，"','"\\u00a7e三瓶长生不老"','"\\u00a78\\u00a7n\\u00a7m下次一定"'],custom_model_data={floats:[4f]}]
 # effect give @s invisibility 99999 1

datapacks/map_all/data/minecraft/function/live/job/tp.mcfunction

@@ -10,6 +10,6 @@ item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable
 item replace entity @s armor.head with minecraft:player_head[unbreakable={},profile="MHF_CoconutG"]
 item replace entity @s armor.feet with minecraft:leather_boots[unbreakable={},dyed_color={rgb:14983439},enchantments={levels:{"minecraft:feather_falling":5}}]
 item replace entity @s armor.legs with minecraft:leather_leggings[unbreakable={},dyed_color={rgb:12583002}]
-give @s carrot_on_a_stick[custom_data={job:3},custom_name='"\\u00a79空间移动 \\u00a77- 右键使用"',lore=['"\\u00a78你突然就消失了"'],custom_model_data=6]
+give @s carrot_on_a_stick[custom_data={job:3},custom_name='"\\u00a79空间移动 \\u00a77- 右键使用"',lore=['"\\u00a78你突然就消失了"'],custom_model_data={floats:[6f]}]
 # effect give @s jump_boost 99999 255 true
 # effect give @s invisibility 99999 1

datapacks/map_all/data/minecraft/function/lpark/second.mcfunction

@@ -7,6 +7,6 @@ execute in parkourworld run spawnpoint @a[team=parkour] 8 4 8 0
 effect give @a[team=parkour] resistance 5 25 true
 effect give @a[team=parkour] fire_resistance 5 25 true
 
-item replace entity @a[team=parkour,nbt=!{Inventory:[{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{park:1}}}]}] hotbar.4 with carrot_on_a_stick[unbreakable={},enchantments={levels:{"minecraft:unbreaking":1}},custom_name='"\\u00a7aCheckpoint \\u00a77(Right click)"',lore=['"\\u00a7bReturn to parkour checkpoint"'],custom_data={park:1},custom_model_data=5]
+item replace entity @a[team=parkour,nbt=!{Inventory:[{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{park:1}}}]}] hotbar.4 with carrot_on_a_stick[unbreakable={},enchantments={levels:{"minecraft:unbreaking":1}},custom_name='"\\u00a7aCheckpoint \\u00a77(Right click)"',lore=['"\\u00a7bReturn to parkour checkpoint"'],custom_data={park:1},custom_model_data={floats:[5f]}]
 
 

datapacks/map_all/data/minecraft/function/maze/second.mcfunction

@@ -7,4 +7,4 @@ execute as @e[type=marker,tag=park] at @s run data merge entity @s {Duration:214
 spawnpoint @a[team=lobby,tag=mazing] 61 19 -51 -90
 effect give @a[team=lobby,tag=mazing] resistance 5 25 true
 
-item replace entity @a[team=lobby,tag=mazing,nbt=!{Inventory:[{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{park:1}}}]}] hotbar.4 with carrot_on_a_stick[unbreakable={},enchantments={levels:{"minecraft:unbreaking":1}},custom_name='"\\u00a7aCheckpoint \\u00a77(Right click)"',lore=['"\\u00a7bReturn to parkour checkpoint"'],custom_data={park:1},custom_model_data=5]
+item replace entity @a[team=lobby,tag=mazing,nbt=!{Inventory:[{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{park:1}}}]}] hotbar.4 with carrot_on_a_stick[unbreakable={},enchantments={levels:{"minecraft:unbreaking":1}},custom_name='"\\u00a7aCheckpoint \\u00a77(Right click)"',lore=['"\\u00a7bReturn to parkour checkpoint"'],custom_data={park:1},custom_model_data={floats:[5f]}]