diff --git a/.gitignore b/.gitignore index fc2bf5be..65663a21 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /level.dat_old /build /session.lock -/map_resourcepack \ No newline at end of file +/map_resourcepack +/new_datapacks \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/action.mcfunction b/datapacks/G_CAR/data/gcar/functions/action.mcfunction deleted file mode 100644 index c56294e3..00000000 --- a/datapacks/G_CAR/data/gcar/functions/action.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -kill @e[type=marker,tag=GCAR.way] -# tag @a remove GCAR.stop -execute as @a[tag=GCAR.go,tag=riding] at @s run function gcar:gcar_go -tag @a remove GCAR.go \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/change_action.mcfunction b/datapacks/G_CAR/data/gcar/functions/change_action.mcfunction deleted file mode 100644 index cfdafe63..00000000 --- a/datapacks/G_CAR/data/gcar/functions/change_action.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -# 获取选择的物品栏 /data get entity @s SelectedItemSlot -# 乘坐的实体 /data get entity @s RootVehicle.Entity -tag @e[tag=ridden] remove ridden -tag @a[tag=riding] remove riding -tag @a[tag=GCAR.go] remove GCAR.go -tag @a[tag=GCAR.go0] remove GCAR.go0 -tag @a[tag=GCAR.go1] remove GCAR.go1 -tag @a[tag=GCAR.go2] remove GCAR.go2 -tag @a[tag=GCAR.go3] remove GCAR.go3 -tag @a[tag=GCAR.go4] remove GCAR.go4 -tag @a[tag=GCAR.go5] remove GCAR.go5 -tag @a[tag=GCAR.go6] remove GCAR.go6 -tag @a[tag=GCAR.go7] remove GCAR.go7 - -# /say @a[y_rotation=0..45] -execute as @a[gamemode=!spectator] at @s if data entity @s {RootVehicle:{Entity:{Tags:['GCAR']}}} run tag @s add riding -execute as @a[tag=riding] at @s as @e[tag=GCAR,limit=1,sort=nearest,distance=..1] at @s run tag @s add ridden -execute as @e[tag=ridden,tag=GCAR] at @s run title @a[limit=1,sort=nearest,distance=..1,tag=riding] actionbar ["\u00a7aGCAR \u00a77- 按下",{"keybind":"key.sneak","color":"yellow"},"\u00a77离开 - \u00a7e物品栏第一格\u00a77前进 - \u00a77本次已行驶",{"score":{"objective": "GCAR.long","name": "*"},"color": "green"},"\u00a7am"] -# [tag=GCAR] -# /summon minecraft:minecart ~ ~1 ~ {CustomName:"[\"GCAR\"]",CustomNameVisible:1b,Tags:["GCAR"],CustomDisplayTile:1b,DisplayState:{Name:"minecraft:white_carpet"},DisplayOffset:5} -tag @a[tag=riding,nbt={SelectedItemSlot:0}] add GCAR.go -tag @a[tag=GCAR.go,y_rotation=-22.5..22.5] add GCAR.go0 -tag @a[tag=GCAR.go,y_rotation=22.5..67.5] add GCAR.go1 -tag @a[tag=GCAR.go,y_rotation=67.5..112.5] add GCAR.go2 -tag @a[tag=GCAR.go,y_rotation=112.5..157.5] add GCAR.go3 -tag @a[tag=GCAR.go,y_rotation=157.5..-157.5] add GCAR.go4 -tag @a[tag=GCAR.go,y_rotation=-157.5..-112.5] add GCAR.go5 -tag @a[tag=GCAR.go,y_rotation=-112.5..-67.5] add GCAR.go6 -tag @a[tag=GCAR.go,y_rotation=-67.5..-22.5] add GCAR.go7 -scoreboard players reset @a[tag=!riding,scores={GCAR.tick=-1..}] GCAR.tick -scoreboard players reset @a[tag=!riding,scores={GCAR.long=-1..}] GCAR.long diff --git a/datapacks/G_CAR/data/gcar/functions/gcar_go.mcfunction b/datapacks/G_CAR/data/gcar/functions/gcar_go.mcfunction deleted file mode 100644 index 55d5ee24..00000000 --- a/datapacks/G_CAR/data/gcar/functions/gcar_go.mcfunction +++ /dev/null @@ -1,69 +0,0 @@ -# execute positioned 0.0 0.0 0.0 run summon minecraft:marker ^ ^ ^2 {Tags:["GCAR.way"]} -# tag @a[tag=GCAR.go,y_rotation=-22.5..22.5] add GCAR.go0 -# tag @a[tag=GCAR.go,y_rotation=22.5..67.5] add GCAR.go1 -# tag @a[tag=GCAR.go,y_rotation=67.5..112.5] add GCAR.go2 -# tag @a[tag=GCAR.go,y_rotation=112.5..157.5] add GCAR.go3 -# tag @a[tag=GCAR.go,y_rotation=157.5..-157.5] add GCAR.go4 -# tag @a[tag=GCAR.go,y_rotation=-157.5..-112.5] add GCAR.go5 -# tag @a[tag=GCAR.go,y_rotation=-112.5..-67.5] add GCAR.go6 -# tag @a[tag=GCAR.go,y_rotation=-67.5..-22.5] add GCAR.go7 -# data modify entity @s Motion[0] set value 0 -# data modify entity @s Motion[2] set value 0 - -execute as @s at @s unless block ~ ~-0.5 ~ air run scoreboard players add @s[tag=GCAR.go] GCAR.tick 1 -execute as @s[scores={GCAR.tick=2..}] at @s run scoreboard players add @s GCAR.long 1 -execute as @s[scores={GCAR.tick=2..}] at @s run scoreboard players set @s GCAR.tick 0 -## Rotation -execute as @s[tag=GCAR.go] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~ ~-0.5 ~ air run data modify entity @s Motion[1] set value 0.04 - -## go0 -execute as @s[tag=GCAR.go0] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value 0.0 -execute as @s[tag=GCAR.go0] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value 2.0 -execute as @s[tag=GCAR.go0] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~ ~ ~1 air if block ~ ~1.5 ~1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 -## go1 -execute as @s[tag=GCAR.go1] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value 45.0 -execute as @s[tag=GCAR.go1] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value 2.0 -execute as @s[tag=GCAR.go1] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value -2.0 -execute as @s[tag=GCAR.go1] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~-1 ~ ~1 air if block ~-1 ~1.5 ~1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go2 -execute as @s[tag=GCAR.go2] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value 180.0 -execute as @s[tag=GCAR.go2] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value -2.0 -execute as @s[tag=GCAR.go2] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~-1 ~ ~ air if block ~-1 ~1.5 ~ air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go3 -execute as @s[tag=GCAR.go3] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value 135.0 -execute as @s[tag=GCAR.go3] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value -2.0 -execute as @s[tag=GCAR.go3] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value -2.0 -execute as @s[tag=GCAR.go3] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~-1 ~ ~-1 air if block ~-1 ~1.5 ~-1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go4 -execute as @s[tag=GCAR.go4] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value 90.0 -execute as @s[tag=GCAR.go4] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value -2.0 -execute as @s[tag=GCAR.go4] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~ ~ ~-1 air if block ~ ~1.5 ~-1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go5 -execute as @s[tag=GCAR.go5] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value -135.0 -execute as @s[tag=GCAR.go5] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value -2.0 -execute as @s[tag=GCAR.go5] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value 2.0 -execute as @s[tag=GCAR.go5] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~-1 ~ ~1 air if block ~-1 ~1.5 ~1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go6 -execute as @s[tag=GCAR.go6] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value -90.0 -execute as @s[tag=GCAR.go6] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value 2.0 -execute as @s[tag=GCAR.go6] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~1 ~ ~ air if block ~1 ~1.5 ~ air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -## go7 -execute as @s[tag=GCAR.go6] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Rotation[0] set value -45.0 - -execute as @s[tag=GCAR.go7] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[0] set value 2.0 -execute as @s[tag=GCAR.go7] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set value 2.0 -execute as @s[tag=GCAR.go7] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~1 ~ ~1 air if block ~1 ~1.5 ~1 air unless block ~ ~-0.9 ~ air run data modify entity @s Motion[1] set value 0.2 - -# execute as @s[tag=GCAR.go] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s if block ~ ~-0.1 ~ air run data modify entity @s Motion[1] set value -0.15 -execute as @s[tag=GCAR.go] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s if block ~ ~-0.5 ~ lime_glazed_terracotta run data modify entity @s Motion[1] set value 1.0 -execute as @s[tag=GCAR.go] as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ~ ~ ~ air unless block ~ ~ ~ #wall_signs unless block ~ ~ ~ #signs unless block ~ ~ ~ torch run data modify entity @s Motion[1] set value 0.2 - -# execute as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s unless block ^ ^ ^0.1 air run data modify entity @s Motion[1] set value 0.1 -# execute as @e[distance=0..1,sort=nearest,limit=1,tag=ridden,tag=GCAR] at @s run data modify entity @s Motion[2] set from entity @e[limit=1,sort=nearest,type=marker,tag=GCAR.way] Pos[2] -kill @e[type=marker,tag=GCAR.way] diff --git a/datapacks/G_CAR/data/gcar/functions/kill_a_car.mcfunction b/datapacks/G_CAR/data/gcar/functions/kill_a_car.mcfunction deleted file mode 100644 index d52f1c46..00000000 --- a/datapacks/G_CAR/data/gcar/functions/kill_a_car.mcfunction +++ /dev/null @@ -1 +0,0 @@ -say kill! \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/loot_car.mcfunction b/datapacks/G_CAR/data/gcar/functions/loot_car.mcfunction deleted file mode 100644 index 8acf34c7..00000000 --- a/datapacks/G_CAR/data/gcar/functions/loot_car.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -kill @s -summon minecraft:minecart ~ ~ ~ {CustomName:'["GCAR"]',CustomNameVisible:1b,Tags:["GCAR"],CustomDisplayTile:1b,DisplayState:{Name:"minecraft:white_carpet"},DisplayOffset:5} \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/main.mcfunction b/datapacks/G_CAR/data/gcar/functions/main.mcfunction deleted file mode 100644 index 7737936e..00000000 --- a/datapacks/G_CAR/data/gcar/functions/main.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ - -function gcar:change_action -function gcar:action -execute as @a[nbt={Inventory:[{id:"minecraft:minecart",Slot:-106b,tag:{gcar:1b}}]}] at @s run function gcar:put_car -# execute as @a[scores={GCAR.long=10000}] at @s run advancement grant @s only gcar:car_master -execute as @e[type=item,nbt={Item:{tag:{display:{Name:'{"text":"GCAR"}'}}}}] at @s run function gcar:loot_car diff --git a/datapacks/G_CAR/data/gcar/functions/put_car.mcfunction b/datapacks/G_CAR/data/gcar/functions/put_car.mcfunction deleted file mode 100644 index 108b2fa4..00000000 --- a/datapacks/G_CAR/data/gcar/functions/put_car.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -item replace entity @s weapon.offhand with air -summon minecraft:minecart ~ ~ ~ {CustomName:'["GCAR"]',CustomNameVisible:1b,Tags:["GCAR"],CustomDisplayTile:1b,DisplayState:{Name:"minecraft:white_carpet"},DisplayOffset:5} -tellraw @s ["\u00a7aGCAR 已经准备就绪。"] \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/setup.mcfunction b/datapacks/G_CAR/data/gcar/functions/setup.mcfunction deleted file mode 100644 index 47e253e0..00000000 --- a/datapacks/G_CAR/data/gcar/functions/setup.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -tellraw @a ["\u00a7b[GCAR] \u00a7a数据包成功加载！"] -scoreboard objectives remove GCAR.long -scoreboard objectives remove GCAR.tick -scoreboard objectives add GCAR.tick dummy "GCAR 行驶路程" -scoreboard objectives add GCAR.long dummy "GCAR 行驶路程" \ No newline at end of file diff --git a/datapacks/G_CAR/data/gcar/functions/test.mcfunction b/datapacks/G_CAR/data/gcar/functions/test.mcfunction deleted file mode 100644 index d131c1e1..00000000 --- a/datapacks/G_CAR/data/gcar/functions/test.mcfunction +++ /dev/null @@ -1 +0,0 @@ -say @a[nbt={Inventory:[{id:"minecraft:minecart",Slot:-106b,tag:{display:{}}}]}] \ No newline at end of file diff --git a/datapacks/G_CAR/data/minecraft/tags/functions/load.json b/datapacks/G_CAR/data/minecraft/tags/functions/load.json deleted file mode 100644 index 7c9c2858..00000000 --- a/datapacks/G_CAR/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gcar:setup" - ] -} diff --git a/datapacks/G_CAR/data/minecraft/tags/functions/tick.json b/datapacks/G_CAR/data/minecraft/tags/functions/tick.json deleted file mode 100644 index d85433d9..00000000 --- a/datapacks/G_CAR/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gcar:main" - ] -} diff --git a/datapacks/G_CAR/pack.mcmeta b/datapacks/G_CAR/pack.mcmeta deleted file mode 100644 index 64b64919..00000000 --- a/datapacks/G_CAR/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 15, - "description": "§aGamom's §bCAR §8| §eDATAPACK" - } -} \ No newline at end of file diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/after/over.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/after/over.mcfunction index 261f974b..17dafb9c 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/after/over.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/after/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say @a[tag=bw.play] scoreboard players reset * bw.tmp.ir scoreboard players reset * bw.tmp.gd @@ -16,7 +20,7 @@ scoreboard players set bw.state state 6 tag @a remove bw.play gamemode spectator @a[tag=bw.player] clear @a[tag=bw.player] -effect clear @a[tag=bw.player] +effect clear @a[tag=bw.player] schedule function bedwars/after/tp 5s forceload remove -216 300 -393 121 kill @e[type=item] @@ -30,4 +34,4 @@ kill @e[tag=bw.entity] scoreboard players reset @e[type=sheep,tag=bw.tntsheep] kill @e[type=sheep,tag=bw.tntsheep] -kill @e[type=marker,tag=tntsheep.spawn] \ No newline at end of file +kill @e[type=marker,tag=tntsheep.spawn] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/after/over_timeout.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/after/over_timeout.mcfunction index 4aec8361..ab175f93 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/after/over_timeout.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/after/over_timeout.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\n\n\n\u00a7f\u00a7l平局 > \u00a7b此轮游戏是平局\n"] title @a[tag=bw.player] title ["\u00a7c\u00a7lGAME OVER"] title @a[tag=bw.player] subtitle ["\u00a7e平局"] -function minecraft:bedwars/after/over \ No newline at end of file +function minecraft:bedwars/after/over diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/after/overreset.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/after/overreset.mcfunction index d8d8026f..1830f3e0 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/after/overreset.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/after/overreset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say @a[tag=bw.play] schedule clear bedwars/resets/mogu schedule clear bedwars/resets/unnamed @@ -20,7 +24,7 @@ scoreboard players set bw.state state 6 tag @a remove bw.play gamemode spectator @a[tag=bw.player] clear @a[tag=bw.player] -effect clear @a[tag=bw.player] +effect clear @a[tag=bw.player] function bedwars/after/tp forceload remove -216 300 -393 121 -kill @e[type=item] \ No newline at end of file +kill @e[type=item] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/after/tp.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/after/tp.mcfunction index 4d106ccd..d2f0d549 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/after/tp.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/after/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.state state 0 gamemode adventure @a[tag=bw.player] @@ -14,4 +18,4 @@ scoreboard players set §eBedwars@MiniGame bw.info 1 bossbar set minigames:bedwars value 1 bossbar set minigames:bedwars max 1 bossbar set minigames:bedwars players -bossbar set minigames:bedwars visible false \ No newline at end of file +bossbar set minigames:bedwars visible false diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/armor.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/armor.mcfunction index 4479d47b..16fa3498 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/armor.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/armor.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=bw.play] add bwneeds tag @a[tag=bwneeds,nbt={Inventory:[{id:"minecraft:wooden_sword"}]}] remove bwneeds tag @a[tag=bwneeds,nbt={Inventory:[{id:"minecraft:stone_sword"}]}] remove bwneeds @@ -6,5 +10,5 @@ tag @a[tag=bwneeds,nbt={Inventory:[{id:"minecraft:diamond_sword"}]}] remove bwne function fix:bw/armor -execute as @a[tag=INV,tag=bw.play,gamemode=!spectator] run function minecraft:bedwars/during/player/removearmor -execute as @a[tag=!INV,tag=bw.play,gamemode=!spectator] run function minecraft:bedwars/during/player/getarmor \ No newline at end of file +execute as @a[tag=bw.play,gamemode=!spectator] run function minecraft:bedwars/during/player/removearmor +execute as @a[tag=bw.play,gamemode=!spectator] run function minecraft:bedwars/during/player/getarmor diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/beds/destory.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/beds/destory.mcfunction index 01882e3a..5e7dc3a6 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/beds/destory.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/beds/destory.mcfunction @@ -1 +1,5 @@ -execute as @e[tag=bw.bed.beds] at @s run setblock ~ ~ ~ air \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[tag=bw.bed.beds] at @s run setblock ~ ~ ~ air diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team.mcfunction index aece4919..1d922244 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[team=bw.wait,tag=!GOABLE.SPEC] add bw.rd.sel execute if score bw.team.random board matches 0..0 run team join bw.green @a[tag=bw.rd.sel] execute if score bw.team.random board matches 1..1 run team join bw.yellow @a[tag=bw.rd.sel] @@ -6,3 +10,4 @@ execute if score bw.team.random board matches 3..3 run team join bw.blue @a[tag= tag @a[tag=bw.rd.sel] remove bw.rd.sel scoreboard players add bw.team.random board 1 execute if score bw.team.random board matches 4.. run scoreboard players set bw.team.random board 0 + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team_2teams.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team_2teams.mcfunction index f0f6ab04..caf2b0ac 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team_2teams.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/before/random_team_2teams.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[team=bw.wait,tag=!GOABLE.SPEC] add bw.rd.sel execute if score bw.team.random1 board matches 0..0 run team join bw.red @a[tag=bw.rd.sel] execute if score bw.team.random1 board matches 1..1 run team join bw.blue @a[tag=bw.rd.sel] tag @a[tag=bw.rd.sel] remove bw.rd.sel scoreboard players add bw.team.random1 board 1 execute if score bw.team.random1 board matches 2.. run scoreboard players set bw.team.random1 board 0 + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/before/start.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/before/start.mcfunction index 954908b5..63caddef 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/before/start.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/before/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=bw.wait] ["",{"text":"▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬","color":"green"},{"text":"\n\n "},{"text":"起床战争","bold":true,"color":"yellow"},{"text":"\n\n 保护你的床并摧毁敌人的床。收集铁锭，金锭，绿宝石和钻石\n 来升级，使自身和队伍变得更强。\n\n"},{"text":"▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬\n\n\u00a7a您可以使用 \u00a7e/tm <信息> \u00a7a进行队伍内聊天。","color":"green"}] scoreboard players add globle globle.game 1 @@ -10,3 +14,4 @@ schedule clear bedwars/resets/unnamed schedule clear bedwars/resets/glassworld schedule clear bedwars/resets/special1 function minecraft:bedwars/reset + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/before/trystart.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/before/trystart.mcfunction index 7cac7abf..a1d726e9 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/before/trystart.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/before/trystart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s scoreboard players set wait.bw.player tick 0 execute as @a[team=bw.wait,gamemode=adventure] run scoreboard players add wait.bw.player tick 1 execute unless score bw.state state matches ..-1 unless score bw.state state matches 1.. if score wait.bw.player tick matches ..1 run title @a[team=bw.wait] subtitle ["\u00a7cWait for more players !"] execute unless score bw.state state matches ..-1 unless score bw.state state matches 1.. if score wait.bw.player tick matches ..1 run title @a[team=bw.wait] title ["\u00a7fBedwars"] -execute unless score bw.state state matches ..-1 unless score bw.state state matches 1.. if score wait.bw.player tick matches 2.. run function minecraft:bedwars/before/start \ No newline at end of file +execute unless score bw.state state matches ..-1 unless score bw.state state matches 1.. if score wait.bw.player tick matches 2.. run function minecraft:bedwars/before/start diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/debug/getpos.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/debug/getpos.mcfunction index 5022d50a..b8fcdf67 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/debug/getpos.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/debug/getpos.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute store result score getx board run data get block ~ ~ ~ x execute store result score gety board run data get block ~ ~ ~ y execute store result score getz board run data get block ~ ~ ~ z -tellraw @a [{"score":{"name": "getx","objective": "board"},"color": "red"}," ",{"score":{"name": "gety","objective": "board"},"color": "red"}," ",{"score":{"name": "getz","objective": "board"},"color": "red"}] \ No newline at end of file +tellraw @a [{"score":{"name": "getx","objective": "board"},"color": "red"}," ",{"score":{"name": "gety","objective": "board"},"color": "red"}," ",{"score":{"name": "getz","objective": "board"},"color": "red"}] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/blue.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/blue.mcfunction index eea6a89a..45b7e1f7 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/blue.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/blue.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bd.blue state 0 execute as @a[scores={pickblue=1..},team=bw.blue] run tellraw @s ["\u00a7c你不能破坏自己的床！"] execute as @a[scores={pickblue=1..},team=bw.blue] run function minecraft:bedwars/resets/beds/blue @@ -30,3 +34,4 @@ execute unless entity @a[scores={pickblue=1..},team=bw.blue] run title @a[team=b # execute unless entity @a[scores={pickblue=1..},team=bw.blue] run scoreboard players display name blue bw.info "§9蓝§8 §r蓝队:§a§l" execute unless entity @a[scores={pickblue=1..},team=bw.blue] run function minecraft:bedwars/during/updateinfo/blue scoreboard players reset * pickblue + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/green.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/green.mcfunction index 7bb3edea..93f011ee 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/green.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/green.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bd.green state 0 execute as @a[scores={pickgreen=1..},team=bw.green] run tellraw @s ["\u00a7c你不能破坏自己的床！"] execute as @a[scores={pickgreen=1..},team=bw.green] run function minecraft:bedwars/resets/beds/green @@ -29,3 +33,4 @@ execute unless entity @a[scores={pickgreen=1..},team=bw.green] run title @a[team # execute unless entity @a[scores={pickgreen=1..},team=bw.green] run scoreboard players set §a绿§8　§r绿队:§e§l❁ bw.info 8 execute unless entity @a[scores={pickgreen=1..},team=bw.green] run function minecraft:bedwars/during/updateinfo/green scoreboard players reset * pickgreen + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/red.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/red.mcfunction index 4e820770..6eb3e7fd 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/red.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/red.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bd.red state 0 execute as @a[scores={pickred=1..},team=bw.red] run tellraw @s ["\u00a7c你不能破坏自己的床！"] execute as @a[scores={pickred=1..},team=bw.red] run function minecraft:bedwars/resets/beds/red @@ -28,3 +32,4 @@ execute unless entity @a[scores={pickred=1..},team=bw.red] run title @a[team=bw. execute unless entity @a[scores={pickred=1..},team=bw.red] run function minecraft:bedwars/during/updateinfo/red scoreboard players reset * pickred + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/yellow.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/yellow.mcfunction index d768ddb3..aaa8cd4f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/yellow.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/beddestroy/yellow.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bd.yellow state 0 execute as @a[scores={pickyellow=1..},team=bw.yellow] run tellraw @s ["\u00a7c你不能破坏自己的床！"] execute as @a[scores={pickyellow=1..},team=bw.yellow] run function minecraft:bedwars/resets/beds/yellow -# execute as @a[scores={pickyellow=1..},team=bw.yellow] run +# execute as @a[scores={pickyellow=1..},team=bw.yellow] run execute as @a[scores={pickyellow=1..},team=bw.yellow] run scoreboard players set bd.yellow state 1 # execute unless entity @a[scores={pickyellow=1..}] run setblock -371 31 210 yellow_bed[facing=west] @@ -28,3 +32,4 @@ execute unless entity @a[scores={pickyellow=1..},team=bw.yellow] run title @a[te execute unless entity @a[scores={pickyellow=1..},team=bw.yellow] run function minecraft:bedwars/during/updateinfo/yellow scoreboard players reset * pickyellow + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/died.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/died.mcfunction index 2db4e23e..fc02b79c 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/died.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s -302 68 210 gamemode spectator @s @@ -17,4 +21,4 @@ execute as @s[tag=!bw.fhing] at @s run tag @s remove bw.play execute as @s[tag=!bw.play] run tellraw @a[tag=bw.player] ["\u00a7b\u00a7l最终击杀！"] execute as @s[tag=!bw.fhing] at @s run tellraw @s ["\u00a7c你已被淘汰！"] -execute as @s[tag=!bw.play] run function minecraft:bedwars/during/updateinfo/update \ No newline at end of file +execute as @s[tag=!bw.play] run function minecraft:bedwars/during/updateinfo/update diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getarmor.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getarmor.mcfunction index b982eade..6165ecc3 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getarmor.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getarmor.mcfunction @@ -1,32 +1,38 @@ -execute unless data entity @s {Inventory:[{id:"minecraft:leather_helmet"}]} run item replace entity @s[team=bw.green] armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:65280}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_chestplate"}]} run item replace entity @s[team=bw.green] armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:65280}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## -execute unless data entity @s {Inventory:[{id:"minecraft:leather_helmet"}]} run item replace entity @s[team=bw.red] armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16711680}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_chestplate"}]} run item replace entity @s[team=bw.red] armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16711680}} +execute unless items entity @s armor.* minecraft:leather_helmet run item replace entity @s[team=bw.green] armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:65280}] +execute unless items entity @s armor.* minecraft:leather_chestplate run item replace entity @s[team=bw.green] armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:65280}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_helmet"}]} run item replace entity @s[team=bw.blue] armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:255}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_chestplate"}]} run item replace entity @s[team=bw.blue] armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:255}} +execute unless items entity @s armor.* minecraft:leather_helmet run item replace entity @s[team=bw.red] armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16711680}] +execute unless items entity @s armor.* minecraft:leather_chestplate run item replace entity @s[team=bw.red] armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16711680}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_helmet"}]} run item replace entity @s[team=bw.yellow] armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16776960}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_chestplate"}]} run item replace entity @s[team=bw.yellow] armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16776960}} +execute unless items entity @s armor.* minecraft:leather_helmet run item replace entity @s[team=bw.blue] armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:255}] +execute unless items entity @s armor.* minecraft:leather_chestplate run item replace entity @s[team=bw.blue] armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:255}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_leggings"}]} run item replace entity @s[team=bw.green,scores={bw.armor=..0}] armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:65280}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_boots"}]} run item replace entity @s[team=bw.green,scores={bw.armor=..0}] armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:65280}} +execute unless items entity @s armor.* minecraft:leather_helmet run item replace entity @s[team=bw.yellow] armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16776960}] +execute unless items entity @s armor.* minecraft:leather_chestplate run item replace entity @s[team=bw.yellow] armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16776960}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_leggings"}]} run item replace entity @s[team=bw.red,scores={bw.armor=..0}] armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16711680}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_boots"}]} run item replace entity @s[team=bw.red,scores={bw.armor=..0}] armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16711680}} +execute unless items entity @s armor.* minecraft:leather_leggings run item replace entity @s[team=bw.green,scores={bw.armor=..0}] armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:65280}] +execute unless items entity @s armor.* minecraft:leather_boots run item replace entity @s[team=bw.green,scores={bw.armor=..0}] armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:65280}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_leggings"}]} run item replace entity @s[team=bw.yellow,scores={bw.armor=..0}] armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16776960}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_boots"}]} run item replace entity @s[team=bw.yellow,scores={bw.armor=..0}] armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:16776960}} +execute unless items entity @s armor.* minecraft:leather_leggings run item replace entity @s[team=bw.red,scores={bw.armor=..0}] armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16711680}] +execute unless items entity @s armor.* minecraft:leather_boots run item replace entity @s[team=bw.red,scores={bw.armor=..0}] armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16711680}] -execute unless data entity @s {Inventory:[{id:"minecraft:leather_leggings"}]} run item replace entity @s[team=bw.blue,scores={bw.armor=..0}] armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:255}} -execute unless data entity @s {Inventory:[{id:"minecraft:leather_boots"}]} run item replace entity @s[team=bw.blue,scores={bw.armor=..0}] armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}],display:{color:255}} +execute unless items entity @s armor.* minecraft:leather_leggings run item replace entity @s[team=bw.yellow,scores={bw.armor=..0}] armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16776960}] +execute unless items entity @s armor.* minecraft:leather_boots run item replace entity @s[team=bw.yellow,scores={bw.armor=..0}] armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:16776960}] -execute unless data entity @s {Inventory:[{id:"minecraft:chainmail_leggings"}]} run item replace entity @s[scores={bw.armor=1..1}] armor.legs with chainmail_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} -execute unless data entity @s {Inventory:[{id:"minecraft:chainmail_boots"}]} run item replace entity @s[scores={bw.armor=1..1}] armor.feet with chainmail_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} +execute unless items entity @s armor.* minecraft:leather_leggings run item replace entity @s[team=bw.blue,scores={bw.armor=..0}] armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:255}] +execute unless items entity @s armor.* minecraft:leather_boots run item replace entity @s[team=bw.blue,scores={bw.armor=..0}] armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}},dyed_color={rgb:255}] -execute unless data entity @s {Inventory:[{id:"minecraft:iron_leggings"}]} run item replace entity @s[scores={bw.armor=2..2}] armor.legs with iron_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} -execute unless data entity @s {Inventory:[{id:"minecraft:iron_boots"}]} run item replace entity @s[scores={bw.armor=2..2}] armor.feet with iron_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} +execute unless items entity @s armor.* minecraft:chainmail_leggings run item replace entity @s[scores={bw.armor=1..1}] armor.legs with chainmail_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] +execute unless items entity @s armor.* minecraft:chainmail_boots run item replace entity @s[scores={bw.armor=1..1}] armor.feet with chainmail_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] + +execute unless items entity @s armor.* minecraft:iron_leggings run item replace entity @s[scores={bw.armor=2..2}] armor.legs with iron_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] +execute unless items entity @s armor.* minecraft:iron_boots run item replace entity @s[scores={bw.armor=2..2}] armor.feet with iron_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] + +execute unless items entity @s armor.* minecraft:diamond_leggings run item replace entity @s[scores={bw.armor=3..3}] armor.legs with diamond_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] +execute unless items entity @s armor.* minecraft:diamond_boots run item replace entity @s[scores={bw.armor=3..3}] armor.feet with diamond_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1s}}] -execute unless data entity @s {Inventory:[{id:"minecraft:diamond_leggings"}]} run item replace entity @s[scores={bw.armor=3..3}] armor.legs with diamond_leggings{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} -execute unless data entity @s {Inventory:[{id:"minecraft:diamond_boots"}]} run item replace entity @s[scores={bw.armor=3..3}] armor.feet with diamond_boots{Unbreakable:1b,Enchantments:[{id:"minecraft:binding_curse",lvl:1s}]} diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getitem.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getitem.mcfunction index 87fdb604..8cb39dc7 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getitem.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/getitem.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function fix:bw/getitem execute if score @s bw.tmp.ir matches 1.. run scoreboard players remove @s bw.tmp.ir 1 @@ -6,6 +10,6 @@ execute if score @s bw.tmp.gd matches 1.. run scoreboard players remove @s bw.tm execute if score @s bw.tmp.em matches 1.. run scoreboard players remove @s bw.tmp.em 1 execute if score @s bw.tmp.ir matches 1.. run function bedwars/during/player/getitem -execute if score @s bw.tmp.dm matches 1.. run function bedwars/during/player/getitem +execute if score @s bw.tmp.dm matches 1.. run function bedwars/during/player/getitem execute if score @s bw.tmp.gd matches 1.. run function bedwars/during/player/getitem -execute if score @s bw.tmp.em matches 1.. run function bedwars/during/player/getitem \ No newline at end of file +execute if score @s bw.tmp.em matches 1.. run function bedwars/during/player/getitem diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/loot.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/loot.mcfunction index 89b937aa..0c58fcf1 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/loot.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/loot.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 # scoreboard players reset @s[tag=!bw.play] bw.kill #gamemode spectator @s -data modify storage test Pos set from entity @s Pos +data modify storage minecraft:test Pos set from entity @s Pos execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 @@ -10,12 +14,8 @@ execute if entity @a[scores={bw.kill=1..}] at @a[scores={bw.kill=1..}] run score execute if entity @a[scores={bw.kill=1..}] at @a[scores={bw.kill=1..}] run scoreboard players operation @a[scores={bw.kill=1..},limit=1] bw.tmp.gd = @s bw.tmp.gd execute if entity @a[scores={bw.kill=1..}] at @a[scores={bw.kill=1..}] run scoreboard players operation @a[scores={bw.kill=1..},limit=1] bw.tmp.dm = @s bw.tmp.dm execute if entity @a[scores={bw.kill=1..}] at @a[scores={bw.kill=1..}] run scoreboard players operation @a[scores={bw.kill=1..},limit=1] bw.tmp.em = @s bw.tmp.em -# execute unless entity @a[scores={bw.kill=1..}] run data modify entity @e[type=marker,tag=loot,tag=neweee,limit=1] Pos set from storage test Pos -# scoreboard players operation @e[type=marker,tag=loot,tag=neweee] bw.tmp.ir = @s bw.tmp.ir -# scoreboard players operation @e[type=marker,tag=loot,tag=neweee] bw.tmp.gd = @s bw.tmp.gd -# scoreboard players operation @e[type=marker,tag=loot,tag=neweee] bw.tmp.dm = @s bw.tmp.dm -# scoreboard players operation @e[type=marker,tag=loot,tag=neweee] bw.tmp.em = @s bw.tmp.em -# tag @e[type=marker,tag=loot,tag=neweee] remove neweee + + execute if entity @a[scores={bw.kill=1..}] run tellraw @a[tag=bw.player] [{"selector":"@s"},"\u00a77 was killed by ",{"selector":"@a[scores={bw.kill=1..}]"}] execute unless entity @a[scores={bw.kill=1..}] run tellraw @a[tag=bw.player] [{"selector":"@s"},"\u00a77 died."] execute as @a[scores={bw.kill=1..}] at @s run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 @@ -25,3 +25,4 @@ execute as @a[scores={bw.kill=1..}] if score @s bw.tmp.dm matches 1.. run tellra execute as @a[scores={bw.kill=1..}] if score @s bw.tmp.em matches 1.. run tellraw @s [{"text":"+ ","color": "dark_green"},{"score":{"objective": "bw.tmp.em","name": "@s"},"color": "dark_green"},{"text":" 绿宝石","color": "dark_green"}] execute as @a[scores={bw.kill=1..}] at @s run function bedwars/during/player/getitem scoreboard players reset @a[tag=bw.player] bw.kill + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/lootkill.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/lootkill.mcfunction index 69aed71c..9556a227 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/lootkill.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/lootkill.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s bw.tmp.ir scoreboard players reset @s bw.tmp.gd scoreboard players reset @s bw.tmp.dm scoreboard players reset @s bw.tmp.em -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/onlytpspawn.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/onlytpspawn.mcfunction index 2c255043..d9411ae5 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/onlytpspawn.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/onlytpspawn.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches ..3 run tp @s[team=bw.yellow] -383 30 210 -90 0 execute if score bw.mode board matches ..3 run tp @s[team=bw.blue] -303 30 288 -180 0 execute if score bw.mode board matches ..3 run tp @s[team=bw.green] -225 30 208 90 0 @@ -15,4 +19,4 @@ execute if score bw.mode board matches 5 run tp @s[team=bw.red] -305 33 131 0 0 execute if score bw.mode board matches 6 run tp @s[team=bw.yellow] -377 19 210 -90 0 execute if score bw.mode board matches 6 run tp @s[team=bw.blue] -303 19 284 -180 0 execute if score bw.mode board matches 6 run tp @s[team=bw.green] -231 19 208 90 0 -execute if score bw.mode board matches 6 run tp @s[team=bw.red] -305 19 136 0 0 \ No newline at end of file +execute if score bw.mode board matches 6 run tp @s[team=bw.red] -305 19 136 0 0 diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/rejoin.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/rejoin.mcfunction index a0ea765f..cdf1da2d 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/rejoin.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/rejoin.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s leave execute as @s at @s run tellraw @a[tag=bw.player] [{"selector":"@s"},"\u00a77 重新加入了游戏。"] tag @s[team=bw.blue] add bw.play @@ -7,4 +11,4 @@ tag @s[team=bw.yellow] add bw.play execute as @s[tag=bw.play] run tellraw @s ["\n\u00a77 本次游戏仍然有效，您已加入游戏！\n \u00a77您可以使用 \u00a76/trigger hub\u00a77返回大厅\n"] execute as @s[tag=!bw.play] run tellraw @s ["\n\u00a7c 本次游戏仍有效，但无法确认您的队伍！您无法进入游戏\n"] # execute as @s[team=] run tellraw @s ["\n\u00a77 本次游戏仍然有效，您已加入游戏！\n \u00a77您可以使用 \u00a76/trigger hub\u00a77返回大厅\n"] -execute as @s[tag=bw.play] at @s run function bedwars/during/player/died \ No newline at end of file +execute as @s[tag=bw.play] at @s run function bedwars/during/player/died diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/removearmor.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/removearmor.mcfunction index f253d4f3..9dbc80d1 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/removearmor.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/removearmor.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## item replace entity @s armor.head with air item replace entity @s armor.chest with air item replace entity @s armor.legs with air -item replace entity @s armor.feet with air \ No newline at end of file +item replace entity @s armor.feet with air diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/teleport.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/teleport.mcfunction index d9090059..3bf736cb 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/teleport.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/player/teleport.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function bedwars/during/player/onlytpspawn # -359 30 210 @@ -9,4 +13,4 @@ title @s clear tellraw @s ["\u00a7e你已经重生！"] tag @s remove bw.fhing gamemode adventure @s -clear @s \ No newline at end of file +clear @s diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/bluedied.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/bluedied.mcfunction index b46d57e1..929ed2b4 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/bluedied.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/bluedied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players display name blue bw.info "§9蓝§8 §r蓝队: §c§l✗" # scoreboard players set §9蓝§8　§r蓝队:§c§l✗ bw.info 9 @@ -13,4 +17,4 @@ setblock -303 31 276 air setblock -303 31 277 air scoreboard players reset bw.blue state scoreboard players reset bd.blue state -##✓✗✖❁ \ No newline at end of file +##✓✗✖❁ diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/greendied.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/greendied.mcfunction index 9252fd1c..612e3df8 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/greendied.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/greendied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ##scoreboard players set §c红§8　§r红队:§a✓ bw.info 10 ##scoreboard players set §9蓝§8　§r蓝队:§a✓ bw.info 9 ##scoreboard players set §a绿§8　§r绿队:§a✓ bw.info 8 @@ -14,4 +18,4 @@ scoreboard players reset bd.green state setblock -237 31 208 air setblock -236 31 208 air # setblock -303 31 276 blue_bed[facing=south] -# setblock -303 31 277 blue_bed[facing=south,part=head] \ No newline at end of file +# setblock -303 31 277 blue_bed[facing=south,part=head] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/reddied.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/reddied.mcfunction index 5fc4d156..9f16cad6 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/reddied.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/reddied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ##scoreboard players set §c红§8　§r红队:§a✓ bw.info 10 ##scoreboard players set §9蓝§8　§r蓝队:§a✓ bw.info 9 ##scoreboard players set §a绿§8　§r绿队:§a✓ bw.info 8 @@ -10,4 +14,4 @@ scoreboard players reset bd.red state # setblock -372 31 210 yellow_bed[facing=west,part=head] setblock -305 31 142 air setblock -305 31 141 air -##✓✗✖❁ \ No newline at end of file +##✓✗✖❁ diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/yellowdied.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/yellowdied.mcfunction index 29f445ff..9a9bc67a 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/yellowdied.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/teamover/yellowdied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ##scoreboard players set §c红§8　§r红队:§a✓ bw.info 10 ##scoreboard players set §9蓝§8　§r蓝队:§a✓ bw.info 9 ##scoreboard players set §a绿§8　§r绿队:§a✓ bw.info 8 @@ -10,4 +14,4 @@ setblock -371 31 210 air setblock -372 31 210 air # setblock -305 31 142 red_bed[facing=north] # setblock -305 31 141 red_bed[facing=north,part=head] -##✓✗✖❁ \ No newline at end of file +##✓✗✖❁ diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/blue.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/blue.mcfunction index cc951ef8..a37186f2 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/blue.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/blue.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/totalpeople execute unless score bw.blue state matches 1 run return 0 execute if score bd.blue state matches 1 run return 0 -# scoreboard players +# scoreboard players execute store result storage minecraft:temp info_count int 1 run scoreboard players get bw.blue tick data merge storage minecraft:temp {info_message:"§9蓝§8 §r蓝队: §a",info_from:blue} function minecraft:bedwars/during/updateinfo/connect_info with storage minecraft:temp # scoreboard players display name blue bw.info "§9蓝§8 §r蓝队:§a§l✓" + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/connect_info.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/connect_info.mcfunction index 26afa513..e77f773b 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/connect_info.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/connect_info.mcfunction @@ -1 +1,5 @@ -$scoreboard players display name $(info_from) bw.info "$(info_message)$(info_count)" \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +$scoreboard players display name $(info_from) bw.info "$(info_message)$(info_count)" diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/green.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/green.mcfunction index edcdd1ff..5018f1f2 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/green.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/green.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/totalpeople execute unless score bw.green state matches 1 run return 0 execute if score bd.green state matches 1 run return 0 -# scoreboard players +# scoreboard players execute store result storage minecraft:temp info_count int 1 run scoreboard players get bw.green tick data merge storage minecraft:temp {info_message:"§a绿§8 §r绿队: §a",info_from:green} function minecraft:bedwars/during/updateinfo/connect_info with storage minecraft:temp # scoreboard players display name green bw.info "§9蓝§8 §r蓝队:§a§l✓" + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/red.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/red.mcfunction index c5d47341..bd2ebc39 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/red.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/red.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/totalpeople execute unless score bw.red state matches 1 run return 0 execute if score bd.red state matches 1 run return 0 -# scoreboard players +# scoreboard players execute store result storage minecraft:temp info_count int 1 run scoreboard players get bw.red tick data merge storage minecraft:temp {info_message:"§c红§8 §r红队: §a",info_from:red} function minecraft:bedwars/during/updateinfo/connect_info with storage minecraft:temp # scoreboard players display name red bw.info "§9蓝§8 §r蓝队:§a§l✓" + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/update.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/update.mcfunction index 7d6db3c0..f2af4aa6 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/update.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/update.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/during/updateinfo/red function minecraft:bedwars/during/updateinfo/blue function minecraft:bedwars/during/updateinfo/green -function minecraft:bedwars/during/updateinfo/yellow \ No newline at end of file +function minecraft:bedwars/during/updateinfo/yellow diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/yellow.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/yellow.mcfunction index 9ba26590..6df7a5be 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/yellow.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/updateinfo/yellow.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/totalpeople execute unless score bw.yellow state matches 1 run return 0 execute if score bd.yellow state matches 1 run return 0 -# scoreboard players +# scoreboard players execute store result storage minecraft:temp info_count int 1 run scoreboard players get bw.yellow tick data merge storage minecraft:temp {info_message:"§e黄§8 §r黄队: §a",info_from:yellow} function minecraft:bedwars/during/updateinfo/connect_info with storage minecraft:temp # scoreboard players display name yellow bw.info "§9蓝§8 §r蓝队:§a§l✓" + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/blue.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/blue.mcfunction index 609bb8ab..e324025d 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/blue.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/blue.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\n\n\n\u00a7f\u00a7l胜利 > \u00a79蓝队 \u00a76获得了胜利！\n"] title @a[tag=bw.player] title ["\u00a7c\u00a7lGAME OVER"] title @a[tag=bw.player] subtitle ["\u00a7dBedwars \u00a79Team Blue \u00a76Won"] title @a[team=bw.blue] title ["\u00a76You won!"] title @a[team=bw.blue] subtitle ["\u00a7dBedwars: \u00a79Team Blue"] -function minecraft:bedwars/after/over \ No newline at end of file +function minecraft:bedwars/after/over diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/green.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/green.mcfunction index df75e2ad..88f79fa2 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/green.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/green.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\n\n\n\u00a7f\u00a7l胜利 > \u00a7a绿队 \u00a76获得了胜利！\n"] title @a[tag=bw.player] title ["\u00a7c\u00a7lGAME OVER"] title @a[tag=bw.player] subtitle ["\u00a7dBedwars \u00a7aTeam Green \u00a76Won"] title @a[team=bw.green] title ["\u00a76You won!"] title @a[team=bw.green] subtitle ["\u00a7dBedwars: \u00a7aTeam Green"] -function minecraft:bedwars/after/over \ No newline at end of file +function minecraft:bedwars/after/over diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/red.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/red.mcfunction index 79b476aa..92556904 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/red.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/red.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\n\n\n\u00a7f\u00a7l胜利 > \u00a7c红队 \u00a76获得了胜利！\n"] title @a[tag=bw.player] title ["\u00a7c\u00a7lGAME OVER"] title @a[tag=bw.player] subtitle ["\u00a7dBedwars \u00a7cTeam Red \u00a76Won"] title @a[team=bw.red] title ["\u00a76You won!"] title @a[team=bw.red] subtitle ["\u00a7dBedwars: \u00a7cTeam Red"] -function minecraft:bedwars/after/over \ No newline at end of file +function minecraft:bedwars/after/over diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/yellow.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/yellow.mcfunction index 9dd72ab3..af09e43e 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/yellow.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/during/win/yellow.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\n\n\n\u00a7f\u00a7l胜利 > \u00a7e黄队 \u00a76获得了胜利！\n"] title @a[tag=bw.player] title ["\u00a7c\u00a7lGAME OVER"] title @a[tag=bw.player] subtitle ["\u00a7dBedwars \u00a7eTeam Yellow \u00a76Won"] title @a[team=bw.yellow] title ["\u00a76You won!"] title @a[team=bw.yellow] subtitle ["\u00a7dBedwars: \u00a7eTeam Yellow"] -function minecraft:bedwars/after/over \ No newline at end of file +function minecraft:bedwars/after/over diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/bedgone.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/bedgone.mcfunction index 622d4eab..c3ff36d9 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/bedgone.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/bedgone.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.event state 3 scoreboard players set bw.event.countdown board 120 # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -18,4 +22,4 @@ scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick title @a[tag=bw.play] title ["\u00a7c床已被破坏"] -title @a[tag=bw.play] subtitle ["\u00a7f所有的床都已被破坏"] \ No newline at end of file +title @a[tag=bw.play] subtitle ["\u00a7f所有的床都已被破坏"] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/dragon.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/dragon.mcfunction index 3d20ea41..8c0b1fa2 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/dragon.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/dragon.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[tag=bw.player] ["\n\u00a7e\u00a7lBEDWARS \u00a7c死亡决斗开始。凋灵已召唤。\n"] scoreboard players set bw.event state 4 scoreboard players set bw.event.countdown board 360 # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -22,4 +26,4 @@ execute if score bw.blue state matches 1.. run summon wither -303 60 210 {Team:" execute if score bw.green state matches 1.. run summon wither -303 60 210 {Team:"bw.green",Tags:["bw.entity"],CustomName:'"凋灵"',PersistenceRequired:1b} execute store result score bw.event.time tick run bossbar get minigames:bedwars max scoreboard players operation bw.event.time tick -= bw.event.countdown board -execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/bedgone.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/bedgone.mcfunction index 3027c1f7..c1d6ad1f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/bedgone.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/bedgone.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minigames:bedwars name ["\u00a7f\u00a7lBEDWARS 起床战争 \u00a77| \u00a7e床自毁: ",{"score":{"name": "bw.event.countdown","objective": "board"},"color":"light_purple"},"\u00a7es"] @@ -5,4 +9,4 @@ execute store result score bw.event.time tick run bossbar get minigames:bedwars scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick -execute if score bw.event.countdown board matches ..0 run function bedwars/events/bedgone \ No newline at end of file +execute if score bw.event.countdown board matches ..0 run function bedwars/events/bedgone diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/dragon.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/dragon.mcfunction index 7ff2064f..fea47b83 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/dragon.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/dragon.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board bossbar set minigames:bedwars name ["\u00a7f\u00a7lBEDWARS 起床战争 \u00a77| \u00a7c死亡决斗: ",{"score":{"name": "bw.event.countdown","objective": "board"},"color":"light_purple"},"\u00a7es"] @@ -6,3 +10,4 @@ scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick execute if score bw.event.countdown board matches ..0 run function bedwars/events/dragon + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/overgame.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/overgame.mcfunction index 3db648d0..480a3e30 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/overgame.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/overgame.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board bossbar set minigames:bedwars name ["\u00a7f\u00a7lBEDWARS 起床战争 \u00a77| \u00a7c游戏结束: ",{"score":{"name": "bw.event.countdown","objective": "board"},"color":"light_purple"},"\u00a7es"] @@ -6,3 +10,4 @@ scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick execute if score bw.event.countdown board matches ..0 run function bedwars/events/overgame + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradedianmond.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradedianmond.mcfunction index e59659e1..99a75310 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradedianmond.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradedianmond.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board bossbar set minigames:bedwars name ["\u00a7f\u00a7lBEDWARS 起床战争 \u00a77| \u00a7b钻石\u00a7e速度升级: ",{"score":{"name": "bw.event.countdown","objective": "board"},"color":"light_purple"},"\u00a7es"] @@ -6,3 +10,4 @@ scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick execute if score bw.event.countdown board matches ..0 run function bedwars/events/upgradedianmond + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradeemerald.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradeemerald.mcfunction index d276bc89..fa18c5a4 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradeemerald.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/during/upgradeemerald.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board bossbar set minigames:bedwars name ["\u00a7f\u00a7lBEDWARS 起床战争 \u00a77| \u00a7a绿宝石\u00a7e速度升级: ",{"score":{"name": "bw.event.countdown","objective": "board"},"color":"light_purple"},"\u00a7es"] @@ -6,4 +10,4 @@ execute store result score bw.event.time tick run bossbar get minigames:bedwars scoreboard players operation bw.event.time tick -= bw.event.countdown board execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick -execute if score bw.event.countdown board matches ..0 run function bedwars/events/upgradeemerald \ No newline at end of file +execute if score bw.event.countdown board matches ..0 run function bedwars/events/upgradeemerald diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/eventsecond.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/eventsecond.mcfunction index 9911f5c0..09243059 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/eventsecond.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/eventsecond.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minigames:bedwars players bossbar set minigames:bedwars players @a[tag=bw.player] # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -12,4 +16,4 @@ execute if score bw.event state matches 2 run function bedwars/events/during/bed execute if score bw.event state matches 3 run function bedwars/events/during/dragon execute if score bw.event state matches 4.. run function bedwars/events/during/overgame -scoreboard players remove bw.event.countdown board 1 \ No newline at end of file +scoreboard players remove bw.event.countdown board 1 diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/overgame.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/overgame.mcfunction index e3a23040..f7b93d0c 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/overgame.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/overgame.mcfunction @@ -1 +1,5 @@ -function bedwars/after/over_timeout \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +function bedwars/after/over_timeout diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradedianmond.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradedianmond.mcfunction index 45ffd4e0..d4f95b51 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradedianmond.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradedianmond.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.event state 1 scoreboard players set bw.event.countdown board 360 # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -16,4 +20,4 @@ tellraw @a[tag=bw.player] ["\u00a7b钻石\u00a7e生成变快。"] execute store result score bw.event.time tick run bossbar get minigames:bedwars max scoreboard players operation bw.event.time tick -= bw.event.countdown board -execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradeemerald.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradeemerald.mcfunction index 22025dd9..c0cb184e 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradeemerald.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/events/upgradeemerald.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.event state 2 scoreboard players set bw.event.countdown board 600 # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -16,4 +20,4 @@ tellraw @a[tag=bw.player] ["\u00a7a绿宝石\u00a7e生成变快。"] execute store result score bw.event.time tick run bossbar get minigames:bedwars max scoreboard players operation bw.event.time tick -= bw.event.countdown board -execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.event.time tick diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/init_chest.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/init_chest.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/init_chest.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/init_chest.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepboom.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepboom.mcfunction index 827f3007..1178db39 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepboom.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepboom.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s execute at @s run function cmdtnt:tntpick -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepsecond.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepsecond.mcfunction index f9b207d8..b800133e 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepsecond.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/item/sheepsecond.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound minecraft:entity.sheep.ambient block @a ~ ~ ~ 5 0.5 1 scoreboard players remove @s board 1 scoreboard players operation tmp board = @s board @@ -9,4 +13,4 @@ execute if score @s board matches 1 run data merge entity @s {Color:14b} execute if score @s board matches 4 run data merge entity @s {Color:0b} execute if score @s board matches 2 run data merge entity @s {Color:0b} execute if score @s board matches 0 run data merge entity @s {Color:0b} -execute if score @s board matches ..0 run function bedwars/item/sheepboom \ No newline at end of file +execute if score @s board matches ..0 run function bedwars/item/sheepboom diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/item/tntsheep.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/item/tntsheep.mcfunction index 5adf4237..30835c93 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/item/tntsheep.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/item/tntsheep.mcfunction @@ -1,5 +1,9 @@ -summon minecraft:sheep ~ ~ ~ {Tags:["bw.tntsheep","bw.tntsheep.new"],CustomName:'["\\u00a7c\\u00a7lTNT SHEEP"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Attributes:[{Base:1d,Name:"generic.max_health"},{Base:1d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:1d,Name:"generic.armor"},{Base:1d,Name:"generic.armor_toughness"}],Sheared:false,DeathLootTable:"",Color:14b} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:sheep ~ ~ ~ {Tags:["bw.tntsheep","bw.tntsheep.new"],CustomName:'["\\u00a7c\\u00a7lTNT SHEEP"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Attributes:[{Base:1d,Name:"generic.max_health"},{Base:1d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:1d,Name:"generic.armor"},{Base:1d,Name:"generic.armor_toughness"}],Sheared:false,DeathLootTable:"",Color:14b,potion_contents:{custom_color:14b}} scoreboard players set @e[tag=bw.tntsheep.new] board 6 tag @e[tag=bw.tntsheep.new] remove bw.tntsheep.new playsound entity.tnt.primed block @a ~ ~ ~ 5 1 1 -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/last.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/last.mcfunction index cf4cde1e..a5388155 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/last.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/last.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score bw.mode board matches 2.. run scoreboard players remove bw.mode board 1 function bedwars/mapselector/show -# function tntwars/mapselector/show \ No newline at end of file +# function tntwars/mapselector/show diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/next.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/next.mcfunction index 14714bb9..9ad71aab 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/next.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/next.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score bw.mode board matches ..5 run scoreboard players add bw.mode board 1 -function bedwars/mapselector/show \ No newline at end of file +function bedwars/mapselector/show diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/show.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/show.mcfunction index 1bdb64da..a71f5830 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/show.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/mapselector/show.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches 1 run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7c蘑菇岛"' execute if score bw.mode board matches 2 run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7b一枝花"' @@ -5,4 +9,4 @@ execute if score bw.mode board matches ..0 run data modify block -299 76 210 fro execute if score bw.mode board matches 3 run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a72奇怪的环保太空船"' execute if score bw.mode board matches 4 run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7d迷途岛"' execute if score bw.mode board matches 5 run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7f玻璃世界"' -execute if score bw.mode board matches 6.. run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7a四合院"' \ No newline at end of file +execute if score bw.mode board matches 6.. run data modify block -299 76 210 front_text.messages[2] set value '"\\u00a7a四合院"' diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/message/changemode.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/message/changemode.mcfunction index 04688db1..a478dce3 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/message/changemode.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/message/changemode.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode state matches 0..3 run tellraw @a[team=bw.wait] ["\u00a7a起床战争模式调整为 [\u00a76四队模式\u00a7a]"] execute if score bw.mode state matches 0 run tellraw @a[team=bw.wait] ["\u00a7a起床战争特殊模式禁用"] @@ -12,4 +16,4 @@ execute if score bw.mode state matches 5 run tellraw @a[team=bw.wait] ["\u00a7a execute if score bw.mode state matches 6 run tellraw @a[team=bw.wait] ["\u00a7a起床战争特殊模式启用：[\u00a7a全解锁模式\u00a7a]"] -playsound entity.experience_orb.pickup player @s ~ ~ ~ 5 1 1 \ No newline at end of file +playsound entity.experience_orb.pickup player @s ~ ~ ~ 5 1 1 diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/message/getsign.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/message/getsign.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/message/getsign.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/message/getsign.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/message/join.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/message/join.mcfunction index 83fd9a0d..bdd5ef9f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/message/join.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/message/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 joined \u00a79\u00a7lBedwars\u00a77 ."] tp @s -302 76 210 0 0 execute if score bw.state state matches 1.. run function bedwars/message/spec @@ -5,4 +9,4 @@ execute if score bw.state state matches ..-1 run tellraw @s ["\n\u00a7e您已加 execute if score bw.state state matches ..-1 run gamemode spectator @s team join bw.wait @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/message/spec.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/message/spec.mcfunction index 2fa8d11d..c695216d 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/message/spec.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/message/spec.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s[gamemode=adventure] tellraw @s ["\n\u00a7c很抱歉，游戏已经开始。请等待下一局。\n"] -team join bw.wait @s \ No newline at end of file +team join bw.wait @s diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/reset.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/reset.mcfunction index 4d6d2260..c793377c 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/reset.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/reset.mcfunction @@ -1,12 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[tag=bw.player] ["\u00a7e重置中..."] title @a[tag=bw.player] title ["\u00a7eReseting..."] title @a[tag=bw.player] subtitle ["\u00a7fIt may take some time..."] gamemode spectator @a[tag=bw.player,gamemode=!creative] -# kill @e[tag=bw.bed.red] -# kill @e[tag=bw.bed.blue] -# kill @e[tag=bw.bed.yellow] -# kill @e[tag=bw.bed.green] kill @e[tag=bw.bed.beds] kill @e[tag=iron,type=marker] kill @e[tag=gold,type=marker] @@ -152,4 +152,4 @@ kill @e[type=arrow] kill @e[type=fireball] kill @e[type=egg] kill @e[type=creeper] -kill @e[type=item] \ No newline at end of file +kill @e[type=item] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/blue.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/blue.mcfunction index 110b0dc7..649475c9 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/blue.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/blue.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches 5 run setblock -303 31 276 blue_bed[facing=south,occupied=true] execute if score bw.mode board matches 5 run setblock -303 31 277 blue_bed[facing=south,part=head,occupied=true] execute if score bw.mode board matches 1..3 run setblock -303 31 276 blue_bed[facing=south,occupied=true] @@ -6,6 +10,6 @@ execute if score bw.mode board matches 1..3 run setblock -303 31 277 blue_bed[fa execute if score bw.mode board matches 4 run setblock -326 35 268 blue_bed[facing=west,occupied=true,part=foot] execute if score bw.mode board matches 4 run setblock -327 35 268 blue_bed[facing=west,occupied=true,part=head] - + execute if score bw.mode board matches 6 run setblock -296 28 276 blue_bed[occupied=true,facing=east] -execute if score bw.mode board matches 6 run setblock -295 28 276 blue_bed[occupied=true,facing=east,part=head] \ No newline at end of file +execute if score bw.mode board matches 6 run setblock -295 28 276 blue_bed[occupied=true,facing=east,part=head] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/green.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/green.mcfunction index 30382beb..b372f1e3 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/green.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/green.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches 5 run setblock -237 31 208 lime_bed[facing=east,occupied=true] execute if score bw.mode board matches 5 run setblock -236 31 208 lime_bed[facing=east,part=head,occupied=true] execute if score bw.mode board matches 1..3 run setblock -237 31 208 lime_bed[facing=east,occupied=true] @@ -7,4 +11,4 @@ execute if score bw.mode board matches 4 run setblock -248 35 232 lime_bed[facin execute if score bw.mode board matches 4 run setblock -248 35 233 lime_bed[facing=south,occupied=true,part=head] execute if score bw.mode board matches 6 run setblock -239 28 201 lime_bed[occupied=true,facing=north] -execute if score bw.mode board matches 6 run setblock -239 28 200 lime_bed[occupied=true,facing=north,part=head] \ No newline at end of file +execute if score bw.mode board matches 6 run setblock -239 28 200 lime_bed[occupied=true,facing=north,part=head] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/red.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/red.mcfunction index b792dc8c..5789cc08 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/red.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/red.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches 5 run setblock -305 31 142 red_bed[facing=north,occupied=true] execute if score bw.mode board matches 5 run setblock -305 31 141 red_bed[facing=north,part=head,occupied=true] execute if score bw.mode board matches 1..3 run setblock -305 31 142 red_bed[facing=north,occupied=true] @@ -7,4 +11,4 @@ execute if score bw.mode board matches 4 run setblock -283 35 154 red_bed[facing execute if score bw.mode board matches 4 run setblock -284 35 154 red_bed[facing=east,part=foot,occupied=true] execute if score bw.mode board matches 6 run setblock -312 28 144 red_bed[occupied=true,facing=west] -execute if score bw.mode board matches 6 run setblock -313 28 144 red_bed[occupied=true,facing=west,part=head] \ No newline at end of file +execute if score bw.mode board matches 6 run setblock -313 28 144 red_bed[occupied=true,facing=west,part=head] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/yellow.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/yellow.mcfunction index 0eea74aa..0d6f6b65 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/yellow.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/beds/yellow.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.mode board matches 1..3 run setblock -371 31 210 yellow_bed[facing=west,occupied=true] execute if score bw.mode board matches 1..3 run setblock -372 31 210 yellow_bed[facing=west,part=head,occupied=true] execute if score bw.mode board matches 5 run setblock -371 31 210 yellow_bed[facing=west,occupied=true] @@ -7,4 +11,4 @@ execute if score bw.mode board matches 4 run setblock -362 35 189 yellow_bed[par execute if score bw.mode board matches 4 run setblock -362 35 188 yellow_bed[part=head,facing=north,occupied=true] execute if score bw.mode board matches 6 run setblock -369 28 217 yellow_bed[facing=south,occupied=true] -execute if score bw.mode board matches 6 run setblock -369 28 218 yellow_bed[part=head,facing=south,occupied=true] \ No newline at end of file +execute if score bw.mode board matches 6 run setblock -369 28 218 yellow_bed[part=head,facing=south,occupied=true] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/glassworld.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/glassworld.mcfunction index c1765d91..bb8a60ff 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/glassworld.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/glassworld.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -753 121 -577 299 execute if score bw.reset board matches 1..1 run fill -216 0 299 -392 0 121 air execute if score bw.reset board matches 2..2 run fill -216 1 299 -392 1 121 air @@ -77,4 +81,4 @@ execute if score bw.reset board matches 70.. run function bedwars/resets/resetov scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 70 -execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/mogu.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/mogu.mcfunction index 9173bbeb..85ab01d8 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/mogu.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/mogu.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -573 299 -397 121 execute if score bw.reset board matches 1..1 run clone from bedwars_backup -573 77 299 -397 77 121 -392 0 121 execute if score bw.reset board matches 2..2 run clone from bedwars_backup -573 78 299 -397 78 121 -392 1 121 @@ -82,4 +86,4 @@ execute if score bw.reset board matches 75.. run function bedwars/resets/resetov scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 75 -execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/placebed.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/placebed.mcfunction index 4412a93a..699cdb21 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/placebed.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/placebed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # setblock -371 31 210 yellow_bed[facing=west] # setblock -372 31 210 yellow_bed[facing=west,part=head] @@ -13,4 +17,4 @@ function minecraft:bedwars/resets/beds/blue function minecraft:bedwars/resets/beds/green function minecraft:bedwars/resets/beds/red -function minecraft:bedwars/resets/beds/yellow \ No newline at end of file +function minecraft:bedwars/resets/beds/yellow diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/glassworld.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/glassworld.mcfunction index c376987c..53e3b4c6 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/glassworld.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/glassworld.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # yellow summon marker -371 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} summon marker -372 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -66,3 +70,4 @@ summon marker -305 36 210 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00 summon marker -305 23 210 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00a7lEmerald Spawner"',CustomNameVisible:1b} scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m001B"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/mogu.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/mogu.mcfunction index 7db3a7d1..4b1f48b3 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/mogu.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/mogu.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # yellow summon marker -371 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} summon marker -372 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -71,3 +75,4 @@ summon marker -314 36 198 {Tags:["emerald","bedwars"]} summon marker -294 36 222 {Tags:["emerald","bedwars"]} scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m001A"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/siheyuan.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/siheyuan.mcfunction index e41f808d..0b9c413e 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/siheyuan.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/siheyuan.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # beds # yellow -369 28 217 -369 28 218 summon marker -369 28 217 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -21,7 +25,7 @@ summon area_effect_cloud -298 19.5 291 {Tags:["shop","bedwars"],CustomName:'"\\u summon area_effect_cloud -298 19.5 293 {Tags:["shop2","bedwars"],CustomName:'"\\u00a7a\\u00a7lItem Shop \\u00a762"',CustomNameVisible:1b,Age:-19103293} summon area_effect_cloud -384 19.5 215 {Tags:["shop","bedwars"],CustomName:'"\\u00a7a\\u00a7lItem Shop \\u00a761"',CustomNameVisible:1b,Age:-19103293} summon area_effect_cloud -386 19.5 215 {Tags:["shop2","bedwars"],CustomName:'"\\u00a7a\\u00a7lItem Shop \\u00a762"',CustomNameVisible:1b,Age:-19103293} -# EFFECT +# EFFECT summon area_effect_cloud -300 19.5 127 {Tags:["bedwars","dmshop"],CustomName:'"\\u00a7b\\u00a7lEffect Shop"',CustomNameVisible:1b,Age:-19103293} summon area_effect_cloud -300 19.5 129 {Tags:["bedwars","dmshop"],CustomName:'"\\u00a7b\\u00a7lEffect Shop"',CustomNameVisible:1b,Age:-19103293} @@ -60,3 +64,4 @@ summon marker -305 33.5 210 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u summon marker -305 17.5 210 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00a7lEmerald Spawner"',CustomNameVisible:1b} scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m004A"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/space.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/space.mcfunction index 317d9fce..d220891e 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/space.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/space.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # yellow summon marker -371 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} summon marker -372 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -63,3 +67,4 @@ summon marker -315 38 222 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00 summon marker -303 44 210 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00a7lEmerald Spawner"',CustomNameVisible:1b} scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m002A"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/special1.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/special1.mcfunction index ee413633..a76c918c 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/special1.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/special1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # yellow summon marker -362 35 189 {Tags:["bw.bed.beds","bw.bed.yellow"]} summon marker -362 35 188 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -48,7 +52,7 @@ summon area_effect_cloud -304 31.5 261 {Tags:["shop2","bedwars"],CustomName:'"\\ summon area_effect_cloud -355 31.5 211 {Tags:["shop2","bedwars"],CustomName:'"\\u00a7a\\u00a7lItem Shop \\u00a762"',CustomNameVisible:1b,Age:-19103293} summon area_effect_cloud -306 31.5 161 {Tags:["shop2","bedwars"],CustomName:'"\\u00a7a\\u00a7lItem Shop \\u00a762"',CustomNameVisible:1b,Age:-19103293} - + # # diamond summon marker -276 27 176 {Tags:["diamond","bedwars"],CustomName:'"\\u00a7b\\u00a7lDiamond Spawner"',CustomNameVisible:1b} summon marker -275 27 242 {Tags:["diamond","bedwars"],CustomName:'"\\u00a7b\\u00a7lDiamond Spawner"',CustomNameVisible:1b} @@ -65,3 +69,4 @@ summon marker -294 45 220 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00 scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m002B"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/unnamed.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/unnamed.mcfunction index f5dbd730..109e221f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/unnamed.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/points/unnamed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # yellow summon marker -371 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} summon marker -372 31 210 {Tags:["bw.bed.beds","bw.bed.yellow"]} @@ -68,3 +72,4 @@ summon marker -314 36 198 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00 summon marker -294 36 222 {Tags:["emerald","bedwars"],CustomName:'"\\u00a7a\\u00a7lEmerald Spawner"',CustomNameVisible:1b} scoreboard players display name date bw.info ["\u00a7701/19/24§8 \u00a78m003A"] + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/resetover.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/resetover.mcfunction index 96e2af39..11149a48 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/resetover.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/resetover.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[tag=bw.player] title ["\u00a7aBedwars"] title @a[tag=bw.player] subtitle ["\u00a7fEnjoy the game!"] -execute as @e[tag=diamond,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.8 ~ {Age:-2147483648,Duration:-1,WaitTime: -2147483648,Tags:["bedwars","diamond.title"],CustomName:'"\\u00a7b\\u00a7l钻石"',CustomNameVisible:1b} -execute as @e[tag=diamond,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.5 ~ {Age:-2147483648,Duration:-1,WaitTime: -2147483648,Tags:["bedwars","diamond.subtitle"],CustomName:'"To be edited"',CustomNameVisible:1b} -execute as @e[tag=emerald,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.8 ~ {Age:-2147483648,Duration:-1,WaitTime: -2147483648,Tags:["bedwars","emerald.title"],CustomName:'"\\u00a72绿宝石"',CustomNameVisible:1b} -execute as @e[tag=emerald,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.5 ~ {Age:-2147483648,Duration:-1,WaitTime: -2147483648,Tags:["bedwars","emerald.subtitle"],CustomName:'"To be edited"',CustomNameVisible:1b} +execute as @e[tag=diamond,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.8 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["bedwars","diamond.title"],CustomName:'"\\u00a7b\\u00a7l钻石"',CustomNameVisible:1b} +execute as @e[tag=diamond,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.5 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["bedwars","diamond.subtitle"],CustomName:'"To be edited"',CustomNameVisible:1b} +execute as @e[tag=emerald,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.8 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["bedwars","emerald.title"],CustomName:'"\\u00a72绿宝石"',CustomNameVisible:1b} +execute as @e[tag=emerald,type=marker] at @s run summon minecraft:area_effect_cloud ~ ~1.5 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["bedwars","emerald.subtitle"],CustomName:'"To be edited"',CustomNameVisible:1b} tellraw @a[tag=bw.player] ["\u00a7a重置完毕！"] scoreboard players set bw.reset board 0 @@ -82,7 +86,7 @@ scoreboard players set bw.state state 1 scoreboard players set bw.event state 0 scoreboard players set bw.event.countdown board 720 # bw.event -# 0: Diamond Up +# 0: Diamond Up # 1: Emerlad Up # 2: Bed Gone # 3: Dragon @@ -98,4 +102,4 @@ execute store result bossbar minigames:bedwars value run scoreboard players get scoreboard players set bw.set.em board 90 scoreboard players set bw.set.dm board 60 -kill @e[type=item] \ No newline at end of file +kill @e[type=item] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/siheyuan.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/siheyuan.mcfunction index e98113a0..7eeb9e16 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/siheyuan.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/siheyuan.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -753 121 -577 299 execute if score bw.reset board matches 2 run fill -216 0 299 -392 0 121 air execute if score bw.reset board matches 2 run fill -216 1 299 -392 1 121 air @@ -77,3 +81,4 @@ scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 60 execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/space.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/space.mcfunction index 5d70d775..318ae241 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/space.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/space.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # /clone -573 153 121 -397 153 299 # -> 225 -# +# execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -573 299 -397 121 execute if score bw.reset board matches 1..1 run clone from bedwars_backup -573 153 121 -397 153 299 -392 0 121 execute if score bw.reset board matches 2..2 run clone from bedwars_backup -573 154 121 -397 154 299 -392 1 121 @@ -85,4 +89,4 @@ execute if score bw.reset board matches 75.. run function bedwars/resets/resetov scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 75 -execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/special1.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/special1.mcfunction index 674d4192..d6b4d7d8 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/special1.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/special1.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # /clone -573 153 121 -397 153 299 # -> 225 -# +# execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -573 299 -397 121 execute if score bw.reset board matches 1..1 run fill -216 0 299 -392 0 121 air execute if score bw.reset board matches 2..2 run fill -216 1 299 -392 1 121 air @@ -79,4 +83,4 @@ execute if score bw.reset board matches 75.. run function bedwars/resets/resetov scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 75 -execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/unnamed.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/unnamed.mcfunction index 5ccafad7..a7735a29 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/resets/unnamed.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/resets/unnamed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.reset board matches 0..0 in bedwars_backup run forceload add -573 299 -397 121 execute if score bw.reset board matches 1..1 run clone from bedwars_backup -573 0 299 -397 0 121 -392 0 121 execute if score bw.reset board matches 2..2 run clone from bedwars_backup -573 1 299 -397 1 121 -392 1 121 @@ -86,4 +90,4 @@ execute if score bw.reset board matches 75.. run function bedwars/resets/resetov scoreboard players add bw.reset board 1 bossbar set minigames:bedwars max 75 -execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board \ No newline at end of file +execute store result bossbar minigames:bedwars value run scoreboard players get bw.reset board diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction index 76d1c775..1712aa4d 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=emerald] at @s run title @a[distance=0..2] actionbar ["\u00a7aEmerald \u00a7e将在 ",{"score":{"objective":"board","name":"bw.em","value":"1"},"color":"aqua"},"\u00a7bs\u00a7e 后产出。"] # execute as @e[tag=diamond] at @s run title @a[distance=0..2] actionbar ["\u00a7bDiamond \u00a7e将在 ",{"score":{"objective":"board","name":"bw.dm","value":"1"},"color":"green"},"\u00a7as\u00a7e 后产出。"] execute if score bw.state state matches 1.. run function minecraft:bedwars/summon @@ -5,7 +9,7 @@ execute if score bw.state state matches 1.. run function minecraft:bedwars/testf ## 防止重置的时候出现问题 execute if score bw.state state matches ..-1 run function bedwars/testforreset -# + function minecraft:bedwars/armor execute as @e[tag=bw.tntsheep] at @s run function bedwars/item/sheepsecond @@ -15,14 +19,13 @@ effect give @a[tag=bw.fasti] haste 2 0 true effect give @a[tag=bw.fastii] haste 2 1 true effect give @a[tag=bw.armor] resistance 2 0 true effect give @a[tag=bw.speed] speed 2 0 true -# execute as @a[tag=bw.player] at @s run attribute @s minecraft:generic.attack_speed base set 8 + ## Death scoreboard players remove @a[tag=bw.fhing] board 1 execute as @a[tag=bw.fhing] if score @s board matches ..0 run function minecraft:bedwars/during/player/teleport tellraw @a[tag=bw.fhing] ["\u00a7e你将在",{"score":{"objective": "board","name": "*"},"color":"red"},"\u00a7e秒后重生！"] title @a[tag=bw.fhing] title ["\u00a7c你死了！"] title @a[tag=bw.fhing] subtitle ["\u00a7e你将在",{"score":{"objective": "board","name": "*"},"color":"red"},"\u00a7e秒后重生！"] -# execute as @a[tag=INV] at @s run particle minecraft:block gold_block ~ ~ ~ 0 0 0 1 15 force ## Other @@ -31,7 +34,6 @@ recipe take @a[tag=bw.player] * ## Shop Item function bedwars/shop/resetshop -#execute as @a[tag=bw.play] run attribute @s minecraft:generic.attack_speed base set 10 ## Events -execute if score bw.state state matches 1..3 run function bedwars/events/eventsecond \ No newline at end of file +execute if score bw.state state matches 1..3 run function bedwars/events/eventsecond diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/setup.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/setup.mcfunction index 4ac250d0..39ae79c8 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/setup.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/setup.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard objectives modify bw.info displayname ["\u00a7e\u00a7l起床战争"] bossbar add minigames:bedwars "起床战争" @@ -15,4 +19,4 @@ bossbar add minigames:bedwars "起床战争" # scoreboard players set §r没有任何信息：§a0§b bw.info 4 # scoreboard players set §r没有任何信息：§a0 bw.info 3 # scoreboard players set §d bw.info 2 -# scoreboard players set §eBedwars@MiniGame bw.info 1 \ No newline at end of file +# scoreboard players set §eBedwars@MiniGame bw.info 1 diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy114514.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy114514.mcfunction index 7355f7c2..eaecd8fc 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy114514.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy114514.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -18,4 +22,4 @@ execute if score @s[tag=!bw.speed,team=bw.blue] bw.tmp.dm matches 6.. run tellra execute if score @s[tag=!bw.speed,team=bw.blue] bw.tmp.dm matches 6.. run tag @a[team=bw.blue] add bw.speed execute if score @s[tag=!bw.speed,team=bw.yellow] bw.tmp.dm matches 6.. run tellraw @a[team=bw.yellow] [{"selector":"@s"},"\u00a7a购买了\u00a76团队抗性加成"] -execute if score @s[tag=!bw.speed,team=bw.yellow] bw.tmp.dm matches 6.. run tag @a[team=bw.yellow] add bw.speed \ No newline at end of file +execute if score @s[tag=!bw.speed,team=bw.yellow] bw.tmp.dm matches 6.. run tag @a[team=bw.yellow] add bw.speed diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy5.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy5.mcfunction index ba7fc7e6..c28ccd2b 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy5.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy5.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -18,4 +22,4 @@ execute if score @s[tag=!bw.attack,team=bw.blue] bw.tmp.dm matches 8.. run tellr execute if score @s[tag=!bw.attack,team=bw.blue] bw.tmp.dm matches 8.. run tag @a[team=bw.blue] add bw.attack execute if score @s[tag=!bw.attack,team=bw.yellow] bw.tmp.dm matches 8.. run tellraw @a[team=bw.yellow] [{"selector":"@s"},"\u00a7a购买了\u00a76团队力量加成"] -execute if score @s[tag=!bw.attack,team=bw.yellow] bw.tmp.dm matches 8.. run tag @a[team=bw.yellow] add bw.attack \ No newline at end of file +execute if score @s[tag=!bw.attack,team=bw.yellow] bw.tmp.dm matches 8.. run tag @a[team=bw.yellow] add bw.attack diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy6.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy6.mcfunction index ad9c78f0..41e9c4ae 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy6.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy6.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -17,4 +21,4 @@ execute if score @s[tag=!bw.armor,team=bw.blue] bw.tmp.dm matches 5.. run tellra execute if score @s[tag=!bw.armor,team=bw.blue] bw.tmp.dm matches 5.. run tag @a[team=bw.blue] add bw.armor execute if score @s[tag=!bw.armor,team=bw.yellow] bw.tmp.dm matches 5.. run tellraw @a[team=bw.yellow] [{"selector":"@s"},"\u00a7a购买了\u00a76团队抗性加成"] -execute if score @s[tag=!bw.armor,team=bw.yellow] bw.tmp.dm matches 5.. run tag @a[team=bw.yellow] add bw.armor \ No newline at end of file +execute if score @s[tag=!bw.armor,team=bw.yellow] bw.tmp.dm matches 5.. run tag @a[team=bw.yellow] add bw.armor diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy7.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy7.mcfunction index 146f69f2..f41f2017 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy7.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy7.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -22,4 +26,4 @@ execute if score @s[tag=!bw.fasti,team=bw.blue] bw.tmp.dm matches 4.. run tag @a execute if score @s[tag=!bw.fasti,team=bw.yellow] bw.tmp.dm matches 4.. run tellraw @a[team=bw.yellow] [{"selector":"@s"},"\u00a7a购买了\u00a76团队挖掘速度（I）加成"] execute if score @s[tag=!bw.fasti,team=bw.yellow] bw.tmp.dm matches 4.. run tag @a[team=bw.yellow] add bw.fasti -tag @a[tag=bw.fastii] remove bw.fasti \ No newline at end of file +tag @a[tag=bw.fastii] remove bw.fasti diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy8.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy8.mcfunction index 1cf908f8..1ae714d8 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy8.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buy8.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -5,8 +9,8 @@ execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 tellraw @s[tag=bw.fastii] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[tag=bw.fastii] ~ ~ ~ 1 0 1 -tellraw @s[tag=!bw.fasti,tag=!bw.fastii] ["\u00a7c你还没有购买 急迫（I）！"] -playsound minecraft:entity.enderman.teleport player @s[tag=!bw.fasti,tag=!bw.fastii] ~ ~ ~ 1 0 1 +tellraw @s[tag=!bw.fastii] ["\u00a7c你还没有购买 急迫（I）！"] +playsound minecraft:entity.enderman.teleport player @s[tag=!bw.fastii] ~ ~ ~ 1 0 1 execute if score @s[tag=bw.fasti] bw.tmp.dm matches 6.. run clear @s diamond 6 execute unless score @s[tag=bw.fasti] bw.tmp.dm matches 6.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[tag=bw.fasti] bw.tmp.dm matches 6.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 @@ -22,4 +26,4 @@ execute if score @s[tag=bw.fasti,team=bw.blue] bw.tmp.dm matches 6.. run tag @a[ execute if score @s[tag=bw.fasti,team=bw.yellow] bw.tmp.dm matches 6.. run tellraw @a[team=bw.yellow] [{"selector":"@s"},"\u00a7a购买了\u00a76团队挖掘速度（II）加成"] execute if score @s[tag=bw.fasti,team=bw.yellow] bw.tmp.dm matches 6.. run tag @a[team=bw.yellow] add bw.fastii -tag @a[tag=bw.fastii] remove bw.fasti \ No newline at end of file +tag @a[tag=bw.fastii] remove bw.fasti diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buyf35.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buyf35.mcfunction index ded06b0b..413d2478 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buyf35.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/buyf35.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,4 +11,4 @@ execute if score @s bw.tmp.gd matches 8.. run clear @s gold_ingot 8 execute unless score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 8.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7a你购买了\u00a76TNT Sheep * 1"] -execute if score @s bw.tmp.gd matches 8.. run give @s sheep_spawn_egg{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"],EntityTag:{id:"minecraft:marker",Tags:["tntsheep.spawn"]},display:{Name:'"\\u00a7cTNT Sheep"',Lore:['"\\u00a7a仅可用于破坏方块"']}} 1 +execute if score @s bw.tmp.gd matches 8.. run give @s sheep_spawn_egg[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},entity_data={id:"minecraft:marker",Tags:["tntsheep.spawn"]},custom_name='"\\u00a7cTNT Sheep"',lore=['"\\u00a7a仅可用于破坏方块"']] diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/resetshop.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/resetshop.mcfunction index 41b70f93..ce2c30e1 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/resetshop.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/resetshop.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if entity @s run playsound minecraft:entity.player.burp player @s ~ ~ ~ 1 1 1 execute as @e[tag=dmshop] at @s run data modify block ~ ~ ~ Items set from storage minecraft:dmshop Item execute as @e[tag=shop] at @s run data modify block ~ ~ ~ Items set from storage minecraft:shop Item execute as @e[tag=shop2] at @s run data modify block ~ ~ ~ Items set from storage minecraft:shop Item2 + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/shoptick.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/shoptick.mcfunction index 3879b141..6a952ffb 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/shop/shoptick.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/shop/shoptick.mcfunction @@ -1,138 +1,142 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## Diamond Shop scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s stone_sword{shop:5} +execute as @s store success score @s bw.board run clear @s stone_sword[custom_data~{shop:5}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.5 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_chestplate{shop:6} +execute as @s store success score @s bw.board run clear @s iron_chestplate[custom_data~{shop:6}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.6 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_pickaxe{shop:7} +execute as @s store success score @s bw.board run clear @s iron_pickaxe[custom_data~{shop:7}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.7 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s diamond_pickaxe{shop:8} +execute as @s store success score @s bw.board run clear @s diamond_pickaxe[custom_data~{shop:8}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.8 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s potion{shop:114514} +execute as @s store success score @s bw.board run clear @s potion[custom_data~{shop:114514}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.114514 ## Item Shop scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s golden_apple{shop:9} +execute as @s store success score @s bw.board run clear @s golden_apple[custom_data~{shop:9}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.9 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s white_wool{shop:-2} +execute as @s store success score @s bw.board run clear @s white_wool[custom_data~{shop:-2}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-2 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s end_stone{shop:-3} +execute as @s store success score @s bw.board run clear @s end_stone[custom_data~{shop:-3}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-3 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s shears{shop:-4} +execute as @s store success score @s bw.board run clear @s shears[custom_data~{shop:-4}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-4 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s ladder{shop:-5} +execute as @s store success score @s bw.board run clear @s ladder[custom_data~{shop:-5}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-5 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s oak_planks{shop:-6} +execute as @s store success score @s bw.board run clear @s oak_planks[custom_data~{shop:-6}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-6 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s obsidian{shop:-7} +execute as @s store success score @s bw.board run clear @s obsidian[custom_data~{shop:-7}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-7 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s chainmail_boots{shop:-10} +execute as @s store success score @s bw.board run clear @s chainmail_boots[custom_data~{shop:-10}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-10 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_boots{shop:-11} +execute as @s store success score @s bw.board run clear @s iron_boots[custom_data~{shop:-11}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-11 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s diamond_boots{shop:-12} +execute as @s store success score @s bw.board run clear @s diamond_boots[custom_data~{shop:-12}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-12 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s wooden_pickaxe{shop:-15} +execute as @s store success score @s bw.board run clear @s wooden_pickaxe[custom_data~{shop:-15}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-15 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s wooden_axe{shop:-16} +execute as @s store success score @s bw.board run clear @s wooden_axe[custom_data~{shop:-16}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-16 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_pickaxe{shop:-17} +execute as @s store success score @s bw.board run clear @s iron_pickaxe[custom_data~{shop:-17}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-17 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_axe{shop:-18} +execute as @s store success score @s bw.board run clear @s iron_axe[custom_data~{shop:-18}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-18 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s diamond_pickaxe{shop:-19} +execute as @s store success score @s bw.board run clear @s diamond_pickaxe[custom_data~{shop:-19}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-19 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s diamond_axe{shop:-20} +execute as @s store success score @s bw.board run clear @s diamond_axe[custom_data~{shop:-20}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-20 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s water_bucket{shop:-21} +execute as @s store success score @s bw.board run clear @s water_bucket[custom_data~{shop:-21}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-21 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s stick{shop:-22} +execute as @s store success score @s bw.board run clear @s stick[custom_data~{shop:-22}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-22 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s egg{shop:-23} +execute as @s store success score @s bw.board run clear @s egg[custom_data~{shop:-23}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-23 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s arrow{shop:-24} +execute as @s store success score @s bw.board run clear @s arrow[custom_data~{shop:-24}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-24 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s stone_sword{shop:-25} +execute as @s store success score @s bw.board run clear @s stone_sword[custom_data~{shop:-25}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-25 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s iron_sword{shop:-26} +execute as @s store success score @s bw.board run clear @s iron_sword[custom_data~{shop:-26}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-26 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s diamond_sword{shop:-27} +execute as @s store success score @s bw.board run clear @s diamond_sword[custom_data~{shop:-27}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-27 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s bow{shop:-30} +execute as @s store success score @s bw.board run clear @s bow[custom_data~{shop:-30}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-30 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s bow{shop:-31} +execute as @s store success score @s bw.board run clear @s bow[custom_data~{shop:-31}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-31 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s potion{shop:-32} +execute as @s store success score @s bw.board run clear @s potion[custom_data~{shop:-32}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-32 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s potion{shop:-33} +execute as @s store success score @s bw.board run clear @s potion[custom_data~{shop:-33}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-33 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s ender_pearl{shop:-34} +execute as @s store success score @s bw.board run clear @s ender_pearl[custom_data~{shop:-34}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-34 scoreboard players reset @s bw.board -execute as @s store success score @s bw.board run clear @s tnt{shop:-35} +execute as @s store success score @s bw.board run clear @s tnt[custom_data~{shop:-35}] execute as @s if score @s bw.board matches 1.. run tag @s add bw.buy.-35 ## Diamond Shop @@ -282,4 +286,4 @@ execute as @s[tag=bw.buy.114514] at @s run playsound minecraft:block.note_block. execute as @s[tag=bw.buy.114514] at @s run function minecraft:bedwars/shop/buy114514 tag @s remove bw.buy.114514 -function bedwars/shop/resetshop \ No newline at end of file +function bedwars/shop/resetshop diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/summon.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/summon.mcfunction index 8265cf00..f5574d18 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/summon.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/summon.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #execute if score bw.em board matches ..0 as @e[type=marker,tag=emerald] at @s run summon item ~ ~ ~ {Item:{id:"minecraft:emerald",Count:1b,tag:{HideFlags:63,CanDe1stroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} #execute if score bw.dm board matches ..0 as @e[type=marker,tag=diamond] at @s run summon item ~ ~ ~ {Item:{id:"minecraft:diamond",Count:1b,tag:{HideFlags:63,CanDe1stroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} #execute if score bw.ir board matches ..0 as @e[type=marker,tag=iron] at @s run summon item ~ ~ ~ {Item:{id:"minecraft:iron_ingot",Count:1b,tag:{HideFlags:63,CanDe1stroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} @@ -12,7 +16,7 @@ data modify block -307 74 207 front_text.messages[0] set value '["\\u00a7e将在 data modify block -307 74 207 front_text.messages[1] set value '["\\u00a7e将在",{"score":{"objective":"board","name":"bw.dm"},"color":"red"},"\\u00a7e秒后产生"]' execute as @e[type=area_effect_cloud,tag=emerald.subtitle] at @s run data modify entity @s CustomName set from block -307 74 207 front_text.messages[0] execute as @e[type=area_effect_cloud,tag=diamond.subtitle] at @s run data modify entity @s CustomName set from block -307 74 207 front_text.messages[1] -# execute if score bw.dm board matches ..0 as @e[type=marker,tag=diamond] at @s run function minecraft:bedwars/summont/diamond + execute if score bw.dm board matches ..0 as @e[type=marker,tag=diamond] at @s run function minecraft:bedwars/summont/diamond execute if score bw.ir board matches ..0 as @e[type=marker,tag=iron] at @s run function minecraft:bedwars/summont/iron execute if score bw.gd board matches ..0 as @e[type=marker,tag=gold] at @s run function minecraft:bedwars/summont/gold @@ -31,4 +35,4 @@ execute if score bw.gd board matches ..0 run scoreboard players set bw.gd board execute if score bw.ir board matches ..0 run scoreboard players set bw.ir board 3 scoreboard players remove bw.gd board 1 -scoreboard players remove bw.ir board 1 \ No newline at end of file +scoreboard players remove bw.ir board 1 diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/diamond.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/diamond.mcfunction index 70da591c..01f89e7a 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/diamond.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/diamond.mcfunction @@ -1,3 +1,7 @@ -execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:diamond"}}] Item.Count +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:diamond"}}] Item.count -function fix:bw/dmspan \ No newline at end of file +function fix:bw/dmspan diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/emerald.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/emerald.mcfunction index 03fe81b1..5215a1a4 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/emerald.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/emerald.mcfunction @@ -1,2 +1,6 @@ -execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:emerald"}}] Item.Count -function fix:bw/emspan \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:emerald"}}] Item.count +function fix:bw/emspan diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/gold.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/gold.mcfunction index e1104c4c..24f8e82f 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/gold.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/gold.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # function fix:bw/gospan scoreboard players set temp board 0 scoreboard players set temp1 board 0 -execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:gold_ingot"}}] Item.Count +execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:gold_ingot"}}] Item.count execute at @s as @a[tag=bw.play,gamemode=!spectator,distance=0..2] run scoreboard players add temp1 board 1 execute if score temp1 board matches ..1 run function fix:bw/gospan execute if score temp1 board matches 2.. run function fix:bw/gogive execute if score temp1 board matches 2.. run playsound entity.item.pickup player @a[tag=bw.play,gamemode=!spectator,distance=0..2] ~ ~ ~ 1 1 0.5 scoreboard players reset temp board + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/iron.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/iron.mcfunction index aa048ca9..c7d9fed2 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/summont/iron.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/summont/iron.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set temp board 0 scoreboard players set temp1 board 0 -execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:iron_ingot"}}] Item.Count +execute store result score temp board run data get entity @e[type=item,distance=0..2,limit=1,sort=nearest,nbt={Item:{id:"minecraft:iron_ingot"}}] Item.count execute at @s as @a[tag=bw.play,gamemode=!spectator,distance=0..2] run scoreboard players add temp1 board 1 execute if score temp1 board matches ..1 run function fix:bw/irspan execute if score temp1 board matches 2.. run function fix:bw/irgive execute if score temp1 board matches 2.. run playsound entity.item.pickup player @a[tag=bw.play,gamemode=!spectator,distance=0..2] ~ ~ ~ 1 1 0.5 scoreboard players reset temp board + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/testfor.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/testfor.mcfunction index b855d5d0..1409ad73 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/testfor.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/testfor.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bd.blue state matches 1.. as @e[tag=bw.bed.blue,limit=1] at @s unless block ~ ~ ~ blue_bed run function minecraft:bedwars/during/beddestroy/blue execute if score bd.green state matches 1.. as @e[tag=bw.bed.green,limit=1] at @s unless block ~ ~ ~ lime_bed run function minecraft:bedwars/during/beddestroy/green execute if score bd.yellow state matches 1.. as @e[tag=bw.bed.yellow,limit=1] at @s unless block ~ ~ ~ yellow_bed run function minecraft:bedwars/during/beddestroy/yellow -execute if score bd.red state matches 1.. as @e[tag=bw.bed.red,limit=1] at @s unless block ~ ~ ~ red_bed run function minecraft:bedwars/during/beddestroy/red \ No newline at end of file +execute if score bd.red state matches 1.. as @e[tag=bw.bed.red,limit=1] at @s unless block ~ ~ ~ red_bed run function minecraft:bedwars/during/beddestroy/red diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/testforover.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/testforover.mcfunction index 6fd44034..7ee20edc 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/testforover.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/testforover.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:bedwars/totalpeople # Team Over @@ -15,3 +19,4 @@ execute if score bw.state state matches 1..5 if score bw.blue tick matches 1.. u execute if score bw.state state matches 1..5 if score bw.yellow tick matches 1.. unless score bw.red tick matches 1.. unless score bw.green tick matches 1.. unless score bw.blue tick matches 1.. run function minecraft:bedwars/during/win/yellow execute if score bw.state state matches 1..5 if score bw.total tick matches ..1 run function bedwars/after/over + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/testforreset.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/testforreset.mcfunction index 30f1d021..94f0d417 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/testforreset.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/testforreset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.waitreset tick 0 execute as @a[tag=bw.player] run scoreboard players add bw.waitreset tick 1 -execute if score bw.waitreset tick matches ..1 run function bedwars/after/overreset \ No newline at end of file +execute if score bw.waitreset tick matches ..1 run function bedwars/after/overreset diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/tick.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/tick.mcfunction index d07a401d..b8877061 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/tick.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # /say @e[nbt={Inventory:[{id:"minecraft:white_wool"}]}] #data modify block -183 11 126 Items set from storage minecraft:shop Item #tag @a[nbt={Inventory:[{id:"minecraft:gray_stained_glass_pane",tag:{shop:1}}]}] add bw.buy.1 @@ -5,17 +9,12 @@ execute as @a[tag=bw.play,scores={die=1..}] at @s run function minecraft:bedwars execute if score bw.state state matches 1.. run function minecraft:bedwars/testfor ## Shop # 不可购买 -scoreboard players reset @a[tag=bw.player] bw.board -execute as @a[tag=bw.player] store success score @s bw.board run clear @s gray_stained_glass_pane{shop:1} -execute as @a[tag=bw.player] if score @s bw.board matches 1.. run tag @s add bw.buy.1 -execute as @a[tag=bw.buy.1] at @s run playsound minecraft:entity.player.burp player @s ~ ~ ~ 1 1 1 -execute as @a[tag=bw.buy.1,limit=1] at @s run function bedwars/shop/resetshop -#/playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2 1 -tag @a remove bw.buy.1 +execute as @a[tag=bw.player] if items entity @s player.cursor *[custom_data~{shop:1}] at @s run function bedwars/shop/resetshop +execute as @a[tag=bw.player] if items entity @s container.* *[custom_data~{shop:1}] at @s run function bedwars/shop/resetshop + # 可购买 -scoreboard players reset @a[tag=bw.player] bw.board -execute as @a[tag=bw.player] store success score @s bw.board run clear @s #minecraft:shopitem{bwshopitem:1} 0 -execute as @a[tag=bw.player] if score @s bw.board matches 1.. run function bedwars/shop/shoptick +execute as @a[tag=bw.player] if items entity @s player.cursor *[custom_data~{bwshopitem:1}] at @s run function bedwars/shop/shoptick +execute as @a[tag=bw.player] if items entity @s container.* *[custom_data~{bwshopitem:1}] at @s run function bedwars/shop/shoptick execute as @e[tag=tntsheep.spawn] at @s run function bedwars/item/tntsheep @@ -36,7 +35,7 @@ kill @e[type=item,nbt={Item:{id:"minecraft:red_bed"}}] kill @e[type=item,nbt={Item:{id:"minecraft:blue_bed"}}] kill @e[type=item,nbt={Item:{id:"minecraft:yellow_bed"}}] kill @e[type=item,nbt={Item:{id:"minecraft:lime_bed"}}] -kill @e[type=item,nbt={Item:{tag:{bw:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{bw:1}}}}] execute as @e[tag=bedwars,type=area_effect_cloud] at @s run data merge entity @s {Duration:-1,Age: -2147483648,WaitTime: -2147483648} # [!] @@ -60,50 +59,7 @@ execute as @e[type=egg] run scoreboard players add @s board 1 execute as @a[gamemode=adventure] at @s run kill @s[y=-70,dy=-100] ## Kill Shop Items -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] -kill @e[type=item,nbt={Item:{tag:{bwshopitem:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{bwshopitem:1}}}}] ## Invis tag @a[tag=INV] remove INV @@ -112,4 +68,5 @@ execute if entity @e[scores={attack.1=1..},tag=bw.player] run effect clear @a[ta execute if entity @e[scores={attack.1=1..},tag=bw.player] run tellraw @a[tag=INV,scores={hurt.1=1..}] ["\u00a7c你的隐身状态因为受到伤害被取消！"] scoreboard players reset @a[scores={hurt.1=1..}] hurt.1 scoreboard players reset @a[scores={attack.1=1..}] attack.1 -execute as @a[tag=INV] at @s run particle minecraft:dust 0.388 0.388 0.388 1 ~ ~ ~ 0 0 0 1 1 force +execute as @a[tag=INV] at @s run particle minecraft:dust{color:[0.388, 0.388, 0.388],scale:1} ~ ~ ~ 0 0 0 1 1 force + diff --git a/datapacks/bedwars/data/minecraft/functions/bedwars/totalpeople.mcfunction b/datapacks/bedwars/data/minecraft/functions/bedwars/totalpeople.mcfunction index 5bb1acba..312590a9 100644 --- a/datapacks/bedwars/data/minecraft/functions/bedwars/totalpeople.mcfunction +++ b/datapacks/bedwars/data/minecraft/functions/bedwars/totalpeople.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set bw.green tick 0 execute as @a[team=bw.green,tag=bw.play] run scoreboard players add bw.green tick 1 scoreboard players set bw.blue tick 0 @@ -7,4 +11,4 @@ execute as @a[team=bw.yellow,tag=bw.play] run scoreboard players add bw.yellow t scoreboard players set bw.red tick 0 execute as @a[team=bw.red,tag=bw.play] run scoreboard players add bw.red tick 1 scoreboard players set bw.total tick 0 -execute as @a[tag=bw.play] run scoreboard players add bw.total tick 1 \ No newline at end of file +execute as @a[tag=bw.play] run scoreboard players add bw.total tick 1 diff --git a/datapacks/bedwars/data/minecraft/item_modifiers/bwdm.json b/datapacks/bedwars/data/minecraft/item_modifiers/bwdm.json index 920df64d..2cb60226 100644 --- a/datapacks/bedwars/data/minecraft/item_modifiers/bwdm.json +++ b/datapacks/bedwars/data/minecraft/item_modifiers/bwdm.json @@ -1,6 +1,6 @@ [ { - "function": "set_nbt", + "function": "set_custom_data", "tag": "{bwshopitem:2}" } ] \ No newline at end of file diff --git a/datapacks/bedwars/data/minecraft/item_modifiers/bwitem.json b/datapacks/bedwars/data/minecraft/item_modifiers/bwitem.json index 04370383..074345d1 100644 --- a/datapacks/bedwars/data/minecraft/item_modifiers/bwitem.json +++ b/datapacks/bedwars/data/minecraft/item_modifiers/bwitem.json @@ -1,6 +1,6 @@ [ { - "function": "set_nbt", + "function": "set_custom_data", "tag": "{bwshopitem:1}" } ] \ No newline at end of file diff --git a/datapacks/compasstracker/data/compasstrack/functions/second.mcfunction b/datapacks/compasstracker/data/compasstrack/functions/second.mcfunction index 765880ce..63009e26 100644 --- a/datapacks/compasstracker/data/compasstrack/functions/second.mcfunction +++ b/datapacks/compasstracker/data/compasstrack/functions/second.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in airworld as @a[team=play.sur.zom] at @s run function compasstrack:updatecompass execute as @a[team=play.sur.zom] at @s run effect give @a[distance=0..7,team=play.sur] glowing 2 25 true -execute as @a[team=play.sur] at @s run effect give @a[distance=0..7,team=play.sur.zom] glowing 2 25 true \ No newline at end of file +execute as @a[team=play.sur] at @s run effect give @a[distance=0..7,team=play.sur.zom] glowing 2 25 true diff --git a/datapacks/compasstracker/data/compasstrack/functions/setup.mcfunction b/datapacks/compasstracker/data/compasstrack/functions/setup.mcfunction new file mode 100644 index 00000000..39b34971 --- /dev/null +++ b/datapacks/compasstracker/data/compasstrack/functions/setup.mcfunction @@ -0,0 +1,2 @@ +execute in overworld positioned 0 -64 0 run setblock ~ ~ ~ air +execute in overworld positioned 0 -64 0 run setblock ~ ~ ~ shulker_box{Lock:"1sqws"} replace \ No newline at end of file diff --git a/datapacks/compasstracker/data/compasstrack/functions/tick.mcfunction b/datapacks/compasstracker/data/compasstrack/functions/tick.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/compasstracker/data/compasstrack/functions/tick.mcfunction +++ b/datapacks/compasstracker/data/compasstrack/functions/tick.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/compasstracker/data/compasstrack/functions/updatecompass.mcfunction b/datapacks/compasstracker/data/compasstrack/functions/updatecompass.mcfunction index 57ac37bc..935e9eff 100644 --- a/datapacks/compasstracker/data/compasstrack/functions/updatecompass.mcfunction +++ b/datapacks/compasstracker/data/compasstrack/functions/updatecompass.mcfunction @@ -1,9 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute at @s run tag @p[team=play.sur,gamemode=survival] add sur.sel clear @s compass -execute if entity @a[tag=sur.sel,limit=1] run item replace entity @s[team=play.sur.zom] hotbar.8 with minecraft:compass{LodestoneDimension:"minecraft:airworld",LodestonePos:{X:0,Y:0,Z:0},LodestoneTracked:0b,display:{Name:'"\\u00a7f玩家追踪指南针 \\u00a7c(请勿移动此物品)"',Lore:['"\\u00a77默认追踪离你最近的玩家"']}} -execute unless entity @a[tag=sur.sel,limit=1] run item replace entity @s[team=play.sur.zom] hotbar.8 with minecraft:compass{LodestoneDimension:"minecraft:airworld",LodestonePos:{X:0,Y:0,Z:0},LodestoneTracked:0b,display:{Name:'"\\u00a7f玩家追踪指南针 \\u00a78- \\u00a7c失去目标"',Lore:['"\\u00a77默认追踪离你最近的玩家"']}} -data modify storage compass:tmp Pos.X set from entity @a[tag=sur.sel,limit=1] Pos[0] -data modify storage compass:tmp Pos.Y set from entity @a[tag=sur.sel,limit=1] Pos[1] -data modify storage compass:tmp Pos.Z set from entity @a[tag=sur.sel,limit=1] Pos[2] -item modify entity @s hotbar.8 compasstrack:compassupdater -tag @a remove sur.sel \ No newline at end of file + +execute if entity @a[tag=sur.sel,limit=1] in overworld run item replace block 0 -64 0 container.0 with minecraft:compass[lodestone_tracker={target:{dimension:"minecraft:airworld",pos:[0,0,0]},tracked:0b},custom_name='"\\u00a7f玩家追踪指南针 \\u00a7c(请勿移动此物品)"',lore=['"\\u00a77默认追踪离你最近的玩家"']] + +execute unless entity @a[tag=sur.sel,limit=1] in overworld run item replace block 0 -64 0 container.0 with minecraft:compass[lodestone_tracker={target:{dimension:"minecraft:airworld",pos:[0,0,0]},tracked:0b},custom_name='"\\u00a7f玩家追踪指南针 \\u00a78- \\u00a7c失去目标"',lore=['"\\u00a77默认追踪离你最近的玩家"']] +# execute unless entity @a[tag=sur.sel,limit=1] run item replace entity @s[team=play.sur.zom] hotbar.8 with +execute in overworld positioned 0 -64 0 run data modify block 0 -64 0 Items[0].components."minecraft:lodestone_tracker".target.pos set from entity @a[tag=sur.sel,limit=1] Pos +execute in overworld run loot replace entity @s hotbar.8 mine 0 -64 0 command_block[custom_data={drop_contents:1b}] +# item modify entity @s hotbar.8 compasstrack:compassupdater +tag @a remove sur.sel diff --git a/datapacks/compasstracker/data/compasstrack/item_modifiers/compassupdater.json b/datapacks/compasstracker/data/compasstrack/item_modifiers/compassupdater.json deleted file mode 100644 index 7e4375bb..00000000 --- a/datapacks/compasstracker/data/compasstrack/item_modifiers/compassupdater.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "function": "copy_nbt", - "source": { - "type": "storage", - "source": "compass:tmp" - }, - "ops": [ - { - "source": "Pos", - "target": "LodestonePos", - "op": "replace" - } - ] - } -] \ No newline at end of file diff --git a/datapacks/compasstracker/data/minecraft/loot_tables/blocks/shulker_box.json b/datapacks/compasstracker/data/minecraft/loot_tables/blocks/shulker_box.json new file mode 100644 index 00000000..2c7a98c4 --- /dev/null +++ b/datapacks/compasstracker/data/minecraft/loot_tables/blocks/shulker_box.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:dynamic", + "name": "contents", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:command_block" + ] + } + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/datapacks/compasstracker/data/minecraft/tags/functions/load.json b/datapacks/compasstracker/data/minecraft/tags/functions/load.json new file mode 100644 index 00000000..82a513db --- /dev/null +++ b/datapacks/compasstracker/data/minecraft/tags/functions/load.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "compasstrack:setup" + ] +} \ No newline at end of file diff --git a/datapacks/foodparty/data/foodparty/functions/join.mcfunction b/datapacks/foodparty/data/foodparty/functions/join.mcfunction index 4b70a3d1..8bb17c45 100644 --- a/datapacks/foodparty/data/foodparty/functions/join.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title ["\u00a7e\u00a7lFOOD CARNIVAL: \u00a7b\u00a7lPARTY"] title @s subtitle ["\u00a7a美食嘉年华：美食派对"] team join foodparty @@ -7,4 +11,4 @@ tp @s 213 80 160 0 0 playsound entity.generic.explode player @s 213 80 160 1 2 1 clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/foodparty/data/foodparty/functions/npcevent.mcfunction b/datapacks/foodparty/data/foodparty/functions/npcevent.mcfunction index bb0e2882..8d7f46b6 100644 --- a/datapacks/foodparty/data/foodparty/functions/npcevent.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/npcevent.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if block ~ ~-2 ~ command_block[facing=south] run data modify entity @s Motion[2] set value 0.13 execute if block ~ ~-2 ~ command_block[facing=south] at @s run tp @s ~ ~ ~ 0 ~ execute if block ~ ~-2 ~ command_block[facing=north] run data modify entity @s Motion[2] set value -0.13 @@ -15,4 +19,4 @@ execute as @s[tag=npc.hungry] if block ~ ~-2 ~ lime_terracotta run data modify e execute as @s[tag=npc.hungry] if block ~ ~-2 ~ lime_terracotta at @s run tp @s ~ ~ ~ 0 ~ tag @s remove npc.moving execute as @s[tag=!npc.moving] run data merge entity @s {NoAI:0b} -execute as @s[tag=npc.moving] run data merge entity @s {NoAI:1b} \ No newline at end of file +execute as @s[tag=npc.moving] run data merge entity @s {NoAI:1b} diff --git a/datapacks/foodparty/data/foodparty/functions/second.mcfunction b/datapacks/foodparty/data/foodparty/functions/second.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/foodparty/data/foodparty/functions/second.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/second.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/foodparty/data/foodparty/functions/spec.mcfunction b/datapacks/foodparty/data/foodparty/functions/spec.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/foodparty/data/foodparty/functions/spec.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/spec.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/foodparty/data/foodparty/functions/start.mcfunction b/datapacks/foodparty/data/foodparty/functions/start.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/foodparty/data/foodparty/functions/start.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/start.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/foodparty/data/foodparty/functions/tick.mcfunction b/datapacks/foodparty/data/foodparty/functions/tick.mcfunction index 834abf52..961e9239 100644 --- a/datapacks/foodparty/data/foodparty/functions/tick.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/tick.mcfunction @@ -1 +1,5 @@ -execute as @e[tag=foodparty.npc] at @s run function foodparty:npcevent \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[tag=foodparty.npc] at @s run function foodparty:npcevent diff --git a/datapacks/foodparty/data/foodparty/functions/trystart.mcfunction b/datapacks/foodparty/data/foodparty/functions/trystart.mcfunction index c0b1f78c..3fc95f8b 100644 --- a/datapacks/foodparty/data/foodparty/functions/trystart.mcfunction +++ b/datapacks/foodparty/data/foodparty/functions/trystart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=foodparty,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score foodparty.state state matches 1.. run function foodparty:spec execute unless score foodparty.state state matches 1.. if score wait.player tick matches ..0 run tellraw @s ["\u00a7c人数不够！请等待至少1人！"] execute unless score foodparty.state state matches 1.. if score wait.player tick matches ..0 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score foodparty.state state matches 1.. if score wait.player tick matches 1.. run function foodparty:start \ No newline at end of file +execute unless score foodparty.state state matches 1.. if score wait.player tick matches 1.. run function foodparty:start diff --git a/datapacks/item_gun/data/boatgun/functions/gun/countdownmove.mcfunction b/datapacks/item_gun/data/boatgun/functions/gun/countdownmove.mcfunction index 576b2ff4..a98bd53b 100644 --- a/datapacks/item_gun/data/boatgun/functions/gun/countdownmove.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/gun/countdownmove.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s run function boatgun:gun/move scoreboard players remove tmp.countdown board 1 -execute if score tmp.countdown board matches 1.. run function boatgun:gun/countdownmove \ No newline at end of file +execute if score tmp.countdown board matches 1.. run function boatgun:gun/countdownmove diff --git a/datapacks/item_gun/data/boatgun/functions/gun/die.mcfunction b/datapacks/item_gun/data/boatgun/functions/gun/die.mcfunction index 0b49ef4a..ac9a0104 100644 --- a/datapacks/item_gun/data/boatgun/functions/gun/die.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/gun/die.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/item_gun/data/boatgun/functions/gun/main.mcfunction b/datapacks/item_gun/data/boatgun/functions/gun/main.mcfunction index 378b46b3..16acb40f 100644 --- a/datapacks/item_gun/data/boatgun/functions/gun/main.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/gun/main.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players operation tmp.countdown board = @s btw.gunspeed # execute if score tmp.count execute as @s at @s run function boatgun:gun/countdownmove + diff --git a/datapacks/item_gun/data/boatgun/functions/gun/move.mcfunction b/datapacks/item_gun/data/boatgun/functions/gun/move.mcfunction index 3e01f632..a84def45 100644 --- a/datapacks/item_gun/data/boatgun/functions/gun/move.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/gun/move.mcfunction @@ -1,5 +1,9 @@ -execute if data entity @s {data:{team:1}} run particle minecraft:dust 0.059 0.973 0.439 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{team:2}} run particle minecraft:dust 0.973 0.059 0.059 1 ~ ~ ~ 0 0 0 1 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if data entity @s {data:{team:1}} run particle minecraft:dust{color:[0.059, 0.973, 0.439],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{team:2}} run particle minecraft:dust{color:[0.973, 0.059, 0.059],scale:1} ~ ~ ~ 0 0 0 1 1 execute if score @s PSTJ matches ..-1 run function boatgun:gun/die execute if score @s PSTJ matches 0.. if block ^ ^ ^1 #gunblock run function boatgun:gun/die @@ -14,4 +18,4 @@ execute if score @s PSTJ matches 0.. if data entity @s {data:{team:2}} if entity execute if score @s PSTJ matches 0.. if data entity @s {data:{team:1}} if entity @a[team=btw.play.b,tag=hitted] run function boatgun:hit/a # execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 tag @e[tag=hitted] remove hitted -execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 \ No newline at end of file +execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 diff --git a/datapacks/item_gun/data/boatgun/functions/gun/testfortarget.mcfunction b/datapacks/item_gun/data/boatgun/functions/gun/testfortarget.mcfunction index 2246232e..fc6ad2e0 100644 --- a/datapacks/item_gun/data/boatgun/functions/gun/testfortarget.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/gun/testfortarget.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned ~-0.5 ~ ~-0.5 run tag @e[dx=0.5,dy=2,dz=0.5,tag=pve.zombie] add hitted # execute positioned ~ ~ ~ run tag @e[distance=..0.5,tag=pve.zombie] add hitted tag @s add selel execute as @e[distance=0..3,limit=1,team=btw.play.a,sort=nearest] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel] run tag @s add hitted execute as @e[distance=0..3,limit=1,team=btw.play.b,sort=nearest] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel] run tag @s add hitted # say @a[tag=hitted] -tag @s remove selel \ No newline at end of file +tag @s remove selel diff --git a/datapacks/item_gun/data/boatgun/functions/hit/a.mcfunction b/datapacks/item_gun/data/boatgun/functions/hit/a.mcfunction index b854e9bc..33451ab1 100644 --- a/datapacks/item_gun/data/boatgun/functions/hit/a.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/hit/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel tag @a[team=btw.play.b,tag=hitted] add seled execute as @a[team=btw.play.a] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player @@ -8,7 +12,7 @@ execute if score tmp board matches ..0 run scoreboard players set tmp board 1 execute as @e[tag=damage.boat] at @s run scoreboard players operation @s btw.score -= tmp board -execute as @a[tag=seled] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @a[tag=seled] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=seled] at @s run playsound entity.player.hurt player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 scoreboard players add @a[tag=hit.player] btw.coin 10 @@ -19,4 +23,4 @@ tag @s remove sel tag @e[type=boat,tag=damage.boat] remove damage.boat tag @a remove hit.player -function boatgun:gun/die \ No newline at end of file +function boatgun:gun/die diff --git a/datapacks/item_gun/data/boatgun/functions/hit/b.mcfunction b/datapacks/item_gun/data/boatgun/functions/hit/b.mcfunction index bac693c1..ec725e53 100644 --- a/datapacks/item_gun/data/boatgun/functions/hit/b.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/hit/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel tag @a[team=btw.play.a,tag=hitted] add seled execute as @a[team=btw.play.b] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player @@ -8,7 +12,7 @@ execute if score tmp board matches ..0 run scoreboard players set tmp board 1 execute as @e[tag=damage.boat] at @s run scoreboard players operation @s btw.score -= tmp board -execute as @a[tag=seled] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @a[tag=seled] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=seled] at @s run playsound entity.player.hurt player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 scoreboard players add @a[tag=hit.player] btw.coin 10 @@ -19,3 +23,4 @@ tag @s remove sel tag @e[type=boat,tag=damage.boat] remove damage.boat tag @a remove hit.player function boatgun:gun/die + diff --git a/datapacks/item_gun/data/boatgun/functions/shoot/a.mcfunction b/datapacks/item_gun/data/boatgun/functions/shoot/a.mcfunction index 06c7459c..4c47a8dc 100644 --- a/datapacks/item_gun/data/boatgun/functions/shoot/a.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/shoot/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["boat.gun.line","gun.new"],data:{team:1}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ diff --git a/datapacks/item_gun/data/boatgun/functions/shoot/b.mcfunction b/datapacks/item_gun/data/boatgun/functions/shoot/b.mcfunction index 18aec0f0..7c97003e 100644 --- a/datapacks/item_gun/data/boatgun/functions/shoot/b.mcfunction +++ b/datapacks/item_gun/data/boatgun/functions/shoot/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["boat.gun.line","gun.new"],data:{team:2}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ diff --git a/datapacks/item_gun/data/minecraft/functions/gun/1/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/1/hit.mcfunction index 8115ade8..6429c212 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/1/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/1/hit.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted,limit=1] unless data entity @s {Invulnerable:1b} run damage @s 3 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 # execute unless data entity @e[tag=hitted,limit=1] {Invulnerable:1b} run scoreboard players remove tmp.health board 30 @@ -16,11 +20,11 @@ scoreboard players add tmp.health.calc2 board 0 tellraw @a[tag=hit.player] ["\u00a76+30\u00a76 Coins"] tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] -data modify entity @e[tag=hitted,limit=1] AngryAt set from entity @s UUID -execute as @e[tag=hitted] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 + +execute as @e[tag=hitted] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players add @s zombie.coin 30 tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/1/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/1/shoot.mcfunction index b2ccf8bb..25f1d196 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/1/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/1/shoot.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:1}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^0.5 scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed scoreboard players set @e[tag=gun.new] PSTJ 15 tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/2/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/2/hit.mcfunction index 4752b4f8..e40fd584 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/2/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/2/hit.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted,limit=1] unless data entity @s {Invulnerable:1b} run damage @s 3 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 # execute unless data entity @e[tag=hitted,limit=1] {Invulnerable:1b} run scoreboard players remove tmp.health board 30 @@ -17,12 +21,10 @@ scoreboard players add tmp.health.calc2 board 0 tellraw @a[tag=hit.player] ["\u00a76+30\u00a76 Coins"] tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] data merge entity @e[tag=hitted,limit=1] {Fire:20s} -data modify entity @e[tag=hitted,limit=1] AngryAt set from entity @s UUID -data merge entity @e[tag=hitted,limit=1] {AngerTime:540} -execute as @e[tag=hitted] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @e[tag=hitted] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players add @s zombie.coin 30 tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/2/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/2/shoot.mcfunction index f7ada399..9e8ed0b0 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/2/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/2/shoot.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:2}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^0.5 scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid scoreboard players set @e[tag=gun.new] PSTJ 25 -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/3/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/3/hit.mcfunction index 9bceda32..80b1541a 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/3/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/3/hit.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted,limit=1] unless data entity @s {Invulnerable:1b} run damage @s 6 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 # execute unless data entity @e[tag=hitted,limit=1] {Invulnerable:1b} run scoreboard players remove tmp.health board 60 @@ -17,12 +21,10 @@ scoreboard players add tmp.health.calc2 board 0 tellraw @a[tag=hit.player] ["\u00a76+60\u00a76 Coins"] tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] data modify entity @e[tag=hitted,limit=1] Motion[1] set value 0.6 -data modify entity @e[tag=hitted,limit=1] AngryAt set from entity @s UUID -data merge entity @e[tag=hitted,limit=1] {AngerTime:540} -execute as @e[tag=hitted] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @e[tag=hitted] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players add @s zombie.coin 60 tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/3/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/3/shoot.mcfunction index 34130e97..d2b94ce7 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/3/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/3/shoot.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:3}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^0.5 scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid scoreboard players set @e[tag=gun.new] PSTJ 15 -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/4/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/4/shoot.mcfunction index 3ed7453b..337b6319 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/4/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/4/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^0.25 {Tags:["f.tmp"]} # execute if entity @s[team=job_pvp] anchored eyes run summon fireball ^ ^ ^1 {Tags:["f.new"],ExplosionPower:1} @@ -11,4 +15,4 @@ tag @e[tag=f.new] remove f.new kill @e[tag=f.tmp] tag @a remove sel playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/5/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/5/shoot.mcfunction index 576f4257..571bd54f 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/5/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/5/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^2 {Tags:["f.tmp"]} # execute if entity @s[team=job_pvp] anchored eyes run summon arrow ^ ^ ^1 {Tags:["f.new"],ExplosionPower:1} @@ -12,4 +16,4 @@ tag @e[tag=f.new] remove f.new kill @e[tag=f.tmp] tag @a remove sel playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/6/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/6/hit.mcfunction index a51559b5..df198dff 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/6/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/6/hit.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute unless data entity @s {Invulnerable:1b} run damage @s 10 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @s run data get entity @s Health 10 +execute store result score tmp.health board as @s run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 # execute unless data entity @e[tag=hitted,limit=1] {Invulnerable:1b} run scoreboard players remove tmp.health board 30 @@ -16,8 +20,8 @@ tellraw @a[tag=hit.player] ["\u00a76+100\u00a76 Coins"] tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] -execute as @s at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @s at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players add @s zombie.coin 100 tag @s remove sel -# say 1 \ No newline at end of file +# say 1 diff --git a/datapacks/item_gun/data/minecraft/functions/gun/6/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/6/shoot.mcfunction index 8b3dadd6..f4c3a842 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/6/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/6/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add hit.player execute as @e[tag=pve.zombie,distance=0..10] at @s run function gun/6/hit # execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^3 {Tags:["f.tmp"]} @@ -13,4 +17,4 @@ execute as @e[tag=pve.zombie,distance=0..10] at @s run function gun/6/hit # tag @a remove sel playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 item modify entity @s weapon.mainhand usegun -tag @s remove hit.player \ No newline at end of file +tag @s remove hit.player diff --git a/datapacks/item_gun/data/minecraft/functions/gun/7/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/7/hit.mcfunction index 8115ade8..0446b8cb 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/7/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/7/hit.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted,limit=1] unless data entity @s {Invulnerable:1b} run damage @s 3 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 # execute unless data entity @e[tag=hitted,limit=1] {Invulnerable:1b} run scoreboard players remove tmp.health board 30 @@ -16,11 +20,10 @@ scoreboard players add tmp.health.calc2 board 0 tellraw @a[tag=hit.player] ["\u00a76+30\u00a76 Coins"] tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] -data modify entity @e[tag=hitted,limit=1] AngryAt set from entity @s UUID -execute as @e[tag=hitted] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @e[tag=hitted] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players add @s zombie.coin 30 tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die \ No newline at end of file diff --git a/datapacks/item_gun/data/minecraft/functions/gun/7/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/7/shoot.mcfunction index 69dea66c..fc2833f9 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/7/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/7/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:7}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ @@ -5,7 +9,7 @@ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^ scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid scoreboard players set @e[tag=gun.new] PSTJ 30 tag @e[tag=gun.new] remove gun.new -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:7}} tp @e[tag=gun.new] @s @@ -14,7 +18,7 @@ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^ scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid scoreboard players set @e[tag=gun.new] PSTJ 30 tag @e[tag=gun.new] remove gun.new -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:7}} tp @e[tag=gun.new] @s @@ -23,7 +27,7 @@ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^ scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid scoreboard players set @e[tag=gun.new] PSTJ 30 tag @e[tag=gun.new] remove gun.new -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/countdownmove.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/countdownmove.mcfunction index 1d8b75f4..f6b80107 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/countdownmove.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/countdownmove.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s run function gun/move scoreboard players remove tmp.countdown board 1 -execute if score tmp.countdown board matches 1.. run function gun/countdownmove \ No newline at end of file +execute if score tmp.countdown board matches 1.. run function gun/countdownmove diff --git a/datapacks/item_gun/data/minecraft/functions/gun/custom/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/custom/hit.mcfunction index 28f55afd..697971d0 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/custom/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/custom/hit.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted,limit=1] unless data entity @s {Invulnerable:1b} run damage @s 0.1 minecraft:player_gun by @a[tag=hit.player,limit=1] -execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 execute store result score damage.tmp board run data get entity @s data.damage @@ -20,11 +24,11 @@ tellraw @a[tag=hit.player] ["\u00a76+",{"score":{"name": "damage.tmp","objective tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] execute as @e[tag=hitted] store result entity @s Health float 0.1 run scoreboard players get tmp.health board -execute as @e[tag=hitted] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @e[tag=hitted] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players operation @s zombie.coin += damage.tmp board tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/custom/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/custom/shoot.mcfunction index 51406835..838aaf30 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/custom/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/custom/shoot.mcfunction @@ -1,13 +1,17 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:10}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ -execute store result entity @e[tag=gun.new,limit=1] data.damage int 1 run data get entity @s SelectedItem.tag.damage +execute store result entity @e[tag=gun.new,limit=1] data.damage int 1 run data get entity @s SelectedItem.components."minecraft:custom_data".damage execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #bwplace run tp @s ^ ^ ^0.5 scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid -execute store result score @e[tag=gun.new] PSTJ run data get entity @s SelectedItem.tag.distance +execute store result score @e[tag=gun.new] PSTJ run data get entity @s SelectedItem.components."minecraft:custom_data".distance -execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.tag.speed +execute store result score @e[tag=gun.new,limit=1] btw.gunspeed run data get entity @s SelectedItem.components."minecraft:custom_data".speed tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/die.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/die.mcfunction index 0b49ef4a..ac9a0104 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/die.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/die.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/item_gun/data/minecraft/functions/gun/guns.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/guns.mcfunction index 7b4d156f..b5a13d7c 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/guns.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/guns.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s[team=play.zombie] run function zombieever/guntest execute as @s[team=play.zombie,tag=success] run function gun/guns2 execute unless entity @s[tag=success] run title @s actionbar ["\u00a7c没有足够的能量值"] execute unless entity @s[tag=success] run playsound block.chest.locked player @s ~ ~ ~ 2 2 1 tag @s remove success # execute as @s[team=] run function zombieever/ + diff --git a/datapacks/item_gun/data/minecraft/functions/gun/guns2.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/guns2.mcfunction index 8aaf58b1..63725fcc 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/guns2.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/guns2.mcfunction @@ -1,25 +1,29 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # title @s actionbar ["\u00a7b\u00a7lSkills Actived"] # playsound ui.button.click player @s ~ ~ ~ 1 2 1 # /give @s minecraft:carrot_on_a_stick{gun:1,bullet:1000,cdtime:30} # 自定义枪械： # /give @s minecraft:carrot_on_a_stick{gun:"custom",damage:30,bullet:1000,cdtime:30,distance:20} -execute if entity @s[nbt={SelectedItem:{tag:{gun:1}}}] run tag @s add gun.1 -execute if entity @s[nbt={SelectedItem:{tag:{gun:2}}}] run tag @s add gun.2 -execute if entity @s[nbt={SelectedItem:{tag:{gun:3}}}] run tag @s add gun.3 -execute if entity @s[nbt={SelectedItem:{tag:{gun:4}}}] run tag @s add gun.4 -execute if entity @s[nbt={SelectedItem:{tag:{gun:5}}}] run tag @s add gun.5 -execute if entity @s[nbt={SelectedItem:{tag:{gun:6}}}] run tag @s add gun.6 -execute if entity @s[nbt={SelectedItem:{tag:{gun:7}}}] run tag @s add gun.7 -execute if entity @s[nbt={SelectedItem:{tag:{gun:8}}}] run tag @s add gun.8 -execute if entity @s[nbt={SelectedItem:{tag:{gun:9}}}] run tag @s add gun.9 -execute if entity @s[nbt={SelectedItem:{tag:{gun:-10}}}] run tag @s add gun.f10 -execute if entity @s[nbt={SelectedItem:{tag:{gun:"custom"}}}] run tag @s add gun.10 -execute if entity @s[nbt={SelectedItem:{tag:{gun:"pao"}}}] run tag @s add gun.11 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:1}}}}] run tag @s add gun.1 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:2}}}}] run tag @s add gun.2 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:3}}}}] run tag @s add gun.3 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:4}}}}] run tag @s add gun.4 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:5}}}}] run tag @s add gun.5 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:6}}}}] run tag @s add gun.6 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:7}}}}] run tag @s add gun.7 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:8}}}}] run tag @s add gun.8 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:9}}}}] run tag @s add gun.9 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:-10}}}}] run tag @s add gun.f10 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:"custom"}}}}] run tag @s add gun.10 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{gun:"pao"}}}}] run tag @s add gun.11 execute as @s[tag=gun.f10] at @s run function zombieever/addcoin -execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.tag.bullet -execute store result score @s cooldowntime as @s at @s run data get entity @s SelectedItem.tag.cdtime +execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".bullet +execute store result score @s cooldowntime as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".cdtime execute if score gun.tmp board matches 1.. run tag @s add gun.canshoot # execute unless score gun.tmp board matches 1.. run title @s actionbar ["\u00a7c☼ 弹药不足 ☼"] execute unless score gun.tmp board matches 1.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 @@ -27,15 +31,15 @@ execute as @s[tag=gun.canshoot] run scoreboard players remove gun.tmp board 1 execute as @s[tag=gun.canshoot] run execute store result storage gun:tmp count int 1 run scoreboard players get gun.tmp board # execute as @s[tag=gun.canshoot] run xp add @s -1 levels # execute as @s[tag=gun.canshoot] run title @s actionbar [{"score":{"name": "gun.tmp","objective": "board"},"color":"green"}," Amo\u00a7e Rest"] -execute as @s[tag=gun.1,tag=gun.canshoot] run function gun/1/shoot -execute as @s[tag=gun.10,tag=gun.canshoot] run function gun/custom/shoot -execute as @s[tag=gun.2,tag=gun.canshoot] run function gun/2/shoot -execute as @s[tag=gun.3,tag=gun.canshoot] run function gun/3/shoot -execute as @s[tag=gun.4,tag=gun.canshoot] run function gun/4/shoot -execute as @s[tag=gun.5,tag=gun.canshoot] run function gun/5/shoot -execute as @s[tag=gun.6,tag=gun.canshoot] run function gun/6/shoot -execute as @s[tag=gun.7,tag=gun.canshoot] run function gun/7/shoot -execute as @s[tag=gun.11,tag=gun.canshoot] run function gun/pao/shoot +execute as @s[tag=gun.canshoot] run function gun/1/shoot +execute as @s[tag=gun.canshoot] run function gun/custom/shoot +execute as @s[tag=gun.canshoot] run function gun/2/shoot +execute as @s[tag=gun.canshoot] run function gun/3/shoot +execute as @s[tag=gun.canshoot] run function gun/4/shoot +execute as @s[tag=gun.canshoot] run function gun/5/shoot +execute as @s[tag=gun.canshoot] run function gun/6/shoot +execute as @s[tag=gun.canshoot] run function gun/7/shoot +execute as @s[tag=gun.canshoot] run function gun/pao/shoot tag @s remove gun.1 tag @s remove gun.2 tag @s remove gun.3 @@ -46,4 +50,4 @@ tag @s remove gun.7 tag @s remove gun.10 tag @s remove gun.f10 tag @s remove gun.11 -tag @s remove gun.canshoot \ No newline at end of file +tag @s remove gun.canshoot diff --git a/datapacks/item_gun/data/minecraft/functions/gun/job_1/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/job_1/hit.mcfunction index cf4fbf94..b34c20d6 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/job_1/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/job_1/hit.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=job_pvp] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player @@ -17,4 +21,4 @@ execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/job_1/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/job_1/shoot.mcfunction index 7ffd318e..5a49ef73 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/job_1/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/job_1/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:-1}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ @@ -7,4 +11,4 @@ scoreboard players set @e[tag=gun.new] PSTJ 15 tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 # item modify entity @s weapon.mainhand usegun -xp set @s 20 levels \ No newline at end of file +xp set @s 20 levels diff --git a/datapacks/item_gun/data/minecraft/functions/gun/job_2/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/job_2/hit.mcfunction index b80cc6a0..0b275c46 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/job_2/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/job_2/hit.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=job_pvp] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player @@ -23,4 +27,4 @@ execute as @a[tag=hit.player] at @s run playsound entity.enderman.teleport playe tag @a remove hit.player tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/job_2/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/job_2/shoot.mcfunction index 46e7ad85..04dcc297 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/job_2/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/job_2/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:-2}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ @@ -7,4 +11,4 @@ scoreboard players set @e[tag=gun.new] PSTJ 40 tag @e[tag=gun.new] remove gun.new playsound minecraft:entity.ender_dragon.flap player @s ~ ~ ~ 1 1 1 # item modify entity @s weapon.mainhand usegun -xp set @s 10 levels \ No newline at end of file +xp set @s 10 levels diff --git a/datapacks/item_gun/data/minecraft/functions/gun/main.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/main.mcfunction index 316c7abb..e2c19f58 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/main.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/main.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players operation tmp.countdown board = @s btw.gunspeed # execute if score tmp.count execute as @s at @s run function gun/countdownmove + diff --git a/datapacks/item_gun/data/minecraft/functions/gun/move.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/move.mcfunction index e1144fad..c775f4a7 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/move.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/move.mcfunction @@ -1,13 +1,17 @@ -execute if data entity @s {data:{guntype:1}} run particle minecraft:dust 0.059 0.973 0.439 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:7}} run particle minecraft:dust 0.404 0.459 0.427 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:10}} run particle minecraft:dust 0.973 0.545 0.059 1 ~ ~ ~ 0 0 0 1 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if data entity @s {data:{guntype:1}} run particle minecraft:dust{color:[0.059, 0.973, 0.439],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:7}} run particle minecraft:dust{color:[0.404, 0.459, 0.427],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:10}} run particle minecraft:dust{color:[0.973, 0.545, 0.059],scale:1} ~ ~ ~ 0 0 0 1 1 execute if data entity @s {data:{guntype:2}} run particle minecraft:lava ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:3}} run particle minecraft:dust 0.82 0.059 0.973 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:-1}} run particle minecraft:dust 1 0.125 0.533 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:-2}} run particle minecraft:dust 0.455 0.204 0.322 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:11}} run particle minecraft:dust 0.455 0.204 0.322 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:12}} run particle minecraft:dust 0 1 0.835 1 ~ ~ ~ 0 0 0 1 1 -execute if data entity @s {data:{guntype:11}} run particle minecraft:campfire_signal_smoke ~ ~ ~ 0.5 0.5 0.5 0 6 normal +execute if data entity @s {data:{guntype:3}} run particle minecraft:dust{color:[0.82, 0.059, 0.973],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:-1}} run particle minecraft:dust{color:[1, 0.125, 0.533],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:-2}} run particle minecraft:dust{color:[0.455, 0.204, 0.322],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:11}} run particle minecraft:dust{color:[0.455, 0.204, 0.322],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:12}} run particle minecraft:dust{color:[0, 1, 0.835],scale:1} ~ ~ ~ 0 0 0 1 1 +execute if data entity @s {data:{guntype:11}} run particle minecraft:campfire_signal_smoke ~ ~ ~ 0 0 0 1 1 execute if score @s PSTJ matches ..-1 run function gun/die execute if score @s PSTJ matches 0.. if block ^ ^ ^1 #gunblock run function gun/die execute if score @s PSTJ matches 0.. if block ^ ^ ^0.5 #gunblock run function gun/die @@ -17,12 +21,12 @@ execute unless data entity @s {data:{guntype:12}} if score @s PSTJ matches 0.. r execute unless data entity @s {data:{guntype:12}} if score @s PSTJ matches 0.. run function gun/testfortarget2 execute if data entity @s {data:{guntype:11}} if score @s PSTJ matches 0.. at @s run function gun/testfortarget3 -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:7}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/7/hit -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:1}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/1/hit -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:2}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/2/hit -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:3}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/3/hit -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:10}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/custom/hit -execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:11}} if entity @e[tag=pve.zombie,tag=hitted] run function gun/pao/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:7}} if entity @e[tag=hitted] run function gun/7/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:1}} if entity @e[tag=hitted] run function gun/1/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:2}} if entity @e[tag=hitted] run function gun/2/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:3}} if entity @e[tag=hitted] run function gun/3/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:10}} if entity @e[tag=hitted] run function gun/custom/hit +execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:11}} if entity @e[tag=hitted] run function gun/pao/hit execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:12}} if entity @e[team=play.zombie,tag=hitted] run function gun/zombiegun/hit # execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:11}} if entity @a[tag=pve.zombie,tag=hitted] run say hi @@ -30,4 +34,4 @@ execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:-1}} if en execute if score @s PSTJ matches 0.. if data entity @s {data:{guntype:-2}} if entity @a[team=job_pvp,tag=hitted] run function gun/job_2/hit tag @e[tag=hitted] remove hitted # execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 -execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 \ No newline at end of file +execute if score @s PSTJ matches 0.. run scoreboard players remove @s PSTJ 1 diff --git a/datapacks/item_gun/data/minecraft/functions/gun/pao/foreach.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/pao/foreach.mcfunction index 3e14c755..7c5dd277 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/pao/foreach.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/pao/foreach.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## -execute store result score tmp.health board as @e[tag=hitted,limit=1,sort=nearest] run data get entity @s Health 10 +execute store result score tmp.health board as @e[tag=hitted,limit=1,sort=nearest] run data get entity @s Health # tellraw @a[tag=hit.player] ["\u00a7c 剩余",{"score":{"objective": "board","name": "@s"},"color":"yellow"},"\u00a7c♥"] # scoreboard players set tmp.health board 0 execute store result score damage.tmp board run data get entity @s data.damage @@ -19,12 +23,10 @@ tellraw @a[tag=hit.player] ["\u00a76+",{"score":{"name": "damage.tmp","objective tellraw @a[tag=hit.player] ["\u00a78 - 剩余血量：",{"score":{"objective": "board","name": "tmp.health.calc1"},"color":"yellow"},".",{"score":{"objective": "board","name": "tmp.health.calc2"},"color":"yellow"},"\u00a7c♥"] execute as @e[tag=hitted,limit=1,sort=nearest] store result entity @s Health float 0.1 run scoreboard players get tmp.health board -data modify entity @e[tag=hitted,limit=1,sort=nearest] AngryAt set from entity @s UUID -data merge entity @e[tag=hitted,limit=1,sort=nearest] {AngerTime:540} -execute as @e[tag=hitted,limit=1,sort=nearest] at @s run particle minecraft:block redstone_block ~ ~1.5 ~ 0 0 0 1 10 +execute as @e[tag=hitted,limit=1,sort=nearest] at @s run particle minecraft:block{block_state:{Name:redstone_block,Properties:{}}} ~ ~1.5 ~ 0 0 0 1 10 execute as @a[tag=hit.player] at @s run playsound entity.arrow.hit_player player @s ~ ~ ~ 1 1 0.5 execute as @a[tag=hit.player] at @s run scoreboard players operation @s zombie.coin += damage.tmp board tag @a remove hit.player tag @s remove sel -# say 1 \ No newline at end of file +# say 1 diff --git a/datapacks/item_gun/data/minecraft/functions/gun/pao/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/pao/hit.mcfunction index c91dd9a7..067f51ee 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/pao/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/pao/hit.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player execute as @e[tag=hitted] unless data entity @s {Invulnerable:1b} run damage @s 0.1 minecraft:player_gun by @a[tag=hit.player,limit=1] execute as @e[tag=hitted] run execute as @e[tag=sel,limit=1] at @s run function gun/pao/foreach -function gun/die +function gun/die + diff --git a/datapacks/item_gun/data/minecraft/functions/gun/pao/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/pao/shoot.mcfunction index b183365c..5837a0e2 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/pao/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/pao/shoot.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:11}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ -execute store result entity @e[tag=gun.new,limit=1] data.damage int 1 run data get entity @s SelectedItem.tag.damage +execute store result entity @e[tag=gun.new,limit=1] data.damage int 1 run data get entity @s SelectedItem.components."minecraft:custom_data".damage execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #bwplace run tp @s ^ ^ ^0.5 scoreboard players operation @e[tag=gun.new,limit=1] park.uuid = @s park.uuid -execute store result score @e[tag=gun.new] PSTJ run data get entity @s SelectedItem.tag.distance +execute store result score @e[tag=gun.new] PSTJ run data get entity @s SelectedItem.components."minecraft:custom_data".distance tag @e[tag=gun.new] remove gun.new playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -item modify entity @s weapon.mainhand usegun \ No newline at end of file +item modify entity @s weapon.mainhand usegun diff --git a/datapacks/item_gun/data/minecraft/functions/gun/test/undiedvillage.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/test/undiedvillage.mcfunction index 6225d093..26ee5fce 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/test/undiedvillage.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/test/undiedvillage.mcfunction @@ -1 +1,5 @@ -summon minecraft:villager ~ ~ ~ {Invulnerable:1b,Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],VillagerData:{profession:"minecraft:armorer",type:"minecraft:desert"},NoAI:1b,Tags:["pve.zombie"]} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:villager ~ ~ ~ {Invulnerable:1b,Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],VillagerData:{profession:"minecraft:armorer",type:"minecraft:desert"},NoAI:1b,Tags:["pve.zombie"]} diff --git a/datapacks/item_gun/data/minecraft/functions/gun/test/undiedzombie.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/test/undiedzombie.mcfunction index d7edf5e5..c6fbe849 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/test/undiedzombie.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/test/undiedzombie.mcfunction @@ -1 +1,5 @@ -summon minecraft:zombie ~ ~ ~ {Invulnerable:1b,Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],VillagerData:{profession:"minecraft:armorer",type:"minecraft:desert"},NoAI:1b,Tags:["pve.zombie"]} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:zombie ~ ~ ~ {Invulnerable:1b,Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],VillagerData:{profession:"minecraft:armorer",type:"minecraft:desert"},NoAI:1b,Tags:["pve.zombie"]} diff --git a/datapacks/item_gun/data/minecraft/functions/gun/test/zombie.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/test/zombie.mcfunction index 70407da5..e5a250e7 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/test/zombie.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/test/zombie.mcfunction @@ -1 +1,5 @@ -summon minecraft:zombie ~ ~ ~ {Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],NoAI:1b,Tags:["pve.zombie"]} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:zombie ~ ~ ~ {Health:100f,Attributes:[{Base:100d,Name:"generic.max_health"}],NoAI:1b,Tags:["pve.zombie"]} diff --git a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget.mcfunction index 3f01eb2d..f5ee732a 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned ~-0.5 ~ ~-0.5 run tag @e[dx=0.5,dy=2,dz=0.5,tag=pve.zombie] add hitted # execute positioned ~ ~ ~ run tag @e[distance=..0.5,tag=pve.zombie] add hitted tag @s add selel -execute as @e[distance=0..3,limit=1,tag=pve.zombie,sort=nearest,tag=!pve.gunfree] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel] run tag @s add hitted -tag @s remove selel \ No newline at end of file +execute as @e[distance=0..3,limit=1,tag=!pve.gunfree,sort=nearest] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel] run tag @s add hitted +tag @s remove selel diff --git a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget2.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget2.mcfunction index 544d945a..28a742f9 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget2.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned ~-0.5 ~ ~-0.5 run tag @e[dx=0.5,dy=2,dz=0.5,tag=pve.zombie] add hitted # execute positioned ~ ~ ~ run tag @e[distance=..0.5,tag=pve.zombie] add hitted tag @s add selel @@ -7,4 +11,4 @@ execute as @a[distance=0..3,limit=1,team=job_pvp,sort=nearest] at @s positioned execute as @a[tag=hitted] if score @s park.uuid = @e[tag=selel,limit=1] park.uuid run tag @s remove hitted # say hello2 @a[tag=hitted] # execute as @a[tag=hitted] if score @s park.uuid = @e[tag=selel,limit=1] park.uuid run tellraw wifi_left [{"score":{"name": "@e[tag=selel,limit=1]","objective": "park.uuid"}}] -tag @s remove selel \ No newline at end of file +tag @s remove selel diff --git a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget3.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget3.mcfunction index bdff0bd7..4f730e11 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget3.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget3.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned ~-0.5 ~ ~-0.5 run tag @e[dx=0.5,dy=2,dz=0.5,tag=pve.zombie] add hitted # execute positioned ~ ~ ~ run tag @e[distance=..0.5,tag=pve.zombie] add hitted tag @s add selel -execute as @e[distance=0..7,limit=1,tag=pve.zombie,sort=nearest,tag=!hitted,tag=!pve.gunfree] at @s positioned ~-1 ~-1 ~-1 if entity @e[dx=7,dy=4,dz=7,tag=selel] run tag @s add hitted +execute as @e[distance=0..7,limit=1,tag=!pve.gunfree,sort=nearest] at @s positioned ~-1 ~-1 ~-1 if entity @e[dx=7,dy=4,dz=7,tag=selel] run tag @s add hitted # execute as @e[distance=0..5,limit=1,tag=pve.zombie,sort=nearest] at @s positioned ~-1 ~-1 ~-1 run say hi @e[dx=7,dy=4,dz=7,tag=selel] tag @s remove selel -# say hi @a[tag=hitted] \ No newline at end of file +# say hi @a[tag=hitted] diff --git a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget4.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget4.mcfunction index 8dc919f0..3ca5c884 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/testfortarget4.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/testfortarget4.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned ~-0.5 ~ ~-0.5 run tag @e[dx=0.5,dy=2,dz=0.5,tag=pve.zombie] add hitted # execute positioned ~ ~ ~ run tag @e[distance=..0.5,tag=pve.zombie] add hitted tag @s add selel -execute as @a[distance=0..3,limit=1,team=play.zombie,sort=nearest,gamemode=adventure] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel,tag=!pve.gunfree] run tag @s add hitted +execute as @a[distance=0..3,limit=1,team=play.zombie,sort=nearest,gamemode=adventure] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=!pve.gunfree] run tag @s add hitted # execute as @a[distance=0..3,limit=1,team=play.zombie,sort=nearest,gamemode=adventure] at @s positioned ~-0.5 ~ ~-0.5 run say hi @e[dx=1,dy=2,dz=1,tag=selel] # say @e[tag=hitted] # execute as @a[distance=0..3,limit=1,team=job_pvp,sort=nearest] at @s positioned ~-0.5 ~ ~-0.5 if entity @e[dx=1,dy=2,dz=1,tag=selel] run say hello @s @@ -9,4 +13,4 @@ execute as @a[distance=0..3,limit=1,team=play.zombie,sort=nearest,gamemode=adven # execute as @a[tag=hitted] if score @s park.uuid = @e[tag=selel,limit=1] park.uuid run tag @s remove hitted # say hello2 @a[tag=hitted] # execute as @a[tag=hitted] if score @s park.uuid = @e[tag=selel,limit=1] park.uuid run tellraw wifi_left [{"score":{"name": "@e[tag=selel,limit=1]","objective": "park.uuid"}}] -tag @s remove selel \ No newline at end of file +tag @s remove selel diff --git a/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/hit.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/hit.mcfunction index 2b5f006d..31601d81 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/hit.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/hit.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel # execute as @a[team=play.zombie] if score @s park.uuid = @e[tag=sel,limit=1] park.uuid run tag @s add hit.player @@ -10,4 +14,4 @@ execute as @e[tag=hitted] at @s run playsound minecraft:block.metal.hit player @ # tag @e[tag=hitted] remove hitted tag @s remove sel # say 1 -function gun/die \ No newline at end of file +function gun/die diff --git a/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/shoot.mcfunction b/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/shoot.mcfunction index 0d88dfa4..aadb9c05 100644 --- a/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/shoot.mcfunction +++ b/datapacks/item_gun/data/minecraft/functions/gun/zombiegun/shoot.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["gun.line","gun.new"],data:{guntype:12}} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1.6 ~ @@ -5,4 +9,4 @@ execute as @e[tag=gun.new] at @s unless block ^ ^ ^0.5 #gunblock run tp @s ^ ^ ^ scoreboard players set @e[tag=gun.new] PSTJ 20 tag @e[tag=gun.new] remove gun.new # playsound minecraft:block.piston.contract player @s ~ ~ ~ 1 2 1 -# item modify entity @s weapon.mainhand usegun \ No newline at end of file +# item modify entity @s weapon.mainhand usegun diff --git a/datapacks/map_all/data/minecraft/advancements/hunger/player_was_killed.json b/datapacks/map_all/data/minecraft/advancements/hunger/player_was_killed.json index c38f33dd..0020fc1a 100644 --- a/datapacks/map_all/data/minecraft/advancements/hunger/player_was_killed.json +++ b/datapacks/map_all/data/minecraft/advancements/hunger/player_was_killed.json @@ -17,4 +17,4 @@ "rewards": { "function": "hunger/lootitem" } -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/advancements/player_hit_ball.json b/datapacks/map_all/data/minecraft/advancements/player_hit_ball.json index e4e989d3..20cd8503 100644 --- a/datapacks/map_all/data/minecraft/advancements/player_hit_ball.json +++ b/datapacks/map_all/data/minecraft/advancements/player_hit_ball.json @@ -18,4 +18,4 @@ "rewards": { "function": "minecraft:golf/player_hit_ball" } -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/functions/battle/addscore/blue.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/addscore/blue.mcfunction index 9318ba6b..f59e1c04 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/addscore/blue.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/addscore/blue.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add battle.score.b board 1 tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel @@ -12,4 +16,4 @@ tag @a remove battle.sel function battle/trynextround # scoreboard players set battle.state state 2 -# schedule function battle/nextround 5s \ No newline at end of file +# schedule function battle/nextround 5s diff --git a/datapacks/map_all/data/minecraft/functions/battle/addscore/none.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/addscore/none.mcfunction index 480656b2..236148ea 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/addscore/none.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/addscore/none.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players add battle.score.b board 1 tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel @@ -12,4 +16,4 @@ tag @a remove battle.sel function battle/trynextround # scoreboard players set battle.state state 2 -# schedule function battle/nextround 5s \ No newline at end of file +# schedule function battle/nextround 5s diff --git a/datapacks/map_all/data/minecraft/functions/battle/addscore/red.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/addscore/red.mcfunction index 17dc7062..a441c69f 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/addscore/red.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/addscore/red.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add battle.score.r board 1 tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel @@ -12,3 +16,4 @@ tag @a remove battle.sel # scoreboard players set battle.state state 2 # schedule function battle/nextround 5s function battle/trynextround + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/auto.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/auto.mcfunction index 2f81ee86..7c5055e8 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/auto.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/auto.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7c选择超时，已自动选择。\n"] execute as @s[team=play.battle.b,tag=battle.notready] run function battle/choose/blue/axe @@ -8,4 +12,4 @@ execute as @s[team=play.battle.b,tag=battle.notready] run function battle/choose execute as @s[team=play.battle.r,tag=battle.notready] run function battle/choose/red/axe execute as @s[team=play.battle.r,tag=battle.notready] run function battle/choose/red/csb_m execute as @s[team=play.battle.r,tag=battle.notready] run function battle/choose/red/csb_zt -execute as @s[team=play.battle.r,tag=battle.notready] run function battle/choose/red/stw \ No newline at end of file +execute as @s[team=play.battle.r,tag=battle.notready] run function battle/choose/red/stw diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/axe.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/axe.mcfunction index f02ee40d..352cd2fa 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/axe.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/axe.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.a.1 board matches 1.. run function battle/item/axe execute if score battle.item.a.1 board matches 1.. run function battle/choose/tp execute if score battle.item.a.1 board matches 1.. run scoreboard players remove battle.item.a.1 board 1 execute if score battle.item.a.1 board matches ..0 run setblock 150 44 -312 redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_m.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_m.mcfunction index 831e2a10..02163406 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_m.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_m.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.a.2 board matches 1.. run function battle/item/crossbow_multi # execute if score battle.item.a.2 board matches 1.. run setblock 147 44 -312 redstone_block execute if score battle.item.a.2 board matches 1.. run function battle/choose/tp execute if score battle.item.a.2 board matches 1.. run scoreboard players remove battle.item.a.2 board 1 execute if score battle.item.a.2 board matches ..0 run setblock 147 44 -312 redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_zt.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_zt.mcfunction index 22e1bd54..45a1dec0 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_zt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/csb_zt.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.a.3 board matches 1.. run function battle/item/crossbow_zt execute if score battle.item.a.3 board matches 1.. run function battle/choose/tp execute if score battle.item.a.3 board matches 1.. run scoreboard players remove battle.item.a.3 board 1 execute if score battle.item.a.3 board matches ..0 run setblock 144 44 -312 redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/stw.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/stw.mcfunction index 37b616fb..e984b5b9 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/blue/stw.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/blue/stw.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.a.4 board matches 1.. run function battle/item/stone_sword execute if score battle.item.a.4 board matches 1.. run function battle/choose/tp execute if score battle.item.a.4 board matches 1.. run scoreboard players remove battle.item.a.4 board 1 execute if score battle.item.a.4 board matches ..0 run setblock 141 44 -312 redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/red/axe.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/red/axe.mcfunction index 49f57ab3..227b66cd 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/red/axe.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/red/axe.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.b.1 board matches 1.. run function battle/item/axe execute if score battle.item.b.1 board matches 1.. run function battle/choose/tp execute if score battle.item.b.1 board matches 1.. run scoreboard players remove battle.item.b.1 board 1 execute if score battle.item.b.1 board matches ..0 run setblock 138 44 -368 minecraft:redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_m.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_m.mcfunction index 407c43b9..6ee18f88 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_m.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_m.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.b.2 board matches 1.. run function battle/item/crossbow_multi execute if score battle.item.b.2 board matches 1.. run function battle/choose/tp execute if score battle.item.b.2 board matches 1.. run scoreboard players remove battle.item.b.2 board 1 execute if score battle.item.b.2 board matches ..0 run setblock 141 44 -368 minecraft:redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_zt.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_zt.mcfunction index 379dd5bf..d74abcbb 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_zt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/red/csb_zt.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.b.3 board matches 1.. run function battle/item/crossbow_zt execute if score battle.item.b.3 board matches 1.. run function battle/choose/tp execute if score battle.item.b.3 board matches 1.. run scoreboard players remove battle.item.b.3 board 1 execute if score battle.item.b.3 board matches ..0 run setblock 144 44 -368 minecraft:redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/red/stw.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/red/stw.mcfunction index e4ffe973..c267e08b 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/red/stw.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/red/stw.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.item.b.4 board matches 1.. run function battle/item/stone_sword execute if score battle.item.b.4 board matches 1.. run function battle/choose/tp execute if score battle.item.b.4 board matches 1.. run scoreboard players remove battle.item.b.4 board 1 execute if score battle.item.b.4 board matches ..0 run setblock 147 44 -368 minecraft:redstone_block + diff --git a/datapacks/map_all/data/minecraft/functions/battle/choose/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/choose/tp.mcfunction index 3f0c0077..ea00844e 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/choose/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/choose/tp.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s[team=play.battle.b] 144 35 -321 180 0 tp @s[team=play.battle.r] 144 35 -359 0 0 gamemode spectator @s[team=wait.battle] -give @s arrow{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} 5 -tag @s remove battle.notready \ No newline at end of file +give @s arrow[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +tag @s remove battle.notready diff --git a/datapacks/map_all/data/minecraft/functions/battle/debug/sign.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/debug/sign.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/debug/sign.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/debug/sign.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/battle/died.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/died.mcfunction index 80a239b6..45bfb351 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/died.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s title @s title ["\u00a7c你死了"] title @s subtitle ["\u00a7e请等待回合结束。"] -tp @s 144 40 -340 0 90 \ No newline at end of file +tp @s 144 40 -340 0 90 diff --git a/datapacks/map_all/data/minecraft/functions/battle/entitygetranpotion.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/entitygetranpotion.mcfunction index a2b0ccd2..e8ae5cca 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/entitygetranpotion.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/entitygetranpotion.mcfunction @@ -1,16 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tag=potion.speed, # tag=potion.jump, # tag=potion.strength, # tag=potion.slowfall, # tag=potion.resistance, scoreboard players operation random board = @e[limit=1,tag=random_saying,sort=random,scores={board=1..8}] board -execute if score random board matches 1 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"speed",duration:200,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f速度药水"'}},Count:1b}} -execute if score random board matches 2 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"slowness",duration:200,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f缓慢药水"'}},Count:1b}} -execute if score random board matches 3 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"haste",duration:200,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f急迫药水"'}},Count:1b}} -execute if score random board matches 4 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"mining_fatigue",duration:200,amplifier:1b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f挖掘疲劳药水"'}},Count:1b}} -execute if score random board matches 5 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"strength",duration:200,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f力量药水"'}},Count:1b}} -execute if score random board matches 6 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"instant_health",duration:1,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f治疗药水"'}},Count:1b}} -execute if score random board matches 7 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"instant_damage",duration:1,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7f瞬间伤害药水"'}},Count:1b}} -execute if score random board matches 8 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",tag:{custom_potion_effects:[{id:"jump_boost",duration:200,amplifier:0b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7a跳跃药水"'}},Count:1b}} +execute if score random board matches 1 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"speed",duration:200,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f速度药水"'}}} +execute if score random board matches 2 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"slowness",duration:200,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f缓慢药水"'}}} +execute if score random board matches 3 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"haste",duration:200,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f急迫药水"'}}} +execute if score random board matches 4 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"mining_fatigue",duration:200,amplifier:1b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f挖掘疲劳药水"'}}} +execute if score random board matches 5 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"strength",duration:200,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f力量药水"'}}} +execute if score random board matches 6 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"instant_health",duration:1,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f治疗药水"'}}} +execute if score random board matches 7 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"instant_damage",duration:1,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7f瞬间伤害药水"'}}} +execute if score random board matches 8 run summon item ~ ~0.5 ~ {Item:{id:"minecraft:splash_potion",count:1,components:{"minecraft:potion_contents":{custom_effects:[{id:"jump_boost",duration:200,amplifier:0b,ambient:false,show_particles:false}]},"minecraft:custom_name":'"\\u00a7a跳跃药水"'}}} # say hi~ kill @e[type=armor_stand,tag=battle.ranpotion] + diff --git a/datapacks/map_all/data/minecraft/functions/battle/item/axe.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/item/axe.mcfunction index e79b4018..2fdb4d55 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/item/axe.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/item/axe.mcfunction @@ -1,2 +1,6 @@ -give @s wooden_axe{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63,display:{Lore:['""','"\\u00a77在主手时："','"\\u00a72 7 攻击伤害"','"\\u00a72 0.8 攻击速度"']},Enchantments:[{id:"knockback",lvl:2}]} -# scoreboard players remove battle.item.1 board 1 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s wooden_axe[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false},lore=['""','"\\u00a77在主手时："','"\\u00a72 7 攻击伤害"','"\\u00a72 0.8 攻击速度"'],enchantments={levels:{"minecraft:knockback":2},show_in_tooltip:false}] +# scoreboard players remove battle.item.1 board 1 diff --git a/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_multi.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_multi.mcfunction index 202fda9c..41494af5 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_multi.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_multi.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s bow -give @s crossbow{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63,Enchantments:[{id:"multishot",lvl:1}]} +give @s crossbow[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:multishot":1},show_in_tooltip:false}] # scoreboard players remove battle.item.2 board 1 + diff --git a/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_zt.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_zt.mcfunction index 51a36f69..f389477f 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_zt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/item/crossbow_zt.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s bow -give @s crossbow{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63,Enchantments:[{id:"quick_charge",lvl:1}]} +give @s crossbow[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:quick_charge":1},show_in_tooltip:false}] # scoreboard players remove battle.item.3 board 1 + diff --git a/datapacks/map_all/data/minecraft/functions/battle/item/normal.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/item/normal.mcfunction index f0218f1d..c5f6f81b 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/item/normal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/item/normal.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 木剑，弓，箭*5，皮靴，剪刀，自己颜色的羊毛*64(羊毛只能中间放) # 钮可以选择，选择后自动进入等待区域 # 弩（装填1），弩（多重射击），石剑，木斧（击退2） clear @s -give @s wooden_sword{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63,display:{Lore:['""','"\\u00a77在主手时："','"\\u00a72 4 攻击伤害"','"\\u00a72 1.6 攻击速度"']}} -give @s shears{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} -give @s[team=play.battle.r] red_wool{CanDestroy:["white_wool","blue_wool","red_wool"],CanPlaceOn:["sea_lantern","white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} 64 -give @s[team=play.battle.b] blue_wool{CanDestroy:["white_wool","blue_wool","red_wool"],CanPlaceOn:["sea_lantern","white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} 64 -give @s bow{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} +give @s wooden_sword[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false},lore=['""','"\\u00a77在主手时："','"\\u00a72 4 攻击伤害"','"\\u00a72 1.6 攻击速度"']] +give @s shears[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +give @s[team=play.battle.r] red_wool[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["sea_lantern","white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +give @s[team=play.battle.b] blue_wool[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["sea_lantern","white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +give @s bow[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] + +item replace entity @s armor.feet with leather_boots[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] -item replace entity @s armor.feet with leather_boots{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63} diff --git a/datapacks/map_all/data/minecraft/functions/battle/item/stone_sword.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/item/stone_sword.mcfunction index 7debf15c..6fea214d 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/item/stone_sword.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/item/stone_sword.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s wooden_sword -give @s stone_sword{CanDestroy:["white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63,display:{Lore:['""','"\\u00a77在主手时："','"\\u00a72 5 攻击伤害"','"\\u00a72 1.6 攻击速度"']}} -# scoreboard players remove battle.item.4 board 1 \ No newline at end of file +give @s stone_sword[can_break={predicates:[{blocks:["white_wool","blue_wool","red_wool"]}],show_in_tooltip:false},unbreakable={show_in_tooltip:false},lore=['""','"\\u00a77在主手时："','"\\u00a72 5 攻击伤害"','"\\u00a72 1.6 攻击速度"']] +# scoreboard players remove battle.item.4 board 1 diff --git a/datapacks/map_all/data/minecraft/functions/battle/itemdatamerge.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/itemdatamerge.mcfunction index b37b303a..6a4c8a73 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/itemdatamerge.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/itemdatamerge.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## data modify entity @s Owner set from entity @s Thrower data merge entity @s {PickupDelay:0} execute if data entity @s {Item:{id:"minecraft:white_wool"}} run kill @s execute if data entity @s {Item:{id:"minecraft:blue_wool"}} run data merge entity @s {Item:{tag:{CanDestroy:["white_wool","blue_wool","red_wool"],CanPlaceOn:["sea_lantern","white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63}}} execute if data entity @s {Item:{id:"minecraft:red_wool"}} run data merge entity @s {Item:{tag:{CanDestroy:["white_wool","blue_wool","red_wool"],CanPlaceOn:["sea_lantern","white_wool","blue_wool","red_wool"],Unbreakable:1b,HideFlags:63}}} + diff --git a/datapacks/map_all/data/minecraft/functions/battle/join.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/join.mcfunction index e6ebfec2..93354a69 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title [{"text":"Battle Box","color":"white","bold": true}] title @s subtitle ["\u00a7f与对方开启抢夺羊毛大作战！"] gamemode adventure @s[gamemode=spectator] @@ -16,3 +20,4 @@ tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模 execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator execute if score battle.state state matches 1.. run function minecraft:battle/spec + diff --git a/datapacks/map_all/data/minecraft/functions/battle/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/nextround.mcfunction index bb60412b..fb1d3984 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/nextround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel tag @a[team=play.battle.b] add battle.sel @@ -42,4 +46,4 @@ execute as @a[tag=battle.sel] run tag @s add battle.notready tag @a remove battle.sel -scoreboard players set battle.time board 61 \ No newline at end of file +scoreboard players set battle.time board 61 diff --git a/datapacks/map_all/data/minecraft/functions/battle/over/blue.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/over/blue.mcfunction index 9d9de088..9e5998bd 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/over/blue.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/over/blue.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel tag @a[team=play.battle.b] add battle.sel @@ -8,4 +12,4 @@ title @a[team=play.battle.b] title ["\u00a76You won!"] title @a[tag=battle.sel] subtitle ["\u00a7b蓝队胜利"] tag @a remove battle.sel -function battle/over/globle \ No newline at end of file +function battle/over/globle diff --git a/datapacks/map_all/data/minecraft/functions/battle/over/globle.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/over/globle.mcfunction index fa81b6ed..2154be7d 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/over/globle.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/over/globle.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=wait.battle] add battle.sel tag @a[team=play.battle.r] add battle.sel tag @a[team=play.battle.b] add battle.sel @@ -5,4 +9,4 @@ scoreboard players set battle.state state 5 schedule function battle/over/tp 5s schedule clear battle/nextround gamemode spectator @a[tag=battle.sel] -tag @a remove battle.sel \ No newline at end of file +tag @a remove battle.sel diff --git a/datapacks/map_all/data/minecraft/functions/battle/over/red.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/over/red.mcfunction index 6ee7418f..a214e14f 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/over/red.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/over/red.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # schedule function battle/over/tp 5s # scoreboard players set battle.state state 5 tag @a[team=wait.battle] add battle.sel @@ -9,4 +13,4 @@ title @a[tag=battle.sel] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=play.battle.r] title ["\u00a76You won!"] title @a[tag=battle.sel] subtitle ["\u00a7d红队胜利"] tag @a remove battle.sel -function battle/over/globle \ No newline at end of file +function battle/over/globle diff --git a/datapacks/map_all/data/minecraft/functions/battle/over/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/over/tp.mcfunction index 0de509d7..28877fbf 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/over/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/over/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar remove minecraft:battle scoreboard players set battle.state state 0 bossbar add minecraft:battle "BATTLE GAME" @@ -9,4 +13,4 @@ execute as @a[team=wait.battle,gamemode=!creative] run function battle/join execute as @a[team=play.battle.r,gamemode=!creative] run function battle/join execute as @a[team=play.battle.b,gamemode=!creative] run function battle/join -schedule clear battle/nextround \ No newline at end of file +schedule clear battle/nextround diff --git a/datapacks/map_all/data/minecraft/functions/battle/playergetpotion.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/playergetpotion.mcfunction index 1f3bad22..f6188407 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/playergetpotion.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/playergetpotion.mcfunction @@ -1,9 +1,13 @@ -execute if entity @e[tag=battle.potion.sel,tag=potion.speed,type=armor_stand] run effect give @s speed 15 0 true -execute if entity @e[tag=battle.potion.sel,tag=potion.jump,type=armor_stand] run effect give @s jump_boost 15 1 true -execute if entity @e[tag=battle.potion.sel,tag=potion.strength,type=armor_stand] run effect give @s strength 15 0 true -execute if entity @e[tag=battle.potion.sel,tag=potion.slowfall,type=armor_stand] run effect give @s slow_falling 15 0 true -execute if entity @e[tag=battle.potion.sel,tag=potion.resistance,type=armor_stand] run effect give @s resistance 15 0 true +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if entity @e[tag=potion.speed,type=armor_stand] run effect give @s speed 15 0 true +execute if entity @e[tag=potion.jump,type=armor_stand] run effect give @s jump_boost 15 1 true +execute if entity @e[tag=potion.strength,type=armor_stand] run effect give @s strength 15 0 true +execute if entity @e[tag=potion.slowfall,type=armor_stand] run effect give @s slow_falling 15 0 true +execute if entity @e[tag=potion.resistance,type=armor_stand] run effect give @s resistance 15 0 true tellraw @s ["\u00a76你获得了",{"selector":"@e[tag=battle.potion.sel,limit=1]"},"\u00a76的增益。"] playsound entity.generic.drink player @s ~ ~ ~ 1 1 1 -kill @e[tag=battle.potion.sel,type=armor_stand] \ No newline at end of file +kill @e[tag=battle.potion.sel,type=armor_stand] diff --git a/datapacks/map_all/data/minecraft/functions/battle/ranpotion.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/ranpotion.mcfunction index 3c0b2517..8ce979f7 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/ranpotion.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/ranpotion.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=armor_stand,tag=battle.ranpotion] -summon armor_stand 157 36 -340 {Tags:["battle.ranpotion"],CustomName:'["药水"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,NoBasePlate:true,DisabledSlots:2039583} -summon armor_stand 131 36 -340 {Tags:["battle.ranpotion"],CustomName:'["药水"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,NoBasePlate:true,DisabledSlots:2039583} -execute as @e[tag=battle.ranpotion] at @s run function battle/entitygetranpotion \ No newline at end of file +summon armor_stand 157 36 -340 {Tags:["battle.ranpotion"],CustomName:'["药水"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:"true",NoBasePlate:"true",DisabledSlots:2039583} +summon armor_stand 131 36 -340 {Tags:["battle.ranpotion"],CustomName:'["药水"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:"true",NoBasePlate:"true",DisabledSlots:2039583} +execute as @e[tag=battle.ranpotion] at @s run function battle/entitygetranpotion diff --git a/datapacks/map_all/data/minecraft/functions/battle/ranpotiontick.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/ranpotiontick.mcfunction index 0c63f8d4..4b6cc3f5 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/ranpotiontick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/ranpotiontick.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add battle.potion.sel execute as @a[distance=0..1] run function battle/playergetpotion tag @s remove battle.potion.sel -particle block redstone_block ~ ~0.5 ~ 0.1 0.1 0.1 1 5 normal \ No newline at end of file +particle block{block_state:{Name:redstone_block,Properties:{}}} ~ ~0.5 ~ 0.1 0.1 0.1 1 5 normal diff --git a/datapacks/map_all/data/minecraft/functions/battle/round_ready.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/round_ready.mcfunction index 828cf0c0..c0657a55 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/round_ready.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/round_ready.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set battle.state state 4 # 选择 # scoreboard players set battle.score.r board 0 @@ -17,3 +21,4 @@ title @a[tag=battle.sel] subtitle ["\u00a7bPreparing Fighting!"] tag @a remove battle.sel execute positioned 144 30 -340 run kill @e[type=item,distance=0..50] + diff --git a/datapacks/map_all/data/minecraft/functions/battle/round_start.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/round_start.mcfunction index 54dee3ea..c41c8da9 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/round_start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/round_start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set battle.state state 1 # 选择 @@ -15,4 +19,4 @@ fill 146 39 -324 142 35 -324 air destroy fill 142 39 -356 146 35 -356 air destroy execute positioned 144 35 -340 run kill @e[type=item,distance=0..40] function battle/ranpotion -playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_all/data/minecraft/functions/battle/second.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/second.mcfunction index 39c19a8b..9de6595c 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score battle.state state matches 1 run scoreboard players remove battle.time board 1 execute if score battle.state state matches 3..4 run scoreboard players remove battle.time board 1 tag @a[team=wait.battle] add battle.sel @@ -37,7 +41,7 @@ execute if score battle.state state matches 1..4 if score battle.player.b tick m execute if score battle.state state matches 1 run function battle/testfor/secondblock execute if score battle.state state matches 1 if score battle.time board matches ..0 run function battle/testfor/finalblock -execute if score battle.state state matches 3 if score battle.time board matches ..0 as @a[tag=battle.sel,tag=battle.notready] run function battle/choose/auto +execute if score battle.state state matches 3 if score battle.time board matches ..0 as @a[tag=battle.notready] run function battle/choose/auto execute if score battle.state state matches 3 if score battle.time board matches ..0 run function battle/round_ready execute if score battle.state state matches 3 run function battle/testfor/allready execute if score battle.state state matches 4 if score battle.time board matches 1.. run tellraw @a[tag=battle.sel] ["\u00a7e笼子将在",{"score":{"name": "battle.time","objective": "board"},"color":"red"},"\u00a7e秒后打开。"] @@ -45,4 +49,4 @@ execute if score battle.state state matches 4 if score battle.time board matches execute if score battle.state state matches 4 if score battle.time board matches ..0 run function battle/round_start tag @a remove battle.sel -# execute as @e[type=marker,tag=battle.ranpotion] at @s run \ No newline at end of file +# execute as @e[type=marker,tag=battle.ranpotion] at @s run diff --git a/datapacks/map_all/data/minecraft/functions/battle/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/spec.mcfunction index ac2f0c16..f0ed4493 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n使用 \u00a76/trigger hub\u00a77 返回大厅。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n使用 \u00a76/trigger hub\u00a77 返回大厅。"] diff --git a/datapacks/map_all/data/minecraft/functions/battle/spec_s.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/spec_s.mcfunction index aa9f7ab8..a2fde451 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/spec_s.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/spec_s.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\u00a77您已进入旁观模式。使用 \u00a76/trigger hub\u00a77 返回大厅。"] -playsound block.lever.click player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound block.lever.click player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_all/data/minecraft/functions/battle/spr.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/spr.mcfunction index fb3c1981..cec3fdfb 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/spr.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/spr.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove battle.random.out tag @r[tag=battle.random] add battle.random.out tag @r[tag=battle.random.out] remove battle.random @@ -8,4 +12,4 @@ tellraw @a[tag=battle.random.out,team=play.battle.r] ["\u00a7a你加入了 \u00a tellraw @a[tag=battle.random.out,team=play.battle.b] ["\u00a7a你加入了 \u00a79蓝队"] execute if score battle.ranteam board matches 2.. run scoreboard players set battle.ranteam board 0 -tag @a remove battle.random.out \ No newline at end of file +tag @a remove battle.random.out diff --git a/datapacks/map_all/data/minecraft/functions/battle/start.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/start.mcfunction index 7c52a750..a78f45be 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[gamemode=adventure,team=wait.battle] add battle.random execute as @a[tag=battle.random] run function battle/spr tag @a remove battle.random @@ -18,3 +22,4 @@ scoreboard players operation battle.toolcount board = tmp board kill @e[type=armor_stand,tag=battle.ranpotion] function battle/nextround + diff --git a/datapacks/map_all/data/minecraft/functions/battle/testfor/allready.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/testfor/allready.mcfunction index be093ab0..7d16decc 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/testfor/allready.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/testfor/allready.mcfunction @@ -1 +1,5 @@ -execute unless entity @a[tag=battle.notready,gamemode=adventure,tag=battle.sel] run function battle/round_ready \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute unless entity @a[tag=battle.sel,gamemode=adventure] run function battle/round_ready diff --git a/datapacks/map_all/data/minecraft/functions/battle/testfor/countblock.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/testfor/countblock.mcfunction index c4cf4d1a..8051d30a 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/testfor/countblock.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/testfor/countblock.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set battle.tmp.1 board 0 execute if block 143 27 -341 red_wool run scoreboard players add battle.tmp.1 board 1 execute if block 143 27 -340 red_wool run scoreboard players add battle.tmp.1 board 1 @@ -19,4 +23,4 @@ execute if block 144 27 -340 blue_wool run scoreboard players add battle.tmp.2 b execute if block 144 27 -339 blue_wool run scoreboard players add battle.tmp.2 board 1 execute if block 145 27 -341 blue_wool run scoreboard players add battle.tmp.2 board 1 execute if block 145 27 -340 blue_wool run scoreboard players add battle.tmp.2 board 1 -execute if block 145 27 -339 blue_wool run scoreboard players add battle.tmp.2 board 1 \ No newline at end of file +execute if block 145 27 -339 blue_wool run scoreboard players add battle.tmp.2 board 1 diff --git a/datapacks/map_all/data/minecraft/functions/battle/testfor/finalblock.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/testfor/finalblock.mcfunction index a6ed1f2e..f0023c9b 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/testfor/finalblock.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/testfor/finalblock.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function battle/testfor/countblock execute if score battle.tmp.1 board > battle.tmp.2 board run function battle/addscore/red execute if score battle.tmp.1 board < battle.tmp.2 board run function battle/addscore/blue @@ -5,4 +9,4 @@ execute if score battle.tmp.1 board = battle.tmp.2 board run function battle/add # execute if score matches 9.. run function battle/addscore/blue gamemode spectator @a[tag=battle.sel] -function battle/trynextround \ No newline at end of file +function battle/trynextround diff --git a/datapacks/map_all/data/minecraft/functions/battle/testfor/secondblock.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/testfor/secondblock.mcfunction index bf60ce05..2c0bac1b 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/testfor/secondblock.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/testfor/secondblock.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function battle/testfor/countblock execute if score battle.tmp.1 board matches 9.. run function battle/addscore/red -execute if score battle.tmp.2 board matches 9.. run function battle/addscore/blue \ No newline at end of file +execute if score battle.tmp.2 board matches 9.. run function battle/addscore/blue diff --git a/datapacks/map_all/data/minecraft/functions/battle/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/teststart.mcfunction index fef0b254..aa6d7ec5 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/teststart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.battle,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score battle.state state matches 1.. run function minecraft:battle/spec -execute unless score battle.state state matches 1.. run function battle/teststart_2 \ No newline at end of file +execute unless score battle.state state matches 1.. run function battle/teststart_2 diff --git a/datapacks/map_all/data/minecraft/functions/battle/teststart_2.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/teststart_2.mcfunction index e9a0f089..c1d815b4 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/teststart_2.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/teststart_2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 # execute if score wait.player tick matches 9.. run tellraw @s ["\u00a7c人数过多！只允许最多8人！"] @@ -10,3 +14,4 @@ scoreboard players operation tmp board %= 2 board execute if score wait.player tick matches 2.. unless score tmp board matches 0 run tellraw @s ["\u00a7c为保证游戏质量，防止人数过度不平衡，无法开始游戏"] execute if score wait.player tick matches 2.. unless score tmp board matches 0 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score wait.player tick matches 2.. if score tmp board matches 0 run function minecraft:battle/start + diff --git a/datapacks/map_all/data/minecraft/functions/battle/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/tick.mcfunction index 3021f837..a6c0d0e1 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/tick.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[x=148,y=29,z=-420,dx=1,dy=1,dz=1,gamemode=!creative] at @s run function battle/died -# execute as @a[team=play.battle.r,gamemode=adventure] at @s as @e[type=item,distance=..3,sort=nearest] at @s run +# execute as @a[team=play.battle.r,gamemode=adventure] at @s as @e[type=item,distance=..3,sort=nearest] at @s run execute as @a[team=play.battle.r,gamemode=adventure] at @s as @e[type=item,distance=..3,sort=nearest] at @s run function battle/itemdatamerge # execute as @a[team=play.battle.b,gamemode=adventure] at @s as @e[type=item,distance=..3,sort=nearest] at @s run data modify entity @s Owner set from entity @s Thrower @@ -13,4 +17,4 @@ fill 139 28 -345 149 35 -335 air replace #minecraft:wool -# execute as @e[type=armor_stand,tag=battle.ranpotion] at @s run function battle/ranpotiontick \ No newline at end of file +# execute as @e[type=armor_stand,tag=battle.ranpotion] at @s run function battle/ranpotiontick diff --git a/datapacks/map_all/data/minecraft/functions/battle/trynextround.mcfunction b/datapacks/map_all/data/minecraft/functions/battle/trynextround.mcfunction index 12fd9431..80214242 100644 --- a/datapacks/map_all/data/minecraft/functions/battle/trynextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/battle/trynextround.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set battle.state state 2 schedule function battle/nextround 5s execute if score battle.score.r board matches 3.. run function battle/over/red -execute if score battle.score.b board matches 3.. run function battle/over/blue \ No newline at end of file +execute if score battle.score.b board matches 3.. run function battle/over/blue diff --git a/datapacks/map_all/data/minecraft/functions/believer/died.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/died.mcfunction index fe054a88..f730eb3c 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/died.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c对不起，你淘汰了！"] tellraw @a[team=play.beli] [{"selector":"@s"},"\u00a7c 淘汰！"] tellraw @a[team=wait.beli] [{"selector":"@s"},"\u00a7c 淘汰！"] gamemode spectator @s -scoreboard players set play.beli.player tick 0 +scoreboard players set play.beli.player tick 0 execute as @a[team=play.beli,gamemode=adventure] run scoreboard players add play.beli.player tick 1 -title @a[team=play.beli] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.beli.player"},"color": "dark_purple"}] \ No newline at end of file +title @a[team=play.beli] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.beli.player"},"color": "dark_purple"}] diff --git a/datapacks/map_all/data/minecraft/functions/believer/join.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/join.mcfunction index c5a17077..3aeb84eb 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/join.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s[team=!play.beli] title [{"text":"Block Believer","color":"#a7d3ff","bold": true}] title @s[team=!play.beli] subtitle ["\u00a7rBelieve yourself !"] team join wait.beli @s tellraw @a[team=!wait.beli] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"Block Believer","color":"#a7d3ff","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.beli,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"Block Believer","color":"#a7d3ff","bold": true},"\n\n\u00a7e 游戏介绍：\n \u00a77游戏开始后，方块将会随机开始变化：\n\u00a7f 白色 \u00a7a-> \u00a7e黄色\n\u00a7e 黄色 \u00a7a-> \u00a76橙色\n\u00a76 橙色 \u00a7a-> \u00a7c红色\n\u00a7c 红色 \u00a7a-> \u00a74消失\n"] tellraw @a[team=wait.beli] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] @@ -10,4 +14,4 @@ tp @s 14 3 -44 180 0 playsound entity.player.levelup player @s 14 3 -44 1 1 1 tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/believer/over.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/over.mcfunction index edd760d5..03952d51 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 6 -49 38 -81 scoreboard players set beli.state state 0 tellraw @a ["\u00a7a[I] ",{"text":"Block Believer","color":"#a7d3ff","bold": true}," \u00a7a: \u00a7b游戏结束！\n\u00a7e获胜者：",{"selector":"@a[gamemode=adventure,team=play.beli]"}] @@ -14,4 +18,4 @@ execute as @a[gamemode=adventure,team=wait.beli] run function believer/join execute as @a[gamemode=adventure,team=play.beli] run function believer/join schedule clear minecraft:believer/summon kill @e[tag=beliran,type=marker] -forceload remove 6 -49 38 -81 \ No newline at end of file +forceload remove 6 -49 38 -81 diff --git a/datapacks/map_all/data/minecraft/functions/believer/second.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/second.mcfunction index 1175ab6e..27ea6c98 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/second.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=beliran] run spreadplayers 22 -65 0 16 false @s execute as @e[tag=beliran] at @s if block ~ ~-1 ~ red_wool run setblock ~ ~-1 ~ air execute as @e[tag=beliran] at @s if block ~ ~-1 ~ orange_wool run setblock ~ ~-1 ~ red_wool execute as @e[tag=beliran] at @s if block ~ ~-1 ~ yellow_wool run setblock ~ ~-1 ~ orange_wool execute as @e[tag=beliran] at @s if block ~ ~-1 ~ white_wool run setblock ~ ~-1 ~ yellow_wool -scoreboard players set play.beli.player tick 0 +scoreboard players set play.beli.player tick 0 execute as @a[team=play.beli,gamemode=adventure] run scoreboard players add play.beli.player tick 1 execute if score play.beli.player tick matches ..1 run function minecraft:believer/over effect give @a[team=play.beli] resistance 1 25 true -effect give @a[team=play.beli] minecraft:night_vision 20 25 true \ No newline at end of file +effect give @a[team=play.beli] minecraft:night_vision 20 25 true diff --git a/datapacks/map_all/data/minecraft/functions/believer/sign.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/sign.mcfunction index e25544af..7eae614c 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/sign.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/sign.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute if score beli.num state matches ..0 run scoreboard players set beli.num state 1 execute if score beli.num state matches 7.. run scoreboard players set beli.num state 6 @@ -6,3 +10,4 @@ execute if score beli.num state matches 6..6 run data modify block 14 3 -46 fron execute if score beli.num state matches 4..5 run data modify block 14 3 -46 front_text.messages[3] set value '"\\u00a7cA bit hard"' execute if score beli.num state matches 1..1 run data modify block 14 3 -46 front_text.messages[3] set value '"\\u00a7aEasy"' execute if score beli.num state matches 2..3 run data modify block 14 3 -46 front_text.messages[3] set value '"\\u00a7bNormal"' + diff --git a/datapacks/map_all/data/minecraft/functions/believer/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/spec.mcfunction index 2eb1349f..92177b64 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] diff --git a/datapacks/map_all/data/minecraft/functions/believer/start.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/start.mcfunction index 4a0b4b2b..77128b20 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 6 -49 38 -81 fill 6 10 -49 38 10 -81 minecraft:white_wool title @a[team=wait.beli] title [{"text":"Block Believer","color":"#a7d3ff","bold": true}] @@ -12,3 +16,4 @@ schedule clear minecraft:believer/summon kill @e[tag=beliran,type=marker] schedule function minecraft:believer/summon 3s forceload remove 6 -49 38 -81 + diff --git a/datapacks/map_all/data/minecraft/functions/believer/summon.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/summon.mcfunction index 2f4dbecf..f9c1cc87 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/summon.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/summon.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove temp state 1 summon marker 0 0 0 {Tags:["beliran"]} -execute if score temp state matches 1.. run function believer/summon \ No newline at end of file +execute if score temp state matches 1.. run function believer/summon diff --git a/datapacks/map_all/data/minecraft/functions/believer/test.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/test.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/test.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/believer/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/teststart.mcfunction index 379b2da5..f89f9b04 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.beli,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score beli.state state matches 1.. run function minecraft:believer/spec execute unless score beli.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score beli.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score beli.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:believer/start \ No newline at end of file +execute unless score beli.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:believer/start diff --git a/datapacks/map_all/data/minecraft/functions/believer/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/believer/tick.mcfunction index f541f503..9020986e 100644 --- a/datapacks/map_all/data/minecraft/functions/believer/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/believer/tick.mcfunction @@ -1 +1,5 @@ -execute as @a[team=play.beli,gamemode=adventure] at @s if block ~ ~-1 ~ magma_block run function believer/died \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @a[team=play.beli,gamemode=adventure] at @s if block ~ ~-1 ~ magma_block run function believer/died diff --git a/datapacks/map_all/data/minecraft/functions/car_race/around.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/around.mcfunction deleted file mode 100644 index 0108cc3c..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/around.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -scoreboard players add @p[distance=0..1,tag=riding,team=car.play] car.rounds 1 -tellraw @a[team=car.play] [{"selector":"@p[distance=0..1,tag=riding,team=car.play]"},"\u00a7b完成了第",{"score":{"name": "@p[distance=0..1,tag=riding,team=car.play]","objective": "car.rounds"},"color": "yellow"},"\u00a7b圈！"] -tellraw @a[team=car.wait] [{"selector":"@p[distance=0..1,tag=riding,team=car.play]"},"\u00a7b完成了第",{"score":{"name": "@p[distance=0..1,tag=riding,team=car.play]","objective": "car.rounds"},"color": "yellow"},"\u00a7b圈！"] -tp @s 199 81 45 -title @p[distance=0..1,tag=riding,team=car.play] title ["\u00a76到达终点线"] -title @p[distance=0..1,tag=riding,team=car.play] subtitle ["\u00a7a你完成了 ",{"score":{"name": "@p[distance=0..1,tag=riding,team=car.play]","objective": "car.rounds"},"color": "yellow"},"\u00a7a 圈"] -execute as @p[distance=0..1,tag=riding,team=car.play] at @s if score @s car.rounds matches 3.. run function car_race/win diff --git a/datapacks/map_all/data/minecraft/functions/car_race/check_all_players_on_car.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/check_all_players_on_car.mcfunction deleted file mode 100644 index 6f809af3..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/check_all_players_on_car.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -scoreboard players set need.player tick 0 -execute as @a[team=car.play,gamemode=adventure] run scoreboard players add need.player tick 1 - -scoreboard players set oncar.player tick 0 -execute as @a[team=car.play,tag=riding,gamemode=adventure] run scoreboard players add oncar.player tick 1 - -execute if score need.player tick = oncar.player tick run function car_race/start_count_number \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/count_start_number.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/count_start_number.mcfunction deleted file mode 100644 index 2222801e..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/count_start_number.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ - -title @a[team=car.play] title [{"text":"Car Race","color":"#009966","bold": true}] -title @a[team=car.play] subtitle ["\u00a7e将在" ,{"score":{"name": "car.number","objective": "tick"},"color": "red"},"\u00a7e 秒后开始。"] -tellraw @a[team=car.play] ["\u00a7e游戏将在" ,{"score":{"name": "car.number","objective": "tick"},"color": "red"},"\u00a7e 秒后开始。"] -execute as @a[team=car.play] at @s run playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 0.1 1 -execute if score car.number tick matches ..0 run function car_race/game_start -scoreboard players remove car.number tick 1 - -# scoreboard players set \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/game_start.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/game_start.mcfunction deleted file mode 100644 index 7b453505..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/game_start.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -execute as @a[team=car.play] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 2 2 1 - -title @a[team=car.play] title [{"text":"Car Race","color":"#009966","bold": true}] -title @a[team=car.play] subtitle ["\u00a7e游戏开始！冲刺！" ] -tellraw @a[team=car.play] ["\u00a7e游戏开始！"] -# fill 196 82 42 202 81 42 air -fill 202 82 41 196 81 43 air -scoreboard players set car.state state 1 \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/gameover.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/gameover.mcfunction deleted file mode 100644 index f03736f5..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/gameover.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -tellraw @a [{"text":"Car Race","color":"#009966","bold": true},"\u00a7a 游戏结束！"] -scoreboard players set car.state state 4 -tellraw @a[team=car.play] ["\u00a7a胜利者：",{"selector":"@a[gamemode=spectator,tag=car.win]"}] -tellraw @a[team=car.wait] ["\u00a7a胜利者：",{"selector":"@a[gamemode=spectator,tag=car.win]"}] -title @a[team=car.play] title ["\u00a7c\u00a7lGAME OVER"] -title @a[team=car.wait] subtitle ["\u00a7c5\u00a7e秒后返回等待大厅"] -gamemode spectator @a[team=car.play] - -schedule function car_race/tp 5s \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/introduct.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/introduct.mcfunction deleted file mode 100644 index 5ecd623a..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/introduct.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -tellraw @s ["\n \u00a76※ ",{"text":"Car Race","color":"#009966","bold":true}," \u00a76游戏介绍\n\n\u00a7B ※ 任务：\u00a7a使用赛车进行比赛！争取第一！\n\u00a7b ※ 作者：\u00a7aGamom\n\n \u00a7d\u00a7l祝您游玩愉快！\n"] -playsound ui.toast.challenge_complete player @s ~ ~ ~ \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/join.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/join.mcfunction deleted file mode 100644 index b7648b47..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/join.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -tellraw @a[team=!car.wait] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 加入了 ",{"text":"Car Race","color":"#009966","bold": true}," \u00a77!"] -team join car.wait -scoreboard players set wait.player tick 0 -execute as @a[team=car.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 -tellraw @a[team=car.wait] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] -tp @s 148.0 96 8.0 0 0 -function car_race/introduct -clear @s -effect clear @s -tag @s remove car.win -tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/second.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/second.mcfunction deleted file mode 100644 index 5229c8e1..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/second.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute if score car.state state matches 2..2 run function car_race/check_all_players_on_car -execute if score car.state state matches 3..3 run function car_race/count_start_number -execute if score car.state state matches 1..3 run function car_race/testfor_gameover \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/spec.mcfunction deleted file mode 100644 index 2d1a7c5e..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/spec.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -tellraw @s ["\u00a7c游戏已经开始了！您可以旁观游戏，或者输入 \u00a7b/trigger hub \u00a7c返回大厅。"] -gamemode spectator @s \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/start.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/start.mcfunction deleted file mode 100644 index e60d9167..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/start.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -tp @a[team=car.wait] 199 81 45 180 0 -give @a[team=car.wait] minecart{gcar:1b,display:{Name:'[{"text":"\\u00a7aGCAR \\u00a77 - 放到\\u00a7e副手"},"\\u00a77使用"]'}} 1 -tellraw @a[team=car.wait] ["\u00a7b请选手各就各位，拿着矿车按下",{"keybind":"key.swapOffhand","color":"yellow"},"\u00a7b 或者将矿车放置在副手召唤矿车。\n\u00a7a当所有玩家乘坐上矿车，游戏才会开始。"] -title @a[team=car.wait] title [{"text":"Car Race","color":"#009966","bold": true}] -title @a[team=car.wait] subtitle ["\u00a7b拿着矿车使用",{"keybind":"key.swapOffhand","color":"yellow"},"\u00a7e键\u00a7b快速召唤矿车"] -kill @e[tag=GCAR] -team join car.play @a[team=car.wait] -scoreboard players set car.state state 2 -# fill 196 82 42 202 81 42 minecraft:barrier -fill 202 82 41 196 81 43 minecraft:acacia_fence -# fill 202 81 43 196 81 43 air -scoreboard players reset * car.rounds -tag @a remove car.win diff --git a/datapacks/map_all/data/minecraft/functions/car_race/start_count_number.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/start_count_number.mcfunction deleted file mode 100644 index b3abb4d0..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/start_count_number.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players set car.state state 3 -scoreboard players set car.number tick 5 \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/testfor_gameover.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/testfor_gameover.mcfunction deleted file mode 100644 index 9dd4b393..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/testfor_gameover.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -scoreboard players set play.player tick 0 -execute as @a[team=car.play,gamemode=adventure] run scoreboard players add play.player tick 1 - -execute if score play.player tick matches ..1 run function car_race/gameover \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/teststart.mcfunction deleted file mode 100644 index 91bc9309..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/teststart.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -playsound ui.button.click player @s -scoreboard players set wait.player tick 0 -execute as @a[team=car.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 -scoreboard players add car.state state 0 -tag @s remove car.win - -execute if score car.state state matches 1.. run function minecraft:car_race/spec -execute unless score car.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] -execute unless score car.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score car.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:car_race/start diff --git a/datapacks/map_all/data/minecraft/functions/car_race/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/tick.mcfunction deleted file mode 100644 index 30f683d9..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/tick.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -effect give @a[team=car.play] resistance 2 25 true -execute as @e[tag=ridden,tag=GCAR] at @s if block ~ ~-1 ~ red_wool run function car_race/around \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/tp.mcfunction deleted file mode 100644 index 5bfadaed..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/tp.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -gamemode adventure @a[team=car.play,gamemode=!creative] -gamemode adventure @a[team=car.wait,gamemode=!creative] -scoreboard players add @a[tag=car.win,tag=play.total] score 1 -# execute if entity @a[team=car.wait,tag=play.total] run function small_games/total/next_game -execute if entity @a[team=car.play,tag=play.total] run function small_games/total/next_game -execute as @a[team=car.wait,gamemode=!creative] run function car_race/join -execute as @a[team=car.play,gamemode=!creative] run function car_race/join -scoreboard players set car.state state 0 -kill @e[tag=GCAR] -scoreboard players reset * car.rounds -tag @a remove car.win \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/car_race/win.mcfunction b/datapacks/map_all/data/minecraft/functions/car_race/win.mcfunction deleted file mode 100644 index d93597c3..00000000 --- a/datapacks/map_all/data/minecraft/functions/car_race/win.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -tellraw @a[team=car.play] [{"selector":"@s"},"\u00a7a赢得了比赛！"] -tellraw @a[team=car.wait] [{"selector":"@s"},"\u00a7a赢得了比赛！"] -title @s title ["\u00a76You won!"] -title @s subtitle ["\u00a7a你完成了 3 圈！"] -gamemode spectator @s -kill @e[tag=GCAR,tag=ridden,distance=0..1,sort=nearest,limit=1] -tag @s add car.win \ No newline at end of file diff --git a/datapacks/map_all/data/minecraft/functions/color/block_fall.mcfunction b/datapacks/map_all/data/minecraft/functions/color/block_fall.mcfunction index 059b713c..9691b4da 100644 --- a/datapacks/map_all/data/minecraft/functions/color/block_fall.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/block_fall.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## $fill -7 17 75 32 17 114 bedrock replace $(block) fill -7 17 75 32 17 114 air replace #color $fill -7 17 75 32 17 114 $(block) replace bedrock + diff --git a/datapacks/map_all/data/minecraft/functions/color/colorstartran.mcfunction b/datapacks/map_all/data/minecraft/functions/color/colorstartran.mcfunction index bcb41116..bf27bca3 100644 --- a/datapacks/map_all/data/minecraft/functions/color/colorstartran.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/colorstartran.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tag @e[tag=color.test] add color.Nadd function minecraft:color/setcolor @@ -13,4 +17,4 @@ execute if score color.rantype board matches 5 run function minecraft:color/ran_ # -5 17 77 30 17 112 # 色卡 -52 35 61 -execute as @a[team=play.color] at @s run playsound minecraft:ui.button.click player @s \ No newline at end of file +execute as @a[team=play.color] at @s run playsound minecraft:ui.button.click player @s diff --git a/datapacks/map_all/data/minecraft/functions/color/detect.mcfunction b/datapacks/map_all/data/minecraft/functions/color/detect.mcfunction index 18adbfb8..b33b3749 100644 --- a/datapacks/map_all/data/minecraft/functions/color/detect.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/detect.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set color.state state 1 execute as @a[team=play.color] at @s run playsound entity.generic.explode player @s ~ ~ ~ 1 1.5 1 @@ -6,4 +10,4 @@ function color/block_fall with storage minecraft:temp # execute as @a[team=play.color,gamemode=adventure] at @s unless blocks ~ ~-1 ~ ~ ~-1 ~ -52 35 64 all run function color/died tellraw @a[team=wait.color] ["\u00a77方块掉落！"] tellraw @a[team=play.color] ["\u00a77方块掉落！"] -schedule function minecraft:color/summon 5s \ No newline at end of file +schedule function minecraft:color/summon 5s diff --git a/datapacks/map_all/data/minecraft/functions/color/died.mcfunction b/datapacks/map_all/data/minecraft/functions/color/died.mcfunction index 92559993..3794ca32 100644 --- a/datapacks/map_all/data/minecraft/functions/color/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/died.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c对不起，你淘汰了！"] tellraw @a[team=play.color] [{"selector":"@s"},"\u00a7c 淘汰！"] tellraw @a[team=wait.color] [{"selector":"@s"},"\u00a7c 淘汰！"] gamemode spectator @s -scoreboard players set play.color.player tick 0 +scoreboard players set play.color.player tick 0 execute as @a[team=play.color,gamemode=adventure] run scoreboard players add play.color.player tick 1 title @a[team=play.color] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.color.player"},"color": "dark_purple"}] -tp @s 13.0 38 95.0 0 90 \ No newline at end of file +tp @s 13.0 38 95.0 0 90 diff --git a/datapacks/map_all/data/minecraft/functions/color/fillcolor.mcfunction b/datapacks/map_all/data/minecraft/functions/color/fillcolor.mcfunction index 7e5b4fba..c9db5a20 100644 --- a/datapacks/map_all/data/minecraft/functions/color/fillcolor.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/fillcolor.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clone -52 35 61 -52 35 61 ~-1 ~-1 ~-1 clone -52 35 61 -52 35 61 ~1 ~-1 ~-1 clone -52 35 61 -52 35 61 ~-1 ~-1 ~1 @@ -7,4 +11,4 @@ clone -52 35 61 -52 35 61 ~-1 ~-1 ~ clone -52 35 61 -52 35 61 ~1 ~-1 ~ clone -52 35 61 -52 35 61 ~ ~-1 ~1 clone -52 35 61 -52 35 61 ~ ~-1 ~ -tag @s remove color.Nadd \ No newline at end of file +tag @s remove color.Nadd diff --git a/datapacks/map_all/data/minecraft/functions/color/gettip.mcfunction b/datapacks/map_all/data/minecraft/functions/color/gettip.mcfunction index 79818c0a..fbc6e74a 100644 --- a/datapacks/map_all/data/minecraft/functions/color/gettip.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/gettip.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=play.color,gamemode=adventure] #minecraft:terracottas execute positioned -52 35 64 run function minecraft:color/ran_fill/3_whichblock function minecraft:color/tip_give_item_from_function with storage minecraft:temp + diff --git a/datapacks/map_all/data/minecraft/functions/color/half_second.mcfunction b/datapacks/map_all/data/minecraft/functions/color/half_second.mcfunction index 31bc780f..dcff0c84 100644 --- a/datapacks/map_all/data/minecraft/functions/color/half_second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/half_second.mcfunction @@ -1 +1,5 @@ -execute if score color.state state matches 3..3 if score color.tick tick matches ..3 run execute as @a[team=play.color] at @s run playsound minecraft:ui.button.click player @s ~ ~ ~ 1 1.5 0 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score color.state state matches 3..3 if score color.tick tick matches ..3 run execute as @a[team=play.color] at @s run playsound minecraft:ui.button.click player @s ~ ~ ~ 1 1.5 0 diff --git a/datapacks/map_all/data/minecraft/functions/color/join.mcfunction b/datapacks/map_all/data/minecraft/functions/color/join.mcfunction index 4c2ecf74..dfa44ca0 100644 --- a/datapacks/map_all/data/minecraft/functions/color/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/join.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s[team=!play.color] title [{"text":"Color Blindness Game","color":"#009966","bold": true}] title @s[team=!play.color] subtitle ["\u00a7rShine your eyes !"] team join wait.color @s tellraw @a[team=!wait.color] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"Color Blindness Game","color":"#009966","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.color,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"Color Blindness Game","color":"#009966","bold": true},"\n\n\u00a7e 游戏介绍：\n \u00a77游戏开始后，方块将会随机开始变化。\n\u00a7e 你需要在规定时间踩到指定方块上。\n\u00a7a 方块在物品栏第九格位置。\n"] tellraw @a[team=wait.color] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] @@ -10,6 +14,6 @@ tp @s -32 28 33 0 0 playsound entity.player.levelup player @s -32 28 33 1 1 1 clear @s -effect clear @s +effect clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/color/over.mcfunction b/datapacks/map_all/data/minecraft/functions/color/over.mcfunction index 16491b36..c298e4dc 100644 --- a/datapacks/map_all/data/minecraft/functions/color/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set color.state state 0 tellraw @a ["\u00a7a[I] ",{"text":"色盲派对","color":"#a7d3ff","bold": true}," \u00a7a: \u00a7b游戏结束！"] @@ -17,3 +21,4 @@ fill -5 17 77 30 17 112 glass forceload remove 29 111 -7 75 + diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/1_init.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/1_init.mcfunction index e6d948a8..afadb127 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/1_init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/1_init.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill -7 17 75 32 17 114 air # start from 30 17 77 kill @e[tag=color.test] @@ -2360,4 +2364,4 @@ execute positioned -5 17 112 if score color.ran.blockwidth board matches 1 run f summon marker ~ ~ ~ {Tags:["color.tmp"]} spreadplayers 13.00 95.00 0 20 under 20 false @e[tag=color.tmp] execute as @e[tag=color.tmp] at @s run clone ~ ~-1 ~ ~ ~-1 ~ -52 35 64 -kill @e[tag=color.tmp] \ No newline at end of file +kill @e[tag=color.tmp] diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_place.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_place.mcfunction index 9667f8f7..4fc44c0a 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_place.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_place.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function color/rancolor execute if score color.ran.blockwidth board matches 1.. run clone -52 35 61 -52 35 61 ~ ~ ~ @@ -15,4 +19,4 @@ execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 35 61 ~-3 ~ ~3 execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 35 61 ~-3 ~ ~ execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 35 61 ~-3 ~ ~1 -execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 35 61 ~-3 ~ ~2 \ No newline at end of file +execute if score color.ran.blockwidth board matches 4.. run clone -52 35 61 -52 35 61 ~-3 ~ ~2 diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tick_holder.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tick_holder.mcfunction index 9f9d8f17..76a91c65 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tick_holder.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tick_holder.mcfunction @@ -1 +1,5 @@ -execute as @e[tag=color.test,limit=1] at @s run function minecraft:color/ran_fill/2_tp \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[tag=color.test,limit=1] at @s run function minecraft:color/ran_fill/2_tp diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp.mcfunction index 37c62a35..b5b563b2 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # start from 30 17 77 to -5 17 77 # start from 30 17 77 to 30 17 112 execute at @s run function minecraft:color/ran_fill/2_place @@ -9,3 +13,4 @@ execute if score color.ran.tpx board < color.ran.tpx.to board at @s run scoreboa execute if score color.ran.tpx board < color.ran.tpx.to board at @s run function minecraft:color/ran_fill/2_tp execute if score color.ran.tpx board >= color.ran.tpx.to board at @s run function minecraft:color/ran_fill/2_tp_y + diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_died.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_died.mcfunction index e8e1b45b..98e7ac65 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_died.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @s[type=!player] -execute as @s[type=player] run say [debug] done \ No newline at end of file +execute as @s[type=player] run say [debug] done diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_y.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_y.mcfunction index e3b0da64..cc63b251 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_y.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/2_tp_y.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add color.ran.tpy board 1 scoreboard players set color.ran.tpx board 0 execute if score color.ran.blockwidth board matches 1 at @s positioned 30 ~ ~ run tp ~ ~ ~1 @@ -5,4 +9,4 @@ execute if score color.ran.blockwidth board matches 2 at @s positioned 30 ~ ~ ru execute if score color.ran.blockwidth board matches 3 at @s positioned 30 ~ ~ run tp ~ ~ ~3 execute if score color.ran.blockwidth board matches 4 at @s positioned 30 ~ ~ run tp ~ ~ ~4 execute if score color.ran.tpy board >= color.ran.tpy.to board run function minecraft:color/ran_fill/2_tp_died -execute if score color.ran.tpy board < color.ran.tpy.to board at @s run function minecraft:color/ran_fill/2_tp \ No newline at end of file +execute if score color.ran.tpy board < color.ran.tpy.to board at @s run function minecraft:color/ran_fill/2_tp diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_init.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_init.mcfunction index a657a16f..3afd2d07 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_init.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill -7 17 75 32 17 114 air # start from 30 17 77 kill @e[tag=color.test] @@ -23,75 +27,90 @@ function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 4 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:-2,x2:27,y1:17,y2:17,z1:109,z2:80} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 5 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:-1,x2:26,y1:17,y2:17,z1:108,z2:81} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 6 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:0,x2:25,y1:17,y2:17,z1:107,z2:82} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 7 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:1,x2:24,y1:17,y2:17,z1:106,z2:83} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 8 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:2,x2:23,y1:17,y2:17,z1:105,z2:84} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 9 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:3,x2:22,y1:17,y2:17,z1:104,z2:85} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 10 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:4,x2:21,y1:17,y2:17,z1:103,z2:86} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 11 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:5,x2:20,y1:17,y2:17,z1:102,z2:87} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 12 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:6,x2:19,y1:17,y2:17,z1:101,z2:88} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 13 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:7,x2:18,y1:17,y2:17,z1:100,z2:89} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 14 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:8,x2:17,y1:17,y2:17,z1:99,z2:90} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 15 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:9,x2:16,y1:17,y2:17,z1:98,z2:91} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 16 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:10,x2:15,y1:17,y2:17,z1:97,z2:92} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 17 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:11,x2:14,y1:17,y2:17,z1:96,z2:93} function color/ran_fill/3_place with storage minecraft:temp function color/rancolor execute if score color.ran.targetcount board matches 18 run clone -52 35 64 -52 35 64 -52 35 61 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock + data merge storage minecraft:temp {x1:12,x2:13,y1:17,y2:17,z1:95,z2:94} -function color/ran_fill/3_place with storage minecraft:temp \ No newline at end of file +function color/ran_fill/3_place with storage minecraft:temp diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_place.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_place.mcfunction index 1a11a5e4..13b19d2b 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_place.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_place.mcfunction @@ -1 +1,5 @@ -$fill $(x1) $(y1) $(z1) $(x2) $(y2) $(z2) $(block) \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +$fill $(x1) $(y1) $(z1) $(x2) $(y2) $(z2) $(block) diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_whichblock.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_whichblock.mcfunction index 7e614972..465f8e48 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_whichblock.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/3_whichblock.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## data merge storage minecraft:temp {block:"terracotta"} execute if block ~ ~ ~ terracotta run data merge storage minecraft:temp {block:"terracotta"} execute if block ~ ~ ~ white_terracotta run data merge storage minecraft:temp {block:"white_terracotta"} @@ -66,4 +70,4 @@ execute if block ~ ~ ~ clay run data merge storage minecraft:temp {block:"clay"} # brown_terracotta # green_terracotta # red_terracotta -# black_terracotta \ No newline at end of file +# black_terracotta diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_init.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_init.mcfunction index 9579e81a..1b415dfb 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_init.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill -7 17 75 32 17 114 air # start from 30 17 77 kill @e[tag=color.test] @@ -124,4 +128,4 @@ execute if score color.ran.targetcount board matches 9 run clone -52 35 64 -52 3 execute positioned -52 35 61 run function minecraft:color/ran_fill/3_whichblock data merge storage minecraft:temp {x1:15,x2:24,y1:17,y2:17,z1:95,z2:94} # 15 17 95 24 17 94 -function color/ran_fill/3_place with storage minecraft:temp \ No newline at end of file +function color/ran_fill/3_place with storage minecraft:temp diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_place.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_place.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_place.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/4_place.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_init.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_init.mcfunction index c184c253..05c28ea3 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_init.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # from 36 y 75 75 y 114 to -7 17 75 fill -7 17 75 32 17 114 air @@ -28,4 +32,4 @@ function color/ran_fill/5_place_block with storage minecraft:temp summon marker ~ ~ ~ {Tags:["color.tmp"]} spreadplayers 13.00 95.00 0 20 under 20 false @e[tag=color.tmp] execute as @e[tag=color.tmp] at @s run clone ~ ~-1 ~ ~ ~-1 ~ -52 35 64 -kill @e[tag=color.tmp] \ No newline at end of file +kill @e[tag=color.tmp] diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place.mcfunction index 57701252..c8826b0d 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place.mcfunction @@ -1 +1,5 @@ -$clone 36 $(random_value) 75 75 $(random_value) 114 -7 17 75 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +$clone 36 $(random_value) 75 75 $(random_value) 114 -7 17 75 diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place_block.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place_block.mcfunction index 71d6edd7..5f1e7615 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place_block.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/5_place_block.mcfunction @@ -1 +1,5 @@ -$fill $(x1) $(y1) $(z1) $(x2) $(y2) $(z2) $(block) replace $(replace_block) \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +$fill $(x1) $(y1) $(z1) $(x2) $(y2) $(z2) $(block) replace $(replace_block) diff --git a/datapacks/map_all/data/minecraft/functions/color/ran_fill/per.mcfunction b/datapacks/map_all/data/minecraft/functions/color/ran_fill/per.mcfunction index b1db6b92..b82a98ca 100644 --- a/datapacks/map_all/data/minecraft/functions/color/ran_fill/per.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/ran_fill/per.mcfunction @@ -1 +1,5 @@ -# 随机分配 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# 随机分配 diff --git a/datapacks/map_all/data/minecraft/functions/color/rancolor.mcfunction b/datapacks/map_all/data/minecraft/functions/color/rancolor.mcfunction index 95bcbe21..e4549e31 100644 --- a/datapacks/map_all/data/minecraft/functions/color/rancolor.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/rancolor.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 获取随机颜色 execute as @e[type=marker,tag=color.rancolor,limit=1,sort=random] at @s run clone ~ ~-1 ~ ~ ~-1 ~ -52 35 61 # function color/fillcolor # 色卡 -52 35 61 + diff --git a/datapacks/map_all/data/minecraft/functions/color/second.mcfunction b/datapacks/map_all/data/minecraft/functions/color/second.mcfunction index bb8a1190..cc306523 100644 --- a/datapacks/map_all/data/minecraft/functions/color/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/second.mcfunction @@ -1,4 +1,8 @@ -scoreboard players set play.color.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set play.color.player tick 0 execute as @a[team=play.color,gamemode=adventure] run scoreboard players add play.color.player tick 1 execute if score play.color.player tick matches ..1 run function minecraft:color/over effect give @a[team=play.color] resistance 1 25 true @@ -6,4 +10,4 @@ effect give @a[team=play.color] night_vision 15 25 true execute if score color.state state matches 2..2 run function minecraft:color/step/one execute if score color.state state matches 3..3 run function minecraft:color/step/two -function color/gettip \ No newline at end of file +function color/gettip diff --git a/datapacks/map_all/data/minecraft/functions/color/setcolor.mcfunction b/datapacks/map_all/data/minecraft/functions/color/setcolor.mcfunction index 7c61c1f2..b6387707 100644 --- a/datapacks/map_all/data/minecraft/functions/color/setcolor.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/setcolor.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[type=marker,tag=color.rancolor,limit=1,sort=random] at @s run clone ~ ~-1 ~ ~ ~-1 ~ -52 35 64 # execute as @e[type=marker,tag=color.test,limit=1,sort=random] at @s run function color/ran_fill/per # 色卡 -52 35 61 #color.Nadd -#-52 35 61 \ No newline at end of file +#-52 35 61 diff --git a/datapacks/map_all/data/minecraft/functions/color/sign.mcfunction b/datapacks/map_all/data/minecraft/functions/color/sign.mcfunction index 05c026f5..aaf3cdb9 100644 --- a/datapacks/map_all/data/minecraft/functions/color/sign.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/sign.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute if score color.time state matches ..3 run scoreboard players set color.time state 4 execute if score color.time state matches 19.. run scoreboard players set color.time state 18 @@ -8,3 +12,4 @@ execute if score color.maxtime state >= color.time state run scoreboard players data modify block -36 29 34 front_text.messages[2] set value '["\\u00a7b[",{"score":{"objective":"state","name":"color.time"},"color":"gold"}," \\u00a7bs]"]' data modify block -36 28 34 front_text.messages[2] set value '["\\u00a7b[",{"score":{"objective":"state","name":"color.maxtime"},"color":"gold"}," \\u00a7bs]"]' + diff --git a/datapacks/map_all/data/minecraft/functions/color/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/color/spec.mcfunction index 2eb1349f..92177b64 100644 --- a/datapacks/map_all/data/minecraft/functions/color/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] diff --git a/datapacks/map_all/data/minecraft/functions/color/start.mcfunction b/datapacks/map_all/data/minecraft/functions/color/start.mcfunction index eb1d389f..00ed0738 100644 --- a/datapacks/map_all/data/minecraft/functions/color/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 29 111 -7 75 fill -5 17 77 30 17 112 glass @@ -22,4 +26,4 @@ fill -5 17 77 30 17 112 glass # execute if score color.tick tick matches ..0 run scoreboard players set color.state state 3 # execute if score color.tick tick matches ..0 run scoreboard players operation color.tick tick = color.tt state # execute if score color.tick tick matches ..0 if score color.tre tick matches 1.. run scoreboard players remove color.tt state 1 -# execute if score color.tick tick matches ..0 if score color.tre tick matches 1.. run scoreboard players remove color.tre tick 1 \ No newline at end of file +# execute if score color.tick tick matches ..0 if score color.tre tick matches 1.. run scoreboard players remove color.tre tick 1 diff --git a/datapacks/map_all/data/minecraft/functions/color/step/one.mcfunction b/datapacks/map_all/data/minecraft/functions/color/step/one.mcfunction index b57ea7ae..b3afd3a7 100644 --- a/datapacks/map_all/data/minecraft/functions/color/step/one.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/step/one.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:color/colorstartran scoreboard players remove color.tick tick 1 execute if score color.tick tick matches ..0 run function color/step/onetotwo -execute as @a[team=play.color] at @s run playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 0.1 1 \ No newline at end of file +execute as @a[team=play.color] at @s run playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 0.1 1 diff --git a/datapacks/map_all/data/minecraft/functions/color/step/onetotwo.mcfunction b/datapacks/map_all/data/minecraft/functions/color/step/onetotwo.mcfunction index 1ffaf307..85496485 100644 --- a/datapacks/map_all/data/minecraft/functions/color/step/onetotwo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/step/onetotwo.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set color.state state 3 execute if score color.tre tick matches 1.. run scoreboard players remove color.tt tick 1 execute if score color.tre tick matches 1.. run scoreboard players remove color.tre tick 1 scoreboard players operation color.tick tick = color.tt tick # playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 0.1 1 execute as @a[team=play.color] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 2 2 1 -execute if score color.tick tick matches ..2 run scoreboard players set color.tick tick 2 \ No newline at end of file +execute if score color.tick tick matches ..2 run scoreboard players set color.tick tick 2 diff --git a/datapacks/map_all/data/minecraft/functions/color/step/two.mcfunction b/datapacks/map_all/data/minecraft/functions/color/step/two.mcfunction index 86363691..7cf339f1 100644 --- a/datapacks/map_all/data/minecraft/functions/color/step/two.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/step/two.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=play.color] actionbar ["\u00a76Warn : 将在 ",{"score":{"objective": "tick","name":"color.tick"},"color": "green"},"\u00a76 秒后开始检测！"] execute if score color.tick tick matches ..0 run function minecraft:color/detect execute as @a[team=play.color] at @s run playsound minecraft:entity.experience_orb.pickup player @s scoreboard players remove color.tick tick 1 + diff --git a/datapacks/map_all/data/minecraft/functions/color/summon.mcfunction b/datapacks/map_all/data/minecraft/functions/color/summon.mcfunction index fda8b6fc..fae25392 100644 --- a/datapacks/map_all/data/minecraft/functions/color/summon.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/summon.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set color.state state 2 scoreboard players set color.tick tick 6 tellraw @a[team=wait.color] ["\u00a7c颜色已经开始变化！"] tellraw @a[team=play.color] ["\u00a7c颜色已经开始变化！"] execute store result score color.rantype board run random value 1..5 -execute if score color.rantype board matches 1..2 store result score color.ran.blockwidth board run random value 1..4 \ No newline at end of file +execute if score color.rantype board matches 1..2 store result score color.ran.blockwidth board run random value 1..4 diff --git a/datapacks/map_all/data/minecraft/functions/color/test.mcfunction b/datapacks/map_all/data/minecraft/functions/color/test.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/color/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/test.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/color/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/color/teststart.mcfunction index 8a24b0cc..4fb67322 100644 --- a/datapacks/map_all/data/minecraft/functions/color/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.color,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score color.state state matches 1.. run function minecraft:color/spec execute unless score color.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score color.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score color.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:color/start \ No newline at end of file +execute unless score color.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:color/start diff --git a/datapacks/map_all/data/minecraft/functions/color/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/color/tick.mcfunction index 8d8f3233..2c96a151 100644 --- a/datapacks/map_all/data/minecraft/functions/color/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.color,gamemode=adventure] at @s if block ~ ~-1 ~ water run function color/died execute as @a[team=play.color,gamemode=adventure] at @s if block ~ ~ ~ water run function color/died -kill @e[type=item,nbt={Item:{tag:{Color:1b}}}] \ No newline at end of file +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{Color:1b}}}}] diff --git a/datapacks/map_all/data/minecraft/functions/color/tip_give_item_from_function.mcfunction b/datapacks/map_all/data/minecraft/functions/color/tip_give_item_from_function.mcfunction index 841b1af1..54f83f60 100644 --- a/datapacks/map_all/data/minecraft/functions/color/tip_give_item_from_function.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/color/tip_give_item_from_function.mcfunction @@ -1 +1,5 @@ -$execute as @a[team=play.color] run item replace entity @s container.8 with $(block){Color:1b} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +$execute as @a[team=play.color] run item replace entity @s container.8 with $(block)[custom_data={Color:1b}] diff --git a/datapacks/map_all/data/minecraft/functions/dropper/died.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/died.mcfunction index 57ba93f4..0e37bab3 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/died.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add @s dropper.failed 1 tellraw @s ["\u00a7c你失败了。 当前失败次数：",{"score":{"name": "@s","objective": "dropper.failed"},"color": "gold"}] title @s actionbar ["\u00a7c你失败了。"] scoreboard players add @s dropper.level 0 execute if score @s dropper.level matches ..0 run function dropper/join execute if score @s dropper.level matches 1..10 run function dropper/playlevel -execute if score @s dropper.level matches 11.. run function dropper/join \ No newline at end of file +execute if score @s dropper.level matches 11.. run function dropper/join diff --git a/datapacks/map_all/data/minecraft/functions/dropper/join.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/join.mcfunction index 7aa3a3e5..55fa0b75 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in dropperworld run teleport @s 19 -59 57 180 0 playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 title @s title ["\u00a7a\u00a7lDropper"] @@ -8,4 +12,4 @@ team join dropper clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/dropper/load.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/load.mcfunction index fa1e3712..d2d4bd3c 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/load.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/load.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add @s dropper.level 0 + diff --git a/datapacks/map_all/data/minecraft/functions/dropper/nextlevel.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/nextlevel.mcfunction index 9755f6d4..b6b8a58b 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/nextlevel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/nextlevel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=dropper] [{"selector":"@s"}," \u00a7b完成了\u00a7d第 ",{"score":{"name": "@s","objective": "dropper.level"},"color": "aqua"}," \u00a7d关"] scoreboard players add @s dropper.level 1 execute if score @s dropper.level matches 11.. run function dropper/win @@ -5,4 +9,4 @@ title @s subtitle ["\u00a7a已到达下一关"] execute if score @s dropper.level matches 1..10 run title @s title ["\u00a7d第 ",{"score":{"name": "@s","objective": "dropper.level"},"color": "aqua"},"\u00a7d 关"] execute if score @s dropper.level matches 1..10 run function dropper/playlevel execute at @s run playsound entity.player.levelup player @s ~ ~ ~ 10 1 1 -function dropper/save \ No newline at end of file +function dropper/save diff --git a/datapacks/map_all/data/minecraft/functions/dropper/playlevel.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/playlevel.mcfunction index 4b6a34d6..61c1f0e3 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/playlevel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/playlevel.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function dropper/tptolevel attribute @s generic.max_health base set 2 title @s actionbar ["\u00a7d第 ",{"score":{"name": "@s","objective": "dropper.level"},"color": "aqua"},"\u00a7d 关"] # item replace entity @s armor.feet with diamond_boots{AttributeModifiers:[{AttributeName:"generic.max_health",Name:"noName",Amount:-14d,Operation:0,UUID:[I;1041,1467,7334,9500]}],Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}],HideFlags:63} + diff --git a/datapacks/map_all/data/minecraft/functions/dropper/save.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/save.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/save.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/save.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/dropper/second.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/second.mcfunction index 7d9b6604..7d5429a5 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # effect give @a[team=dropper] minecraft:fire_resistance 2 1 true effect give @a[team=dropper] minecraft:regeneration 1 2 true -spawnpoint @a[team=dropper] 37 -58 21 \ No newline at end of file +spawnpoint @a[team=dropper] 37 -58 21 diff --git a/datapacks/map_all/data/minecraft/functions/dropper/start.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/start.mcfunction index 5a7dcdc1..2dfeba5d 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/start.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 function dropper/load # scoreboard players add @s dropper.level 0 scoreboard players set @s[scores={dropper.level=..1}] dropper.failed 0 scoreboard players set @s[scores={dropper.level=..1}] dropper.level 1 function dropper/playlevel -title @s subtitle ["\u00a7a进入传送门进入下一关"] \ No newline at end of file +title @s subtitle ["\u00a7a进入传送门进入下一关"] diff --git a/datapacks/map_all/data/minecraft/functions/dropper/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/tick.mcfunction index 083c056b..5e631fdf 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/tick.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=dropper] at @s if block ~ ~ ~ nether_portal run function dropper/nextlevel -execute as @a[x=37,y=-59,z=21,dx=1,dy=1,dz=1,distance=..2] run function dropper/died \ No newline at end of file +execute as @a[x=37,y=-59,z=21,dx=1,dy=1,dz=1,distance=..2] run function dropper/died diff --git a/datapacks/map_all/data/minecraft/functions/dropper/tptolevel.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/tptolevel.mcfunction index 45763c7e..99b8f9a3 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/tptolevel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/tptolevel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s dropper.level matches 1 run tp @s -3 53 -10 90 0 execute if score @s dropper.level matches 2 run tp @s -6 54 -43 90 0 execute if score @s dropper.level matches 3 run tp @s -3 52 -77 90 0 @@ -9,3 +13,4 @@ execute if score @s dropper.level matches 8 run tp @s -3 53 -234 90 0 execute if score @s dropper.level matches 9 run tp @s -4 56 -265 90 0 execute if score @s dropper.level matches 10 run tp @s -5 52 -297 90 0 function dropper/save + diff --git a/datapacks/map_all/data/minecraft/functions/dropper/win.mcfunction b/datapacks/map_all/data/minecraft/functions/dropper/win.mcfunction index 33d1b7a3..f903b5a7 100644 --- a/datapacks/map_all/data/minecraft/functions/dropper/win.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/dropper/win.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function dropper/join title @s title ["\u00a7a\u00a7lDropper"] title @s subtitle ["\u00a7a恭喜！你已完成最后的关卡！"] tellraw @s ["\u00a7a恭喜！你已完成最后的关卡！\n\u00a7d你的总失败次数为：",{"score":{"name": "@s","objective": "dropper.failed"},"color": "gold"}] -tellraw @a [{"selector":"@s","color":"aqua"}," \u00a7a完成了所有的\u00a7d 「星跳水立方」 \u00a7a关卡。他的总失败次数为 ",{"score":{"name": "@s","objective": "dropper.failed"},"color": "gold"},"\u00a7a 次。"] +tellraw @a [{"selector":"@s","color":"aqua"}," \u00a7a完成了所有的\u00a7d 「星跳水立方」 \u00a7a关卡。他的总失败次数为 ",{"score":{"name": "@s","objective": "dropper.failed"},"color": "gold"},"\u00a7a 次。"] scoreboard players set @s dropper.level 0 scoreboard players set @s dropper.failed 0 function dropper/save + diff --git a/datapacks/map_all/data/minecraft/functions/duel/died.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/died.mcfunction index 469db098..630ed93a 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/died.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @s ["\u00a7c对不起，你淘汰了！"] # tellraw @a[team=play.beli] [{"selector":"@s"},"\u00a7c 淘汰！"] # tellraw @a[team=wait.beli] [{"selector":"@s"},"\u00a7c 淘汰！"] # gamemode spectator @s -# scoreboard players set play.beli.player tick 0 +# scoreboard players set play.beli.player tick 0 # execute as @a[team=play.beli,gamemode=adventure] run scoreboard players add play.beli.player tick 1 # title @a[team=play.beli] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.beli.player"},"color": "dark_purple"}] effect clear @s @@ -12,4 +16,4 @@ tellraw @a[team=play.duel.blue] [{"selector":"@s"},"\u00a77 死了。"] tellraw @a[team=play.duel.yellow] [{"selector":"@s"},"\u00a77 死了。"] tp @s[team=play.duel.yellow] -350 12 -76 -90 0 tp @s[team=play.duel.blue] -280 12 -76 90 0 -function duel/item \ No newline at end of file +function duel/item diff --git a/datapacks/map_all/data/minecraft/functions/duel/item.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/item.mcfunction index 34a76dc3..4babf9a2 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/item.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/item.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s effect give @s instant_health 2 25 true effect give @s resistance 2 25 true -function fix:duel/thing \ No newline at end of file +function fix:duel/thing diff --git a/datapacks/map_all/data/minecraft/functions/duel/join.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/join.mcfunction index ff3faba5..8fe1d152 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/join.mcfunction @@ -1,8 +1,12 @@ -title @s[team=!play.duel.yellow,team=!play.duel.blue] title [{"text":"Duel Game","color":"yellow","bold": true}] -title @s[team=!play.duel.yellow,team=!play.duel.blue] subtitle ["\u00a7rFight !"] +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +title @s[team=!play.duel.blue] title [{"text":"Duel Game","color":"yellow","bold": true}] +title @s[team=!play.duel.blue] subtitle ["\u00a7rFight !"] team join wait.duel @s tellraw @a[team=!wait.duel] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"Duel Game","color":"yellow","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.duel,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"Duel Game","color":"yellow","bold": true},"\n"] tellraw @a[team=wait.duel] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] @@ -12,4 +16,4 @@ tp @s -108 77 -88 0 0 execute at @s run playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/duel/over.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/over.mcfunction index 37879f29..f696f576 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set duel.state state 0 tellraw @a ["\u00a7a[I] ",{"text":"Duel Game","color":"yellow","bold": true}," \u00a7a: \u00a7b游戏结束！\n"] gamemode adventure @a[gamemode=spectator,team=play.duel.blue] @@ -12,4 +16,5 @@ execute as @a[gamemode=adventure,team=play.duel.blue] run function duel/join execute if entity @a[team=wait.duel,tag=play.total] run function small_games/total/next_game schedule clear minecraft:duel/summon -kill @e[type=item,nbt={Item:{tag:{duel:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{duel:1}}}}] + diff --git a/datapacks/map_all/data/minecraft/functions/duel/over/blue.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/over/blue.mcfunction index e1af0b5a..5fc888dd 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/over/blue.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/over/blue.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a79战桥蓝队 \u00a7a获胜！"] title @a[team=play.duel.blue] title ["\u00a76You won!"] title @a[team=play.duel.yellow] title ["\u00a7cYou lost!"] scoreboard players add @a[team=play.duel.blue,tag=play.total] score 1 function duel/over + diff --git a/datapacks/map_all/data/minecraft/functions/duel/over/yellow.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/over/yellow.mcfunction index 769df688..212a13e1 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/over/yellow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/over/yellow.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7e战桥黄队 \u00a7a获胜！"] title @a[team=play.duel.yellow] title ["\u00a76You won!"] title @a[team=play.duel.blue] title ["\u00a7cYou lost!"] scoreboard players add @a[team=play.duel.yellow,tag=play.total] score 1 -function duel/over \ No newline at end of file +function duel/over diff --git a/datapacks/map_all/data/minecraft/functions/duel/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/reset.mcfunction index e504b6ee..d6fbef82 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill -113 45 -113 -103 63 -63 air replace #minecraft:terracottas # forceload add -272 -76 -358 -76 forceload add -251 -83 -379 -69 @@ -20,3 +24,4 @@ fill -278 12 -78 -282 15 -74 blue_stained_glass fill -281 12 -75 -279 14 -77 air forceload remove -251 -83 -379 -69 + diff --git a/datapacks/map_all/data/minecraft/functions/duel/score/blue.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/score/blue.mcfunction index 2c37393c..37a26ecd 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/score/blue.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/score/blue.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add score.blue tick 1 tellraw @a[team=play.duel.blue] [{"selector":"@s"},"\u00a79 给蓝队加了一分！"] tellraw @a[team=play.duel.yellow] [{"selector":"@s"},"\u00a79 给蓝队加了一分！"] -function duel/score/flush \ No newline at end of file +function duel/score/flush diff --git a/datapacks/map_all/data/minecraft/functions/duel/score/flush.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/score/flush.mcfunction index f2317514..d2287dfd 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/score/flush.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/score/flush.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score duel.clear state matches 0 run function duel/reset forceload add -251 -83 -379 -69 scoreboard players operation §e战桥黄队得分 gg.duel = score.yellow tick @@ -18,3 +22,4 @@ execute as @a[team=play.duel.blue] at @s run playsound entity.experience_orb.pic execute as @a[team=play.duel.yellow] at @s run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 forceload remove -251 -83 -379 -69 + diff --git a/datapacks/map_all/data/minecraft/functions/duel/score/wblue.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/score/wblue.mcfunction index 3aac2c8c..542391df 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/score/wblue.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/score/wblue.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c你不能进入自己的传送门！"] -function duel/died \ No newline at end of file +function duel/died diff --git a/datapacks/map_all/data/minecraft/functions/duel/score/wyellow.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/score/wyellow.mcfunction index 3aac2c8c..542391df 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/score/wyellow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/score/wyellow.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c你不能进入自己的传送门！"] -function duel/died \ No newline at end of file +function duel/died diff --git a/datapacks/map_all/data/minecraft/functions/duel/score/yellow.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/score/yellow.mcfunction index 2ff3bbd4..4b78ce6e 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/score/yellow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/score/yellow.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add score.yellow tick 1 tellraw @a[team=play.duel.blue] [{"selector":"@s"},"\u00a7e 给黄队加了一分！"] tellraw @a[team=play.duel.yellow] [{"selector":"@s"},"\u00a7e 给黄队加了一分！"] -function duel/score/flush \ No newline at end of file +function duel/score/flush diff --git a/datapacks/map_all/data/minecraft/functions/duel/second.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/second.mcfunction index 2d7034d4..f80683ab 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/second.mcfunction @@ -1,6 +1,10 @@ -scoreboard players set play.duel.player tick 0 -scoreboard players set play.duel.yellow.player tick 0 -scoreboard players set play.duel.blue.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set play.duel.player tick 0 +scoreboard players set play.duel.yellow.player tick 0 +scoreboard players set play.duel.blue.player tick 0 execute as @a[team=play.duel.yellow,gamemode=adventure] run scoreboard players add play.duel.player tick 1 execute as @a[team=play.duel.yellow,gamemode=adventure] run scoreboard players add play.duel.yellow.player tick 1 execute as @a[team=play.duel.blue,gamemode=adventure] run scoreboard players add play.duel.blue.player tick 1 @@ -12,4 +16,4 @@ execute if score duel.state state matches 1.. if score play.duel.blue.player tic execute if score duel.state state matches 1.. if score play.duel.yellow.player tick matches ..0 run function minecraft:duel/over effect give @a[team=play.duel] minecraft:night_vision 20 25 true spawnpoint @a[team=play.duel.blue] -105 59 -115 -spawnpoint @a[team=play.duel.yellow] -105 59 -115 \ No newline at end of file +spawnpoint @a[team=play.duel.yellow] -105 59 -115 diff --git a/datapacks/map_all/data/minecraft/functions/duel/setting.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/setting.mcfunction index b3c1deef..7e49541c 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/setting.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/setting.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add duel.clear state 1 execute if score duel.clear state matches 2.. run scoreboard players set duel.clear state 0 execute if score duel.clear state matches 0 run data modify block -111 78 -88 front_text.messages[1] set value '"\\u00a76[每局得分自动清除]"' execute if score duel.clear state matches 1 run data modify block -111 78 -88 front_text.messages[1] set value '"\\u00a7a每局得分自动清除"' execute if score duel.clear state matches 1 run data modify block -111 78 -88 front_text.messages[2] set value '"\\u00a76[不会在得分后清除]"' execute if score duel.clear state matches 0 run data modify block -111 78 -88 front_text.messages[2] set value '"\\u00a7a不会在得分后清除"' -playsound minecraft:ui.button.click player @s ~ ~ ~ 1 1.5 1 \ No newline at end of file +playsound minecraft:ui.button.click player @s ~ ~ ~ 1 1.5 1 diff --git a/datapacks/map_all/data/minecraft/functions/duel/sign.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/sign.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/sign.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/sign.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/duel/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/spec.mcfunction index 2eb1349f..92177b64 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] diff --git a/datapacks/map_all/data/minecraft/functions/duel/spr.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/spr.mcfunction index 79bf1248..d0801b77 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/spr.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/spr.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove duel.out tag @r[team=wait.duel] add duel.out scoreboard players add duel.ranteam board 1 @@ -8,4 +12,4 @@ tellraw @a[tag=duel.out,team=play.duel.blue] ["\u00a7a你加入了 \u00a79战桥 execute if score duel.ranteam board matches 2.. run scoreboard players set duel.ranteam board 0 execute as @a[tag=duel.out] at @s run function duel/item -tag @a remove duel.out \ No newline at end of file +tag @a remove duel.out diff --git a/datapacks/map_all/data/minecraft/functions/duel/start.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/start.mcfunction index 1dcd6d05..42ae10ac 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard objectives setdisplay sidebar.team.dark_gray gg.duel title @a[team=wait.duel] title [{"text":"Duel Game","color":"yellow","bold": true}] @@ -15,3 +19,4 @@ scoreboard players reset * gg.duel schedule function duel/reset 1s replace function duel/score/flush + diff --git a/datapacks/map_all/data/minecraft/functions/duel/summon.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/summon.mcfunction index c8db4ed6..14ab25e4 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/summon.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/summon.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.duel.blue] at @s run playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 execute as @a[team=play.duel.yellow] at @s run playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 @@ -6,4 +10,4 @@ fill -348 12 -78 -352 15 -74 air replace yellow_stained_glass fill -278 12 -78 -282 15 -74 air replace blue_stained_glass tellraw @a[team=play.duel.blue] ["\u00a7b笼子已被打开！"] -tellraw @a[team=play.duel.yellow] ["\u00a7b笼子已被打开！"] \ No newline at end of file +tellraw @a[team=play.duel.yellow] ["\u00a7b笼子已被打开！"] diff --git a/datapacks/map_all/data/minecraft/functions/duel/test.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/test.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/test.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/duel/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/teststart.mcfunction index 19b20661..263dc1ec 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.duel,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score duel.state state matches 1.. run function minecraft:duel/spec execute unless score duel.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score duel.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score duel.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:duel/start \ No newline at end of file +execute unless score duel.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:duel/start diff --git a/datapacks/map_all/data/minecraft/functions/duel/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/duel/tick.mcfunction index 238857d7..b961964d 100644 --- a/datapacks/map_all/data/minecraft/functions/duel/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/duel/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.duel.yellow,gamemode=adventure] at @s if block ~ ~-1 ~ magma_block run function duel/died execute as @a[team=play.duel.blue,gamemode=adventure] at @s if block ~ ~-1 ~ magma_block run function duel/died execute as @a[team=play.duel.yellow,gamemode=adventure] at @s if block ~ ~-1 ~ diamond_block run function duel/score/yellow @@ -8,7 +12,7 @@ execute as @a[team=play.duel.yellow,gamemode=adventure] at @s if block ~ ~-1 ~ g fill -379 -3 -69 -251 -1 -83 air replace #minecraft:terracotta fill -379 15 -69 -251 17 -83 air replace #minecraft:terracotta -kill @e[type=item,nbt={Item:{tag:{duel:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{duel:1}}}}] execute as @a[team=play.duel.yellow] at @s run kill @e[type=item,distance=0..5] execute as @a[team=play.duel.blue] at @s run kill @e[type=item,distance=0..5] @@ -17,4 +21,4 @@ fill -348 12 -78 -352 15 -74 air replace #minecraft:terracotta fill -278 12 -78 -282 15 -74 air replace #minecraft:terracotta fill -354 3 -72 -360 10 -80 air replace #minecraft:terracotta -fill -276 3 -80 -270 10 -72 air replace #minecraft:terracotta \ No newline at end of file +fill -276 3 -80 -270 10 -72 air replace #minecraft:terracotta diff --git a/datapacks/map_all/data/minecraft/functions/hide2/died.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/died.mcfunction index b7f162ff..fac495bc 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s[team=hide.wait2] run function hide2/join execute as @s[team=hide.runner] run function hide2/during/runnerdied -execute as @s[team=hide.killer] run function hide2/during/killerdied \ No newline at end of file +execute as @s[team=hide.killer] run function hide2/during/killerdied diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/hunitem.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/hunitem.mcfunction index 0ffd881e..7aca42b8 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/hunitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/hunitem.mcfunction @@ -1,9 +1,13 @@ -give @s wooden_sword{Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:40d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}]} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s wooden_sword[unbreakable={},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:40d,operation:"add_value"}]}] # effect give @s strength 99998 20 true # give @s bow{Unbreakable:1b,Enchantments:[{id:"power",lvl:1},{id:"infinity",lvl:1}]} # item replace entity @s inventory.26 with arrow 1 # give @s carrot_on_a_stick{Unbreakable:1b,hun:1,display:{Name:'"\\u00a7cBoom!\\u00a77 - 右键点击"'}} -item replace entity @s armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} \ No newline at end of file +item replace entity @s armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/killerdied.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/killerdied.mcfunction index 618d8404..abeb19ff 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/killerdied.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/killerdied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7e你复活了。"] tellraw @a[team=hide.runner] [{"selector":"@s"},"\u00a7c 死了。"] tellraw @a[team=hide.killer] [{"selector":"@s"},"\u00a7c 死了。"] @@ -8,3 +12,4 @@ function hide2/during/hunitem xp set @s 0 levels xp set @s 0 points tp @s 139 59 -135 180 0 + diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/reflushitem.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/reflushitem.mcfunction index 7c5f52f9..388a358e 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/reflushitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/reflushitem.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=hide2.ranitem] at @s run data merge block ~ ~ ~ {LootTable:""} execute as @e[tag=hide2.ranitem] at @s run setblock ~ ~ ~ air execute as @e[tag=hide2.ranitem] at @s run setblock ~ ~ ~ minecraft:barrel[open=true]{LootTable:"hide2/item"} replace @@ -6,4 +10,4 @@ title @a[tag=hide2.sel] actionbar ["\u00a7a事件：\u00a7c刷新物品"] tellraw @a[tag=hide2.sel] ["\n\u00a7a事件：\u00a7c刷新物品\n"] -execute as @a[tag=hide2.sel] at @s run playsound minecraft:block.chest.open player @s ~ ~ ~ 1 1 1 \ No newline at end of file +execute as @a[tag=hide2.sel] at @s run playsound minecraft:block.chest.open player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/runnerdied.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/runnerdied.mcfunction index 47f06708..7c0b7c2e 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/runnerdied.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/runnerdied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s die tellraw @a[team=hide.runner] [{"selector":"@s"},"\u00a7c 被找到了。"] tellraw @a[team=hide.killer] [{"selector":"@s"},"\u00a7c 被找到了。"] @@ -11,4 +15,4 @@ xp set @s 0 levels xp set @s 0 points tp @s 139 59 -135 180 0 title @s title ["\u00a7c你淘汰了"] -title @s subtitle ["\u00a7f你被找到了"] \ No newline at end of file +title @s subtitle ["\u00a7f你被找到了"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/spawnanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/spawnanimal.mcfunction index 5db7c4f2..e4c300a7 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/spawnanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/spawnanimal.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @e[tag=random_game,limit=1,sort=random] add hide.sel scoreboard players operation hide.ranani board = @e[tag=hide.sel,limit=1] board tag @e remove hide.sel @@ -13,4 +17,4 @@ execute if score hide.ranani board matches 9 run summon minecraft:goat 335 65 -3 execute if score hide.ranani board matches 10.. run summon minecraft:sheep 335 65 -332 {DeathLootTable:"",Invulnerable:1b,PersistenceRequired:1b,Team:"hide.play.ani",Tags:["hide.animals","neww"]} # execute if score hide.ranani board matches 1 execute as @e[tag=neww] run spreadplayers 382 -310 0 30 under 72 false @s -tag @e[tag=neww] remove neww \ No newline at end of file +tag @e[tag=neww] remove neww diff --git a/datapacks/map_all/data/minecraft/functions/hide2/during/testanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/during/testanimal.mcfunction index ffa754ba..78545b1c 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/during/testanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/during/testanimal.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set hide.anicount board 0 execute as @e[tag=hide.animals] at @s run scoreboard players add hide.anicount board 1 -execute if score hide.anicount board matches ..30 run function hideseek/during/spawnanimal \ No newline at end of file +execute if score hide.anicount board matches ..30 run function hideseek/during/spawnanimal diff --git a/datapacks/map_all/data/minecraft/functions/hide2/gameover/killer.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/gameover/killer.mcfunction index d9f2eb01..dd924ae3 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/gameover/killer.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/gameover/killer.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.runner] title ["\u00a76Game Over!"] title @a[team=hide.killer] title ["\u00a76Game Over!"] tellraw @a[team=hide.killer] ["\n\u00a7c 追杀者获胜！\n"] @@ -7,3 +11,4 @@ tellraw @a[team=hide.wait2] ["\n\u00a7c 追杀者获胜！\n"] scoreboard players add @a[team=hide.killer,gamemode=adventure,tag=play.total] score 1 function hide2/gameover/over + diff --git a/datapacks/map_all/data/minecraft/functions/hide2/gameover/over.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/gameover/over.mcfunction index a980769d..ac1894be 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/gameover/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/gameover/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set hide2.state state 0 # title @a[team=hide.play.ani] title ["\u00a7cGAMEOVER!"] # title @a[team=hide.play.hun] title ["\u00a7cGAMEOVER!"] @@ -6,4 +10,4 @@ bossbar set minecraft:hideseek2 players function hide2/starting/reset # bossbar set zombie:zombiecount players -schedule function hide2/gameover/tp 5s append \ No newline at end of file +schedule function hide2/gameover/tp 5s append diff --git a/datapacks/map_all/data/minecraft/functions/hide2/gameover/runner.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/gameover/runner.mcfunction index b7a3db0f..e4e6909d 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/gameover/runner.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/gameover/runner.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.runner,gamemode=adventure] title ["\u00a76You won!"] title @a[team=hide.runner,gamemode=spectator] title ["\u00a7cGame Over"] @@ -9,4 +13,4 @@ scoreboard players add @a[team=hide.runner,gamemode=adventure,tag=play.total] sc function hide2/gameover/over -# function hideseek/gameover/over \ No newline at end of file +# function hideseek/gameover/over diff --git a/datapacks/map_all/data/minecraft/functions/hide2/gameover/runnertime.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/gameover/runnertime.mcfunction index 2b4056a0..91b9ad8f 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/gameover/runnertime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/gameover/runnertime.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.runner,gamemode=adventure] title ["\u00a76You won!"] title @a[team=hide.runner,gamemode=spectator] title ["\u00a7cGame Over"] title @a[team=hide.killer] title ["\u00a7cYou lost!"] @@ -8,4 +12,4 @@ scoreboard players add @a[team=hide.runner,gamemode=adventure,tag=play.total] sc function hide2/gameover/over -# function hideseek/gameover/over \ No newline at end of file +# function hideseek/gameover/over diff --git a/datapacks/map_all/data/minecraft/functions/hide2/gameover/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/gameover/tp.mcfunction index 4ab92e70..00f25c28 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/gameover/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/gameover/tp.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=hide.wait2] run function hide2/join execute as @a[team=hide.runner] run function hide2/join execute as @a[team=hide.killer] run function hide2/join execute if entity @a[team=hide.wait2,tag=play.total] run function small_games/total/next_game -gamemode adventure @a[team=hide.wait2] \ No newline at end of file +gamemode adventure @a[team=hide.wait2] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/glowingeveryone.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/glowingeveryone.mcfunction index 8b859962..b406fa7d 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/glowingeveryone.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/glowingeveryone.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## effect give @a[team=hide.runner,gamemode=adventure] glowing 5 25 true effect give @a[team=hide.killer,gamemode=adventure] glowing 5 25 true title @a[tag=hide2.sel] actionbar ["\u00a7a事件：\u00a7e发光 5 秒"] -tellraw @a[tag=hide2.sel] ["\n\u00a7a事件：\u00a7e发光 5 秒\n"] \ No newline at end of file +tellraw @a[tag=hide2.sel] ["\n\u00a7a事件：\u00a7e发光 5 秒\n"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/join.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/join.mcfunction index 7967dd3f..ac049ddf 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s 138.0 84 -186 0 0 team join hide.wait2 title @s title ["\u00a7b\u00a7l躲猫猫"] @@ -9,4 +13,4 @@ effect clear @s effect give @s instant_health 2 25 true tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a7b躲猫猫(道具模式) 游戏。"] tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/hide2/prepare/hungo.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/prepare/hungo.mcfunction index 598b5986..b43e56d1 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/prepare/hungo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/prepare/hungo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill 428 72 -267 434 72 -273 air tellraw @a[team=hide.runner] ["\n\u00a7c 猎人出动！请小心！\n"] title @a[team=hide.killer] title ["\u00a7b出发！"] @@ -6,4 +10,4 @@ title @a[team=hide.killer] subtitle ["寻找躲藏起来的玩家！"] execute as @a[team=hide.killer] run function hide2/during/hunitem tp @a[team=hide.killer] 139 59 -135 180 0 scoreboard players set hide2.state state 1 -# effect give @a[team=hide.play.hun] slow_falling 5 1 true \ No newline at end of file +# effect give @a[team=hide.play.hun] slow_falling 5 1 true diff --git a/datapacks/map_all/data/minecraft/functions/hide2/prepare/step1.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/prepare/step1.mcfunction index 6d6ecdf0..13537b54 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/prepare/step1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/prepare/step1.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove hide2.huntgo board 1 title @a[team=hide.killer] actionbar ["\u00a7a你将在 ",{"score":{"objective":"board","name":"hide2.huntgo"},"color":"yellow"},"\u00a7es\u00a7a 后出动"] title @a[team=hide.runner] actionbar ["\u00a7a猎人将在 ",{"score":{"objective":"board","name":"hide2.huntgo"},"color":"yellow"},"\u00a7es\u00a7a 后出动"] execute if score hide2.huntgo board matches ..0 run function hide2/prepare/hungo # execute if score hide2.huntgo board matches 25 as @a[team=hide.play.ani] at @s run function hide2/changeanimal + diff --git a/datapacks/map_all/data/minecraft/functions/hide2/second.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/second.mcfunction index 44d5d42d..8b9b362f 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove hide2.resttime board 1 scoreboard players set hide2.restanimals board 0 scoreboard players set hide2.resthunts board 0 @@ -36,3 +40,4 @@ scoreboard players operation hide2.tmp board %= 180 board execute if score hide2.resttime board matches 1.. if score hide2.tmp board matches ..0 run function hide2/during/reflushitem tag @a[tag=hide2.sel] remove hide2.sel + diff --git a/datapacks/map_all/data/minecraft/functions/hide2/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/spec.mcfunction index 5fd6c34d..421a2709 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\n\u00a7c很抱歉，游戏已经开始了！请等待下一局！\n"] \ No newline at end of file +tellraw @s ["\n\u00a7c很抱歉，游戏已经开始了！请等待下一局！\n"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/start.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/start.mcfunction index cd4c9636..eabd7dad 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/start.mcfunction @@ -1,4 +1,8 @@ -scoreboard players set start.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set start.player tick 0 effect clear @a[team=hide.wait2] execute as @a[team=hide.wait2,gamemode=adventure] run scoreboard players add start.player tick 1 scoreboard players operation hide2.maxtime1 board = start.player tick @@ -27,4 +31,4 @@ team join hide.wait2 @a[team=hide.wait2,tag=GOABLE.SPEC] tp @a[team=hide.runner] 137 59 -129 -180 0 tp @a[team=hide.killer] 133 60 -118 90 0 -tellraw @a[team=hide.killer] ["\n\u00a76\u00a7l 注意：为了您的游戏体验，请不要使用小地图以及其他作弊模组！\n"] \ No newline at end of file +tellraw @a[team=hide.killer] ["\n\u00a76\u00a7l 注意：为了您的游戏体验，请不要使用小地图以及其他作弊模组！\n"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/starting/joinkiller.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/starting/joinkiller.mcfunction index 3d8d8f3f..6adc2a0a 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/starting/joinkiller.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/starting/joinkiller.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # function hideseek/during/huntdied # team join hide.killer tellraw @s ["\n\u00a7c 你的身份是：追杀者。\n"] title @s title ["\u00a7c你的身份是： 追杀者"] -title @s subtitle ["\u00a7f搜寻逃跑者！击杀他们！"] \ No newline at end of file +title @s subtitle ["\u00a7f搜寻逃跑者！击杀他们！"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/starting/joinrunner.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/starting/joinrunner.mcfunction index 25ba29b4..940c6020 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/starting/joinrunner.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/starting/joinrunner.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # team join hide.runner # item replace entity @s inventory.26 with arrow # function hideseek/changeanimal tellraw @s ["\n\u00a7b 你的身份是：逃跑者。\n"] title @s title ["\u00a7b你的身份是： 逃跑者"] -title @s subtitle ["\u00a7f搜寻道具！坚持到倒计时结束！"] \ No newline at end of file +title @s subtitle ["\u00a7f搜寻道具！坚持到倒计时结束！"] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/starting/ranteam.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/starting/ranteam.mcfunction index 3ef22908..9a2aacb1 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/starting/ranteam.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/starting/ranteam.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # function hideseek/starting/joinani team join hide.killer @a[team=hide.wait2,gamemode=adventure,limit=1,sort=random] execute if score start.player tick matches 5.. run team join hide.killer @a[team=hide.wait2,gamemode=adventure,limit=1,sort=random] @@ -5,4 +9,4 @@ execute if score start.player tick matches 9.. run team join hide.killer @a[team execute if score start.player tick matches 14.. run team join hide.killer @a[team=hide.wait2,gamemode=adventure,limit=1,sort=random] team join hide.runner @a[team=hide.wait2,gamemode=adventure] execute as @a[team=hide.runner] at @s run function hide2/starting/joinrunner -execute as @a[team=hide.killer] at @s run function hide2/starting/joinkiller \ No newline at end of file +execute as @a[team=hide.killer] at @s run function hide2/starting/joinkiller diff --git a/datapacks/map_all/data/minecraft/functions/hide2/starting/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/starting/reset.mcfunction index 59a1215d..190a32f2 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/starting/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/starting/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill 428 72 -267 434 72 -273 black_concrete # kill @e[tag=hide.animals,type=!player] # scoreboard players reset * LRS_START_DJS @@ -7,4 +11,4 @@ function hide2/during/reflushitem # execute as @e[tag=hide2.ranitem] at @s run data merge block ~ ~ ~ {LootTable:""} # execute as @e[tag=hide2.ranitem] at @s run setblock ~ ~ ~ air # execute as @e[tag=hide2.ranitem] at @s run setblock ~ ~ ~ minecraft:barrel[open=true]{LootTable:""} replace -kill @e[type=item] \ No newline at end of file +kill @e[type=item] diff --git a/datapacks/map_all/data/minecraft/functions/hide2/test/huntergo.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/test/huntergo.mcfunction index d166313a..008684b5 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/test/huntergo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/test/huntergo.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill 428 72 -267 434 72 -273 air team join hide.play.ani -give @s carrot_on_a_stick{Unbreakable:1b,ani:1,display:{Name:'"\\u00a7b切换方块\\u00a77 - 右键点击"'}} -function hideseek/changeanimal \ No newline at end of file +give @s carrot_on_a_stick[unbreakable={},custom_data={ani:1},custom_name='"\\u00a7b切换方块\\u00a77 - 右键点击"'] +function hideseek/changeanimal diff --git a/datapacks/map_all/data/minecraft/functions/hide2/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/tick.mcfunction index 7d8250b6..f25d441c 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/tick.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @a[team=hide.runner] at @s run kill @e[type=item,distance=0..10] execute as @a[team=hide.killer] at @s run kill @e[type=item,distance=0..10] clear @a[team=hide.runner] glass_bottle -clear @a[team=hide.killer] glass_bottle \ No newline at end of file +clear @a[team=hide.killer] glass_bottle diff --git a/datapacks/map_all/data/minecraft/functions/hide2/trystart.mcfunction b/datapacks/map_all/data/minecraft/functions/hide2/trystart.mcfunction index da20a8a6..3c9bc4ef 100644 --- a/datapacks/map_all/data/minecraft/functions/hide2/trystart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hide2/trystart.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=hide.wait2,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score hide2.state state matches 1.. run function minecraft:hide2/spec execute unless score hide2.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score hide2.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score hide2.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hide2/start \ No newline at end of file +execute unless score hide2.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hide2/start diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/changeanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/changeanimal.mcfunction index 89648fdc..1ec582c3 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/changeanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/changeanimal.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add seel -execute as @e[tag=hide.animals,tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp +execute as @e[tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp tag @s remove seel # tp @e[tag=shouldtp] @s @@ -19,4 +23,4 @@ execute at @s align xyz if block ~ ~-0.5 ~ #hideseek run tellraw @s ["\n\u00a7a execute at @s align xyz unless block ~ ~-0.5 ~ #hideseek run tellraw @s ["\n\u00a7a \u00a7l无法切换：方块不支持\n"] tag @e[tag=neww] remove neww -tag @e remove shouldtp \ No newline at end of file +tag @e remove shouldtp diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/defaultanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/defaultanimal.mcfunction index 863891d9..0be05892 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/defaultanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/defaultanimal.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add seel -execute as @e[tag=hide.animals,tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp +execute as @e[tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp tag @s remove seel # tp @e[tag=shouldtp] @s @@ -8,10 +12,11 @@ tag @s remove seel # execute if score @s LRS_START_DJS matches 1 run summon minecraft:cat 335 65 -332 {DeathLootTable:"",Invulnerable:1b,PersistenceRequired:1b,Team:"hide.play.ani",Tags:["hianimal","hide.animals","neww"],NoAI:1b} item replace block 0 2 0 container.0 with air + summon minecraft:block_display ~ ~ ~ {Invulnerable:1b,Team:"hide.play.ani",Tags:["hianimal","hide.animals","neww"],block_state:{Name:"minecraft:dirt"}} execute at @s align xyz if block ~ ~-0.5 ~ #hideseek run tellraw @s ["\n\u00a7a \u00a7l你的新身份为： 泥土","\n"] tag @e[tag=neww] add hide.cosplay scoreboard players operation @e[tag=neww] LRS_START_DJS = @s park.uuid tag @e[tag=neww] remove neww -tag @e remove shouldtp \ No newline at end of file +tag @e remove shouldtp diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/during/anidied.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/during/anidied.mcfunction index 18229611..f95a5cbe 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/during/anidied.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/during/anidied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s die tellraw @a[team=hide.play.hun] [{"selector":"@s"},"\u00a7c 变成了猎人。"] tellraw @a[team=hide.play.ani] [{"selector":"@s"},"\u00a7c 变成了猎人。"] @@ -9,9 +13,10 @@ xp set @s 0 levels xp set @s 0 points tag @s add seel -execute as @e[tag=hide.animals,tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp +execute as @e[tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp tag @s remove seel # tp @e[tag=shouldtp] @s scoreboard players reset @e[tag=shouldtp,limit=1] kill @e[tag=shouldtp,limit=1] # tellraw @s ["\n\u00a7a提示：请攻击动物靠上部分。\n"] + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/during/hunitem.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/during/hunitem.mcfunction index bca4b8f5..91e7e52d 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/during/hunitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/during/hunitem.mcfunction @@ -1,9 +1,13 @@ -give @s wooden_sword{Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:7d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}]} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s wooden_sword[unbreakable={},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:7d,operation:"add_value"}]}] # give @s bow{Unbreakable:1b,Enchantments:[{id:"power",lvl:1},{id:"infinity",lvl:1}]} # item replace entity @s inventory.26 with arrow 1 # effect give @s speed infinite 0 true # give @s carrot_on_a_stick{Unbreakable:1b,hun:1,display:{Name:'"\\u00a7cGlowing!\\u00a77 - 右键点击"'}} -item replace entity @s armor.head with leather_helmet{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.chest with leather_chestplate{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.legs with leather_leggings{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.feet with leather_boots{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}],AttributeModifiers:[{Name:"sd2",AttributeName:"generic.movement_speed",Amount:0.02,Operation:0,Slot:"feet",UUID:[I;1233,2233,233,233]}]} \ No newline at end of file +item replace entity @s armor.head with leather_helmet[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.chest with leather_chestplate[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.legs with leather_leggings[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.feet with leather_boots[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}},attribute_modifiers={modifiers:[{type:"generic.movement_speed",slot:"feet",uuid:[1233,2233,233,233],name:"sd2",amount:0.02,operation:"add_value"}]}] diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/during/huntdied.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/during/huntdied.mcfunction index 4e3ca2ef..6b881cac 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/during/huntdied.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/during/huntdied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7e你复活了。"] tellraw @a[team=hide.play.hun] [{"selector":"@s"},"\u00a7c 死了。"] tellraw @a[team=hide.play.ani] [{"selector":"@s"},"\u00a7c 死了。"] @@ -7,4 +11,4 @@ function hideseek/during/hunitem team join hide.play.hun tp @s 470 2 -362 -180 0 xp set @s 0 levels -xp set @s 0 points \ No newline at end of file +xp set @s 0 points diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/during/spawnanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/during/spawnanimal.mcfunction index b52588c8..f2f6cfdb 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/during/spawnanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/during/spawnanimal.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @e[tag=random_game,limit=1,sort=random] add hide.sel scoreboard players operation hide.ranani board = @e[tag=hide.sel,limit=1] board tag @e remove hide.sel @@ -13,5 +17,5 @@ execute if score hide.ranani board matches 9 run summon minecraft:block_display execute if score hide.ranani board matches 10.. run summon minecraft:block_display 501 -1 -365 {Invulnerable:1b,Tags:["hide.animals","neww","hide.wtf"],block_state:{Name:"minecraft:dirt"}} # execute if score hide.ranani board matches 1 execute as @e[tag=neww] run spreadplayers 468.0 -364.0 0 40 under 20 false @s -execute as @e[tag=neww] at @s align xyz run tp @s ~ ~ ~ -tag @e[tag=neww] remove neww \ No newline at end of file +execute as @e[tag=neww] at @s align xyz run tp @s ~ ~ ~ +tag @e[tag=neww] remove neww diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/during/testanimal.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/during/testanimal.mcfunction index ffa754ba..78545b1c 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/during/testanimal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/during/testanimal.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set hide.anicount board 0 execute as @e[tag=hide.animals] at @s run scoreboard players add hide.anicount board 1 -execute if score hide.anicount board matches ..30 run function hideseek/during/spawnanimal \ No newline at end of file +execute if score hide.anicount board matches ..30 run function hideseek/during/spawnanimal diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/follow.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/follow.mcfunction index 5ff17955..a83da994 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/follow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/follow.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add seel -execute as @e[tag=hide.animals,tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp +execute as @e[tag=hide.cosplay] if score @s LRS_START_DJS = @a[tag=seel,limit=1] park.uuid run tag @s add shouldtp tag @s remove seel # tp @e[tag=shouldtp] @s execute unless entity @e[tag=shouldtp,limit=1] run function hideseek/changeanimal @@ -7,3 +11,4 @@ execute as @s[tag=action.sneaking] at @s align xyz as @e[tag=shouldtp,limit=1] r execute as @s[tag=!action.sneaking] at @s positioned ~-0.5 ~ ~-0.5 as @e[tag=shouldtp,limit=1] run tp @s ~ ~ ~ tag @e[tag=shouldtp] remove shouldtp + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/ani.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/ani.mcfunction index 63212864..6e281ccf 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/ani.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/ani.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.play.hun] title ["\u00a76You won!"] title @a[team=hide.play.ani] title ["\u00a7cYou lost!"] tellraw @a[team=hide.play.hun] ["\n\u00a7b 躲藏者胜！\n"] @@ -11,4 +15,4 @@ execute as @a[team=hide.play.ani] run function hideseek/join gamemode adventure @a[team=hide.wait] function hideseek/gameover/over -# function hideseek/gameover/over \ No newline at end of file +# function hideseek/gameover/over diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/anitime.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/anitime.mcfunction index 3315fa07..702ef078 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/anitime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/anitime.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.play.hun] title ["\u00a76You won!"] title @a[team=hide.play.ani] title ["\u00a7cYou lost!"] tellraw @a[team=hide.play.hun] ["\n\u00a7b 时间结束，躲藏者获胜！\n"] @@ -11,4 +15,4 @@ execute as @a[team=hide.play.ani] run function hideseek/join gamemode adventure @a[team=hide.wait] function hideseek/gameover/over -# function hideseek/gameover/over \ No newline at end of file +# function hideseek/gameover/over diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/hunt.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/hunt.mcfunction index 027feb94..cf29df58 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/hunt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/hunt.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=hide.play.hun] title ["\u00a76Game Over!"] tellraw @a[team=hide.play.hun] ["\n\u00a7c 猎人获胜！\n"] tellraw @a[team=hide.play.ani] ["\n\u00a7c 猎人获胜！\n"] @@ -8,3 +12,4 @@ execute as @a[team=hide.play.hun] run function hideseek/join execute as @a[team=hide.play.ani] run function hideseek/join gamemode adventure @a[team=hide.wait] function hideseek/gameover/over + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/over.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/over.mcfunction index 66adca86..a401386c 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/gameover/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/gameover/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 390 -301 545 -428 # execute if entity @a[team=play.snow,tag=play.total] run function small_games/total/next_game execute if entity @a[team=hide.wait,tag=play.total] run function small_games/total/next_game @@ -12,3 +16,4 @@ function hideseek/starting/reset # forceload add 435 -266 328 -356 kill @e[tag=hide.animals] forceload remove 390 -301 545 -428 + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/glowingeveryone.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/glowingeveryone.mcfunction index b8906287..4a02a0f7 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/glowingeveryone.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/glowingeveryone.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## effect give @a[team=hide.play.hun] glowing 2 25 true effect give @a[team=hide.play.ani] glowing 2 25 true title @a[tag=hide.play.hun] actionbar ["\u00a7a事件：\u00a7e发光 2 秒"] title @a[tag=hide.play.ani] actionbar ["\u00a7a事件：\u00a7e发光 2 秒"] execute as @e[tag=hide.wtf] run spreadplayers 468.0 -364.0 0 40 under 20 false @s -execute as @e[tag=hide.wtf] at @s align xyz run tp @s ~ ~ ~ +execute as @e[tag=hide.wtf] at @s align xyz run tp @s ~ ~ ~ + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/join.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/join.mcfunction index 28f0930f..604aa368 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s 406 1 -431 -90 0 team join hide.wait title @s title ["\u00a7b\u00a7l方块躲猫猫"] @@ -9,4 +13,4 @@ effect give @s instant_health 2 25 true tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a7b方块躲猫猫\u00a7a游戏。"] tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] scoreboard players reset @s die -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/prepare/hungo.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/prepare/hungo.mcfunction index cd9312bf..5b34df9a 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/prepare/hungo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/prepare/hungo.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=hide.play.hun] run tp @s 470 2 -362 -180 0 tellraw @a[team=hide.play.ani] ["\n\u00a7c 猎人出动！请小心！\n"] title @a[team=hide.play.hun] title ["\u00a7b出发！"] title @a[team=hide.play.hun] subtitle ["寻找伪装成方块的玩家！"] # tellraw @a[team=hide.play.hun] ["\n\u00a7a提示：请攻击动物靠上部分。\n"] execute as @a[team=hide.play.hun] run function hideseek/during/hunitem -scoreboard players set hide.state state 1 \ No newline at end of file +scoreboard players set hide.state state 1 diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/prepare/step1.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/prepare/step1.mcfunction index 68389e40..cddd6f4b 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/prepare/step1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/prepare/step1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove hide.huntgo board 1 data modify block 347 4 -451 front_text.messages[2] set value '["\\u00a7a你将在 ",{"score":{"objective":"board","name":"hide.huntgo"},"color":"yellow"},"\\u00a7es\\u00a7a 后出动"]' title @a[team=hide.play.ani] actionbar ["\u00a7c猎人将在 ",{"score":{"objective":"board","name":"hide.huntgo"},"color":"yellow"},"\u00a7es\u00a7c 后出动"] @@ -6,3 +10,4 @@ title @a[team=hide.play.hun] actionbar ["\u00a7a你将在 ",{"score":{"objective execute if score hide.huntgo board matches ..0 run function hideseek/prepare/hungo execute if score hide.huntgo board matches 25 as @a[team=hide.play.ani] at @s run function hideseek/changeblock + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/second.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/second.mcfunction index 7144e90b..ef7a620b 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # effect give @a[team=hide.play.ani] resistance 1 25 true # effect give @a[team=hide.play.hun] resistance 1 25 true effect give @a[team=hide.wait] resistance 1 25 true @@ -35,3 +39,4 @@ execute if score hide.state state matches 1.. if score hide.restanimals board ma execute if score hide.state state matches 1.. if score hide.resthunts board matches ..0 run function hideseek/gameover/ani execute if score hide.state state matches 1.. if score hide.resttime board matches ..0 run function hideseek/gameover/anitime + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/skillss.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/skillss.mcfunction index 93fd6040..7d94c31a 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/skillss.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/skillss.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s actionbar ["\u00a7b\u00a7lActived"] playsound ui.button.click player @s ~ ~ ~ 1 2 1 -execute if entity @s[nbt={SelectedItem:{tag:{hun:1}}}] run tag @s add skill.boom -execute if entity @s[nbt={SelectedItem:{tag:{ani:1}}}] run tag @s add skill.change +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{hun:1}}}}] run tag @s add skill.boom +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{ani:1}}}}] run tag @s add skill.change # execute if entity @s[nbt={SelectedItem:{tag:{gun:1}}}] run tag @s add gun.1 execute as @s[tag=skill.change,team=hide.play.ani] at @s run function hideseek/changeanimal xp add @s[tag=skill.boom] 6 levels @@ -10,3 +14,4 @@ xp add @s[tag=skill.change] 5 levels # execute as @s[tag=gun.1] run function gun/1/shoot tag @s remove skill.boom tag @s remove skill.change + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/spec.mcfunction index d6a48da2..cfd16b00 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7d你加入了游戏。"] -function hideseek/during/huntdied \ No newline at end of file +function hideseek/during/huntdied diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/start.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/start.mcfunction index 4b70db89..8d458f0f 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/start.mcfunction @@ -1,4 +1,8 @@ -scoreboard players set start.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set start.player tick 0 effect clear @a[team=hide.wait] execute as @a[team=hide.wait,gamemode=adventure] run scoreboard players add start.player tick 1 scoreboard players operation hide.maxtime2 board = start.player tick @@ -25,3 +29,4 @@ tellraw @a[team=hide.play.hun] ["\n\u00a7c 你将在30秒后出动。\n"] scoreboard players set hide.state state 2 gamemode spectator @a[tag=GOABLE.SPEC] team join hide.wait @a[tag=GOABLE.SPEC] + diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinani.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinani.mcfunction index b1f1d6b5..b50b98b4 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinani.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinani.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join hide.play.ani clear @s -give @s stick{Unbreakable:1b,Enchantments:[{id:"knockback",lvl:3}],display:{Name:'"\\u00a7bKB Stick"'}} +give @s stick[unbreakable={},enchantments={levels:{"minecraft:knockback":3}},custom_name='"\\u00a7bKB Stick"'] # item replace entity @s inventory.26 with arrow -give @s carrot_on_a_stick{Unbreakable:1b,ani:1,display:{Name:'"\\u00a7b模仿脚下方块\\u00a77 - 右键点击"'},Enchantments:[{id:"knockback",lvl:3}]} +give @s carrot_on_a_stick[unbreakable={},custom_data={ani:1},custom_name='"\\u00a7b模仿脚下方块\\u00a77 - 右键点击"',enchantments={levels:{"minecraft:knockback":3}}] scoreboard players set @s LRS_START_DJS 1 execute as @s run spreadplayers 468.0 -364.0 0 40 under 5 false @s function hideseek/defaultanimal -tellraw @s ["\n\u00a7b 你的身份是：躲藏者。\n\u00a76温馨提示：\u00a7b潜行时可以让方块对其。"] \ No newline at end of file +tellraw @s ["\n\u00a7b 你的身份是：躲藏者。\n\u00a76温馨提示：\u00a7b潜行时可以让方块对其。"] diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinhun.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinhun.mcfunction index 4e25ccd7..d680987c 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinhun.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/starting/joinhun.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # function hideseek/during/huntdied tellraw @s ["\n\u00a76 你的身份是：猎人。\n"] clear @s -tp @s 347 3 -448 0 0 \ No newline at end of file +tp @s 347 3 -448 0 0 diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/starting/ranteam.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/starting/ranteam.mcfunction index c37998b7..aa3ecc06 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/starting/ranteam.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/starting/ranteam.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # function hideseek/starting/joinani team join hide.play.hun @a[team=hide.wait,limit=1,sort=random] execute if score start.player tick matches 6.. run team join hide.play.hun @a[team=hide.wait,limit=1,sort=random] @@ -5,4 +9,4 @@ execute if score start.player tick matches 12.. run team join hide.play.hun @a[t execute if score start.player tick matches 15.. run team join hide.play.hun @a[team=hide.wait,limit=1,sort=random] team join hide.play.ani @a[team=hide.wait] execute as @a[team=hide.play.ani] at @s run function hideseek/starting/joinani -execute as @a[team=hide.play.hun] at @s run function hideseek/starting/joinhun \ No newline at end of file +execute as @a[team=hide.play.hun] at @s run function hideseek/starting/joinhun diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/starting/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/starting/reset.mcfunction index 31b19bbe..c32dcf34 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/starting/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/starting/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 390 -301 545 -428 kill @e[tag=hide.animals,type=!player] -forceload remove 390 -301 545 -428 \ No newline at end of file +forceload remove 390 -301 545 -428 diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/test/huntergo.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/test/huntergo.mcfunction index d166313a..008684b5 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/test/huntergo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/test/huntergo.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill 428 72 -267 434 72 -273 air team join hide.play.ani -give @s carrot_on_a_stick{Unbreakable:1b,ani:1,display:{Name:'"\\u00a7b切换方块\\u00a77 - 右键点击"'}} -function hideseek/changeanimal \ No newline at end of file +give @s carrot_on_a_stick[unbreakable={},custom_data={ani:1},custom_name='"\\u00a7b切换方块\\u00a77 - 右键点击"'] +function hideseek/changeanimal diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/tick.mcfunction index b4858677..ed034aa6 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/tick.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=hide.play.ani] at @s run function hideseek/follow execute as @a[team=hide.play.ani] at @s run kill @e[type=item,distance=0..8] execute as @a[team=hide.play.hun] at @s run kill @e[type=item,distance=0..8] execute as @a[scores={die=1..},team=hide.play.ani] run function hideseek/during/anidied -execute as @a[scores={die=1..},team=hide.play.hun] run function hideseek/during/huntdied \ No newline at end of file +execute as @a[scores={die=1..},team=hide.play.hun] run function hideseek/during/huntdied diff --git a/datapacks/map_all/data/minecraft/functions/hideseek/trystart.mcfunction b/datapacks/map_all/data/minecraft/functions/hideseek/trystart.mcfunction index 331ab5fa..1c81c28c 100644 --- a/datapacks/map_all/data/minecraft/functions/hideseek/trystart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hideseek/trystart.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=hide.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score hide.state state matches 1.. run function minecraft:hideseek/spec execute unless score hide.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score hide.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score hide.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hideseek/start \ No newline at end of file +execute unless score hide.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hideseek/start diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/changeto.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/changeto.mcfunction index 5c8f0a2d..f5847c9c 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/changeto.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/changeto.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s hp.hurt tellraw @a[team=play.hotpot] [" ",{"selector":"@s"},"\u00a7b 将 \u00a7aHot Potato \u00a7b传给了 ",{"selector":"@a[tag=hp.flag]"}] @@ -8,7 +12,7 @@ team join play.hotpot @s team join play.hotpot.k @a[tag=hp.flag] clear @a[team=play.hotpot] potato clear @a[team=play.hotpot.k] potato -give @a[team=play.hotpot.k] potato{hotpot:1,display:{Name:'{"text":"Hot Potato","color":"#aed3ff","bold": true}'}} +give @a[team=play.hotpot.k] potato[custom_data={hotpot:1},custom_name='{"text":"Hot Potato","color":"#aed3ff","bold": true}'] playsound entity.firework_rocket.launch player @s execute as @a[team=play.hotpot.k] at @s run playsound entity.firework_rocket.launch player @s -tag @a remove hp.flag \ No newline at end of file +tag @a remove hp.flag diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/changetofaild.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/changetofaild.mcfunction index a710986f..15895799 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/changetofaild.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/changetofaild.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s hp.hurt tellraw @s ["\u00a7c你无法将土豆传递给他。请重试！"] -playsound entity.enderman.teleport player @s ~ ~ ~ 2 0 1 \ No newline at end of file +playsound entity.enderman.teleport player @s ~ ~ ~ 2 0 1 diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/died.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/died.mcfunction index b362fa79..b970a65f 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/died.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c对不起，你淘汰了！"] team join play.hotpot @s tellraw @a[team=play.hotpot] [{"selector":"@s"},"\u00a7c 淘汰！"] tellraw @a[team=wait.hotpot] [{"selector":"@s"},"\u00a7c 淘汰！"] gamemode spectator @s -scoreboard players set play.hotpot.player tick 0 +scoreboard players set play.hotpot.player tick 0 execute as @a[team=play.hotpot,gamemode=adventure] run scoreboard players add play.hotpot.player tick 1 -title @a[team=play.hotpot] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.hotpot.player"},"color": "dark_purple"}] \ No newline at end of file +title @a[team=play.hotpot] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.hotpot.player"},"color": "dark_purple"}] diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/join.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/join.mcfunction index acb79a38..b803fb7b 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/join.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s[team=!play.hotpot] title [{"text":"Hot Potato","color":"#5ed3ff","bold": true}] title @s[team=!play.hotpot] subtitle ["\u00a7rBe Careful !"] team join wait.hotpot @s tellraw @a[team=!wait.hotpot] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"Hot Potato","color":"#aed3ff","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.hotpot,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"Hot Potato","color":"#aed3ff","bold": true},"\n\n \u00a7b游戏规则：\n\u00a7a 游戏开始后，一名玩家会持有 “Hot Potato”，他需要将它\n传给其他人。倒计时结束，持有者死亡。最后死亡者获胜！\n"] tellraw @a[team=wait.hotpot] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] @@ -10,4 +14,4 @@ tellraw @a[team=wait.hotpot] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入 tp @s -66 60 -83 90 0 playsound entity.player.levelup player @s 14 3 -44 1 1 1 tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/onceover.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/onceover.mcfunction index ee67c743..7f93aa79 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/onceover.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/onceover.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.hotpot.k] at @s run function hotpotever/died schedule clear minecraft:hotpotever/summon schedule function minecraft:hotpotever/summon 5s @@ -5,3 +9,4 @@ tellraw @a[team=wait.hotpot] ["\n\u00a76 下一轮将在\u00a7e5\u00a76秒后 execute as @a[team=play.hotpot.k] at @s run playsound entity.player.levelup player @s scoreboard players set hotpot.state state 1 execute as @a[team=play.hotpot] at @s run playsound entity.player.levelup player @s + diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/over.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/over.mcfunction index 34fe5e7b..e594519e 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set hotpot.state state 0 tellraw @a ["\u00a7a[I] ",{"text":"Hot Potato","color":"#aed3ff","bold": true}," \u00a7a: \u00a7b游戏结束！\n\u00a7e获胜者：",{"selector":"@a[gamemode=adventure,team=play.hotpot]"}] @@ -15,4 +19,4 @@ execute as @a[gamemode=adventure,team=play.hotpot.k] run function hotpotever/joi execute if entity @a[team=wait.hotpot,tag=play.total] run function small_games/total/next_game # Reset -schedule clear minecraft:hotpotever/summon \ No newline at end of file +schedule clear minecraft:hotpotever/summon diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/second.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/second.mcfunction index 48c550f4..d729921e 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/second.mcfunction @@ -1,4 +1,8 @@ -scoreboard players set play.hotpot.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set play.hotpot.player tick 0 execute as @a[team=play.hotpot,gamemode=adventure] run scoreboard players add play.hotpot.player tick 1 execute as @a[team=play.hotpot.k,gamemode=adventure] run scoreboard players add play.hotpot.player tick 1 @@ -20,4 +24,4 @@ execute if score hotpot.state state matches 2.. as @a[team=play.hotpot.k] run ti execute if score hotpot.state state matches 2.. as @a[team=play.hotpot] run title @s actionbar ["\u00a7b小心土豆持有者！ \u00a7e剩余时间： ",{"score":{"objective": "tick","name": "hp.time"},"color": "green"},"\u00a7as"] execute if score hotpot.state state matches 2.. if score hp.time tick matches ..0 run function hotpotever/onceover execute if score hotpot.state state matches 2.. run scoreboard players remove hp.time tick 1 -clear @a[team=play.hotpot] potato \ No newline at end of file +clear @a[team=play.hotpot] potato diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/spec.mcfunction index 656ef8fa..40270ef1 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/spec.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] -team join play.hotpot @s \ No newline at end of file +team join play.hotpot @s diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/start.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/start.mcfunction index f2972ec8..c41a6072 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 6 10 -49 38 10 -81 minecraft:white_wool title @a[team=wait.hotpot] title [{"text":"Hot Potato","color":"#5ed3ff","bold": true}] title @a[team=wait.hotpot] subtitle ["\u00a7rBe Careful !"] @@ -10,3 +14,4 @@ scoreboard players operation temp state = hotpot.num state schedule clear minecraft:hotpotever/summon schedule function minecraft:hotpotever/summon 5s + diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/summon.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/summon.mcfunction index da0ed148..a3a88ca6 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/summon.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/summon.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ##execute as @a[team=play.hotpot.k] at @s run function hotpotever/died -scoreboard players set play.hotpot.player tick 0 +scoreboard players set play.hotpot.player tick 0 execute as @a[team=play.hotpot,gamemode=adventure] run scoreboard players add play.hotpot.player tick 1 team join play.hotpot.k @r[team=play.hotpot,gamemode=adventure] @@ -13,11 +17,11 @@ execute as @a[team=play.hotpot.k] at @s run playsound entity.ender_dragon.growl tellraw @a[team=play.hotpot] ["\n \u00a7cHot Potato 持有者：",{"selector":"@a[team=play.hotpot.k]"},"\n"] tellraw @a[team=play.hotpot.k] ["\n \u00a7bHot Potato 持有者（包含你）：",{"selector":"@a[team=play.hotpot.k]"},"\n"] -give @a[team=play.hotpot.k] potato{hotpot:1,display:{Name:'{"text":"Hot Potato","color":"#aed3ff","bold": true}'}} +give @a[team=play.hotpot.k] potato[custom_data={hotpot:1},custom_name='{"text":"Hot Potato","color":"#aed3ff","bold": true}'] scoreboard players set hotpot.state state 2 execute if score play.hotpot.player tick matches 2.. run scoreboard players set hp.time tick 30 execute if score play.hotpot.player tick matches 3.. run scoreboard players set hp.time tick 40 execute if score play.hotpot.player tick matches 4.. run scoreboard players set hp.time tick 45 execute if score play.hotpot.player tick matches 8.. run scoreboard players set hp.time tick 50 execute if score play.hotpot.player tick matches 16.. run scoreboard players set hp.time tick 60 -team modify play.hotpot.k color dark_red \ No newline at end of file +team modify play.hotpot.k color dark_red diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/test.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/test.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/test.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/teststart.mcfunction index 1f546c3d..efa30382 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.hotpot,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score hotpot.state state matches 1.. run function minecraft:hotpotever/spec execute unless score hotpot.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score hotpot.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score hotpot.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hotpotever/start \ No newline at end of file +execute unless score hotpot.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hotpotever/start diff --git a/datapacks/map_all/data/minecraft/functions/hotpotever/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/hotpotever/tick.mcfunction index 3be6ac65..6b5a62f7 100644 --- a/datapacks/map_all/data/minecraft/functions/hotpotever/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hotpotever/tick.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[scores={hp.gethurt=0..},team=play.hotpot,limit=1] add hp.flag execute as @a[scores={hp.hurt=-1..},team=play.hotpot.k] at @s if entity @a[tag=hp.flag] run function hotpotever/changeto execute as @a[scores={hp.hurt=-1..},team=play.hotpot.k] at @s unless entity @a[tag=hp.flag] run function hotpotever/changetofaild tag @a[tag=hp.flag] remove hp.flag scoreboard players reset @a hp.hurt # scoreboard players reset @a hp.gethurt -kill @e[type=item,nbt={Item:{tag:{hotpot:1}}}] \ No newline at end of file +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{hotpot:1}}}}] diff --git a/datapacks/map_all/data/minecraft/functions/hunger/debug/egg.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/debug/egg.mcfunction index a1b9d6aa..6a6d2ab3 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/debug/egg.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/debug/egg.mcfunction @@ -1 +1,5 @@ -give @s minecraft:villager_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["hunger.chest"]},display:{Name:'"\\u00a7f箱子刷新点"'}} 1 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s minecraft:villager_spawn_egg[entity_data={id:"minecraft:marker",Tags:["hunger.chest"]},custom_name='"\\u00a7f箱子刷新点"'] diff --git a/datapacks/map_all/data/minecraft/functions/hunger/died.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/died.mcfunction index 8d638709..66f07bdc 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/died.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score hunger.state state matches ..0 run function hunger/join -execute if score hunger.state state matches 1.. run function hunger/out \ No newline at end of file +execute if score hunger.state state matches 1.. run function hunger/out diff --git a/datapacks/map_all/data/minecraft/functions/hunger/finalpvp.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/finalpvp.mcfunction index 2073eba2..720d8c82 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/finalpvp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/finalpvp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=hunger] ["\n\u00a7b死亡对决\u00a7a即将开始。\n"] execute as @a[team=hunger,gamemode=adventure] in hungerworld run spreadplayers 130 74 0 8 under -26 false @s scoreboard players set hunger.state state 4 @@ -7,4 +11,4 @@ scoreboard players set hunger.state state 4 # scoreboard players set hunger.time board 5 scoreboard players set hunger.time board 6 team modify hunger friendlyFire false -bossbar set minecraft:hungergame max 5 \ No newline at end of file +bossbar set minecraft:hungergame max 5 diff --git a/datapacks/map_all/data/minecraft/functions/hunger/flushitem.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/flushitem.mcfunction index eebff9dd..c6ff2179 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/flushitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/flushitem.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[type=minecraft:marker,tag=hunger.chest] at @s run data merge block ~ ~ ~ {Items:[]} execute as @e[type=minecraft:marker,tag=hunger.chest] at @s run data merge block ~ ~ ~ {LootTable:""} execute as @e[type=minecraft:marker,tag=hunger.chest] at @s run setblock ~ ~ ~ air replace -execute as @e[type=minecraft:marker,tag=hunger.chest] at @s run setblock ~ ~ ~ chest{CustomName:'"\\u00a7a\\u00a7l补给箱"',LootTable:"minecraft:hunger/chest"} replace \ No newline at end of file +execute as @e[type=minecraft:marker,tag=hunger.chest] at @s run setblock ~ ~ ~ chest{CustomName:'"\\u00a7a\\u00a7l补给箱"',LootTable:"minecraft:hunger/chest"} replace diff --git a/datapacks/map_all/data/minecraft/functions/hunger/join.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/join.mcfunction index 18968f0a..f1dce17e 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join hunger @s tellraw @a ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"}," \u00a7a加入了小游戏 \u00a74\u00a7l饥饿战争"] execute in hungerworld run tp @s 141 -49 75 90 0 @@ -15,4 +19,4 @@ xp set @s 0 levels xp set @s 0 points spawnpoint @s 101 -60 0 tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/hunger/lootitem.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/lootitem.mcfunction index be8f5347..a81fc39f 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/lootitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/lootitem.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say @a[scores={bw.kill=1..},team=hunger] # scoreboard players reset @a[scores={bw.kill=1..},team=hunger] bw.kill advancement revoke @s only hunger/player_was_killed @@ -5,13 +9,13 @@ team leave @s tag @s add hunger.sel data modify block 133 -40 86 front_text.messages[0] set value '[{"selector":"@a[tag=hunger.sel]","color":"aqua"},"\\u00a7a 的背包"]' team join hunger @s -summon item ~ ~ ~ {Item:{id:"minecraft:bundle",Count:1b,tag:{hungerItem:1b}},Tags:["hunger.loot.new"],CustomNameVisible:1b} -data modify entity @e[limit=1,type=item,tag=hunger.loot.new] Item.tag.Items set from entity @s Inventory -data modify entity @e[limit=1,type=item,tag=hunger.loot.new] Item.tag.display.Name set from block 133 -40 86 front_text.messages[0] +summon item ~ ~ ~ {Item:{id:"minecraft:bundle",count:1,components:{"minecraft:custom_data":{hungerItem:1b}}},Tags:["hunger.loot.new"],CustomNameVisible:1b} +data modify entity @e[limit=1,type=item,tag=hunger.loot.new] Item.components."minecraft:bundle_contents" set from entity @s Inventory +data modify entity @e[limit=1,type=item,tag=hunger.loot.new] Item.components."minecraft:custom_name" set from block 133 -40 86 front_text.messages[0] data modify entity @e[limit=1,type=item,tag=hunger.loot.new] CustomName set from block 133 -40 86 front_text.messages[0] tag @e[tag=hunger.loot.new] remove hunger.loot.new # execute as @a[team=hunger] if predicate minecraft:hunger/killed scoreboard players reset @s die tag @s remove hunger.sel clear @s -tellraw @s ["\u00a7c你的物品已经掉落。"] \ No newline at end of file +tellraw @s ["\u00a7c你的物品已经掉落。"] diff --git a/datapacks/map_all/data/minecraft/functions/hunger/out.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/out.mcfunction index f14c2c3d..47784796 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/out.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/out.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a[team=hunger] [{"selector":"@s"},"\u00a7c 淘汰了。"] tellraw @s ["\u00a7c你已被淘汰。"] gamemode spectator tp @s 159 15 147 0 0 -title @a[team=hunters] actionbar [{"selector":"@s"},"\u00a7c淘汰了。剩余",{"score":{"objective": "tick","name": "hunger.player"}},"\u00a7c人。"] \ No newline at end of file +title @a[team=hunters] actionbar [{"selector":"@s"},"\u00a7c淘汰了。剩余",{"score":{"objective": "tick","name": "hunger.player"}},"\u00a7c人。"] diff --git a/datapacks/map_all/data/minecraft/functions/hunger/over/over.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/over/over.mcfunction index aaa61c34..45dbc76a 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/over/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/over/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name "\u00a74饥饿游戏 \u00a78| \u00a7c游戏结束" bossbar set minecraft:hungergame max 1 bossbar set minecraft:hungergame value 1 @@ -9,3 +13,4 @@ scoreboard players set hunger.state state 10 execute in hungerworld run kill @e[distance=0..,type=experience_orb] execute in hungerworld run forceload remove all team modify hunger friendlyFire false + diff --git a/datapacks/map_all/data/minecraft/functions/hunger/over/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/over/tp.mcfunction index 039131fd..e0a7ceb6 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/over/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/over/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name "\u00a74饥饿游戏 \u00a78| \u00a7a等待玩家加入" scoreboard players set hunger.state state 0 gamemode adventure @a[team=hunger] @@ -6,3 +10,4 @@ execute in hungerworld run kill @e[type=item,distance=0..] execute in hungerworld run kill @e[distance=0..,type=experience_orb] team modify hunger friendlyFire false execute in hungerworld run forceload remove all + diff --git a/datapacks/map_all/data/minecraft/functions/hunger/second.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/second.mcfunction index 9336a984..21236927 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in minecraft:hungerworld run spawnpoint @a[team=hunger] 101 -60 0 # 人数检测 @@ -14,4 +18,4 @@ execute if score hunger.state state matches 5 run function hunger/step/waitend # 结束检测 -execute if score hunger.state state matches 1..9 if score hunger.player tick matches ..1 run function hunger/over/over \ No newline at end of file +execute if score hunger.state state matches 1..9 if score hunger.player tick matches ..1 run function hunger/over/over diff --git a/datapacks/map_all/data/minecraft/functions/hunger/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/spec.mcfunction index b8a5b36d..a327e526 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/spec.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。请等待下一场游戏。"] title @s title ["\u00a7c很抱歉！"] -title @s subtitle ["\u00a7e游戏已经开始，请等待下一场游戏。"] \ No newline at end of file +title @s subtitle ["\u00a7e游戏已经开始，请等待下一场游戏。"] diff --git a/datapacks/map_all/data/minecraft/functions/hunger/start.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/start.mcfunction index 1e3782ef..44d453dd 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame players @a[team=hunger] bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7e游戏开始"] execute as @a[team=hunger] at @s run spreadplayers 159 147 1 40 under 0 false @s @@ -11,4 +15,4 @@ execute in hungerworld run kill @e[type=item,distance=0..] function hunger/flushitem team modify hunger friendlyFire false execute in hungerworld run kill @e[distance=0..,type=experience_orb] -bossbar set minecraft:hungergame max 60 \ No newline at end of file +bossbar set minecraft:hungergame max 60 diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/allowpvp.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/allowpvp.mcfunction index 3214cc15..e9bee089 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/allowpvp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/allowpvp.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team modify hunger friendlyFire true tellraw @a[team=hunger] ["\n\u00a7a PVP 目前已被允许。\n"] scoreboard players set hunger.state state 2 scoreboard players set hunger.time board 60 bossbar set minecraft:hungergame max 60 + diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/finalcountdown.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/finalcountdown.mcfunction index 33a0700a..ee545615 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/finalcountdown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/finalcountdown.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7b死亡对决将在\u00a7e",{"score":{"objective": "board","name": "hunger.time"},"color": "yellow"},"\u00a7e秒\u00a7b后开始。"] -execute if score hunger.time board matches ..0 run function hunger/step/finalstart \ No newline at end of file +execute if score hunger.time board matches ..0 run function hunger/step/finalstart diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/finalstart.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/finalstart.mcfunction index 6d22b7f4..b8f3081f 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/finalstart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/finalstart.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=hunger] ["\u00a7c死亡对决开始！"] team modify hunger friendlyFire true scoreboard players set hunger.time board 180 scoreboard players set hunger.state state 5 -bossbar set minecraft:hungergame max 180 \ No newline at end of file +bossbar set minecraft:hungergame max 180 diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/rechest.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/rechest.mcfunction index 45ad2d16..32f0dbf5 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/rechest.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/rechest.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function hunger/flushitem tellraw @a[team=hunger] ["\u00a7a箱子补给已刷新"] title @a[team=hunger] title [""] @@ -10,4 +14,4 @@ bossbar set minecraft:hungergame max 240 execute if score hunger.chests board matches ..0 run bossbar set minecraft:hungergame max 300 execute if score hunger.chests board matches ..0 run scoreboard players set hunger.time board 300 -execute if score hunger.chests board matches ..0 run scoreboard players set hunger.state state 3 \ No newline at end of file +execute if score hunger.chests board matches ..0 run scoreboard players set hunger.state state 3 diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/waitallowpvp.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/waitallowpvp.mcfunction index 4f159b7d..eea902c6 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/waitallowpvp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/waitallowpvp.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7aPVP 将在\u00a7e",{"score":{"objective": "board","name": "hunger.time"},"color": "yellow"},"\u00a7e秒\u00a7a后启用"] -execute if score hunger.time board matches ..0 run function hunger/step/allowpvp \ No newline at end of file +execute if score hunger.time board matches ..0 run function hunger/step/allowpvp diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/waitend.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/waitend.mcfunction index 7dda721d..2fbf1426 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/waitend.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/waitend.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7a游戏即将结束：\u00a7b剩余\u00a7e",{"score":{"objective": "board","name": "hunger.time"},"color": "yellow"},"\u00a7e秒"] -execute if score hunger.time board matches ..0 run function hunger/over/over \ No newline at end of file +execute if score hunger.time board matches ..0 run function hunger/over/over diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/waitfinal.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/waitfinal.mcfunction index 607eda3b..baa0b613 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/waitfinal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/waitfinal.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7c死亡对决将在\u00a7e",{"score":{"objective": "board","name": "hunger.time"},"color": "yellow"},"\u00a7e秒\u00a7c后开始"] -execute if score hunger.time board matches ..0 run function hunger/finalpvp \ No newline at end of file +execute if score hunger.time board matches ..0 run function hunger/finalpvp diff --git a/datapacks/map_all/data/minecraft/functions/hunger/step/waitrechest.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/step/waitrechest.mcfunction index 31818968..455bcf09 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/step/waitrechest.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/step/waitrechest.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set minecraft:hungergame name ["\u00a74饥饿游戏 \u00a78| \u00a7a下一次箱子补给：\u00a7b剩余\u00a7e",{"score":{"objective": "board","name": "hunger.time"},"color": "yellow"},"\u00a7e秒"] execute if score hunger.time board matches ..0 run function hunger/step/rechest + diff --git a/datapacks/map_all/data/minecraft/functions/hunger/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/tick.mcfunction index 0e5e7803..f34f2ed4 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/tick.mcfunction @@ -1 +1,5 @@ -# execute as @a[scores={die=1..}] at @s run function hunger/lootitem \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute as @a[scores={die=1..}] at @s run function hunger/lootitem diff --git a/datapacks/map_all/data/minecraft/functions/hunger/trystart.mcfunction b/datapacks/map_all/data/minecraft/functions/hunger/trystart.mcfunction index 649d0c4c..886207a3 100644 --- a/datapacks/map_all/data/minecraft/functions/hunger/trystart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/hunger/trystart.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score hunger.state state matches 1.. run function hunger/spec playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=hunger,gamemode=adventure] run scoreboard players add wait.player tick 1 execute unless score hunger.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score hunger.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score hunger.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hunger/start \ No newline at end of file +execute unless score hunger.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:hunger/start diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/getakill.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/getakill.mcfunction index c8f17036..aa5a44cb 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/getakill.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/getakill.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players operation @s kill += @s job_kill execute if score @s job_kill matches ..1 run title @s actionbar ["\u00a76+",{"score":{"name": "@s","objective": "job_kill"},"color":"gold"}," \u00a76Kill \u00a7b(Total: ",{"score":{"name": "@s","objective": "kill"},"color":"green"},"\u00a7b)"] execute if score @s job_kill matches 2.. run title @s actionbar ["\u00a76+",{"score":{"name": "@s","objective": "job_kill"},"color":"gold"}," \u00a76Kills \u00a7b(Total: ",{"score":{"name": "@s","objective": "kill"},"color":"green"},"\u00a7b)"] -scoreboard players reset @s job_kill \ No newline at end of file +scoreboard players reset @s job_kill diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/join.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/join.mcfunction index a9cf9d18..a450844e 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join job_pvp @s tellraw @a [{"selector":"@s"},"\u00a77 已加入 \u00a7a职业战争\u00a77!"] tp @s -121 6 234 90 0 @@ -14,4 +18,4 @@ execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator # /give @p oak_sign{BlockEntityTag:{Textx4: '{"color":"gray","clickEvent":{"action":"run_command","value":""},"text":"点击选择"}', Textx3: '{"color":"yellow","clickEvent":{"action":"run_command","value":"/execute as @s[scores={kill=30..}] run function minecraft:live/job/fisherman"},"text":"棒棒糖使者"}', Textx2: '{"color":"light_purple","clickEvent":{"action":"run_command","value":"/execute as @s[scores={kill=30..}] run function minecraft:job_pvp/start"},"text":"[30 Kills]"}', Textx1: '{"color":"aqua","clickEvent":{"action":"run_command","value":""},"text":"职业战争"}'}} -# /summon armor_stand ~ ~ ~ {NoAI:1b,DisabledSlots:2039583,Invulnerable:false,Invisible:1b,Tags:["pvp.job.display"]} \ No newline at end of file +# /summon armor_stand ~ ~ ~ {NoAI:1b,DisabledSlots:2039583,Invulnerable:false,Invisible:1b,Tags:["pvp.job.display"]} diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/over.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/over.mcfunction index ecd04305..8d0713b8 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/over.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title ["\u00a7c你死了"] clear @s effect clear @s team join wait.jobpvp @s title @s subtitle ["\u00a7e你复活在了大厅！"] -scoreboard players reset @s JOBPVP.die \ No newline at end of file +scoreboard players reset @s JOBPVP.die diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/second.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/second.mcfunction index 14b991bf..9569f912 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## spawnpoint @a[team=job_pvp] -121 6 234 90 spawnpoint @a[team=wait.jobpvp] -121 6 234 90 effect give @a[team=wait.jobpvp] speed 1 0 true @@ -5,4 +9,4 @@ effect give @a[team=wait.jobpvp] jump_boost 1 0 true effect give @a[team=wait.jobpvp] resistance 2 25 true effect give @a[team=wait.jobpvp] regeneration 2 25 true effect give @a[team=job_pvp] night_vision 20 25 true -execute as @a[team=job_pvp,level=1..] run xp add @s -1 levels \ No newline at end of file +execute as @a[team=job_pvp,level=1..] run xp add @s -1 levels diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/start.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/start.mcfunction index c5e1d436..7e9adf6c 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/start.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s @e[limit=1,sort=random,tag=pvp.tp] team join job_pvp @s tellraw @a[team=job_pvp] ["\u00a7d ＞ ",{"selector":"@s"},"\u00a7d 进入了战场！"] # tellraw @a[team=wait.jobpvp] ["\u00a7d ＞ ",{"selector":"@s"},"\u00a7d 进入了战场！"] xp set @s 0 levels -xp set @s 0 points \ No newline at end of file +xp set @s 0 points diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/summoncar.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/summoncar.mcfunction index f2347c09..2543772e 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/summoncar.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/summoncar.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players set need.pvpcar board 0 # execute as @e[tag=pvp.car] at @s run scoreboard players add need.pvpcar board 1 # execute if score need.pvpcar board matches ..6 run summon minecart -143 36 225 {Tags:["pvp.car"]} -# team join entity @e[tag=pvp.car] \ No newline at end of file +# team join entity @e[tag=pvp.car] diff --git a/datapacks/map_all/data/minecraft/functions/job_pvp/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/job_pvp/tick.mcfunction index 429fd224..bad71e01 100644 --- a/datapacks/map_all/data/minecraft/functions/job_pvp/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/job_pvp/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=pvp.car] at @s if block ~ ~3.9 ~ minecraft:dropper[facing=north] run tp ~ ~0.05 ~-0.5 execute as @e[tag=pvp.car] at @s if block ~ ~3.9 ~ minecraft:dropper[facing=east] run tp ~0.5 ~0.05 ~ execute as @e[tag=pvp.car] at @s if block ~ ~3.9 ~ minecraft:dropper[facing=south] run tp ~ ~0.05 ~0.5 @@ -14,5 +18,5 @@ execute as @e[tag=pvp.car] at @s if block ~ ~3.9 ~ minecraft:observer[facing=dow execute as @e[tag=pvp.car] at @s run effect give @a[distance=0..1] slow_falling 2 0 true execute as @a[team=job_pvp,scores={JOBPVP.die=1..}] at @s run function job_pvp/over -execute as @a[team=job_pvp] at @s run kill @e[type=item,distance=0..6,nbt=!{Item:{tag:{job_pvp:1}}}] -execute as @a[team=wait.jobpvp] at @s run kill @e[type=item,distance=0..6,nbt=!{Item:{tag:{job_pvp:1}}}] \ No newline at end of file +execute as @a[team=job_pvp] at @s run kill @e[type=item,distance=0..6,nbt=!{Item:{components:{"minecraft:custom_data":{job_pvp:1}}}}] +execute as @a[team=wait.jobpvp] at @s run kill @e[type=item,distance=0..6,nbt=!{Item:{components:{"minecraft:custom_data":{job_pvp:1}}}}] diff --git a/datapacks/map_all/data/minecraft/functions/killerever/action/check_bow.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/action/check_bow.mcfunction index fe1e40a1..afd98621 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/action/check_bow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/action/check_bow.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set golds temp 0 execute store result score golds temp run clear @s gold_ingot 0 -execute if score golds temp matches 10.. run give @s bow{ms:1,Enchantments:[{id:"infinity",lvl:1s},{id:"power",lvl:2s}],Unbreakable:1b,HideFlags:63,dtb:1b} +execute if score golds temp matches 10.. run give @s bow[custom_data={ms:1,dtb:1b},enchantments={levels:{"minecraft:infinity":1s,"minecraft:power":2s},show_in_tooltip:false},unbreakable={show_in_tooltip:false}] execute if score golds temp matches 10.. run tag @s add killer.saver execute if score golds temp matches 10.. run clear @s gold_ingot 10 execute if score golds temp matches 10.. run tellraw @s ["\u00a7e10 Gold \u00a7b兑换了 \u00a7a1 把 弓。"] -function killerever/action/check_if_get_bow_pm \ No newline at end of file +function killerever/action/check_if_get_bow_pm diff --git a/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow.mcfunction index aefc0308..ab11243d 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s temp 0 -execute store result score @s temp run clear @s bow{dtb:1b} 0 -execute if score @s temp matches 1.. run clear @s bow{dtb:1b} 1 +execute store result score @s temp run clear @s bow[custom_data~{dtb:1b}] 0 +execute if score @s temp matches 1.. run clear @s bow[custom_data~{dtb:1b}] 1 execute if score @s temp matches 1.. run tellraw @s ["\u00a7c你不能捡起这把弓。"] + execute if score @s temp matches 1.. run data merge entity @e[limit=1,sort=nearest,tag=killer.bow,type=armor_stand] {CustomName:'["\\u00a7a弓\\u00a77 - 右键获取"]',Marker:0b,CustomNameVisible:1b,Invulnerable:0b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Glowing:1b,Tags:["killer.bow"],HandItems:[{id:"minecraft:bow",Count:1b,Damage:0s,tag:{dtb:1b,Unbreakable:1b,display:{Name:'["\\u00a7a弓"]'},Enchantments:[{id:"minecraft:power",lvl:10s}]}},{}]} execute if score @s temp matches 1.. run function minecraft:killerever/action/check_if_get_bow -scoreboard players reset @s temp \ No newline at end of file +scoreboard players reset @s temp diff --git a/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow_pm.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow_pm.mcfunction index e418af33..8a4972c8 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow_pm.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/action/check_if_get_bow_pm.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s temp 0 -execute store result score @s temp run clear @s bow{dtb:1b} 0 -execute if score @s temp matches 1.. run tag @s add killer.saver \ No newline at end of file +execute store result score @s temp run clear @s bow[custom_data~{dtb:1b}] 0 +execute if score @s temp matches 1.. run tag @s add killer.saver diff --git a/datapacks/map_all/data/minecraft/functions/killerever/died.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/died.mcfunction index fe994dd3..a54d4cd1 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/died.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/died.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c对不起，你淘汰了！"] execute if entity @s[tag=killer.saver] run tellraw @a[team=play.killer] ["\u00a7a侦探 ",{"selector":"@s"},"\u00a7c 淘汰！"] execute if entity @s[tag=killer.saver] run tellraw @a[team=wait.killer] ["\u00a7a侦探 ",{"selector":"@s"},"\u00a7c 淘汰！"] execute if entity @s[tag=killer.killer] run tellraw @a[team=play.killer] ["\u00a7c杀手 ",{"selector":"@s"},"\u00a7c 淘汰！"] execute if entity @s[tag=killer.killer] run tellraw @a[team=wait.killer] ["\u00a7c杀手 ",{"selector":"@s"},"\u00a7c 淘汰！"] gamemode spectator @s -scoreboard players set play.killer.player tick 0 +scoreboard players set play.killer.player tick 0 execute as @a[team=play.killer,gamemode=adventure] run scoreboard players add play.killer.player tick 1 title @a[team=play.killer] actionbar ["\u00a7c当前场上剩余选手： ",{"score":{"objective": "tick","name": "play.killer.player"},"color": "dark_purple"}] tp @s 187 63 26 0 90 @@ -17,12 +21,12 @@ execute store result score y temp run data get entity @e[tag=killer.temp,limit=1 execute store result score z temp run data get entity @e[tag=killer.temp,limit=1,sort=nearest] Pos[2] tellraw @a[team=play.killer] ["\u00a7b一把弓掉落在 \u00a7a[x:",{"score":{"name": "x","objective": "temp"},"color": "yellow"},"\u00a7a,y:",{"score":{"name": "y","objective": "temp"},"color": "yellow"},"\u00a7a,z:",{"score":{"name": "z","objective": "temp"},"color": "yellow"},"\u00a7a]"] -execute unless entity @s[tag=killer.saver] at @e[tag=killer.temp] run summon minecraft:armor_stand ~ ~ ~ {CustomNameVisible:0b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Glowing:0b,Tags:["killer.bow","new"],HandDropChances:[0f,0f],Invisible:true,ShowArms:true,NoBasePlate:true,DisabledSlots:2039326} +execute unless entity @s[tag=killer.saver] at @e[tag=killer.temp] run summon minecraft:armor_stand ~ ~ ~ {CustomNameVisible:0b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Glowing:0b,Tags:["killer.bow","new"],HandDropChances:[0f,0f],Invisible:"true",ShowArms:"true",NoBasePlate:"true",DisabledSlots:2039326} -execute if entity @s[tag=killer.saver] at @e[tag=killer.temp] run summon minecraft:armor_stand ~ ~ ~ {CustomName:'["\\u00a7a弓\\u00a77 - 右键获取"]',CustomNameVisible:1b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Glowing:1b,Tags:["killer.bow","new"],HandItems:[{id:"minecraft:bow",Count:1b,Damage:0s,tag:{dtb:1b,Unbreakable:1b,display:{Name:'["\\u00a7a弓"]'},Enchantments:[{id:"minecraft:power",lvl:10s}]}},{}],HandDropChances:[0f,0f],Invisible:true,ShowArms:true,NoBasePlate:true,DisabledSlots:2039326} +execute if entity @s[tag=killer.saver] at @e[tag=killer.temp] run summon minecraft:armor_stand ~ ~ ~ {CustomName:'["\\u00a7a弓\\u00a77 - 右键获取"]',CustomNameVisible:1b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Glowing:1b,Tags:["killer.bow","new"],HandItems:[{id:"minecraft:bow",count:1,components:{"minecraft:custom_data":{dtb:1b},"minecraft:unbreakable":{},"minecraft:custom_name":'["\\u00a7a弓"]',"minecraft:enchantments":{levels:{"minecraft:power":10s}}}},{}],HandDropChances:[0f,0f],Invisible:"true",ShowArms:"true",NoBasePlate:"true",DisabledSlots:2039326} tag @e[tag=killer.bow] remove new kill @e[tag=killer.temp,type=marker] # bow{ms:1,Enchantments:[{id:"infinity",lvl:1s},{id:"power",lvl:10s}],Unbreakable:1b,HideFlags:63} # execute as @e[type=item,tag=newitem] at @s run function killerever/ranitem # summon item 142 55 -21 {Item:{id:"minecraft:bow",tag:{ms:1,Enchantments:[{id:"infinity"},{id:"power",lvl:10s}],Unbreakable:1b,HideFlags:63}}} -# tag @s remove killer.saver \ No newline at end of file +# tag @s remove killer.saver diff --git a/datapacks/map_all/data/minecraft/functions/killerever/getjob/killer.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/getjob/killer.mcfunction index 5e282d95..03a7cf30 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/getjob/killer.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/getjob/killer.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove killer.runner tag @s add killer.killer -tellraw @s ["\n\u00a7b\u00a7l密室杀手 ＞ \u00a76你的身份是：\u00a7c杀手\n\u00a7a 杀死其他非杀手玩家，即可胜利。\n \u00a7b小心警探！\n"] \ No newline at end of file +tellraw @s ["\n\u00a7b\u00a7l密室杀手 ＞ \u00a76你的身份是：\u00a7c杀手\n\u00a7a 杀死其他非杀手玩家，即可胜利。\n \u00a7b小心警探！\n"] diff --git a/datapacks/map_all/data/minecraft/functions/killerever/getjob/saver.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/getjob/saver.mcfunction index 8ce562b2..6ae8d63d 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/getjob/saver.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/getjob/saver.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7b\u00a7l密室杀手 ＞ \u00a76你的身份是：\u00a7a警探\n\u00a7a 找出杀手，击杀它即可胜利。\n"] -tag @s add killer.saver \ No newline at end of file +tag @s add killer.saver diff --git a/datapacks/map_all/data/minecraft/functions/killerever/join.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/join.mcfunction index 551d0de3..b044be17 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/join.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title [{"text":"密室杀手","color":"red","bold": true}] title @s subtitle ["\u00a7r小心！ 杀手也许就在你身边！"] team join wait.killer @s tellraw @a[team=!wait.killer] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"密室杀手","color":"red","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.killer,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"密室杀手","color":"red","bold": true},"\n"] tellraw @a[team=wait.killer] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] @@ -12,4 +16,4 @@ playsound entity.player.levelup player @s 94 20 16 1 1 1 clear @s effect clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/killerever/over.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/over.mcfunction index 13aa4e36..4631ce14 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set killer.state state 4 tellraw @a ["\u00a7a[I] ",{"text":"密室杀手","color":"red","bold": true}," \u00a7a: \u00a7b游戏结束！"] tellraw @a[team=play.killer] ["\n\u00a7c 杀手：",{"selector":"@a[tag=killer.killer]"},"\n\n \u00a7b侦探：",{"selector":"@a[tag=killer.saver]"},"\n"] @@ -5,4 +9,4 @@ tellraw @a[team=wait.killer] ["\n\u00a7c 杀手：",{"selector":"@a[tag=kille schedule function minecraft:killerever/tp 5s kill @e[tag=killer.bow,type=armor_stand] tag @a remove killer.saver -tag @a remove killer.killer \ No newline at end of file +tag @a remove killer.killer diff --git a/datapacks/map_all/data/minecraft/functions/killerever/over/killer.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/over/killer.mcfunction index b9e3a155..3234eaa9 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/over/killer.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/over/killer.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l密室杀手 ＞ \u00a7a获胜队伍：\u00a7c杀手"] title @a[team=play.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=play.killer] subtitle ["\u00a7c杀手胜利"] title @a[team=wait.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=wait.killer] subtitle ["\u00a7c杀手胜利"] title @a[team=play.killer,tag=killer.killer] title ["\u00a76You won!"] -scoreboard players add @a[team=play.killer,tag=killer.killer,tag=play.total] score 1 -function killerever/over \ No newline at end of file +scoreboard players add @a[team=play.killer,tag=play.total] score 1 +function killerever/over diff --git a/datapacks/map_all/data/minecraft/functions/killerever/over/runner.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/over/runner.mcfunction index 8b8fc8c4..86375384 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/over/runner.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/over/runner.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l密室杀手 ＞ \u00a7a获胜队伍：\u00a7d平民"] title @a[team=play.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=play.killer] subtitle ["\u00a7a平民胜利"] title @a[team=wait.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=wait.killer] subtitle ["\u00a7a平民胜利"] title @a[team=play.killer,tag=!killer.killer] title ["\u00a76You won!"] -scoreboard players add @a[team=play.killer,tag=!killer.killer,tag=play.total] score 1 -function killerever/over \ No newline at end of file +scoreboard players add @a[team=play.killer,tag=play.total] score 1 +function killerever/over diff --git a/datapacks/map_all/data/minecraft/functions/killerever/over/sthwrong.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/over/sthwrong.mcfunction index ad680f2a..bf8af158 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/over/sthwrong.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/over/sthwrong.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l密室杀手 ＞ \u00a7c游戏人数不够或出现问题，游戏结束！"] title @a[team=play.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=play.killer] subtitle ["\u00a7b锟斤拷襬卡檞"] title @a[team=wait.killer] title ["\u00a7c\u00a7lGAME OVER"] title @a[team=wait.killer] subtitle ["\u00a7b锟斤拷襬卡檞"] -function killerever/over \ No newline at end of file +function killerever/over diff --git a/datapacks/map_all/data/minecraft/functions/killerever/ranitem.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/ranitem.mcfunction index 97331bac..24e9a507 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/ranitem.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/ranitem.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove newitem -spreadplayers 187 26 0 25 under 67 false @s \ No newline at end of file +spreadplayers 187 26 0 25 under 67 false @s diff --git a/datapacks/map_all/data/minecraft/functions/killerever/second.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/second.mcfunction index afdd3575..bd261c07 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/second.mcfunction @@ -1,6 +1,10 @@ -scoreboard players set play.killer.player tick 0 -scoreboard players set play.killer.killer tick 0 -scoreboard players set play.killer.runner tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set play.killer.player tick 0 +scoreboard players set play.killer.killer tick 0 +scoreboard players set play.killer.runner tick 0 execute as @a[team=play.killer,gamemode=adventure] run scoreboard players add play.killer.player tick 1 execute as @a[team=play.killer,tag=killer.killer,gamemode=adventure] run scoreboard players add play.killer.killer tick 1 execute as @a[team=play.killer,tag=killer.runner,gamemode=adventure] run scoreboard players add play.killer.runner tick 1 @@ -10,6 +14,6 @@ execute if score killer.state state matches 1..3 if score play.killer.killer tic execute if score killer.state state matches 1..3 if score play.killer.player tick matches ..1 run function minecraft:killerever/over/sthwrong -item replace entity @a[team=play.killer,nbt={Inventory:[{id:"minecraft:bow"}]}] container.8 with arrow{ms:1} +item replace entity @a[team=play.killer,nbt={Inventory:[{id:"minecraft:bow"}]}] container.8 with arrow[custom_data={ms:1}] -execute as @e[tag=killer.bow,nbt={Glowing:1b}] at @s unless data entity @s {HandItems:[{id:"minecraft:bow"},{}]} at @s run data merge entity @s {Glowing:0b,CustomName:'""',CustomNameVisible:0b,Marker:1b} \ No newline at end of file +execute as @e[tag=killer.bow,nbt={Glowing:1b}] at @s unless data entity @s {HandItems:[{id:"minecraft:bow"},{}]} at @s run data merge entity @s {Glowing:0b,CustomName:'""',CustomNameVisible:0b,Marker:1b} diff --git a/datapacks/map_all/data/minecraft/functions/killerever/sign.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/sign.mcfunction index 8afacd7a..cacc7f9e 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/sign.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/sign.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute if score beli.num state matches ..0 run scoreboard players set beli.num state 1 execute if score beli.num state matches 7.. run scoreboard players set beli.num state 6 @@ -6,3 +10,4 @@ execute if score beli.num state matches 7.. run scoreboard players set beli.num # execute if score beli.num state matches 4..5 run data merge block 14 3 -46 {Textx4:'"\\u00a7cA bit hard"'} # execute if score beli.num state matches 1..1 run data merge block 14 3 -46 {Textx4:'"\\u00a7aEasy"'} # execute if score beli.num state matches 2..3 run data merge block 14 3 -46 {Textx4:'"\\u00a7bNormal"'} + diff --git a/datapacks/map_all/data/minecraft/functions/killerever/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/spec.mcfunction index 2eb1349f..92177b64 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！"] diff --git a/datapacks/map_all/data/minecraft/functions/killerever/start.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/start.mcfunction index d3f90ddd..23ba22cc 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove killer.killer tag @a remove killer.saver tag @a remove killer.runner @@ -10,13 +14,13 @@ team join play.killer @a[team=wait.killer] scoreboard players set killer.state state 1 kill @e[type=armor_stand,tag=killer.bow] tag @a[team=play.killer,gamemode=adventure] add killer.runner -scoreboard players set play.player tick 0 +scoreboard players set play.player tick 0 execute as @a[team=play.killer,gamemode=adventure] run scoreboard players add play.player tick 1 -execute if score play.player tick matches 8.. run execute as @r[tag=killer.runner,gamemode=adventure,team=play.killer,tag=!killer.saver] at @s run function killerever/getjob/killer -execute if score play.player tick matches 8.. run execute as @r[tag=killer.runner,gamemode=adventure,team=play.killer,tag=!killer.saver] at @s run function killerever/getjob/saver +execute if score play.player tick matches 8.. run execute as @r[tag=!killer.saver,gamemode=adventure,team=play.killer] at @s run function killerever/getjob/killer +execute if score play.player tick matches 8.. run execute as @r[tag=!killer.saver,gamemode=adventure,team=play.killer] at @s run function killerever/getjob/saver execute if score play.player tick matches 8.. run tellraw @a[team=play.killer] ["\u00a76\u00a7l因为本局人数较多，已分配2杀手 + 2侦探。"] -execute as @r[tag=killer.runner,team=play.killer,tag=!killer.saver,gamemode=adventure] at @s run function killerever/getjob/killer -execute as @r[tag=killer.runner,team=play.killer,tag=!killer.saver,gamemode=adventure] at @s run function killerever/getjob/saver +execute as @r[tag=!killer.saver,team=play.killer,gamemode=adventure] at @s run function killerever/getjob/killer +execute as @r[tag=!killer.saver,team=play.killer,gamemode=adventure] at @s run function killerever/getjob/saver # execute if score wait.player tick matches 6.. run execute as @r[tag=killer.runner,team=play.killer] at @s run function killerever/getjob/killer # execute if score wait.player tick matches 6.. run execute as @r[tag=killer.runner,team=play.killer] at @s run function killerever/getjob/saver title @a[team=play.killer] title ["\u00a7c\u00a7l密室杀手"] @@ -37,3 +41,4 @@ tellraw @a[tag=killer.saver] ["\u00a7a [I] \u00a7b你的团队成员： ",{"sele tellraw @a[team=play.killer] ["\n\u00a7a为了防止打扰其他游戏的玩家，可使用 \u00a76/tm <信息> \u00a7a进行聊天。"] schedule clear minecraft:killerever/summon schedule function minecraft:killerever/summon 8s + diff --git a/datapacks/map_all/data/minecraft/functions/killerever/summon.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/summon.mcfunction index d8e2bbd0..5905a91e 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/summon.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/summon.mcfunction @@ -1,7 +1,12 @@ -give @a[team=play.killer,tag=killer.killer] iron_sword{ms:1,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:40d,Operation:0,UUID:[I;1041,1467,7334,9500]}],Unbreakable:1b,HideFlags:63} -give @a[team=play.killer,tag=killer.saver] bow{ms:1,Enchantments:[{id:"infinity",lvl:1s},{id:"power",lvl:10s}],Unbreakable:1b,HideFlags:63,dtb:1b} -give @a[team=play.killer,tag=killer.saver] arrow{ms:1} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @a[team=play.killer,tag=killer.killer] iron_sword[custom_data={ms:1},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[1041,1467,7334,9500],name:"noName",amount:40d,operation:"add_value"}],show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +give @a[team=play.killer,tag=killer.saver] bow[custom_data={ms:1,dtb:1b},enchantments={levels:{"minecraft:infinity":1s,"minecraft:power":10s},show_in_tooltip:false},unbreakable={show_in_tooltip:false}] +give @a[team=play.killer,tag=killer.saver] arrow[custom_data={ms:1}] effect give @a[team=play.killer] regeneration 2 25 true title @a[team=play.killer] title ["\u00a7c\u00a7l密室杀手"] title @a[team=play.killer] subtitle ["\u00a7r游戏正式开始！"] + diff --git a/datapacks/map_all/data/minecraft/functions/killerever/test.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/test.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/test.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/killerever/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/teststart.mcfunction index 569ffefb..a29ae3d0 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.killer,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score killer.state state matches 1.. run function minecraft:killerever/spec execute unless score killer.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score killer.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score killer.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:killerever/start \ No newline at end of file +execute unless score killer.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:killerever/start diff --git a/datapacks/map_all/data/minecraft/functions/killerever/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/tick.mcfunction index 21644e71..334f2261 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/tick.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## spawnpoint @a[team=play.killer] 235 56 33 execute as @a[team=play.killer,x=235.0,y=56.0,z=33.0,distance=0..2,gamemode=adventure] at @s run function killerever/died tag @a[team=play.killer,nbt={Inventory:[{id:"minecraft:enchanted_book",Slot:-106b}]}] add killer.sb tag @a[team=play.killer,nbt={Inventory:[{id:"minecraft:rabbit_stew",Slot:-106b}]}] add killer.te tag @a[team=play.killer,nbt={Inventory:[{id:"minecraft:mushroom_stew",Slot:-106b}]}] add killer.gis -# execute as @e[tag=killer.bow] at @s run function +# execute as @e[tag=killer.bow] at @s run function execute as @a[team=play.killer,tag=killer.killer] at @s run function killerever/action/check_if_get_bow -execute as @a[team=play.killer,tag=killer.runner,tag=!killer.saver] at @s run function killerever/action/check_bow +execute as @a[team=play.killer,tag=!killer.saver] at @s run function killerever/action/check_bow tag @a[scores={eat.goldapple=1..}] add killer.ga tag @a[scores={eat.glow=1..}] add killer.glow @@ -44,4 +48,4 @@ tag @a remove killer.glow # minecraft:glow_ink_sac v ## 计分板 # minecraft:enchanted_golden_apple v -# minecraft:glow_berries v \ No newline at end of file +# minecraft:glow_berries v diff --git a/datapacks/map_all/data/minecraft/functions/killerever/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/tp.mcfunction index 21713621..45ca4185 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode adventure @a[gamemode=spectator,team=play.killer] gamemode adventure @a[gamemode=spectator,team=wait.killer] # scoreboard players add @a[gamemode=adventure,team=play.beli,tag=play.total] score 1 @@ -5,5 +9,6 @@ execute if entity @a[team=play.killer,tag=play.total] run function small_games/t execute as @a[gamemode=adventure,team=wait.killer] run function killerever/join execute as @a[gamemode=adventure,team=play.killer] run function killerever/join schedule clear minecraft:killerever/summon -kill @e[type=item,nbt={Item:{tag:{ms:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{ms:1}}}}] scoreboard players set killer.state state 0 + diff --git a/datapacks/map_all/data/minecraft/functions/killerever/tsecond.mcfunction b/datapacks/map_all/data/minecraft/functions/killerever/tsecond.mcfunction index ed6d3c5d..2ad27f48 100644 --- a/datapacks/map_all/data/minecraft/functions/killerever/tsecond.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/killerever/tsecond.mcfunction @@ -1,9 +1,13 @@ -summon item 142 55 -21 {Item:{id:"minecraft:enchanted_book",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e冻冻球 \\u00a77- 放在副手(F键)使用"'}}},Tags:["newitem"]} -summon item 142 55 -21 {Item:{id:"minecraft:rabbit_stew",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e海王之卵 \\u00a77- 放在副手(F键)使用"'}}},Tags:["newitem"]} -summon item 142 55 -21 {Item:{id:"minecraft:mushroom_stew",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e原地升天 \\u00a77- 放在副手(F键)使用"'}}},Tags:["newitem"]} -summon item 142 55 -21 {Item:{id:"minecraft:gold_ingot",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e金锭"'}}},Tags:["newitem"]} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon item 142 55 -21 {Item:{id:"minecraft:enchanted_book",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e冻冻球 \\u00a77- 放在副手(F键)使用"'}},Tags:["newitem"]} +summon item 142 55 -21 {Item:{id:"minecraft:rabbit_stew",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e海王之卵 \\u00a77- 放在副手(F键)使用"'}},Tags:["newitem"]} +summon item 142 55 -21 {Item:{id:"minecraft:mushroom_stew",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e原地升天 \\u00a77- 放在副手(F键)使用"'}},Tags:["newitem"]} +summon item 142 55 -21 {Item:{id:"minecraft:gold_ingot",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e金锭"'}},Tags:["newitem"]} -summon item 142 55 -21 {Item:{id:"minecraft:enchanted_golden_apple",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e无敌球(10s 免疫伤害) \\u00a77- 食用即可"'}}},Tags:["newitem"]} -summon item 142 55 -21 {Item:{id:"minecraft:golden_apple",Count:1b,tag:{ms:1,display:{Name:'"\\u00a7e神之果(10s 速度 + 跳跃效果) \\u00a77- 食用即可"'}}},Tags:["newitem"]} +summon item 142 55 -21 {Item:{id:"minecraft:enchanted_golden_apple",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e无敌球(10s 免疫伤害) \\u00a77- 食用即可"'}},Tags:["newitem"]} +summon item 142 55 -21 {Item:{id:"minecraft:golden_apple",count:1,components:{"minecraft:custom_data":{ms:1},"minecraft:custom_name":'"\\u00a7e神之果(10s 速度 + 跳跃效果) \\u00a77- 食用即可"'}},Tags:["newitem"]} -execute as @e[type=item,tag=newitem] at @s run function killerever/ranitem \ No newline at end of file +execute as @e[type=item,tag=newitem] at @s run function killerever/ranitem diff --git a/datapacks/map_all/data/minecraft/functions/live/givemythings.mcfunction b/datapacks/map_all/data/minecraft/functions/live/givemythings.mcfunction index 5a5e6fef..0dc8837c 100644 --- a/datapacks/map_all/data/minecraft/functions/live/givemythings.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/givemythings.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players set live.state state 1 effect clear @s scoreboard players add @s live.job 0 @@ -11,3 +15,4 @@ execute if score @s live.job matches 6..6 run function minecraft:live/job/creepe execute if score @s live.job matches 7..7 run function minecraft:live/job/old # function minecraft:live/ingame/selkiller # execute if score live.set.mode live.all matches 1..1 run team modify play.live.runner friendlyFire true + diff --git a/datapacks/map_all/data/minecraft/functions/live/givethings.mcfunction b/datapacks/map_all/data/minecraft/functions/live/givethings.mcfunction index 008a1e51..1fac61df 100644 --- a/datapacks/map_all/data/minecraft/functions/live/givethings.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/givethings.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set live.state state 1 effect clear @a[team=play.live.runner] scoreboard players add @a[team=play.live.runner] live.job 0 @@ -9,3 +13,4 @@ execute as @a[team=play.live.runner] if score @s live.job matches 4..4 run funct execute as @a[team=play.live.runner] if score @s live.job matches 5..5 run function minecraft:live/job/cactus function minecraft:live/ingame/selkiller execute if score live.set.mode live.all matches 1..1 run team modify play.live.runner friendlyFire true + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/axe.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/axe.mcfunction index 4126471b..9178b1c4 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/axe.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/axe.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## item replace entity @s armor.head with air -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:iron_boots{Unbreakable:1b} +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +item replace entity @s armor.feet with minecraft:iron_boots[unbreakable={}] item replace entity @s armor.legs with air -item replace entity @s container.0 with minecraft:iron_axe{Unbreakable:1b,display:{Name:'["§6Golden §fIron §bAxe"]',Lore:['["§f7§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:7d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-3.1,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 \ No newline at end of file +item replace entity @s container.0 with minecraft:iron_axe[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §fIron §bAxe"]',lore=['["§f7§c♥"]'],attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:7d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-3.1,operation:"add_value"}],show_in_tooltip:false}] 1 diff --git a/datapacks/map_all/data/minecraft/functions/live/job/cactus.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/cactus.mcfunction index f1fb491e..23d46ce6 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/cactus.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/cactus.mcfunction @@ -1,8 +1,13 @@ -item replace entity @s armor.head with minecraft:cactus{Unbreakable:1b,Enchantments:[{id:"minecraft:protection",lvl:2s},{id:"minecraft:thorns",lvl:2s}],AttributeModifiers:[{AttributeName:"generic.movement_speed",Name:"noName",Amount:0.01d,Operation:0,UUID:[I;1693,9851,4672,6648]}]} 1 -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s armor.head with minecraft:cactus[unbreakable={},enchantments={levels:{"minecraft:protection":2s,"minecraft:thorns":2s}},attribute_modifiers={modifiers:[{type:"generic.movement_speed",slot:"any",uuid:[1693,9851,4672,6648],name:"noName",amount:0.01d,operation:"add_value"}]}] 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] -item replace entity @s armor.feet with minecraft:leather_boots{Unbreakable:1b} +item replace entity @s armor.feet with minecraft:leather_boots[unbreakable={}] -item replace entity @s armor.legs with minecraft:iron_leggings{Unbreakable:1b} +item replace entity @s armor.legs with minecraft:iron_leggings[unbreakable={}] + +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 diff --git a/datapacks/map_all/data/minecraft/functions/live/job/clock.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/clock.mcfunction index 97aa8b20..7fbf5aba 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/clock.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/clock.mcfunction @@ -1,7 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:13825332},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:leather_helmet{display:{color:13825332},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:13825332},Unbreakable:1b,Enchantments:[{id:"blast_protection",lvl:0}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:13825332},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:0}]} -item replace entity @s container.1 with minecraft:carrot_on_a_stick{job:7,display:{Name:'"\\u00a72\\u00a7l古老的钟"',Lore:['"\\u00a7b右键使用"']},Unbreakable:1b,Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}],CustomModelData:1} 1 -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:13825332},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +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={},enchantments={levels:{"minecraft:blast_protection":0}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:13825332},unbreakable={},enchantments={levels:{"minecraft:fire_protection":0}}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=1] 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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/creeper.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/creeper.mcfunction index 51421636..7d355f13 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/creeper.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/creeper.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:5764183},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:tnt{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:5764183},Unbreakable:1b,Enchantments:[{id:"blast_protection",lvl:1}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:5764183},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:1}]} -item replace entity @s container.0 with minecraft:green_dye{Unbreakable:1b,display:{Name:'["§2Green §bSword"]',Lore:['["§c5 HP"]']},Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:5764183},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:tnt[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:5764183},unbreakable={},enchantments={levels:{"minecraft:blast_protection":1}}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 # give @s minecraft:creeper_spawn_egg{EntityTag:{id:"minecraft:creeper",CustomName:'["CREEPER"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:30s},display:{Name:'"\\u00a72\\u00a7lCreeper"',Lore:['"\\u00a7b小心！他可能会误伤你"']},CanPlaceOn:["#minecraft:bwplace"],HideFlags:63} 3 -give @s carrot_on_a_stick{job:4,display:{Name:'"\\u00a72苦力怕 \\u00a77- 右键使用"',Lore:['"\\u00a7c小心！他可能会误伤你"']},CustomModelData:2} \ No newline at end of file +give @s carrot_on_a_stick[custom_data={job:4},custom_name='"\\u00a72苦力怕 \\u00a77- 右键使用"',lore=['"\\u00a7c小心！他可能会误伤你"'],custom_model_data=2] diff --git a/datapacks/map_all/data/minecraft/functions/live/job/feather.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/feather.mcfunction index b5e95409..ea803aed 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/feather.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/feather.mcfunction @@ -1,7 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:16777215},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:leather_helmet{display:{color:16777215},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:16777215},Unbreakable:1b,Enchantments:[{id:"feather_falling",lvl:3}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:16777215},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:0}]} -item replace entity @s container.1 with minecraft:carrot_on_a_stick{job:5,display:{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:1b,Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}],CustomModelData:18} 1 -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:16777215},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +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={},enchantments={levels:{"minecraft:fire_protection":0}}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=18] 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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/fire.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/fire.mcfunction index b267b5ed..b1315051 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/fire.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/fire.mcfunction @@ -1,7 +1,11 @@ -item replace entity @s armor.head with minecraft:bone{Unbreakable:1b,display:{color:16711808},HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s},{id:"fire_protection",lvl:2s},{id:"binding_curse",lvl:1s}]} -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,display:{color:16711808},HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s},{id:"minecraft:protection",lvl:1s},{id:"fire_protection",lvl:2s}]} -item replace entity @s armor.feet with minecraft:iron_boots{Unbreakable:1b,display:{color:16711808},HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s},{id:"minecraft:protection",lvl:1s},{id:"fire_protection",lvl:2s}]} -item replace entity @s armor.legs with leather_leggings{Unbreakable:1b,display:{color:16711808},HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s},{id:"minecraft:protection",lvl:1s},{id:"fire_protection",lvl:2s}]} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s armor.head with minecraft:bone[unbreakable={show_in_tooltip:false},dyed_color={rgb:16711808},enchantments={levels:{"minecraft:protection":1s,"minecraft:fire_protection":2s,"minecraft:binding_curse":1s},show_in_tooltip:false}] +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={show_in_tooltip:false},dyed_color={rgb:16711808},enchantments={levels:{"minecraft:protection":1s,"minecraft:fire_protection":2s},show_in_tooltip:false}] +item replace entity @s armor.feet with minecraft:iron_boots[unbreakable={show_in_tooltip:false},dyed_color={rgb:16711808},enchantments={levels:{"minecraft:protection":1s,"minecraft:fire_protection":2s},show_in_tooltip:false}] +item replace entity @s armor.legs with leather_leggings[unbreakable={show_in_tooltip:false},dyed_color={rgb:16711808},enchantments={levels:{"minecraft:protection":1s,"minecraft:fire_protection":2s},show_in_tooltip:false}] effect give @s fire_resistance 99999 25 true -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§bSOMTHING JUST LIKE THIS"]',Lore:['["§f7§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:6d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}],Enchantments:[{id:"fire_aspect",lvl:1}]} 1 \ No newline at end of file +item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§bSOMTHING JUST LIKE THIS"]',lore=['["§f7§c♥"]'],attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:6d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false},enchantments={levels:{"minecraft:fire_aspect":1},show_in_tooltip:false}] 1 diff --git a/datapacks/map_all/data/minecraft/functions/live/job/fireball.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/fireball.mcfunction index cb1af915..7533fcb7 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/fireball.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/fireball.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:15488341},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s},{id:"fire_protection",lvl:1}]} -item replace entity @s armor.head with minecraft:note_block{Unbreakable:1b,Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:15488341},Unbreakable:1b,Enchantments:[{id:"blast_protection",lvl:1}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:15488341},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:1}]} -item replace entity @s container.0 with minecraft:red_dye{Unbreakable:1b,display:{Name:'["§4Red §bSword"]',Lore:['["§c5 HP"]']},Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.2,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 -give @s minecraft:snowball{Enchantments:[{id:"unbreaking",lvl:1}],display:{Name:'"\\u00a74\\u00a7lFIREBALL"',Lore:['"\\u00a7b小心！火球可能会误伤你"']},HideFlags:63} 4 -# give @s carrot_on_a_stick{job:3,display:{Name:'"\\u00a7c火球 \\u00a77- 右键使用"',Lore:['"\\u00a78小心误伤！"']}} \ No newline at end of file +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:15488341},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s,"minecraft:fire_protection":1},show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:note_block[unbreakable={},enchantments={levels:{"minecraft:binding_curse":1}}] +item replace entity @s armor.feet with minecraft:leather_boots[dyed_color={rgb:15488341},unbreakable={},enchantments={levels:{"minecraft:blast_protection":1}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:15488341},unbreakable={},enchantments={levels:{"minecraft:fire_protection":1}}] +item replace entity @s container.0 with minecraft:red_dye[unbreakable={show_in_tooltip:false},custom_name='["§4Red §bSword"]',lore=['["§c5 HP"]'],enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.2,operation:"add_value"}],show_in_tooltip:false}] 1 +give @s minecraft:snowball[enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},custom_name='"\\u00a74\\u00a7lFIREBALL"',lore=['"\\u00a7b小心！火球可能会误伤你"']] +# give @s carrot_on_a_stick{job:3,display:{Name:'"\\u00a7c火球 \\u00a77- 右键使用"',Lore:['"\\u00a78小心误伤！"']}} diff --git a/datapacks/map_all/data/minecraft/functions/live/job/fisherman.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/fisherman.mcfunction index f0d304bc..e21bf0f6 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/fisherman.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/fisherman.mcfunction @@ -1,7 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:15158200},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:leather_helmet{display:{color:10554854},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:16711786},Unbreakable:1b,Enchantments:[{id:"feather_falling",lvl:0}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:8852467},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:0}]} -item replace entity @s container.1 with minecraft:carrot_on_a_stick{job:6,display:{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:1b,Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}],CustomModelData:19} 1 -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:15158200},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +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={},enchantments={levels:{"minecraft:feather_falling":0}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:8852467},unbreakable={},enchantments={levels:{"minecraft:fire_protection":0}}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=19] 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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/haerkala.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/haerkala.mcfunction index dc937a59..2c731f8d 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/haerkala.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/haerkala.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## 哈尔卡拉 # 类型：森林精灵 # 出处：《打了300年的史莱姆，不知不觉就练到了满级》 # 147,170,79 -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:3319573},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:leather_helmet{display:{color:16775968},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:7814157},Unbreakable:1b,Enchantments:[{id:"feather_falling",lvl:0}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:2659444},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:0}]} +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:3319573},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:leather_helmet[dyed_color={rgb:16775968},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:7814157},unbreakable={},enchantments={levels:{"minecraft:feather_falling":0}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:2659444},unbreakable={},enchantments={levels:{"minecraft:fire_protection":0}}] # '"\\u00a7a累的时候来一瓶"', # '"\\u00a7b头脑清醒，身体健壮"', @@ -15,5 +19,6 @@ item replace entity @s armor.legs with minecraft:leather_leggings{display:{color # '"\\u00a7e（喝下后）"', # '"\\u00a7f啊！ 充满能量！"' -item replace entity @s container.1 with minecraft:carrot_on_a_stick{job:9,display:{Name:'"\\u00a76\\u00a7l哈尔克拉特制营养酒 \\u00a77- 右键饮用"',Lore:['"\\u00a7d\\u00a7l饮下后，获得随机神奇效果。"','"\\u00a7b持续时间：\\u00a7a15s"','"\\u00a7b冷却时间：\\u00a7e45s"','""','"\\u00a7a累的时候来一瓶"','"\\u00a7b头脑清醒，身体健壮"','"\\u00a7c\\u00a7l哈尔克拉特制营养酒"','"\\u00a7d克服劳累的工作吧！"','"\\u00a7e（喝下后）"','"\\u00a7f啊！ 充满能量！"']},Unbreakable:1b,HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand}],CustomModelData:20} 1 -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§f§l小刀"]',Lore:['["\\u00a7b默认伤害：§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.6,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false},custom_model_data=20] 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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.6,operation:"add_value"}],show_in_tooltip:false}] 1 + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/icarus.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/icarus.mcfunction index 20854924..2645e831 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/icarus.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/icarus.mcfunction @@ -1,7 +1,11 @@ -item replace entity @s armor.chest with minecraft:elytra{Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,display:{Name:'["§6伊卡洛斯之翼"]'}} -item replace entity @s armor.legs with minecraft:leather_leggings{Unbreakable:1b,HideFlags:63} -item replace entity @s armor.feet with minecraft:leather_boots{Unbreakable:1b,HideFlags:63} -item replace entity @s weapon.offhand with minecraft:crossbow{Unbreakable:0b,Enchantments:[{id:"quick_charge",lvl:1}],display:{Name:'["§9伊卡洛斯之弩"]'}} -item replace entity @s weapon.mainhand with minecraft:wooden_sword{Unbreakable:1b,Enchantments:[{id:"knockback",lvl:2}],display:{Name:'["§c伊卡洛斯之剑"]'}} -give @s arrow 3 -give @s firework_rocket 5 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s armor.chest with minecraft:elytra[enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},custom_name='["§6伊卡洛斯之翼"]'] +item replace entity @s armor.legs with minecraft:leather_leggings[unbreakable={show_in_tooltip:false}] +item replace entity @s armor.feet with minecraft:leather_boots[unbreakable={show_in_tooltip:false}] +item replace entity @s weapon.offhand with minecraft:crossbow[enchantments={levels:{"minecraft:quick_charge":1}},custom_name='["§9伊卡洛斯之弩"]'] +item replace entity @s weapon.mainhand with minecraft:wooden_sword[unbreakable={},enchantments={levels:{"minecraft:knockback":2}},custom_name='["§c伊卡洛斯之剑"]'] +give @s arrow +give @s firework_rocket diff --git a/datapacks/map_all/data/minecraft/functions/live/job/lianjinshu.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/lianjinshu.mcfunction index faeefef4..0a03a0f6 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/lianjinshu.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/lianjinshu.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## 哈尔卡拉 # 类型：森林精灵 # 出处：《打了300年的史莱姆，不知不觉就练到了满级》 # 147,170,79 -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:16556054},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:leather_helmet{display:{color:14857765},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:3737721},Unbreakable:1b,Enchantments:[{id:"feather_falling",lvl:1}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:15520669},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:1}]} +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:16556054},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:leather_helmet[dyed_color={rgb:14857765},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:3737721},unbreakable={},enchantments={levels:{"minecraft:feather_falling":1}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:15520669},unbreakable={},enchantments={levels:{"minecraft:fire_protection":1}}] # '"\\u00a7a累的时候来一瓶"', # '"\\u00a7b头脑清醒，身体健壮"', @@ -16,7 +20,7 @@ item replace entity @s armor.legs with minecraft:leather_leggings{display:{color # '"\\u00a7f啊！ 充满能量！"' # item replace entity @s container.1 with potion{C} -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§f§l小刀"]',Lore:['["\\u00a7b默认伤害：§c5 ♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.6,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 -give @s minecraft:potion{custom_potion_effects:[{id:"minecraft:speed",duration:200,amplifier:2b,ambient:0b,show_particles:0b},{id:"haste",duration:200,amplifier:1b,ambient:0b,show_particles:0b},{id:"strength",duration:200,amplifier:1b,ambient:0b,show_particles:0b},{id:"slowness",duration:400,amplifier:2b,ambient:0b,show_particles:0b},{id:"regeneration",duration:200,amplifier:1b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7a魔法药水"'},CustomPotionColor:3392158} 2 +item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§f§l小刀"]',lore=['["\\u00a7b默认伤害：§c5 ♥"]'],attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.6,operation:"add_value"}],show_in_tooltip:false}] 1 +give @s minecraft:potion[potion_contents={custom_effects:[{id:"minecraft:speed",duration:200,amplifier:2b,ambient:false,show_particles:false},{id:"haste",duration:200,amplifier:1b,ambient:false,show_particles:false},{id:"strength",duration:200,amplifier:1b,ambient:false,show_particles:false},{id:"slowness",duration:400,amplifier:2b,ambient:false,show_particles:false},{id:"regeneration",duration:200,amplifier:1b,ambient:false,show_particles:false}],custom_color:3392158},custom_name='"\\u00a7a魔法药水"'] -give @s minecraft:potion{custom_potion_effects:[{id:"regeneration",duration:200,amplifier:1b,ambient:0b,show_particles:0b},{id:"absorption",duration:2000,amplifier:1b,ambient:0b,show_particles:0b}],display:{Name:'"\\u00a7c恢复药水"'},CustomPotionColor:14365954} 2 \ No newline at end of file +give @s minecraft:potion[potion_contents={custom_effects:[{id:"regeneration",duration:200,amplifier:1b,ambient:false,show_particles:false},{id:"absorption",duration:2000,amplifier:1b,ambient:false,show_particles:false}],custom_color:14365954},custom_name='"\\u00a7c恢复药水"'] diff --git a/datapacks/map_all/data/minecraft/functions/live/job/normal.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/normal.mcfunction index b69edb2d..4e34a110 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/normal.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/normal.mcfunction @@ -1,5 +1,9 @@ -item replace entity @s armor.chest with minecraft:iron_chestplate{Unbreakable:1b} -item replace entity @s armor.head with minecraft:iron_helmet{Unbreakable:1b} -item replace entity @s armor.feet with minecraft:iron_boots{Unbreakable:1b} -item replace entity @s armor.legs with minecraft:iron_leggings{Unbreakable:1b} -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f7§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:7d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s armor.chest with minecraft:iron_chestplate[unbreakable={}] +item replace entity @s armor.head with minecraft:iron_helmet[unbreakable={}] +item replace entity @s armor.feet with minecraft:iron_boots[unbreakable={}] +item replace entity @s armor.legs with minecraft:iron_leggings[unbreakable={}] +item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §rIron §bSword"]',lore=['["§f7§c♥"]'],attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:7d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 diff --git a/datapacks/map_all/data/minecraft/functions/live/job/old.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/old.mcfunction index 1b258da3..9f3a9d16 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/old.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/old.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #/summon minecraft:creeper ~ ~1 ~ {CustomName:"[\"CREEPER\"]",CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:20s} -item replace entity @s armor.chest with minecraft:leather_chestplate{display:{color:16039255},Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}]} -item replace entity @s armor.head with minecraft:player_head{Unbreakable:1b,SkullOwner:"MHF_ArrowUp",Enchantments:[{id:"binding_curse",lvl:1}]} -item replace entity @s armor.feet with minecraft:leather_boots{display:{color:16039255},Unbreakable:1b,Enchantments:[{id:"blast_protection",lvl:0}]} -item replace entity @s armor.legs with minecraft:leather_leggings{display:{color:16039255},Unbreakable:1b,Enchantments:[{id:"fire_protection",lvl:0}]} -item replace entity @s container.0 with minecraft:carrot_on_a_stick{job:1,display:{Name:'"\\u00a72\\u00a7l古老的剑"',Lore:['"\\u00a7b右键释放剑气"']},Unbreakable:1b,Enchantments:[{id:"unbreaking",lvl:1}],HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:2d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}],CustomModelData:3} 1 +item replace entity @s armor.chest with minecraft:leather_chestplate[dyed_color={rgb:16039255},unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false}] +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={},enchantments={levels:{"minecraft:blast_protection":0}}] +item replace entity @s armor.legs with minecraft:leather_leggings[dyed_color={rgb:16039255},unbreakable={},enchantments={levels:{"minecraft:fire_protection":0}}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:2d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false},custom_model_data=3] 1 -effect give @s slowness 99999 0 true \ No newline at end of file +effect give @s slowness 99999 0 true diff --git a/datapacks/map_all/data/minecraft/functions/live/job/scientist.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/scientist.mcfunction index fba50d4c..ec1b0dad 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/scientist.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/scientist.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s effect clear @s -item replace entity @s container.0 with minecraft:diamond_sword{Unbreakable:1b,HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:6d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,display:{color:7963501}} -item replace entity @s armor.head with minecraft:player_head{Unbreakable:1b,SkullOwner:"MHF_ArrowUp"} -item replace entity @s armor.feet with minecraft:leather_boots{Unbreakable:1b,display:{color:7963501}} -item replace entity @s armor.legs with minecraft:leather_leggings{Unbreakable:1b,display:{color:8950395}} +item replace entity @s container.0 with minecraft:diamond_sword[unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:6d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={},dyed_color={rgb:7963501}] +item replace entity @s armor.head with minecraft:player_head[unbreakable={},profile="MHF_ArrowUp"] +item replace entity @s armor.feet with minecraft:leather_boots[unbreakable={},dyed_color={rgb:7963501}] +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{job:2,display:{Name:'"\\u00a7a肾 宝"',Lore:['"\\u00a77右键使用"','""','"\\u00a7d肾宝，"','"\\u00a7b一瓶提神醒脑，"','"\\u00a76二瓶永不疲劳，"','"\\u00a7e三瓶长生不老"','"\\u00a78\\u00a7n\\u00a7m下次一定"']},CustomModelData:4} -# effect give @s invisibility 99999 1 \ No newline at end of file +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] +# effect give @s invisibility 99999 1 diff --git a/datapacks/map_all/data/minecraft/functions/live/job/shooter.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/shooter.mcfunction index 85e6dbe6..2c6a3e5d 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/shooter.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/shooter.mcfunction @@ -1,7 +1,11 @@ -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,HideFlags:63} -item replace entity @s armor.head with minecraft:iron_helmet{Unbreakable:1b} -item replace entity @s armor.feet with minecraft:iron_boots{Unbreakable:1b} -item replace entity @s armor.legs with minecraft:iron_leggings{Unbreakable:1b} -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f3§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:3d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 -item replace entity @s container.1 with minecraft:bow{Unbreakable:1b,display:{Name:'["§aR§ba§ci§dn §eB§fo§6w"]',Lore:['["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]']},Enchantments:[{id:"minecraft:power",lvl:0s}]} 1 -give @s arrow 32 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:iron_helmet[unbreakable={}] +item replace entity @s armor.feet with minecraft:iron_boots[unbreakable={}] +item replace entity @s armor.legs with minecraft:iron_leggings[unbreakable={}] +item replace entity @s container.0 with minecraft:iron_sword[unbreakable={show_in_tooltip:false},custom_name='["§6Golden §rIron §bSword"]',lore=['["§f3§c♥"]'],attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:3d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 +item replace entity @s container.1 with minecraft:bow[unbreakable={},custom_name='["§aR§ba§ci§dn §eB§fo§6w"]',lore=['["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]'],enchantments={levels:{"minecraft:power":0s}}] 1 +give @s arrow diff --git a/datapacks/map_all/data/minecraft/functions/live/job/tank.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/tank.mcfunction index 2cb94611..a45ea6dc 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/tank.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/tank.mcfunction @@ -1,7 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## ok? -item replace entity @s armor.chest with diamond_chestplate{Unbreakable:1b,HideFlags:63,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.movement_speed",Name:"noName",Amount:-0.03d,Operation:0,UUID:[I;1693,9851,4672,6648]},{AttributeName:"generic.knockback_resistance",Name:"noName",Amount:-0.3d,Operation:0,UUID:[I;1393,9851,4672,6648]},{AttributeName:"generic.armor",Name:"noName",Amount:10d,Operation:0,UUID:[I;1393,9851,4472,6648]}]} -item replace entity @s armor.head with minecraft:diamond_helmet{Unbreakable:1b} -item replace entity @s armor.feet with minecraft:iron_boots{Unbreakable:1b} -item replace entity @s armor.legs with minecraft:iron_leggings{Unbreakable:1b} -item replace entity @s container.0 with minecraft:iron_sword{Unbreakable:1b,display:{Name:'["§6Golden §rIron §bSword"]',Lore:['["§f5§c♥"]']},HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:5d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} 1 -item replace entity @s weapon.offhand with minecraft:shield{Damage:250} 1 +item replace entity @s armor.chest with diamond_chestplate[unbreakable={show_in_tooltip:false},enchantments={levels:{"minecraft:protection":1s},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.movement_speed",slot:"any",uuid:[1693,9851,4672,6648],name:"noName",amount:-0.03d,operation:"add_value"},{type:"generic.knockback_resistance",slot:"any",uuid:[1393,9851,4672,6648],name:"noName",amount:-0.3d,operation:"add_value"},{type:"generic.armor",slot:"any",uuid:[1393,9851,4472,6648],name:"noName",amount:10d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s armor.head with minecraft:diamond_helmet[unbreakable={}] +item replace entity @s armor.feet with minecraft:iron_boots[unbreakable={}] +item replace entity @s armor.legs with minecraft:iron_leggings[unbreakable={}] +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:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:5d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] 1 +item replace entity @s weapon.offhand with minecraft:shield[damage=250] 1 + diff --git a/datapacks/map_all/data/minecraft/functions/live/job/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/live/job/tp.mcfunction index c8e85f34..88ea2fb2 100644 --- a/datapacks/map_all/data/minecraft/functions/live/job/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/live/job/tp.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s effect clear @s -item replace entity @s container.0 with minecraft:wooden_sword{Enchantments:[{id:"unbreaking",lvl:1}],display:{Name:'{"text":"桃木剑","color":"#e4a10f","italic": false}',Lore:['"\\u00a77一个很基础的木剑"']},Unbreakable:1b,HideFlags:63,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:6d,Operation:0,UUID:[I;4894,7942,7863,6495],Slot:mainhand},{AttributeName:"generic.attack_speed",Amount:-2.4,Slot:"mainhand",Operation:0,UUID:[I;1145,5145,1145,5145]}]} +item replace entity @s container.0 with minecraft:wooden_sword[enchantments={levels:{"minecraft:unbreaking":1},show_in_tooltip:false},custom_name='{"text":"桃木剑","color":"#e4a10f","italic": false}',lore=['"\\u00a77一个很基础的木剑"'],unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:mainhand,uuid:[4894,7942,7863,6495],name:"noName",amount:6d,operation:"add_value"},{type:"generic.attack_speed",slot:"mainhand",uuid:[1145,5145,1145,5145],name:"noName",amount:-2.4,operation:"add_value"}],show_in_tooltip:false}] # give @s minecraft:ender_pearl{Unbreakable:1b,HideFlags:63} 32 -item replace entity @s armor.chest with minecraft:leather_chestplate{Unbreakable:1b,display:{color:24768}} -item replace entity @s armor.head with minecraft:player_head{Unbreakable:1b,SkullOwner:"MHF_CoconutG"} -item replace entity @s armor.feet with minecraft:leather_boots{Unbreakable:1b,display:{color:14983439},Enchantments:[{id:"feather_falling",lvl:5}]} -item replace entity @s armor.legs with minecraft:leather_leggings{Unbreakable:1b,display:{color:12583002}} -give @s carrot_on_a_stick{job:3,display:{Name:'"\\u00a79空间移动 \\u00a77- 右键使用"',Lore:['"\\u00a78你突然就消失了"']},CustomModelData:6} +item replace entity @s armor.chest with minecraft:leather_chestplate[unbreakable={},dyed_color={rgb:24768}] +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] # effect give @s jump_boost 99999 255 true -# effect give @s invisibility 99999 1 \ No newline at end of file +# effect give @s invisibility 99999 1 diff --git a/datapacks/map_all/data/minecraft/functions/lpark/backpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/backpoint.mcfunction index 1646ab4a..57e54c63 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/backpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/backpoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=lpark] at @s if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid rotated ~ 0 run tag @s add totpsel execute as @e[tag=totpsel] at @s run tp @a[tag=park.sel] ~ ~ ~ @@ -8,3 +12,4 @@ tellraw @s ["\u00a7a[记录点] \u00a7b你已返回记录点！\n",{"text":"\u00 effect give @s jump_boost 1 255 true # playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute at @s run playsound ui.button.click player @s ~ ~ ~ 10 1 1 + diff --git a/datapacks/map_all/data/minecraft/functions/lpark/cancel.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/cancel.mcfunction index 56550cf8..aa483acc 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/cancel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/cancel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=lpark] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的跑酷已经取消！"] @@ -6,4 +10,4 @@ playsound ui.button.click player @s tag @s remove parkouring clear @s carrot_on_a_stick -scoreboard players set @s hub 1 \ No newline at end of file +scoreboard players set @s hub 1 diff --git a/datapacks/map_all/data/minecraft/functions/lpark/delect.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/delect.mcfunction index ee5172f6..d646c5f9 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/delect.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/delect.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=lpark] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tag @a[tag=park.sel] remove park.sel tellraw @s ["\u00a7a[Checkpoint] \u00a7e你的记录点已被删除！"] -playsound ui.button.click player @s \ No newline at end of file +playsound ui.button.click player @s diff --git a/datapacks/map_all/data/minecraft/functions/lpark/end.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/end.mcfunction index 8a274f0f..879f8b77 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/end.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/end.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove parkouring tellraw @s ["\u00a7a\u00a7l\n你完成了这个跑酷！"] playsound entity.player.levelup player @s @@ -8,4 +12,4 @@ execute if score @s parkour.second matches ..9 if score @s parkour.stick matches execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @a [{"selector":"@s"},"\u00a7b\u00a7l 的跑酷用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s [{"selector":"@s"},"\u00a7b\u00a7l 的跑酷用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] tellraw @s [""] -execute in minecraft:parkourworld run tp @s 8 4 8 0 0 \ No newline at end of file +execute in minecraft:parkourworld run tp @s 8 4 8 0 0 diff --git a/datapacks/map_all/data/minecraft/functions/lpark/join.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/join.mcfunction index d8412d9b..a984491b 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 \u00a7aParkour \u00a77!"] tellraw @s ["\n\u00a7b 欢迎来到关卡跑酷！\n\u00a7a 您可以随时输入\u00a7d/trigger hub set 1\u00a7a返回大厅（出生点）！\n\u00a7a 在地图中，\u00a7f",{"translate":"block.minecraft.heavy_weighted_pressure_plate","color":"white"},"\u00a7a代表\u00a7e记录点\u00a7a，您可以随时返回记录点！\n\u00a77 ",{"translate":"block.minecraft.polished_blackstone_pressure_plate","color":"aqua"},"\u00a7a代表终点。\n"] # team join lobby,tag=parkouring @@ -17,3 +21,4 @@ execute in minecraft:parkourworld run tp @s 8 4 8 0 0 execute in minecraft:parkourworld at @s run playsound entity.player.levelup player @s ~ ~ ~ 10 1 1 execute in minecraft:parkourworld at @s run function lpark/plset + diff --git a/datapacks/map_all/data/minecraft/functions/lpark/plset.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/plset.mcfunction index ebe68101..b12a0bcc 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/plset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/plset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=lpark] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 kill @e[tag=flaged1] @@ -16,4 +20,4 @@ function npark/calctime execute if score @s parkour.second matches ..9 if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches ..9 if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] -execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] \ No newline at end of file +execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] diff --git a/datapacks/map_all/data/minecraft/functions/lpark/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/reset.mcfunction index 87889efc..18036c3a 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=lpark] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的跑酷已经重置！"] @@ -7,3 +11,4 @@ execute in minecraft:parkourworld run tp @s 8 4 8 0 0 # function minecraft:npark/join execute at @s run playsound ui.button.click player @s ~ ~ ~ 10 1 1 # function minecraft:npark/resettime + diff --git a/datapacks/map_all/data/minecraft/functions/lpark/resettime.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/resettime.mcfunction index 99c34645..c0d4c622 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/resettime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/resettime.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s parkour.tick scoreboard players reset @s parkour.second scoreboard players reset @s parkour.minute scoreboard players reset @s parkour.hour scoreboard players reset @s parkour.stick title @s actionbar ["\u00a7a你的时间已经重置到 \u00a7b[0:00.00]"] -function lpark/setpoint \ No newline at end of file +function lpark/setpoint diff --git a/datapacks/map_all/data/minecraft/functions/lpark/second.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/second.mcfunction index dd5c2cd4..2a502979 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/second.mcfunction @@ -1,7 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[type=marker,tag=lpark] at @s run data merge entity @s {Duration:2147483647,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Radius:0f} 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",tag:{park:1}}]}] hotbar.4 with carrot_on_a_stick{Unbreakable:1b,Enchantments:[{id:"unbreaking",lvl:1}],display:{Name:'"\\u00a7aCheckpoint \\u00a77(Right click)"',Lore:['"\\u00a7bReturn to parkour checkpoint"']},park:1,CustomModelData: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=5] + diff --git a/datapacks/map_all/data/minecraft/functions/lpark/setpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/setpoint.mcfunction index dbe4cf05..33f89f96 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/setpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/setpoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=lpark] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 tag @a[tag=park.sel] remove park.sel @@ -5,3 +9,4 @@ scoreboard players set park.tmp park.uuid 0 execute if entity @e[tag=flaged1,distance=0..1.5] run title @s actionbar ["\u00a7c[你的记录点已经设置过了]"] execute unless entity @e[tag=flaged1,distance=0..1.5] align xyz positioned ~0.5 ~0 ~0.5 rotated ~ 0 run function minecraft:lpark/plset tag @e[tag=flaged1] remove flaged1 + diff --git a/datapacks/map_all/data/minecraft/functions/lpark/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/lpark/tick.mcfunction index ebc17d34..ba5efb12 100644 --- a/datapacks/map_all/data/minecraft/functions/lpark/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/lpark/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players enable @a[team=parkour] parkour execute as @a[scores={park.click=1..},team=parkour] at @s run function minecraft:lpark/backpoint scoreboard players reset @a[scores={park.click=1..},team=parkour] park.click @@ -18,7 +22,7 @@ execute as @a[team=parkour] at @s if block ~ ~ ~ light_weighted_pressure_plate r scoreboard players add @a[team=parkour] parkour.tick 5 # 100 'tick' -> 's' -execute as @a[team=parkour] at @s as @s[y=-10,dy=-50] run function lpark/backpoint -execute as @a[team=parkour,gamemode=adventure] at @s if block ~ ~ ~ lava run function lpark/backpoint -# execute as @a[team=parkour,gamemode=adventure] at @s if block ~ ~-0.2 ~ lava run function lpark/backpoint -execute as @a[team=parkour,gamemode=survival] at @s run gamemode adventure @s \ No newline at end of file +execute as @a[team=parkour] at @s as @s[y=-10,dy=-50] run function lpark/backpoint +execute as @a[team=parkour,gamemode=adventure] at @s if block ~ ~ ~ lava run function lpark/backpoint +# execute as @a[team=parkour,gamemode=adventure] at @s if block ~ ~-0.2 ~ lava run function lpark/backpoint +execute as @a[team=parkour,gamemode=survival] at @s run gamemode adventure @s diff --git a/datapacks/map_all/data/minecraft/functions/maze/backpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/backpoint.mcfunction index 7cb20668..6bff8de0 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/backpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/backpoint.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] at @s if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid rotated ~ 0 run tp @a[tag=park.sel] ~ ~ ~ tag @a[tag=park.sel] remove park.sel tellraw @s ["\u00a7a[记录点] \u00a7b你已返回记录点！\n",{"text":"\u00a7d[Back]","clickEvent": {"action": "run_command","value": "/trigger parkour set 1"},"hoverEvent": {"action": "show_text","value": "\u00a7b[信息] 你将会返回记录点"}}," ",{"text":"\u00a7c[Reset]","clickEvent": {"action": "run_command","value": "/trigger parkour set 2"},"hoverEvent": {"action": "show_text","value": "\u00a7c[警告] 你的所有的进度都将消失！"}}," ",{"text":"\u00a76[Cancel]","clickEvent": {"action": "run_command","value": "/trigger parkour set 4"},"hoverEvent": {"action": "show_text","value": "\u00a7c[警告] 你的所有的进度都将消失！迷宫进度也将取消。"}}] effect give @s jump_boost 1 255 true -playsound ui.button.click player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound ui.button.click player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_all/data/minecraft/functions/maze/calctime.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/calctime.mcfunction index 1def5ee4..3b889a1c 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/calctime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/calctime.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set 100 board 100 scoreboard players set 60 board 60 scoreboard players operation @s parkour.second = @s parkour.tick @@ -9,3 +13,4 @@ scoreboard players operation @s parkour.minute = @s parkour.second scoreboard players operation @s parkour.minute /= 60 board scoreboard players operation @s parkour.second %= 60 board + diff --git a/datapacks/map_all/data/minecraft/functions/maze/cancel.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/cancel.mcfunction index 97536c8b..eeff2ba4 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/cancel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/cancel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的迷宫进度已经重置！"] @@ -5,4 +9,4 @@ tag @a[tag=park.sel] remove park.sel playsound ui.button.click player @s tag @s remove mazing clear @s carrot_on_a_stick -tp @s 235 115 66 -90 0 \ No newline at end of file +tp @s 235 115 66 -90 0 diff --git a/datapacks/map_all/data/minecraft/functions/maze/cancelnottp.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/cancelnottp.mcfunction index 4b335a93..ae601804 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/cancelnottp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/cancelnottp.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的迷宫进度已经重置！"] tag @a[tag=park.sel] remove park.sel playsound ui.button.click player @s tag @s remove mazing -clear @s carrot_on_a_stick \ No newline at end of file +clear @s carrot_on_a_stick diff --git a/datapacks/map_all/data/minecraft/functions/maze/delect.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/delect.mcfunction index fdfa3582..9bfcc84d 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/delect.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/delect.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tag @a[tag=park.sel] remove park.sel tellraw @s ["\u00a7a[Checkpoint] \u00a7e你的记录点已被删除！"] -playsound ui.button.click player @s \ No newline at end of file +playsound ui.button.click player @s diff --git a/datapacks/map_all/data/minecraft/functions/maze/end.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/end.mcfunction index 06267097..2d6c0c7a 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/end.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/end.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove mazing tellraw @s ["\u00a7a\u00a7l\n你完成了这个迷宫！"] playsound entity.player.levelup player @s @@ -8,4 +12,4 @@ execute if score @s parkour.second matches ..9 if score @s parkour.stick matches execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @a [{"selector":"@s"},"\u00a7b\u00a7l 的迷宫用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s [{"selector":"@s"},"\u00a7b\u00a7l 的迷宫用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] tellraw @a [""] -# tp @s 235 115 66 -90 0 \ No newline at end of file +# tp @s 235 115 66 -90 0 diff --git a/datapacks/map_all/data/minecraft/functions/maze/join.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/join.mcfunction index a37ef40a..168a0d71 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 \u00a7aParkour \u00a77!"] tellraw @s ["\n\u00a7b 欢迎来到迷宫！\n\u00a7a 您可以随时输入\u00a7d/trigger hub set 1\u00a7a返回大厅（出生点）！\n\u00a7a 在地图中，\u00a7f",{"translate":"block.minecraft.warped_pressure_plate","color":"white"},"\u00a7a代表\u00a7e起点\u00a7a，您可以随时返回记录点！\n\u00a77 ",{"translate":"block.minecraft.crimson_pressure_plate","color":"aqua"},"代表终点。\n"] # team join lobby,tag=mazing @@ -11,4 +15,4 @@ tag @s remove parkouring tag @s add mazing playsound ui.button.click player @s ~ ~ ~ effect clear @s jump_boost -effect clear @s speed \ No newline at end of file +effect clear @s speed diff --git a/datapacks/map_all/data/minecraft/functions/maze/plset.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/plset.mcfunction index 77656cde..4e9e21c5 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/plset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/plset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 kill @e[tag=flaged1] @@ -16,4 +20,4 @@ function maze/calctime execute if score @s parkour.second matches ..9 if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches ..9 if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] -execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] \ No newline at end of file +execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] diff --git a/datapacks/map_all/data/minecraft/functions/maze/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/reset.mcfunction index 5891064b..ed9cc73d 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的跑酷已经重置！"] @@ -6,3 +10,4 @@ playsound ui.button.click player @s tp @s 235 115 66 -90 0 # function minecraft:maze/resettime # function minecraft:maze/join + diff --git a/datapacks/map_all/data/minecraft/functions/maze/resettime.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/resettime.mcfunction index 88c18fa4..3009a069 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/resettime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/resettime.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s parkour.tick scoreboard players reset @s parkour.second scoreboard players reset @s parkour.minute scoreboard players reset @s parkour.hour scoreboard players reset @s parkour.stick title @s actionbar ["\u00a7a你的时间已经重置到 \u00a7b[0:00.00]"] -function maze/setpoint \ No newline at end of file +function maze/setpoint diff --git a/datapacks/map_all/data/minecraft/functions/maze/resettimeonly.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/resettimeonly.mcfunction index d1a75250..135f3c76 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/resettimeonly.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/resettimeonly.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s parkour.tick scoreboard players reset @s parkour.second scoreboard players reset @s parkour.minute scoreboard players reset @s parkour.hour scoreboard players reset @s parkour.stick -title @s actionbar ["\u00a7a你的时间已经重置到 \u00a7b[0:00.00]"] \ No newline at end of file +title @s actionbar ["\u00a7a你的时间已经重置到 \u00a7b[0:00.00]"] diff --git a/datapacks/map_all/data/minecraft/functions/maze/second.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/second.mcfunction index 5076f370..2e25a4db 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/second.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[type=marker,tag=park] at @s run data merge entity @s {Duration:2147483647,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Radius:0f} 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",tag:{park:1}}]}] hotbar.4 with carrot_on_a_stick{Unbreakable:1b,Enchantments:[{id:"unbreaking",lvl:1}],display:{Name:'"\\u00a7aCheckpoint \\u00a77(Right click)"',Lore:['"\\u00a7bReturn to parkour checkpoint"']},park:1,CustomModelData:5} \ No newline at end of file +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] diff --git a/datapacks/map_all/data/minecraft/functions/maze/setpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/setpoint.mcfunction index 61886c7d..ff8b5f10 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/setpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/setpoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 tag @a[tag=park.sel] remove park.sel @@ -5,3 +9,4 @@ scoreboard players set park.tmp park.uuid 0 execute if entity @e[tag=flaged1,distance=0..1.5] run title @s actionbar ["\u00a7c[你的记录点已经设置过了]"] execute unless entity @e[tag=flaged1,distance=0..1.5] align xyz positioned ~0.5 ~0 ~0.5 rotated ~ 0 run function minecraft:maze/plset tag @e[tag=flaged1] remove flaged1 + diff --git a/datapacks/map_all/data/minecraft/functions/maze/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/maze/tick.mcfunction index a5ee0b8e..336b25e0 100644 --- a/datapacks/map_all/data/minecraft/functions/maze/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/maze/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players enable @a[team=lobby,tag=mazing] parkour execute as @a[scores={park.click=1..},team=lobby,tag=mazing] at @s run function minecraft:maze/backpoint scoreboard players reset @a[scores={park.click=1..},team=lobby,tag=mazing] park.click @@ -17,3 +21,4 @@ execute as @a[team=lobby,tag=mazing] at @s if block ~ ~ ~ warped_pressure_plate scoreboard players add @a[tag=mazing,team=lobby] parkour.tick 5 # 100 'tick' -> 's' + diff --git a/datapacks/map_all/data/minecraft/functions/npark/backpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/backpoint.mcfunction index 68455fcd..cf75e949 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/backpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/backpoint.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] at @s if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid rotated ~ 0 run tp @a[tag=park.sel] ~ ~ ~ tag @a[tag=park.sel] remove park.sel tellraw @s ["\u00a7a[记录点] \u00a7b你已返回记录点！\n",{"text":"\u00a7d[Back]","clickEvent": {"action": "run_command","value": "/trigger parkour set 1"},"hoverEvent": {"action": "show_text","value": "\u00a7b[信息] 你将会返回记录点"}}," ",{"text":"\u00a7e[Delete]","clickEvent": {"action": "run_command","value": "/trigger parkour set 3"},"hoverEvent": {"action": "show_text","value": "\u00a7e[警告] 你的所有的记录点都将消失！"}}," ",{"text":"\u00a7c[Reset]","clickEvent": {"action": "run_command","value": "/trigger parkour set 2"},"hoverEvent": {"action": "show_text","value": "\u00a7c[警告] 你的所有的进度都将消失！"}}," ",{"text":"\u00a76[Cancel]","clickEvent": {"action": "run_command","value": "/trigger parkour set 4"},"hoverEvent": {"action": "show_text","value": "\u00a7c[警告] 你的所有的进度都将消失！跑酷也将取消。"}}] effect give @s jump_boost 1 255 true -playsound ui.button.click player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound ui.button.click player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_all/data/minecraft/functions/npark/calctime.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/calctime.mcfunction index 1def5ee4..3b889a1c 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/calctime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/calctime.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set 100 board 100 scoreboard players set 60 board 60 scoreboard players operation @s parkour.second = @s parkour.tick @@ -9,3 +13,4 @@ scoreboard players operation @s parkour.minute = @s parkour.second scoreboard players operation @s parkour.minute /= 60 board scoreboard players operation @s parkour.second %= 60 board + diff --git a/datapacks/map_all/data/minecraft/functions/npark/cancel.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/cancel.mcfunction index f54e8175..3cd5eba0 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/cancel.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/cancel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的跑酷已经取消！"] @@ -5,3 +9,4 @@ tag @a[tag=park.sel] remove park.sel playsound ui.button.click player @s tag @s remove parkouring clear @s carrot_on_a_stick + diff --git a/datapacks/map_all/data/minecraft/functions/npark/delect.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/delect.mcfunction index fdfa3582..9bfcc84d 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/delect.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/delect.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tag @a[tag=park.sel] remove park.sel tellraw @s ["\u00a7a[Checkpoint] \u00a7e你的记录点已被删除！"] -playsound ui.button.click player @s \ No newline at end of file +playsound ui.button.click player @s diff --git a/datapacks/map_all/data/minecraft/functions/npark/end.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/end.mcfunction index 3ddc19c8..6fd4b394 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/end.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/end.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove parkouring tellraw @s ["\u00a7a\u00a7l\n你完成了这个跑酷！"] playsound entity.player.levelup player @s @@ -7,4 +11,4 @@ execute if score @s parkour.second matches ..9 if score @s parkour.stick matches execute if score @s parkour.second matches ..9 if score @s parkour.stick matches 10.. run tellraw @a [{"selector":"@s"},"\u00a7b\u00a7l 的跑酷用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @a [{"selector":"@s"},"\u00a7b\u00a7l 的跑酷用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s [{"selector":"@s"},"\u00a7b\u00a7l 的跑酷用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] -tellraw @s [""] \ No newline at end of file +tellraw @s [""] diff --git a/datapacks/map_all/data/minecraft/functions/npark/getuuid.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/getuuid.mcfunction index 520115d2..d9a037cc 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/getuuid.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/getuuid.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add p.uid park.uuid 1 scoreboard players operation @s park.uuid = p.uid park.uuid -tellraw @s ["\u00a77Debug Info : Your UUID is [",{"score":{"objective": "park.uuid","name": "@s"},"color": "gray"},"\u00a77]"] \ No newline at end of file +tellraw @s ["\u00a77Debug Info : Your UUID is [",{"score":{"objective": "park.uuid","name": "@s"},"color": "gray"},"\u00a77]"] diff --git a/datapacks/map_all/data/minecraft/functions/npark/join.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/join.mcfunction index 296aee78..15fc379d 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 \u00a7aParkour \u00a77!"] tellraw @s ["\n\u00a7b 欢迎加入跑酷大军！\n\u00a7a 您可以随时输入\u00a7d/trigger hub set 1\u00a7a返回大厅（出生点）！\n\u00a7a 在地图中，\u00a7f",{"translate":"block.minecraft.heavy_weighted_pressure_plate","color":"white"},"\u00a7a代表\u00a7e记录点\u00a7a，您可以随时返回记录点！\n\u00a77 ",{"translate":"block.minecraft.polished_blackstone_pressure_plate","color":"aqua"},"代表终点。\n"] # team join lobby,tag=parkouring @@ -12,3 +16,4 @@ playsound ui.button.click player @s ~ ~ ~ effect clear @s jump_boost effect clear @s speed tag @s remove mazing + diff --git a/datapacks/map_all/data/minecraft/functions/npark/plset.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/plset.mcfunction index ccec76ee..f0b7e7fb 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/plset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/plset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 kill @e[tag=flaged1] @@ -16,4 +20,4 @@ function npark/calctime execute if score @s parkour.second matches ..9 if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches ..9 if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:0",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] execute if score @s parkour.second matches 10.. if score @s parkour.stick matches 10.. run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] -execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] \ No newline at end of file +execute if score @s parkour.second matches 10.. if score @s parkour.stick matches ..9 run tellraw @s ["\u00a7b到达此记录点用时：\u00a7e[",{"score":{"name": "@s","objective": "parkour.minute"},"color": "yellow"},"\u00a7e:",{"score":{"name": "@s","objective": "parkour.second"},"color": "yellow"},"\u00a7e.0",{"score":{"name": "@s","objective": "parkour.stick"},"color": "yellow"},"\u00a7e]"] diff --git a/datapacks/map_all/data/minecraft/functions/npark/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/reset.mcfunction index d40f9966..dc58d4f2 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run kill @s tellraw @s ["\u00a7e你的跑酷已经重置！"] @@ -7,3 +11,4 @@ tp @s 188 115 -26 180 0 # function minecraft:npark/join playsound ui.button.click player @s # function minecraft:npark/resettime + diff --git a/datapacks/map_all/data/minecraft/functions/npark/resettime.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/resettime.mcfunction index f7285509..1eb4fead 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/resettime.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/resettime.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s parkour.tick scoreboard players reset @s parkour.second scoreboard players reset @s parkour.minute scoreboard players reset @s parkour.hour scoreboard players reset @s parkour.stick title @s actionbar ["\u00a7a你的时间已经重置到 \u00a7b[0:00.00]"] -function npark/setpoint \ No newline at end of file +function npark/setpoint diff --git a/datapacks/map_all/data/minecraft/functions/npark/second.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/second.mcfunction index fe5ba4b9..af454e9a 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/second.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + execute as @e[type=marker,tag=park] at @s run data merge entity @s {Duration:2147483647,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Radius:0f} spawnpoint @a[team=lobby,tag=parkouring] 61 19 -51 -90 effect give @a[team=lobby,tag=parkouring] resistance 5 25 true -item replace entity @a[team=lobby,tag=parkouring,nbt=!{Inventory:[{id:"minecraft:carrot_on_a_stick",tag:{park:1}}]}] hotbar.4 with carrot_on_a_stick{Unbreakable:1b,Enchantments:[{id:"unbreaking",lvl:1}],display:{Name:'"\\u00a7aCheckpoint \\u00a77(Right click)"',Lore:['"\\u00a7bReturn to parkour checkpoint"']},park:1,CustomModelData:5} \ No newline at end of file +item replace entity @a[team=lobby,tag=parkouring,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] diff --git a/datapacks/map_all/data/minecraft/functions/npark/setpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/setpoint.mcfunction index ab4f4b50..e6ab1144 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/setpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/setpoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add park.sel execute at @s as @e[type=marker,tag=park] if score @s park.uuid = @a[tag=park.sel,limit=1] park.uuid run tag @s add flaged1 tag @a[tag=park.sel] remove park.sel @@ -5,3 +9,4 @@ scoreboard players set park.tmp park.uuid 0 execute if entity @e[tag=flaged1,distance=0..1.5] run title @s actionbar ["\u00a7c[你的记录点已经设置过了]"] execute unless entity @e[tag=flaged1,distance=0..1.5] align xyz positioned ~0.5 ~0 ~0.5 rotated ~ 0 run function minecraft:npark/plset tag @e[tag=flaged1] remove flaged1 + diff --git a/datapacks/map_all/data/minecraft/functions/npark/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/npark/tick.mcfunction index a33cea05..4355e2fc 100644 --- a/datapacks/map_all/data/minecraft/functions/npark/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/npark/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players enable @a[team=lobby,tag=parkouring] parkour execute as @a[scores={park.click=1..},team=lobby,tag=parkouring] at @s run function minecraft:npark/backpoint scoreboard players reset @a[scores={park.click=1..},team=lobby,tag=parkouring] park.click @@ -17,3 +21,4 @@ execute as @a[team=lobby,tag=parkouring] at @s if block ~ ~ ~ light_weighted_pre scoreboard players add @a[tag=parkouring,team=lobby] parkour.tick 5 # 100 'tick' -> 's' + diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/die.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/die.mcfunction index 2e442e83..73d908fc 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/die.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/die.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=pw.play] [{"selector":"@s"},"\u00a77 died."] -gamemode spectator @s \ No newline at end of file +gamemode spectator @s diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/gameover.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/gameover.mcfunction index 3d856f83..9c3f5d95 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/gameover.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/gameover.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a [{"text":"冬泳怪鸽","color":"#1E90FF","bold":true},"\u00a7a 游戏结束！ 获胜者：",{"selector":"@a[team=pw.play,gamemode=adventure]","color":"white"}] scoreboard players set pw.state state 0 scoreboard players add @a[gamemode=adventure,team=pw.play,tag=play.total] score 1 @@ -11,4 +15,4 @@ execute as @a[team=pw.play] run function poolwar/join tellraw @a[team=pw.play] ["\u00a7e没有正确返回？输入 \u00a7b/trigger hub \u00a7e返回大厅！"] scoreboard players reset * pw.max -scoreboard players reset * drown \ No newline at end of file +scoreboard players reset * drown diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/introduct.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/introduct.mcfunction index 08e3d44e..9cb45fc1 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/introduct.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/introduct.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n \u00a76※ ",{"text":"冬泳怪鸽","color":"#1E90FF","bold":true}," \u00a76游戏介绍\n\n ※ 背景 \u00a7a在游戏中，您将成为一个奇怪的鸽子，您喜欢游泳（此处采用直译）。但您一旦在水中停留时间过长，将会“原地去世”。您需要做的，便是让自己活下去。\n\u00a76 ※ 任务：\u00a7a活到最后。使用工具将对方击入水中。\n\u00a76 ※ 作者：\u00a7bGamom\n\n \u00a7d\u00a7l祝您游玩愉快！\n"] -playsound ui.toast.challenge_complete player @s ~ ~ ~ \ No newline at end of file +playsound ui.toast.challenge_complete player @s ~ ~ ~ diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/join.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/join.mcfunction index 3f34a69f..281aa771 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/join.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=!pw.wait] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 加入了 ",{"text":"冬泳怪鸽","color":"#1E90FF","bold": true}," \u00a77!"] team join pw.wait -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=pw.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @a[team=pw.wait] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] tp @s -93 20 -10 0 0 @@ -9,4 +13,4 @@ clear @s effect clear @s tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator -scoreboard players set @s pw.max 120 \ No newline at end of file +scoreboard players set @s pw.max 120 diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/resetdrown.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/resetdrown.mcfunction index 86800a15..16070ce4 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/resetdrown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/resetdrown.mcfunction @@ -1 +1,5 @@ -scoreboard players set @s drown 800 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set @s drown 800 diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/second.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/second.mcfunction index 24877387..d3ef4e76 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/second.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## Testfor -scoreboard players set play.pw tick 0 +scoreboard players set play.pw tick 0 execute as @a[team=pw.play,gamemode=adventure] run scoreboard players add play.pw tick 1 scoreboard players add play.pw state 0 execute if score play.pw tick matches ..1 if score pw.state state matches 1.. run function poolwar/gameover -execute as @a[team=pw.play,gamemode=adventure] at @s if score @s pw.max matches 35.. if block ~ ~ ~ water run scoreboard players remove @s pw.max 5 \ No newline at end of file +execute as @a[team=pw.play,gamemode=adventure] at @s if score @s pw.max matches 35.. if block ~ ~ ~ water run scoreboard players remove @s pw.max 5 diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/spec.mcfunction index 2d1a7c5e..16c2e620 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c游戏已经开始了！您可以旁观游戏，或者输入 \u00a7b/trigger hub \u00a7c返回大厅。"] -gamemode spectator @s \ No newline at end of file +gamemode spectator @s diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/start.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/start.mcfunction index c3b80c91..48c5ee37 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=pw.wait] subtitle ["\u00a7r冬泳怪鸽"] title @a[team=pw.wait] title ["\u00a7a\u00a7l游戏开始"] fill -91 16 -12 -95 16 -8 minecraft:barrier @@ -5,10 +9,10 @@ team join pw.play @a[team=pw.wait] execute as @a[team=pw.play,gamemode=adventure] run spreadplayers -93 -10 0 12 under 12 false @s execute as @a[team=pw.play,gamemode=adventure] run clear @s execute as @a[team=pw.play,gamemode=adventure] run effect clear @s -execute as @a[team=pw.play,gamemode=adventure] run item replace entity @s armor.feet with leather_boots{Enchantments:[{id:"binding_curse",lvl:1},{id:"frost_walker",lvl:1}],Unbreakable:1b,display:{color:1105614},HideFlags:63} 1 -execute as @a[team=pw.play,gamemode=adventure] run item replace entity @s container.0 with stick{Enchantments:[{id:"knockback",lvl:2}],Unbreakable:1b,display:{color:1105614},HideFlags:63} 1 +execute as @a[team=pw.play,gamemode=adventure] run item replace entity @s armor.feet with leather_boots[enchantments={levels:{"minecraft:binding_curse":1,"minecraft:frost_walker":1},show_in_tooltip:false},unbreakable={show_in_tooltip:false},dyed_color={rgb:1105614}] 1 +execute as @a[team=pw.play,gamemode=adventure] run item replace entity @s container.0 with stick[enchantments={levels:{"minecraft:knockback":2},show_in_tooltip:false},unbreakable={show_in_tooltip:false},dyed_color={rgb:1105614}] 1 scoreboard players set pw.state state 1 scoreboard players reset * pw.max scoreboard players reset * drown scoreboard players set @a[team=pw.play] drown 120 -scoreboard players set @a[team=pw.play] pw.max 120 \ No newline at end of file +scoreboard players set @a[team=pw.play] pw.max 120 diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/teststart.mcfunction index 976c3f6d..e46971ba 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/teststart.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=pw.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 scoreboard players add pw.state state 0 execute if score pw.state state matches 1.. run function minecraft:poolwar/spec execute unless score pw.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score pw.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute unless score pw.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:poolwar/start + diff --git a/datapacks/map_all/data/minecraft/functions/poolwar/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/poolwar/tick.mcfunction index 78ee7d12..a1e57b6c 100644 --- a/datapacks/map_all/data/minecraft/functions/poolwar/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/poolwar/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=pw.play,gamemode=adventure] at @s if block ~ ~ ~ water run scoreboard players remove @s drown 1 execute as @a[team=pw.play,gamemode=adventure] at @s if block ~ ~ ~ air if block ~ ~1 ~ air if score @s drown < @s pw.max run scoreboard players add @s drown 1 execute as @a[team=pw.play,gamemode=adventure] at @s if block ~ ~ ~ air if block ~ ~1 ~ air if score @s drown < @s pw.max run title @s actionbar ["\u00a7d\u00a7l您正在休息... ",{"score":{"objective": "drown","name": "@s"},"color": "aqua"}," \u00a76/ \u00a7a",{"score":{"objective": "pw.max","name": "@s"},"color": "green"}] @@ -13,4 +17,4 @@ execute as @a[team=pw.play,gamemode=adventure] at @s as @e[type=item,distance=.. # execute as @a[team=pw.play] at @s run scoreboard players add @s drown 1 effect give @a[team=pw.play] resistance 1 25 true effect give @a[team=pw.wait] resistance 1 25 true -execute as @a[team=pw.play,gamemode=adventure] at @s if block ~ ~ ~ water if score @s drown matches ..0 run function poolwar/die \ No newline at end of file +execute as @a[team=pw.play,gamemode=adventure] at @s if block ~ ~ ~ water if score @s drown matches ..0 run function poolwar/die diff --git a/datapacks/map_all/data/minecraft/functions/pvelobby/join.mcfunction b/datapacks/map_all/data/minecraft/functions/pvelobby/join.mcfunction index 5f07b3d5..ead02230 100644 --- a/datapacks/map_all/data/minecraft/functions/pvelobby/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/pvelobby/join.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in overworld run tp @s 257 88.5 113 90 0 playsound entity.enderman.teleport player @s ~ ~ ~ 1 2 1 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/getpos.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/getpos.mcfunction index 7ad25e45..d4f3ef1b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/getpos.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/getpos.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute store result score boom.tmp.x1 board run data get entity @s Pos[0] execute store result score boom.tmp.z1 board run data get entity @s Pos[2] @@ -23,4 +27,4 @@ execute if score boom.tmp.x board matches 4.. run scoreboard players remove boom execute if score boom.tmp.z board matches 4.. run scoreboard players add boom.tmp.idx2 board 1 execute if score boom.tmp.z board matches 4.. run scoreboard players remove boom.tmp.z board 4 -# tellraw @a [{"score":{"objective": "board","name": "boom.tmp.idx1"}},":",{"score":{"objective": "board","name": "boom.tmp.idx2"}},":",{"score":{"objective": "board","name": "boom.tmp.x"}},",",{"score":{"objective": "board","name": "boom.tmp.z"}}] \ No newline at end of file +# tellraw @a [{"score":{"objective": "board","name": "boom.tmp.idx1"}},":",{"score":{"objective": "board","name": "boom.tmp.idx2"}},":",{"score":{"objective": "board","name": "boom.tmp.x"}},",",{"score":{"objective": "board","name": "boom.tmp.z"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/nextround.mcfunction index 33dc8b7e..e0321d7b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/nextround.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/action/getpos scoreboard players operation boom.in.idx1 board = boom.tmp.x board scoreboard players operation boom.in.idx2 board = boom.tmp.z board function small_games/chess/boom/action/unlockonlyoneplace -function small_games/chess/boom/nextround \ No newline at end of file +function small_games/chess/boom/nextround diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placeblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placeblack.mcfunction index c8ceb902..84e89720 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placeblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placeblack.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:small_games/chess/boom/check/cblack -function minecraft:small_games/chess/boom/action/nextround \ No newline at end of file +function minecraft:small_games/chess/boom/action/nextround diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placewhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placewhite.mcfunction index a5c7c169..a7f7595d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placewhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/placewhite.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:small_games/chess/boom/check/cwhite -function minecraft:small_games/chess/boom/action/nextround \ No newline at end of file +function minecraft:small_games/chess/boom/action/nextround diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_a.mcfunction index e650d596..6b18451c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 检测是否赢了---?> # /clone 79 125 50 79 125 50 75 106 54 -function minecraft:small_games/chess/boom/check/big_a \ No newline at end of file +function minecraft:small_games/chess/boom/check/big_a diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_b.mcfunction index 2a253f4a..be525d86 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/after_b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 检测是否赢了---?> # /clone 79 125 50 79 125 50 75 106 54 -function minecraft:small_games/chess/boom/check/big_b \ No newline at end of file +function minecraft:small_games/chess/boom/check/big_b diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/black.mcfunction index 67d6fd10..af716f1a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/black.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/action/getpos execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 0 run fill 79 125 60 77 125 58 black_wool execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 1 run fill 79 125 56 77 125 54 black_wool @@ -31,4 +35,4 @@ execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matc tellraw @a[team=chestgame] [{"translate":"\u00a70\u00a7l黑队\u00a76占领了 [%s, %s]","color": "gold","with":[{"score":{"name": "boom.tmp.idx1","objective": "board"},"color": "yellow"},{"score":{"name": "boom.tmp.idx2","objective": "board"},"color": "yellow"}]}] -function minecraft:small_games/chess/boom/action/takeover/after_b \ No newline at end of file +function minecraft:small_games/chess/boom/action/takeover/after_b diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/pj.mcfunction index d22652d2..985c88f3 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/pj.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 0 run fill 79 125 60 77 125 58 red_wool execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 1 run fill 79 125 56 77 125 54 red_wool execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 2 run fill 79 125 52 77 125 50 red_wool @@ -30,4 +34,4 @@ execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matc tellraw @a[team=chestgame] [{"translate":"\u00a7e\u00a7l平局：\u00a76 [%s, %s]","color": "gold","with":[{"score":{"name": "boom.tmp.idx1","objective": "board"},"color": "yellow"},{"score":{"name": "boom.tmp.idx2","objective": "board"},"color": "yellow"}]}] -function minecraft:small_games/chess/boom/check/pj \ No newline at end of file +function minecraft:small_games/chess/boom/check/pj diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/white.mcfunction index 873bfeda..8b04fa46 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/takeover/white.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/action/getpos execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 0 run fill 79 125 60 77 125 58 white_wool execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 1 run fill 79 125 56 77 125 54 white_wool @@ -32,3 +36,4 @@ execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matc tellraw @a[team=chestgame] [{"translate":"\u00a7f\u00a7l白队\u00a76占领了 [%s, %s]","color": "gold","with":[{"score":{"name": "boom.tmp.idx1","objective": "board"},"color": "yellow"},{"score":{"name": "boom.tmp.idx2","objective": "board"},"color": "yellow"}]}] function minecraft:small_games/chess/boom/action/takeover/after_a + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/unlockonlyoneplace.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/unlockonlyoneplace.mcfunction index 6d8f5a0e..7404fbc5 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/unlockonlyoneplace.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/action/unlockonlyoneplace.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 79 120 50 69 120 60 minecraft:orange_stained_glass replace glass scoreboard players set boom.fill.result board 0 @@ -13,4 +17,4 @@ execute store result score boom.fill.result board if score boom.in.idx1 board ma execute store result score boom.fill.result board if score boom.in.idx1 board matches 2 if score boom.in.idx2 board matches 2 run fill 71 120 52 69 120 50 glass replace orange_stained_glass execute if score boom.fill.result board matches ..0 run tellraw @a[team=chestgame,gamemode=adventure] ["\u00a7e该区域已被占满，所以您可以选择任意位置下这一步棋。"] -execute if score boom.fill.result board matches ..0 run fill 79 120 50 69 120 60 minecraft:glass replace orange_stained_glass \ No newline at end of file +execute if score boom.fill.result board matches ..0 run fill 79 120 50 69 120 60 minecraft:glass replace orange_stained_glass diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big.mcfunction index 3fd0b1a7..3f0fbfb4 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clone 79 125 50 79 125 50 75 106 54 clone 79 125 54 79 125 54 75 106 55 clone 79 125 58 79 125 58 75 106 56 @@ -17,3 +21,4 @@ execute if score chess.state state matches 1 store result score boom.fill.result execute if score chess.state state matches 1 if score boom.fill.result board matches 5.. run function minecraft:small_games/chess/boom/win/white execute if score chess.state state matches 1 run function minecraft:small_games/chess/boom/check/pj + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_a.mcfunction index 1f97e545..ee024e10 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:small_games/chess/boom/check/big clone 71 125 50 71 125 50 73 106 54 @@ -19,4 +23,4 @@ execute if score boom.tmp.idx1 board matches 1 if score boom.tmp.idx2 board matc execute if score boom.tmp.idx1 board matches 1 if score boom.tmp.idx2 board matches 2 positioned 74 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_a execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 0 positioned 73 106 56 run function minecraft:small_games/chess/boom/check/bigcheck2_a execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 1 positioned 73 106 55 run function minecraft:small_games/chess/boom/check/bigcheck2_a -execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 2 positioned 73 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_a \ No newline at end of file +execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 2 positioned 73 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_a diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_b.mcfunction index d1d1d80f..515099c0 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/big_b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:small_games/chess/boom/check/big clone 79 125 50 79 125 50 75 106 54 @@ -18,4 +22,4 @@ execute if score boom.tmp.idx1 board matches 1 if score boom.tmp.idx2 board matc execute if score boom.tmp.idx1 board matches 1 if score boom.tmp.idx2 board matches 2 positioned 74 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_b execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 0 positioned 73 106 56 run function minecraft:small_games/chess/boom/check/bigcheck2_b execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 1 positioned 73 106 55 run function minecraft:small_games/chess/boom/check/bigcheck2_b -execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 2 positioned 73 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_b \ No newline at end of file +execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 2 positioned 73 106 54 run function minecraft:small_games/chess/boom/check/bigcheck2_b diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_a.mcfunction index a142ce9b..493a7f8c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_a.mcfunction @@ -1,4 +1,8 @@ -setblock 74 111 33 white_wool +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +setblock 74 111 33 white_wool scoreboard players set whitecount board 1 # tellraw @a [0] # Part 1 @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score whitecount board matches 3.. run tellraw @a [3] -execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/win/white \ No newline at end of file +execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/win/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_b.mcfunction index cf06f9e5..55a479de 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/bigcheck2_b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 33 black_wool scoreboard players set whitecount board 1 # tellraw @a [0] @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score whitecount board matches 3.. run tellraw @a [3] -execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/win/black \ No newline at end of file +execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/win/black diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/a.mcfunction index 68e50d64..1ccf770e 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. run function small_games/chess/boom/check/black/a -# setblock 74 111 55 black_wool -# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 black_wool +# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/b.mcfunction index e6830ae4..1613af61 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/c.mcfunction index f269db93..e0ab93af 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/checkmain.mcfunction index f44675c7..94ba59b9 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/checkmain.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 black_wool scoreboard players set blackcount board 1 # tellraw @a [0] @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score blackcount board matches 5.. run tellraw @a [5] -execute if score blackcount board matches 3.. run function small_games/chess/boom/action/takeover/black \ No newline at end of file +execute if score blackcount board matches 3.. run function small_games/chess/boom/action/takeover/black diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/d.mcfunction index 93cf9f28..41b0e762 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/e.mcfunction index 68a76655..bb631b8a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/f.mcfunction index f0f35714..05a5b2f1 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/g.mcfunction index aaa7f674..41cef249 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/h.mcfunction index 2698cd0f..88fbf79c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/black/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 3.. at @s run function small_games/chess/boom/check/black/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cblack.mcfunction index 47e3af96..0f6d6c85 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cblack.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/check/black/checkmain # execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround -function minecraft:small_games/chess/boom/check/smallpj \ No newline at end of file +function minecraft:small_games/chess/boom/check/smallpj diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/checkbig2.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/checkbig2.mcfunction index caf7bf50..7c06ee24 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/checkbig2.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/checkbig2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clone 79 125 50 79 125 50 75 106 54 clone 79 125 54 79 125 54 75 106 55 clone 79 125 58 79 125 58 75 106 56 @@ -18,4 +22,4 @@ tellraw @a[team=chestgame] {"translate":"当前占领：\n\u00a70\u00a7l黑队 % execute if score chess.state state matches 1 if score boom.fill.result.white board = boom.fill.result.black board run function minecraft:small_games/chess/boom/win/pj execute if score chess.state state matches 1 if score boom.fill.result.white board < boom.fill.result.black board run function minecraft:small_games/chess/boom/win/black -execute if score chess.state state matches 1 if score boom.fill.result.white board > boom.fill.result.black board run function minecraft:small_games/chess/boom/win/white \ No newline at end of file +execute if score chess.state state matches 1 if score boom.fill.result.white board > boom.fill.result.black board run function minecraft:small_games/chess/boom/win/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cwhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cwhite.mcfunction index bbfabc26..f7f1efe7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cwhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/cwhite.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/check/white/checkmain # execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround function minecraft:small_games/chess/boom/check/smallpj + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/pj.mcfunction index c9e1d2e8..1e51bfce 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/pj.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # clone 67 115 48 81 115 62 66 100 47 # fill 66 100 47 80 100 61 lime_wool replace black_wool # fill 66 100 47 80 100 61 lime_wool replace white_wool @@ -18,3 +22,4 @@ scoreboard players set boom.fill.result board 0 execute if score chess.state state matches 1 store result score boom.fill.result board run fill 73 106 56 75 106 54 minecraft:air replace #wool execute if score chess.state state matches 1 if score boom.fill.result board matches 9.. run function minecraft:small_games/chess/boom/check/checkbig2 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/smallpj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/smallpj.mcfunction index 11ab6df3..0c259031 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/smallpj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/smallpj.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/boom/action/getpos execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 0 run clone 79 120 60 77 120 58 77 101 50 execute if score boom.tmp.idx1 board matches 0 if score boom.tmp.idx2 board matches 1 run clone 79 120 56 77 120 54 77 101 50 @@ -10,3 +14,4 @@ execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matc execute if score boom.tmp.idx1 board matches 2 if score boom.tmp.idx2 board matches 2 run clone 71 120 52 69 120 50 77 101 50 execute store result score boom.fill.result board run fill 77 101 50 79 101 52 air replace #minecraft:chessglass execute if score chess.state state matches 1 if score boom.fill.result board matches 9.. run function minecraft:small_games/chess/boom/action/takeover/pj + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/a.mcfunction index 67c4d1a6..19800a95 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. run function small_games/chess/boom/check/white/a -# setblock 74 111 55 white_wool -# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 white_wool +# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/b.mcfunction index 9bcd9b2b..c05753d6 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/b -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/c.mcfunction index 6968d7d5..4a2a2fa2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/c -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/checkmain.mcfunction index b01abfcb..a8489045 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/checkmain.mcfunction @@ -1,4 +1,8 @@ -setblock 74 111 55 white_wool +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +setblock 74 111 55 white_wool scoreboard players set whitecount board 1 # tellraw @a [0] # Part 1 @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score whitecount board matches 3.. run tellraw @a [3] -execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/action/takeover/white \ No newline at end of file +execute if score whitecount board matches 3.. at @s run function small_games/chess/boom/action/takeover/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/d.mcfunction index d1efc006..dc523702 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/d -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/e.mcfunction index 390f0bff..035e8071 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/e -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/f.mcfunction index f018bf94..30d44302 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/f -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/g.mcfunction index 175af57b..e5c98727 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/g -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/h.mcfunction index b0b368f6..9b01fa72 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/check/white/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 3.. at @s run function small_games/chess/boom/check/white/h -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/confirm_point_block.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/confirm_point_block.mcfunction index b410a6c1..ff751e6a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/confirm_point_block.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/confirm_point_block.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute store result score boom.tmp.x1 board run data get block ~ ~ ~ x execute store result score boom.tmp.z1 board run data get block ~ ~ ~ z @@ -23,4 +27,4 @@ execute if score boom.tmp.x board matches 4.. run scoreboard players remove boom execute if score boom.tmp.z board matches 4.. run scoreboard players add boom.tmp.idx2 board 1 execute if score boom.tmp.z board matches 4.. run scoreboard players remove boom.tmp.z board 4 -tellraw @a [{"score":{"objective": "board","name": "boom.tmp.idx1"}},":",{"score":{"objective": "board","name": "boom.tmp.idx2"}},":",{"score":{"objective": "board","name": "boom.tmp.x"}},",",{"score":{"objective": "board","name": "boom.tmp.z"}}] \ No newline at end of file +tellraw @a [{"score":{"objective": "board","name": "boom.tmp.idx1"}},":",{"score":{"objective": "board","name": "boom.tmp.idx2"}},":",{"score":{"objective": "board","name": "boom.tmp.x"}},",",{"score":{"objective": "board","name": "boom.tmp.z"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/init.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/init.mcfunction index 96dcdbc8..efe6c5be 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/init.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=marker,tag=chess.point] kill @e[tag=chess.display] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/nextround.mcfunction index b8b697b5..aa7c36bb 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/nextround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=chestgame] #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 #/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 @@ -9,4 +13,4 @@ function minecraft:small_games/chess/boom/action/check/pj execute if score chess.state state matches 2 run scoreboard players set chess.turn board 0 execute if score chess.turn board matches 1 run function small_games/chess/boom/turn/black -execute if score chess.turn board matches 2 run function small_games/chess/boom/turn/white \ No newline at end of file +execute if score chess.turn board matches 2 run function small_games/chess/boom/turn/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/random_team.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/random_team.mcfunction index 6b604bf0..8eef9ce8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/random_team.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/random_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[tag=chess.ranteam] add chess.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -5,3 +9,4 @@ execute if score rand board matches ..1 run tag @a[tag=chess.ransel] add chess.b execute if score rand board matches 2.. run tag @a[tag=chess.ransel] add chess.white tag @a[tag=chess.ransel] remove chess.ranteam tag @a[tag=chess.ransel] remove chess.ransel + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/reset.mcfunction index e08dd192..038fd669 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill -77 138 -343 -46 138 -312 glass forceload add 82 47 66 63 fill 81 120 62 67 120 48 minecraft:acacia_leaves[persistent=false] @@ -33,4 +37,4 @@ fill 73 115 52 75 115 50 orange_wool fill 77 115 60 79 115 58 orange_wool fill 77 115 56 79 115 54 orange_wool -fill 77 115 52 79 115 50 orange_wool \ No newline at end of file +fill 77 115 52 79 115 50 orange_wool diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/second.mcfunction index 8ed07de3..1ae26a25 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ black_wool run particle minecraft:dust 0 0 0 1 ~ ~10 ~ 0 0 0 1 5 normal # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ white_wool run particle minecraft:dust 1 1 1 1 ~ ~10 ~ 0 0 0 1 5 normal title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7b\u00a7l下棋时间限制：",{"score":{"name": "chess.countdown","objective": "board"},"color": "red","bold": true},"\u00a7a秒"] @@ -15,4 +19,4 @@ execute if score chess.state state matches 1..1 if score chess.players.white boa execute if score chess.state state matches 1..1 if score chess.players.white board matches ..0 run function small_games/chess/boom/win/black execute if score chess.countdown board matches 1.. if score chess.state state matches 1 run scoreboard players remove chess.countdown board 1 -execute if score chess.countdown board matches ..0 run function small_games/chess/boom/turn/timeout \ No newline at end of file +execute if score chess.countdown board matches ..0 run function small_games/chess/boom/turn/timeout diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/start.mcfunction index 49e1cfb0..207a2b13 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=chess.put.white] kill @e[tag=chess.put.black] function small_games/chess/boom/reset @@ -24,3 +28,4 @@ tellraw @a[tag=chess.black] ["\n\u00a77 你在： \u00a70\u00a7l黑队\n\u00a tellraw @a[tag=chess.white] ["\n\u00a77 你在： \u00a7f\u00a7l白队\n\u00a7a 队友：",{"selector":"@a[tag=chess.white]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.black]"},"\n"] function small_games/chess/boom/nextround # Black First + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/black.mcfunction index 71c3e954..9e5b15ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/black.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.black] -give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.black"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/white.mcfunction index 003c1a56..d2354e2a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/things/white.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.white] -give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.white"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/tick.mcfunction index f12c382f..9f89fda6 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/tick.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=chess.put.white] at @s run function small_games/chess/boom/turntowhite execute as @e[tag=chess.put.black] at @s run function small_games/chess/boom/turntoblack tag @a[team=!chestgame] remove chess.black tag @a[team=!chestgame] remove chess.white -execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/boom/things/black +execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/boom/things/black execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run kill @s -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/boom/things/white -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s \ No newline at end of file +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/boom/things/white +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/black.mcfunction index 080f06b4..9aa5805a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/black.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a70\u00a7l黑队\u00a76下棋了。"] tellraw @a[tag=chess.black] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.black] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/boom/things/black title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/timeout.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/timeout.mcfunction index 44230e7e..d6fe68fe 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/timeout.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/timeout.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c超时，跳过！"] function small_games/chess/boom/nextround title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l超时跳过。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/white.mcfunction index 317c1dde..9f63905c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turn/white.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a7f\u00a7l白队\u00a76下棋了。"] tellraw @a[tag=chess.white] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.white] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/boom/things/white title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7a\u00a7l该你下棋了。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntoblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntoblack.mcfunction index 65edd555..170b0621 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntoblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntoblack.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ black_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ black_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ execute at @s run function small_games/chess/boom/action/placeblack # execute if score chess.state state matches 1 run function small_games/chess/boom/check/pj kill @s -#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntowhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntowhite.mcfunction index 6c1ff625..11e4e18e 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntowhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/turntowhite.mcfunction @@ -1,9 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ white_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ white_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ # function small_games/chess/five/check/pj execute at @s run function small_games/chess/boom/action/placewhite # execute if score chess.state state matches 1 run function small_games/chess/boom/check/pj kill @s #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/black.mcfunction index 020aabce..2fedf0ef 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/black.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/pj.mcfunction index fa1ac5bf..060298fd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/pj.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7b\u00a7l平局！"] title @a[team=chestgame] title ["\u00a7b\u00a7l平局"] title @a[team=chestgame] subtitle ["\u00a7a你并没有输。"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/sthwrong.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/sthwrong.mcfunction index f2d0c31a..7407a576 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/sthwrong.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/sthwrong.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c\u00a7l人数不够！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7e出现错误"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -function small_games/chess/tp \ No newline at end of file +function small_games/chess/tp diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/white.mcfunction index 3f4de3f7..5f764796 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/boom/win/white.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.white] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/second.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/second.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/start.mcfunction index ab2d4b4a..f64dbbd7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c该棋类仍在制作！"] # kill @e[tag=chess.put.white] # kill @e[tag=chess.put.black] @@ -22,4 +26,4 @@ tellraw @s ["\u00a7c该棋类仍在制作！"] # tellraw @a[tag=chess.black] ["\n\u00a77 你在： \u00a70\u00a7l黑队\n\u00a7a 队友：",{"selector":"@a[tag=chess.black]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.white]"},"\n"] # tellraw @a[tag=chess.white] ["\n\u00a77 你在： \u00a7f\u00a7l白队\n\u00a7a 队友：",{"selector":"@a[tag=chess.white]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.black]"},"\n"] # function small_games/chess/five/nextround -# # Black First \ No newline at end of file +# # Black First diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/tick.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/ch_chess/tick.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/a.mcfunction index 7cdccb31..b37d6d3d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. run function small_games/chess/five/check/black/a -# setblock 74 111 55 black_wool -# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 black_wool +# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/b.mcfunction index 20a701bf..95ea08e2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/c.mcfunction index 66a5def8..3807ead8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/checkmain.mcfunction index d6c1a5e9..e30e0fb7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/checkmain.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 black_wool scoreboard players set blackcount board 1 # tellraw @a [0] @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score blackcount board matches 5.. run tellraw @a [5] -execute if score blackcount board matches 5.. run function small_games/chess/five/win/black \ No newline at end of file +execute if score blackcount board matches 5.. run function small_games/chess/five/win/black diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/d.mcfunction index 63a0ba2a..ee68379c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/e.mcfunction index 1b2a88ff..53672d1a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/f.mcfunction index 30a966b1..2ae0372a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/g.mcfunction index 9560fd4d..79df011d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/h.mcfunction index a96b82e0..1bacb6dd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/black/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkblack.mcfunction index 830a1c4e..c8a5b59c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkblack.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/five/check/black/checkmain -execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround \ No newline at end of file +execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkwhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkwhite.mcfunction index 4e9695c7..ba74ee7d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkwhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/checkwhite.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/five/check/white/checkmain execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/pj.mcfunction index e5afb802..38e48b36 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/pj.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clone 67 115 48 81 115 62 66 100 47 fill 66 100 47 80 100 61 lime_wool replace black_wool fill 66 100 47 80 100 61 lime_wool replace white_wool fill 66 100 63 80 100 77 minecraft:lime_wool -execute if blocks 66 100 47 80 100 61 66 100 63 all run function small_games/chess/five/win/pj \ No newline at end of file +execute if blocks 66 100 47 80 100 61 66 100 63 all run function small_games/chess/five/win/pj diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/a.mcfunction index 00474a9c..fc30f6af 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. run function small_games/chess/five/check/white/a -# setblock 74 111 55 white_wool -# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 white_wool +# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/b.mcfunction index e557d6a7..9ab55812 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/b -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/c.mcfunction index d329b744..c5b805de 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/c -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/checkmain.mcfunction index b5c625d7..0c4727b2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/checkmain.mcfunction @@ -1,4 +1,8 @@ -setblock 74 111 55 white_wool +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +setblock 74 111 55 white_wool scoreboard players set whitecount board 1 # tellraw @a [0] # Part 1 @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score whitecount board matches 5.. run tellraw @a [5] -execute if score whitecount board matches 5.. run function small_games/chess/five/win/white \ No newline at end of file +execute if score whitecount board matches 5.. run function small_games/chess/five/win/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/d.mcfunction index 58515a0f..2162acb4 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/d -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/e.mcfunction index b48f269d..b25ebb30 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/e -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/f.mcfunction index a84e3057..a265f314 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/f -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/g.mcfunction index a5e6567b..882fd3ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/g -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/h.mcfunction index 75097741..7257c039 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/check/white/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/h -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/init.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/init.mcfunction index 96dcdbc8..efe6c5be 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/init.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=marker,tag=chess.point] kill @e[tag=chess.display] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/introduce.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/introduce.mcfunction index d7aebd61..1002ec9a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/introduce.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/introduce.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a76 ※ 五子棋介绍\n\n\u00a7a行棋：\u00a7f黑子先行，一人轮流一著下于棋盘空点处。\n\u00a7a胜负：\u00a7f先把五枚或以上己棋相连成任何横纵斜方向为胜。（长连仍算胜利）"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a76 ※ 五子棋介绍\n\n\u00a7a行棋：\u00a7f黑子先行，一人轮流一著下于棋盘空点处。\n\u00a7a胜负：\u00a7f先把五枚或以上己棋相连成任何横纵斜方向为胜。（长连仍算胜利）"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/nextround.mcfunction index 9536359c..efcc744f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/nextround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=chestgame] #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 #/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 @@ -6,4 +10,4 @@ scoreboard players add chess.turn board 1 execute if score chess.turn board matches 3.. run scoreboard players set chess.turn board 1 execute if score chess.turn board matches 1 run function small_games/chess/five/turn/black -execute if score chess.turn board matches 2 run function small_games/chess/five/turn/white \ No newline at end of file +execute if score chess.turn board matches 2 run function small_games/chess/five/turn/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/random_team.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/random_team.mcfunction index 6b604bf0..8eef9ce8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/random_team.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/random_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[tag=chess.ranteam] add chess.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -5,3 +9,4 @@ execute if score rand board matches ..1 run tag @a[tag=chess.ransel] add chess.b execute if score rand board matches 2.. run tag @a[tag=chess.ransel] add chess.white tag @a[tag=chess.ransel] remove chess.ranteam tag @a[tag=chess.ransel] remove chess.ransel + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/reset.mcfunction index accaf494..8a3bc25b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill -77 138 -343 -46 138 -312 glass forceload add 82 47 66 63 fill 81 120 62 67 120 48 glass @@ -7,4 +11,4 @@ forceload remove 82 47 66 63 kill @e[tag=chess.put.black] kill @e[tag=chess.put.white] scoreboard players set blackcount board 1 -scoreboard players set whitecount board 1 \ No newline at end of file +scoreboard players set whitecount board 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/second.mcfunction index 7573caf9..a78bb4bd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ black_wool run particle minecraft:dust 0 0 0 1 ~ ~10 ~ 0 0 0 1 5 normal # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ white_wool run particle minecraft:dust 1 1 1 1 ~ ~10 ~ 0 0 0 1 5 normal title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7b\u00a7l下棋时间限制：",{"score":{"name": "chess.countdown","objective": "board"},"color": "red","bold": true},"\u00a7a秒"] @@ -15,4 +19,4 @@ execute if score chess.state state matches 1..1 if score chess.players.white boa execute if score chess.state state matches 1..1 if score chess.players.white board matches ..0 run function small_games/chess/five/win/black execute if score chess.countdown board matches 1.. if score chess.state state matches 1 run scoreboard players remove chess.countdown board 1 -execute if score chess.countdown board matches ..0 run function small_games/chess/five/turn/timeout \ No newline at end of file +execute if score chess.countdown board matches ..0 run function small_games/chess/five/turn/timeout diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/start.mcfunction index 07ec07ef..c8a9b2fa 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=chess.put.white] kill @e[tag=chess.put.black] function small_games/chess/five/reset @@ -23,4 +27,4 @@ tellraw @a[tag=chess.black] ["\n\u00a77 你在： \u00a70\u00a7l黑队\n\u00a tellraw @a[tag=chess.white] ["\n\u00a77 你在： \u00a7f\u00a7l白队\n\u00a7a 队友：",{"selector":"@a[tag=chess.white]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.black]"},"\n"] function small_games/chess/five/nextround # Black First -execute as @a[team=chestgame] run function minecraft:small_games/chess/five/introduce \ No newline at end of file +execute as @a[team=chestgame] run function minecraft:small_games/chess/five/introduce diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/black.mcfunction index 71c3e954..9e5b15ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/black.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.black] -give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.black"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/white.mcfunction index 003c1a56..d2354e2a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/things/white.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.white] -give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.white"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/tick.mcfunction index 3fc17cf4..c6ffc734 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/tick.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=chess.put.white] at @s run function small_games/chess/five/turntowhite execute as @e[tag=chess.put.black] at @s run function small_games/chess/five/turntoblack tag @a[team=!chestgame] remove chess.black tag @a[team=!chestgame] remove chess.white -execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/black +execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/black execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run kill @s -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/white -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s \ No newline at end of file +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/white +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/black.mcfunction index 62d43182..9af32b02 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/black.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a70\u00a7l黑队\u00a76下棋了。"] tellraw @a[tag=chess.black] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.black] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/five/things/black title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/timeout.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/timeout.mcfunction index 8fa5e619..14e030cd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/timeout.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/timeout.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c超时，跳过！"] function small_games/chess/five/nextround title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l超时跳过。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/white.mcfunction index 7a622f58..da244551 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turn/white.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a7f\u00a7l白队\u00a76下棋了。"] tellraw @a[tag=chess.white] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.white] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/five/things/white title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7a\u00a7l该你下棋了。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntoblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntoblack.mcfunction index 59a6a3c5..6fb73749 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntoblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntoblack.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ black_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ black_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ function small_games/chess/five/check/checkblack execute if score chess.state state matches 1 run function small_games/chess/five/check/pj kill @s -#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntowhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntowhite.mcfunction index 9776c385..b4e3f39d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntowhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/turntowhite.mcfunction @@ -1,9 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ white_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ white_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ # function small_games/chess/five/check/pj function small_games/chess/five/check/checkwhite execute if score chess.state state matches 1 run function small_games/chess/five/check/pj kill @s #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/black.mcfunction index 020aabce..2fedf0ef 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/black.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/pj.mcfunction index fa1ac5bf..060298fd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/pj.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7b\u00a7l平局！"] title @a[team=chestgame] title ["\u00a7b\u00a7l平局"] title @a[team=chestgame] subtitle ["\u00a7a你并没有输。"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/sthwrong.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/sthwrong.mcfunction index f2d0c31a..7407a576 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/sthwrong.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/sthwrong.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c\u00a7l人数不够！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7e出现错误"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -function small_games/chess/tp \ No newline at end of file +function small_games/chess/tp diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/white.mcfunction index 3f4de3f7..5f764796 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/five/win/white.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.white] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/a.mcfunction index 7cdccb31..b37d6d3d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. run function small_games/chess/five/check/black/a -# setblock 74 111 55 black_wool -# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 black_wool +# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/b.mcfunction index 20a701bf..95ea08e2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/c.mcfunction index 66a5def8..3807ead8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/checkmain.mcfunction index d6c1a5e9..e30e0fb7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/checkmain.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 black_wool scoreboard players set blackcount board 1 # tellraw @a [0] @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score blackcount board matches 5.. run tellraw @a [5] -execute if score blackcount board matches 5.. run function small_games/chess/five/win/black \ No newline at end of file +execute if score blackcount board matches 5.. run function small_games/chess/five/win/black diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/d.mcfunction index 63a0ba2a..ee68379c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/e.mcfunction index 1b2a88ff..53672d1a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/f.mcfunction index 30a966b1..2ae0372a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/g.mcfunction index 9560fd4d..79df011d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/h.mcfunction index a96b82e0..1bacb6dd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/black/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add blackcount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score blackcount board matches 5.. at @s run function small_games/chess/five/check/black/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkblack.mcfunction index 830a1c4e..c8a5b59c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkblack.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/five/check/black/checkmain -execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround \ No newline at end of file +execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkwhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkwhite.mcfunction index 4e9695c7..ba74ee7d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkwhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/checkwhite.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function small_games/chess/five/check/white/checkmain execute if score chess.state state matches 1..1 run function small_games/chess/five/nextround + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/pj.mcfunction index e5afb802..38e48b36 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/pj.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clone 67 115 48 81 115 62 66 100 47 fill 66 100 47 80 100 61 lime_wool replace black_wool fill 66 100 47 80 100 61 lime_wool replace white_wool fill 66 100 63 80 100 77 minecraft:lime_wool -execute if blocks 66 100 47 80 100 61 66 100 63 all run function small_games/chess/five/win/pj \ No newline at end of file +execute if blocks 66 100 47 80 100 61 66 100 63 all run function small_games/chess/five/win/pj diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/a.mcfunction index 00474a9c..fc30f6af 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~ # tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. run function small_games/chess/five/check/white/a -# setblock 74 111 55 white_wool -# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 white_wool +# tellraw @a [{"score":{"name": "whitecount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/b.mcfunction index e557d6a7..9ab55812 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/b -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/c.mcfunction index d329b744..c5b805de 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/c -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/checkmain.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/checkmain.mcfunction index b5c625d7..0c4727b2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/checkmain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/checkmain.mcfunction @@ -1,4 +1,8 @@ -setblock 74 111 55 white_wool +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +setblock 74 111 55 white_wool scoreboard players set whitecount board 1 # tellraw @a [0] # Part 1 @@ -42,4 +46,4 @@ kill @e[tag=chess.calc] # Total # execute unless score whitecount board matches 5.. run tellraw @a [5] -execute if score whitecount board matches 5.. run function small_games/chess/five/win/white \ No newline at end of file +execute if score whitecount board matches 5.. run function small_games/chess/five/win/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/d.mcfunction index 58515a0f..2162acb4 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/d -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/e.mcfunction index b48f269d..b25ebb30 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/e -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/f.mcfunction index a84e3057..a265f314 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/f -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/g.mcfunction index a5e6567b..882fd3ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-1 ~ ~1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/g -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/h.mcfunction index 75097741..7257c039 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/check/white/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~1 ~ ~-1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players add whitecount board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all unless score whitecount board matches 5.. at @s run function small_games/chess/five/check/white/h -# setblock 74 111 55 white_wool +# setblock 74 111 55 white_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/init.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/init.mcfunction index 96dcdbc8..efe6c5be 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/init.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=marker,tag=chess.point] kill @e[tag=chess.display] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/introduce.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/introduce.mcfunction index bca6640c..96e68f77 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/introduce.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/introduce.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a76 ※ 围棋介绍\n\n\u00a7a行棋：\u00a7f黑子先行，一人轮流一著下于棋盘空点处。\n\u00a7a胜负：\u00a7f先把五枚或以上己棋相连成任何横纵斜方向为胜。（长连仍算胜利）"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a76 ※ 围棋介绍\n\n\u00a7a行棋：\u00a7f黑子先行，一人轮流一著下于棋盘空点处。\n\u00a7a胜负：\u00a7f先把五枚或以上己棋相连成任何横纵斜方向为胜。（长连仍算胜利）"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/nextround.mcfunction index 9536359c..efcc744f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/nextround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=chestgame] #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 #/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 @@ -6,4 +10,4 @@ scoreboard players add chess.turn board 1 execute if score chess.turn board matches 3.. run scoreboard players set chess.turn board 1 execute if score chess.turn board matches 1 run function small_games/chess/five/turn/black -execute if score chess.turn board matches 2 run function small_games/chess/five/turn/white \ No newline at end of file +execute if score chess.turn board matches 2 run function small_games/chess/five/turn/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/random_team.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/random_team.mcfunction index 6b604bf0..8eef9ce8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/random_team.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/random_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[tag=chess.ranteam] add chess.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -5,3 +9,4 @@ execute if score rand board matches ..1 run tag @a[tag=chess.ransel] add chess.b execute if score rand board matches 2.. run tag @a[tag=chess.ransel] add chess.white tag @a[tag=chess.ransel] remove chess.ranteam tag @a[tag=chess.ransel] remove chess.ransel + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/reset.mcfunction index 59489dd1..f1e67d26 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill -77 138 -343 -46 138 -312 glass forceload add 82 47 66 63 fill 81 120 62 67 120 48 glass @@ -237,4 +241,4 @@ summon marker 81 120 58 {Tags:["chess.marker"]} summon marker 81 120 59 {Tags:["chess.marker"]} summon marker 81 120 60 {Tags:["chess.marker"]} summon marker 81 120 61 {Tags:["chess.marker"]} -summon marker 81 120 62 {Tags:["chess.marker"]} \ No newline at end of file +summon marker 81 120 62 {Tags:["chess.marker"]} diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/second.mcfunction index 7573caf9..a78bb4bd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ black_wool run particle minecraft:dust 0 0 0 1 ~ ~10 ~ 0 0 0 1 5 normal # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ white_wool run particle minecraft:dust 1 1 1 1 ~ ~10 ~ 0 0 0 1 5 normal title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7b\u00a7l下棋时间限制：",{"score":{"name": "chess.countdown","objective": "board"},"color": "red","bold": true},"\u00a7a秒"] @@ -15,4 +19,4 @@ execute if score chess.state state matches 1..1 if score chess.players.white boa execute if score chess.state state matches 1..1 if score chess.players.white board matches ..0 run function small_games/chess/five/win/black execute if score chess.countdown board matches 1.. if score chess.state state matches 1 run scoreboard players remove chess.countdown board 1 -execute if score chess.countdown board matches ..0 run function small_games/chess/five/turn/timeout \ No newline at end of file +execute if score chess.countdown board matches ..0 run function small_games/chess/five/turn/timeout diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/start.mcfunction index a35859f4..987d3cbd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=chess.put.white] kill @e[tag=chess.put.black] function small_games/chess/go/reset @@ -22,4 +26,4 @@ scoreboard players set rand board 0 tellraw @a[tag=chess.black] ["\n\u00a77 你在： \u00a70\u00a7l黑队\n\u00a7a 队友：",{"selector":"@a[tag=chess.black]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.white]"},"\n"] tellraw @a[tag=chess.white] ["\n\u00a77 你在： \u00a7f\u00a7l白队\n\u00a7a 队友：",{"selector":"@a[tag=chess.white]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.black]"},"\n"] function small_games/chess/go/nextround -# Black First \ No newline at end of file +# Black First diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/black.mcfunction index 71c3e954..9e5b15ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/black.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.black] -give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.black"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/white.mcfunction index 003c1a56..d2354e2a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/things/white.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.white] -give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.white"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/tick.mcfunction index 3fc17cf4..c6ffc734 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/tick.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=chess.put.white] at @s run function small_games/chess/five/turntowhite execute as @e[tag=chess.put.black] at @s run function small_games/chess/five/turntoblack tag @a[team=!chestgame] remove chess.black tag @a[team=!chestgame] remove chess.white -execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/black +execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/black execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run kill @s -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/white -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s \ No newline at end of file +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/five/things/white +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/black.mcfunction index 62d43182..9af32b02 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/black.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a70\u00a7l黑队\u00a76下棋了。"] tellraw @a[tag=chess.black] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.black] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/five/things/black title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/timeout.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/timeout.mcfunction index 8fa5e619..14e030cd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/timeout.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/timeout.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c超时，跳过！"] function small_games/chess/five/nextround title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l超时跳过。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/white.mcfunction index 7a622f58..da244551 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turn/white.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a7f\u00a7l白队\u00a76下棋了。"] tellraw @a[tag=chess.white] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.white] at @s run playsound entity.experience_orb.pickup player @s function small_games/chess/five/things/white title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7a\u00a7l该你下棋了。"] -title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] \ No newline at end of file +title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntoblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntoblack.mcfunction index 59a6a3c5..6fb73749 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntoblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntoblack.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ black_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ black_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ function small_games/chess/five/check/checkblack execute if score chess.state state matches 1 run function small_games/chess/five/check/pj kill @s -#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntowhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntowhite.mcfunction index 9776c385..b4e3f39d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntowhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/turntowhite.mcfunction @@ -1,9 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ white_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ white_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ # function small_games/chess/five/check/pj function small_games/chess/five/check/checkwhite execute if score chess.state state matches 1 run function small_games/chess/five/check/pj kill @s #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/black.mcfunction index 020aabce..2fedf0ef 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/black.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/pj.mcfunction index fa1ac5bf..060298fd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/pj.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7b\u00a7l平局！"] title @a[team=chestgame] title ["\u00a7b\u00a7l平局"] title @a[team=chestgame] subtitle ["\u00a7a你并没有输。"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/sthwrong.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/sthwrong.mcfunction index f2d0c31a..7407a576 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/sthwrong.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/sthwrong.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c\u00a7l人数不够！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7e出现错误"] # title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -function small_games/chess/tp \ No newline at end of file +function small_games/chess/tp diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/white.mcfunction index 3f4de3f7..5f764796 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/go/win/white.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame,tag=chess.white] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/black.mcfunction index fb76a799..fda2ead0 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/black.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 black_stained_glass setblock 74 110 55 white_stained_glass @@ -48,3 +52,4 @@ function minecraft:small_games/chess/gojp/change/ways/sh execute if score chess.tmp board matches 1.. run fill 81 120 62 67 120 48 black_stained_glass replace lime_stained_glass execute if score chess.tmp board matches 0 run fill 81 120 62 67 120 48 white_stained_glass replace lime_stained_glass # tellraw @a ["8",{"score":{"objective": "board","name": "chess.tmp"}}] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/a.mcfunction index ff0030ec..220b0e20 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/a.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~ # tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. run function small_games/chess/gojp/change/ways/a -# setblock 74 111 55 black_wool -# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 black_wool +# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/b.mcfunction index 98ca49ae..4a336d06 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/b.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/c.mcfunction index e1ef6b65..9baac4ba 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/c.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/d.mcfunction index c72cec3a..e9c7a365 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/d.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/e.mcfunction index 3c858518..1d561ea7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/e.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/f.mcfunction index cb840cda..41a3799a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/f.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/g.mcfunction index c97a3d51..c20a795e 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/g.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 -execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass +execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/h.mcfunction index 7abb6fae..3b67c55a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/h.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all run setblock ~ ~-1 ~ lime_stained_glass execute at @s if block ~ ~-1 ~ lime_stained_glass unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/change/ways/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sa.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sa.mcfunction index b5ae4799..bdaf4af2 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sa.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sa.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} # execute as @e[type=marker,tag=chess.tmp] at @s run setblock ~ ~ ~ diamond_block execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/a -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sb.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sb.mcfunction index 3d6ee24e..59cd7e99 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sb.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sb.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sc.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sc.mcfunction index 9d1387cc..c5edb263 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sc.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sc.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sd.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sd.mcfunction index a3e70f66..235457cd 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sd.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sd.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/se.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/se.mcfunction index a5c88ea8..d7308deb 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/se.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/se.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sf.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sf.mcfunction index 90ad88e3..7a5359ab 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sf.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sf.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sg.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sg.mcfunction index abd1c507..38870f3c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sg.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sg.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sh.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sh.mcfunction index cdecc6a4..fbd93e69 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sh.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/ways/sh.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/change/ways/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/white.mcfunction index ae1bf592..5d9b0e07 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/change/white.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 110 55 black_stained_glass setblock 74 111 55 white_stained_glass @@ -40,3 +44,4 @@ scoreboard players set chess.tmp board 0 function minecraft:small_games/chess/gojp/change/ways/sh execute if score chess.tmp board matches 1.. run fill 81 120 62 67 120 48 white_stained_glass replace lime_stained_glass execute if score chess.tmp board matches 0 run fill 81 120 62 67 120 48 black_stained_glass replace lime_stained_glass + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/black_candown.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/black_candown.mcfunction index 06e1667f..fac4c117 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/black_candown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/black_candown.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set chess.tmp board 0 # 默认初始化为 0：false @@ -12,4 +16,4 @@ execute if score chess.tmp board matches 0 positioned ~2 ~ ~-2 if block ~ ~ ~ wh execute if score chess.tmp board matches 1.. run setblock ~ ~ ~ glass execute if score chess.tmp board matches 1.. run scoreboard players add chess.tmp.count board 1 -execute if score chess.tmp board matches 0 run setblock ~ ~ ~ red_stained_glass \ No newline at end of file +execute if score chess.tmp board matches 0 run setblock ~ ~ ~ red_stained_glass diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/blackpoint.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/blackpoint.mcfunction index a4a45a93..60834f2c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/blackpoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/blackpoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 black_stained_glass setblock 74 110 55 white_stained_glass fill 81 120 62 67 120 48 pink_stained_glass replace glass @@ -9,4 +13,4 @@ fill 81 120 62 67 120 48 pink_stained_glass replace red_stained_glass # /clone 67 120 48 81 120 62 66 100 47 execute if score chess.tmp.count board matches 0 run function minecraft:small_games/chess/gojp/turn/blackcantdown -execute unless score chess.tmp.count board matches 0 run scoreboard players set chess.tmp.flag board 0 \ No newline at end of file +execute unless score chess.tmp.count board matches 0 run scoreboard players set chess.tmp.flag board 0 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/final.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/final.mcfunction index ada4450f..cad267d8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/final.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/final.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76游戏结束！正在统计中..."] scoreboard players set boom.fill.result.b board 0 scoreboard players set boom.fill.result.w board 0 @@ -6,4 +10,4 @@ execute store result score boom.fill.result.b board run fill 81 120 62 67 120 48 # scoreboard players set chess.state state 2 execute if score chess.state state matches 1 if score boom.fill.result.w board > boom.fill.result.b board run function minecraft:small_games/chess/gojp/win/white execute if score chess.state state matches 1 if score boom.fill.result.w board < boom.fill.result.b board run function minecraft:small_games/chess/gojp/win/black -execute if score chess.state state matches 1 if score boom.fill.result.w board = boom.fill.result.b board run function minecraft:small_games/chess/gojp/win/pj \ No newline at end of file +execute if score chess.state state matches 1 if score boom.fill.result.w board = boom.fill.result.b board run function minecraft:small_games/chess/gojp/win/pj diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perblack.mcfunction index 2e74e3b4..b1d8323c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perblack.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute positioned ~2 ~ ~ if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown execute positioned ~2 ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown execute positioned ~2 ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown @@ -5,4 +9,4 @@ execute positioned ~-2 ~ ~ if block ~ ~ ~ pink_stained_glass run function minecr execute positioned ~-2 ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown execute positioned ~-2 ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown execute positioned ~ ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown -execute positioned ~ ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown \ No newline at end of file +execute positioned ~ ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/black_candown diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perwhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perwhite.mcfunction index d45688d8..cf4fe710 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perwhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/perwhite.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute positioned ~2 ~ ~ if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown execute positioned ~2 ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown execute positioned ~2 ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown @@ -5,4 +9,4 @@ execute positioned ~-2 ~ ~ if block ~ ~ ~ pink_stained_glass run function minecr execute positioned ~-2 ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown execute positioned ~-2 ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown execute positioned ~ ~ ~2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown -execute positioned ~ ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown \ No newline at end of file +execute positioned ~ ~ ~-2 if block ~ ~ ~ pink_stained_glass run function minecraft:small_games/chess/gojp/check/white_candown diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/a.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/a.mcfunction index 6fa38c9f..cfc28e0a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/a.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/a.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~ # tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. run function small_games/chess/gojp/check/ways/a -# setblock 74 111 55 black_wool -# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] \ No newline at end of file +# setblock 74 111 55 black_wool +# tellraw @a [{"score":{"name": "blackcount","objective": "board"}}] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/b.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/b.mcfunction index bcc63db5..57875dd6 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/b.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/b.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~ execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/c.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/c.mcfunction index 0531b619..7529537b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/c.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/c.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/d.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/d.mcfunction index aa4ab40e..e4568ab3 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/d.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/d.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~ ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/e.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/e.mcfunction index 8c20692c..9469a018 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/e.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/e.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/f.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/f.mcfunction index a75fd21c..42689cf4 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/f.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/f.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/g.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/g.mcfunction index 0ffad3cb..ebc09ea0 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/g.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/g.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~-2 ~ ~2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/h.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/h.mcfunction index 13c7bae5..6954c22d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/h.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/h.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s ~2 ~ ~-2 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 111 55 all run scoreboard players set chess.tmp board 1 execute at @s if blocks ~ ~-1 ~ ~ ~-1 ~ 74 110 55 all unless score chess.tmp board matches 1.. at @s run function small_games/chess/gojp/check/ways/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sa.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sa.mcfunction index 4a7939b1..df2e85c7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sa.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sa.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/a -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sb.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sb.mcfunction index 9a4eec59..258f7d1f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sb.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sb.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/b -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sc.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sc.mcfunction index 2efa4353..9a9b5b2c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sc.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sc.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/c -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sd.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sd.mcfunction index 71911664..5532fc89 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sd.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sd.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/d -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/se.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/se.mcfunction index ca6f5d5c..f958dbdf 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/se.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/se.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/e -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sf.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sf.mcfunction index 0a6a6af2..f872db85 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sf.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sf.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/f -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sg.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sg.mcfunction index ec907123..27ed8b9b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sg.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sg.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/g -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sh.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sh.mcfunction index 74599844..e43be808 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sh.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/ways/sh.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~1 ~ {Tags:["chess.tmp"]} execute as @e[type=marker,tag=chess.tmp] at @s run function small_games/chess/gojp/check/ways/h -# setblock 74 111 55 black_wool +# setblock 74 111 55 black_wool kill @e[type=marker,tag=chess.tmp] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/white_candown.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/white_candown.mcfunction index 524e3141..f3464187 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/white_candown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/white_candown.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set chess.tmp board 0 # 默认初始化为 0：false @@ -13,4 +17,4 @@ execute if score chess.tmp board matches 0 positioned ~2 ~ ~-2 if block ~ ~ ~ bl execute if score chess.tmp board matches 1.. run setblock ~ ~ ~ glass execute if score chess.tmp board matches 1.. run scoreboard players add chess.tmp.count board 1 -execute if score chess.tmp board matches 0 run setblock ~ ~ ~ red_stained_glass \ No newline at end of file +execute if score chess.tmp board matches 0 run setblock ~ ~ ~ red_stained_glass diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/whitepoint.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/whitepoint.mcfunction index 8e84c7f3..bf6f7a3b 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/whitepoint.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/check/whitepoint.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## setblock 74 111 55 white_stained_glass setblock 74 110 55 black_stained_glass scoreboard players set chess.tmp.count board 0 @@ -8,3 +12,4 @@ fill 81 120 62 67 120 48 pink_stained_glass replace red_stained_glass execute if score chess.tmp.count board matches 0 run function minecraft:small_games/chess/gojp/turn/whitecantdown execute unless score chess.tmp.count board matches 0 run scoreboard players set chess.tmp.flag board 0 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/init.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/init.mcfunction index 96dcdbc8..efe6c5be 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/init.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/init.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=marker,tag=chess.point] kill @e[tag=chess.display] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/introduce.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/introduce.mcfunction index 78c9989a..b9eb7241 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/introduce.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/introduce.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a76 ※ 黑白棋介绍\n\n\u00a7e\u00a7l棋规\n\n\u00a7f1．棋局开始时黑棋位于e4和d5，白棋位于d4和e5。（默认棋子）\n2．黑方先行，双方交替下棋。\n3．一步合法的棋步包括：在一个空格新落下一个棋子，并且翻转对手一个或多个棋子。\n4．新落下的棋子与棋盘上已有的同色棋子间，对方被夹住的所有棋子都要翻转过来。可以是横着夹，竖着夹，或是斜着夹。夹住的位置上必须全部是对手的棋子，不能有空格。\n5．一步棋可以在数个方向上翻棋，任何被夹住的棋子都必须被翻转过来，棋手无权选择不去翻某个棋子。\n6．除非至少翻转了对手的一个棋子，否则就不能落子。如果一方没有合法棋步，也就是说不管他下到哪里，都不能至少翻转对手的一个棋子，那他这一轮只能弃权，而由他的对手继续落子直到他有合法棋步可下。\n7．如果一方至少有一步合法棋步可下，他就必须落子，不得弃权。\n8．棋局持续下去，直到棋盘填满或者双方都无合法棋步可下。\n\n\u00a7a\u00a7b\u00a7l下子的方法\n\n\u00a7f把自己颜色的棋子放在棋盘的空格上，而当自己放下的棋子在横、竖、斜八个方向内有一个自己的棋子，则被夹在中间的全部翻转会成为自己的棋子。并且，只有在可以翻转棋子的地方才可以下子。\n"] + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/nextround.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/nextround.mcfunction index d7687d7a..a5b98d21 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/nextround.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/nextround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=chestgame] #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 #/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 @@ -7,4 +11,4 @@ scoreboard players add chess.turn board 1 execute if score chess.turn board matches 3.. run scoreboard players set chess.turn board 1 execute if score chess.turn board matches 1 run function small_games/chess/gojp/turn/black -execute if score chess.turn board matches 2 run function small_games/chess/gojp/turn/white \ No newline at end of file +execute if score chess.turn board matches 2 run function small_games/chess/gojp/turn/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/random_team.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/random_team.mcfunction index 6b604bf0..8eef9ce8 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/random_team.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/random_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[tag=chess.ranteam] add chess.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -5,3 +9,4 @@ execute if score rand board matches ..1 run tag @a[tag=chess.ransel] add chess.b execute if score rand board matches 2.. run tag @a[tag=chess.ransel] add chess.white tag @a[tag=chess.ransel] remove chess.ranteam tag @a[tag=chess.ransel] remove chess.ransel + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/reset.mcfunction index 68ac0eef..8a376be5 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill -77 138 -343 -46 138 -312 glass forceload add 82 47 66 63 fill 81 120 62 67 120 48 glass @@ -56,4 +60,4 @@ forceload remove 82 47 66 63 kill @e[tag=chess.put.black] kill @e[tag=chess.put.white] scoreboard players set blackcount board 1 -scoreboard players set whitecount board 1 \ No newline at end of file +scoreboard players set whitecount board 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/second.mcfunction index 09139f0f..14a76c60 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ black_wool run particle minecraft:dust 0 0 0 1 ~ ~10 ~ 0 0 0 1 5 normal # execute as @e[tag=chess.point] at @s if block ~ ~-1 ~ white_wool run particle minecraft:dust 1 1 1 1 ~ ~10 ~ 0 0 0 1 5 normal title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7b\u00a7l下棋时间限制：",{"score":{"name": "chess.countdown","objective": "board"},"color": "red","bold": true},"\u00a7a秒"] @@ -15,4 +19,4 @@ execute if score chess.state state matches 1..1 if score chess.players.white boa execute if score chess.state state matches 1..1 if score chess.players.white board matches ..0 run function small_games/chess/five/win/black execute if score chess.countdown board matches 1.. if score chess.state state matches 1 run scoreboard players remove chess.countdown board 1 -execute if score chess.countdown board matches ..0 run function small_games/chess/gojp/turn/timeout \ No newline at end of file +execute if score chess.countdown board matches ..0 run function small_games/chess/gojp/turn/timeout diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/start.mcfunction index 5680fe1e..3f08651d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=chess.put.white] kill @e[tag=chess.put.black] function small_games/chess/gojp/reset @@ -23,4 +27,4 @@ tellraw @a[tag=chess.black] ["\n\u00a77 你在： \u00a70\u00a7l黑队\n\u00a tellraw @a[tag=chess.white] ["\n\u00a77 你在： \u00a7f\u00a7l白队\n\u00a7a 队友：",{"selector":"@a[tag=chess.white]"},"\n\u00a7c 对手：",{"selector":"@a[tag=chess.black]"},"\n"] function small_games/chess/gojp/nextround # Black First -execute as @a[team=chestgame] run function minecraft:small_games/chess/gojp/introduce \ No newline at end of file +execute as @a[team=chestgame] run function minecraft:small_games/chess/gojp/introduce diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/black.mcfunction index 71c3e954..9e5b15ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/black.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.black] -give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.black,team=chestgame] minecraft:bat_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.black"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/white.mcfunction index 003c1a56..d2354e2a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/things/white.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[tag=chess.white] -give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +give @a[tag=chess.white,team=chestgame] minecraft:ghast_spawn_egg[entity_data={id:"minecraft:marker",Tags:["chess.put.white"]},can_place_on={predicates:[{blocks:['glass']}]},custom_data={hideFlags:63},custom_name='"\\u00a7a放置棋"'] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/tick.mcfunction index 3cd4bd15..9340d9ee 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/tick.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=chess.put.white] at @s run function small_games/chess/gojp/turntowhite execute as @e[tag=chess.put.black] at @s run function small_games/chess/gojp/turntoblack tag @a[team=!chestgame] remove chess.black tag @a[team=!chestgame] remove chess.white -execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/gojp/things/black +execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run function small_games/chess/gojp/things/black execute if score chess.turn board matches 1 as @a[tag=chess.black] at @s as @e[type=item,distance=0..10] run kill @s -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/gojp/things/white -execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s \ No newline at end of file +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run function small_games/chess/gojp/things/white +execute if score chess.turn board matches 2 as @a[tag=chess.white] at @s as @e[type=item,distance=0..10] run kill @s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/black.mcfunction index 7b56d6fc..4adcb1d9 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/black.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a70\u00a7l黑队\u00a76下棋了。"] tellraw @a[tag=chess.black] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.black] at @s run playsound entity.experience_orb.pickup player @s @@ -5,4 +9,4 @@ function small_games/chess/gojp/things/black title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l"] title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7a\u00a7l该你下棋了。"] -function small_games/chess/gojp/check/blackpoint \ No newline at end of file +function small_games/chess/gojp/check/blackpoint diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/blackcantdown.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/blackcantdown.mcfunction index 9fa59e36..06a4dbb1 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/blackcantdown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/blackcantdown.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score chess.tmp.flag board matches 1.. run function minecraft:small_games/chess/gojp/check/final scoreboard players set chess.tmp.flag board 1 execute if score chess.state state matches 1 run tellraw @a[team=chestgame] ["\u00a7a跳过\u00a70\u00a7l黑队\u00a7a下棋，因为他们没法下任何一颗！"] -execute if score chess.state state matches 1 run function minecraft:small_games/chess/gojp/turn/white \ No newline at end of file +execute if score chess.state state matches 1 run function minecraft:small_games/chess/gojp/turn/white diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/timeout.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/timeout.mcfunction index b9708f13..92e50eb1 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/timeout.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/timeout.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c超时，游戏结束！"] # function small_games/chess/five/nextround execute if score chess.turn board matches 1 run function small_games/chess/gojp/win/white execute if score chess.turn board matches 2 run function small_games/chess/gojp/win/black # title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7c\u00a7l超时跳过。"] -# title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] \ No newline at end of file +# title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。\u00a7c\u00a7l超时跳过。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/white.mcfunction index e3a7fe90..df2f76cc 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/white.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a76轮到\u00a7f\u00a7l白队\u00a76下棋了。"] tellraw @a[tag=chess.white] ["\u00a7a轮到你下棋了。\n\u00a77注意：你与你的队友本局只有1颗棋子可以下。"] execute as @a[tag=chess.white] at @s run playsound entity.experience_orb.pickup player @s @@ -6,3 +10,4 @@ function small_games/chess/gojp/things/white title @a[tag=chess.white] actionbar ["\u00a76\u00a7l你在\u00a7f\u00a7l白队。\u00a7a\u00a7l该你下棋了。"] title @a[tag=chess.black] actionbar ["\u00a76\u00a7l你在\u00a70\u00a7l黑队。"] function small_games/chess/gojp/check/whitepoint + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/whitecantdown.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/whitecantdown.mcfunction index 57f4aea8..e9d16ee4 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/whitecantdown.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turn/whitecantdown.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score chess.tmp.flag board matches 1.. run function minecraft:small_games/chess/gojp/check/final scoreboard players set chess.tmp.flag board 1 execute if score chess.state state matches 1 run tellraw @a[team=chestgame] ["\u00a7a跳过\u00a7f\u00a7l白队\u00a7a下棋，因为他们没法下任何一颗！"] -execute if score chess.state state matches 1 run function minecraft:small_games/chess/gojp/turn/black \ No newline at end of file +execute if score chess.state state matches 1 run function minecraft:small_games/chess/gojp/turn/black diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntoblack.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntoblack.mcfunction index 71d7dd3f..3b8f21ae 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntoblack.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntoblack.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ black_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ black_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ summon marker ~ ~-1 ~ {Tags:["chess.point"]} function small_games/chess/gojp/change/black execute if score chess.state state matches 1 run function small_games/chess/gojp/nextround @@ -8,4 +12,4 @@ execute if score chess.state state matches 1 run function small_games/chess/gojp # execute if score chess.state state matches 1 run function small_games/chess/gojp/check/pj kill @s -#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 \ No newline at end of file +#/give @p minecraft:bat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.black"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntowhite.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntowhite.mcfunction index 763476cc..cca057f7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntowhite.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/turntowhite.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill ~ ~-1 ~ ~ ~-1 ~ white_stained_glass replace glass fill ~ 115 ~ ~ 115 ~ white_wool replace orange_wool -playsound ui.button.click player @a[team=chestgame] ~ ~ ~ +playsound ui.button.click player @a[team=chestgame] ~ ~ ~ summon marker ~ ~-1 ~ {Tags:["chess.point"]} function small_games/chess/gojp/change/white # function small_games/chess/five/check/pj @@ -9,3 +13,4 @@ execute if score chess.state state matches 1 run function small_games/chess/gojp kill @s #/give @p minecraft:ghast_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["chess.put.white"]},CanPlaceOn:['glass'],hideFlags:63,display:{Name:'"\\u00a7a放置棋"'}} 1 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/black.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/black.mcfunction index 4dbe522f..7f8fbacb 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/black.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/black.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a70\u00a7l黑方\u00a76\u00a7l胜利！"] @@ -5,4 +9,4 @@ title @a[team=chestgame,tag=chess.black] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 fill 81 120 62 67 120 48 glass -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/pj.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/pj.mcfunction index c06977e1..ba300a1e 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/pj.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/pj.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7b\u00a7l平局！"] title @a[team=chestgame] title ["\u00a7b\u00a7l平局"] title @a[team=chestgame] subtitle ["\u00a7a你并没有输。"] @@ -5,4 +9,4 @@ title @a[team=chestgame] subtitle ["\u00a7a你并没有输。"] scoreboard players set chess.state state 2 fill 81 120 62 67 120 48 glass -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/sthwrong.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/sthwrong.mcfunction index 2de2a056..004e990c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/sthwrong.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/sthwrong.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7c\u00a7l人数不够！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7e出现错误"] @@ -5,4 +9,4 @@ title @a[team=chestgame] subtitle ["\u00a7e出现错误"] scoreboard players set chess.state state 2 fill 81 120 62 67 120 48 glass -function small_games/chess/tp \ No newline at end of file +function small_games/chess/tp diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/white.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/white.mcfunction index 56155cf5..97c9ed10 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/white.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/gojp/win/white.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=chestgame] ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] title @a[team=chestgame] title ["\u00a7c\u00a7lGame Over!"] title @a[team=chestgame] subtitle ["\u00a7f\u00a7l白方\u00a76\u00a7l胜利！"] @@ -5,4 +9,4 @@ title @a[team=chestgame,tag=chess.white] title ["\u00a76你赢了！"] scoreboard players set chess.state state 2 fill 81 120 62 67 120 48 glass -schedule function small_games/chess/tp 5s \ No newline at end of file +schedule function small_games/chess/tp 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/join.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/join.mcfunction index a81a502c..dbfde65d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in overworld run tp @s 87 125 20 -90 0 title @s title ["\u00a7c\u00a7l棋类游戏"] title @s subtitle ["\u00a7f打发时间的休闲小游戏"] @@ -10,4 +14,4 @@ tag @s remove chess.black # execute if score chess.state state matches 1.. run function minecraft:small_games/chess/spec clear @s tellraw @a ["\u00a7a\u00a7l[棋类游戏] ",{"selector":"@s"}," \u00a7d加入。"] -tellraw @s ["\u00a77欢迎光临咖啡厅~\n请您随便就坐。"] \ No newline at end of file +tellraw @s ["\u00a77欢迎光临咖啡厅~\n请您随便就坐。"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/modify.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/modify.mcfunction index 858de576..8bd2d0db 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/modify.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/modify.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute unless score chess.state state matches 1.. run scoreboard players add chest.type board 1 execute if score chess.state state matches 1.. run tellraw @s ["\u00a7c游戏开始后无法修改。"] @@ -7,4 +11,4 @@ execute if score chest.type board matches ..1 run data modify block 90 126 19 fr execute if score chest.type board matches 2 run data modify block 90 126 19 front_text.messages[1] set value '"\\u00a7b\\u00a7l[爆炸棋(Beta)]"' execute if score chest.type board matches 3 run data modify block 90 126 19 front_text.messages[1] set value '"\\u00a7d\\u00a7l[围棋]"' execute if score chest.type board matches 4 run data modify block 90 126 19 front_text.messages[1] set value '"\\u00a7e\\u00a7l[黑白棋(Alpha)]"' -# execute if score chest.type board matches 2 run data modify block 90 126 19 front_text.messages[(2-1)] set value '"\\u00a7b\\u00a7l[爆炸棋(Alpha)]"'} \ No newline at end of file +# execute if score chest.type board matches 2 run data modify block 90 126 19 front_text.messages[(2-1)] set value '"\\u00a7b\\u00a7l[爆炸棋(Alpha)]"'} diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/second.mcfunction index eb4d1921..d3626d12 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/second.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score chess.state state matches 1 if score chest.type board matches 1 run function small_games/chess/five/second execute if score chess.state state matches 1 if score chest.type board matches 2 run function small_games/chess/boom/second execute if score chess.state state matches 1 if score chest.type board matches 3 run function small_games/chess/go/second -execute if score chess.state state matches 1 if score chest.type board matches 4 run function small_games/chess/gojp/second \ No newline at end of file +execute if score chess.state state matches 1 if score chest.type board matches 4 run function small_games/chess/gojp/second diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/spec.mcfunction index 1ea75374..bb213d3f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/spec.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # gamemode spectator @s tellraw @s ["\u00a7c很抱歉，游戏已经开始！"] playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 1 1 gamemode spectator @s -tp @s @r[team=chestgame,gamemode=adventure,distance=10..] \ No newline at end of file +tp @s @r[team=chestgame,gamemode=adventure,distance=10..] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/specgame.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/specgame.mcfunction index 66cf3cad..c748705a 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/specgame.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/specgame.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound minecraft:entity.experience_orb.pickup player @s ~ ~ ~ 2 1 1 tp @s 74 115 34 0 0 tag @s remove chest.white @@ -8,3 +12,4 @@ effect clear @s tellraw @s ["\u00a77欢迎来到活动广场。"] tellraw @a ["\u00a7a\u00a7l[棋类游戏] ",{"selector":"@s","color":"gold"},"\u00a7b 退出队列。"] team join lobby @s + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/start.mcfunction index 5ac00e87..eadcc273 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 68 125 61 80 125 49 air replace #wool kill @e[tag=chess.marker,type=marker] kill @e[type=marker,tag=chess.point] @@ -8,3 +12,4 @@ execute if score chest.type board matches 2 run function small_games/chess/boom/ execute if score chest.type board matches 4 run function small_games/chess/gojp/start execute if score chest.type board matches 3 run tellraw @s ["\u00a7c正在制作中..."] # execute if score chest.type board matches 4 run function small_games/chess/gojp/start + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/teststart.mcfunction index 7e3de6bc..f5d9717d 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/teststart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=chestgame,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score chess.state state matches 1.. run function minecraft:small_games/chess/spec execute unless score chess.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score chess.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score chess.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:small_games/chess/start \ No newline at end of file +execute unless score chess.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:small_games/chess/start diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/tick.mcfunction index 32a8bbd7..4ae4abfc 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/tick.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score chest.type board matches 1 if score chess.state state matches 1 run function small_games/chess/five/tick execute if score chest.type board matches 2 if score chess.state state matches 1 run function small_games/chess/boom/tick execute if score chest.type board matches 3 if score chess.state state matches 1 run function small_games/chess/go/tick execute if score chest.type board matches 4 if score chess.state state matches 1 run function small_games/chess/gojp/tick -# execute as @a[team=chestgame] at @s if block ~ ~-1 ~ lime_glazed_terracotta run effect give @s levitation 2 25 true \ No newline at end of file +# execute as @a[team=chestgame] at @s if block ~ ~-1 ~ lime_glazed_terracotta run effect give @s levitation 2 25 true diff --git a/datapacks/map_all/data/minecraft/functions/small_games/chess/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/chess/tp.mcfunction index b2fbf7e8..380f1570 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/chess/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/chess/tp.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set chess.state state 0 gamemode adventure @a[team=chestgame,gamemode=spectator] execute as @a[team=chestgame,gamemode=adventure] run function small_games/chess/join kill @e[type=marker,tag=chess.marker] -kill @e[type=marker,tag=chess.point] \ No newline at end of file +kill @e[type=marker,tag=chess.point] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/get_random_game.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/get_random_game.mcfunction index 440eb9c2..6bb9ff9c 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/get_random_game.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/get_random_game.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset count.1 board scoreboard players reset count.2 board execute as @e[type=marker,tag=random_game] run scoreboard players add count.1 board 1 @@ -26,7 +30,7 @@ execute as @e[tag=random_game_sel] as @a[tag=play.total] at @s run playsound ent # Snow TNTRUN 2 # Snow Pick 3 # Repeling 4 -# Color 5 +# Color 5 # Block Believer 6 # Muder Mystery 7 # Duel 8 @@ -44,7 +48,7 @@ execute if score total.game board matches 8..8 if score duel.state state matches execute if score total.game board matches 9..9 if score hotpot.state state matches 1.. run scoreboard players set error state 1 execute if score total.game board matches 10..10 if score pw.state state matches 1.. run scoreboard players set error state 1 execute if score total.game board matches 11..11 if score tnt.state state matches 1.. run scoreboard players set error state 1 -# execute if score total.game board matches 10..10 run +# execute if score total.game board matches 10..10 run ## Failure: Retry execute as @e[tag=random_game_sel] run execute if score error state matches 1.. run function small_games/total/next_game_fail # execute as @e[tag=random_game_sel] run tag @s remove random_game_able @@ -53,3 +57,4 @@ execute as @e[tag=random_game_sel] run tag @s remove random_game_sel execute unless score error state matches 1.. run schedule function small_games/total/start_next_game 5s scoreboard players reset error state + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/join.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/join.mcfunction index cb28f2d5..08bbe030 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/join.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s tp @s 214.0 80 138.0 0 0 team join wait.total @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.total,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @a[team=!wait.total] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"小游戏合集","color":"#afd3ff","bold": true}," \u00a77!"] tellraw @a[team=wait.total] ["\u00a76 > ",{"selector":"@s"},"\u00a72 已加入。 \u00a7b(",{"score":{"objective": "tick","name": "wait.player"},"color": "yellow"}," \u00a7ePeople\u00a7b)"] execute if score gametotal state matches 1.. as @s run function small_games/total/spec -tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] \ No newline at end of file +tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/neover.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/neover.mcfunction index c52c68ea..9b1dd333 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/neover.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/neover.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove total.win tellraw @a ["\u00a7b\u00a7l小游戏合集 \u00a72游戏结束！"] title @a[team=play.total] title ["\u00a7cGAME OVER"] title @a[team=play.total] subtitle ["\u00a7b意外结束了游戏"] schedule function small_games/total/tp 5s -scoreboard players set gametotal state 2000 \ No newline at end of file +scoreboard players set gametotal state 2000 diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/next_game.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/next_game.mcfunction index b0a2b821..298c8d90 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/next_game.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/next_game.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @a[tag=play.total] # title @a[tag=play.total] title ["\u00a7b\u00a7lGame Total"] # title @a[tag=play.total] title ["\u00a7a\u00a7lGame Total"] title @a[tag=play.total] actionbar ["\u00a7e\u00a7l即将选择下一个小游戏"] -clear @a[tag=play.total] -effect clear @a[tag=play.total] +clear @a[tag=play.total] +effect clear @a[tag=play.total] tp @a[tag=play.total] 213 97 157 180 0 team join play.total @a[tag=play.total] execute as @a[tag=play.total] at @s run playsound entity.experience_orb.pickup player @s -schedule function small_games/total/get_random_game 5s \ No newline at end of file +schedule function small_games/total/get_random_game 5s diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/next_game_fail.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/next_game_fail.mcfunction index ad6c1ae9..d6b29199 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/next_game_fail.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/next_game_fail.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.total] ["\u00a7c\u00a7l很抱歉，这个游戏已经开始了。将在\u00a76\u00a7l5\u00a7c\u00a7l秒后重试"] title @a[team=play.total] title ["\u00a7c抱歉！"] title @a[team=play.total] subtitle ["\u00a7b我们将在 \u00a7e5 \u00a7b秒后重试"] tag @s add random_game_able schedule function small_games/total/get_random_game 5s + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/over.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/over.mcfunction index bce7d23f..9e85eeca 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l小游戏派对 \u00a72游戏结束！"] tag @a remove total.win scoreboard players reset total.best board @@ -11,3 +15,4 @@ tellraw @a[team=play.total] ["\u00a7b获胜者：",{"selector":"@a[tag=total.win tag @a remove total.win schedule function small_games/total/tp 5s scoreboard players set gametotal state 2000 + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/rejoin.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/rejoin.mcfunction index faa9ced4..c0b53208 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/rejoin.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/rejoin.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s leave execute as @s at @s run tellraw @a[tag=play.total] [{"selector":"@s"},"\u00a77 重新加入了游戏。"] tellraw @s ["\n\u00a77 本次游戏仍然有效，您已加入游戏！\n \u00a77您可以使用 \u00a76/trigger hub\u00a77返回大厅\n"] team join play.total tag @s add play.total gamemode spectator @s -tp @s @r[tag=play.total,gamemode=adventure] \ No newline at end of file +tp @s @r[tag=play.total,gamemode=adventure] diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/reset.mcfunction index 38a57d51..c96be6a7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/reset.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset * score scoreboard players reset total.snow.tntrun state scoreboard players reset total.snow.pick state -tag @e[tag=random_game] add random_game_able \ No newline at end of file +tag @e[tag=random_game] add random_game_able diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/second.mcfunction index 931f3fd6..a9c280fa 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/second.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set count.4 board 0 execute as @a[tag=play.total] run scoreboard players add count.4 board 1 execute if score gametotal state matches 1..1000 if score count.4 board matches ..1 run function small_games/total/neover -# execute if score count.4 board matches ..1 run function small_games/total/neover \ No newline at end of file +# execute if score count.4 board matches ..1 run function small_games/total/neover diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/spec.mcfunction index 0634dd07..67086328 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/spec.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s team join play.total @s tellraw @s ["\u00a7c抱歉！游戏已经开始了。您将在下一个小游戏加入！"] -tag @s add play.total \ No newline at end of file +tag @s add play.total diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/start.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/start.mcfunction index f1452c0a..a7a467eb 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l小游戏合集 \u00a7a游戏开始。"] scoreboard players add globle globle.game 1 scoreboard players operation game.total globle.game = globle globle.game @@ -6,4 +10,4 @@ scoreboard players set gametotal state 1 team join play.total @a[team=wait.total] tag @a[team=play.total] add play.total function small_games/total/reset -function small_games/total/next_game \ No newline at end of file +function small_games/total/next_game diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/start_next_game.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/start_next_game.mcfunction index ddde565f..15c7ed1e 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/start_next_game.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/start_next_game.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # Car 1 # Snow TNTRUN 2 # Snow Pick 3 # Repeling 4 -# Color 5 +# Color 5 # Block Believer 6 # Muder Mystery 7 # Duel 8 @@ -35,3 +39,4 @@ execute as @a[tag=play.total,limit=1,sort=random] if score total.game board matc execute as @a[tag=play.total,limit=1,sort=random] if score total.game board matches 11..11 run execute as @a[tag=play.total] run function tntwars/join execute as @a[tag=play.total,limit=1,sort=random] if score total.game board matches 11..11 run function tntwars/trystart + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/start_second.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/start_second.mcfunction index 8b239674..7f99afd0 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/start_second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/start_second.mcfunction @@ -1 +1,5 @@ -execute if score gametotal state matches 1.. as @a[team=wait.total] run function small_games/total/spec \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score gametotal state matches 1.. as @a[team=wait.total] run function small_games/total/spec diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/teststart.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/teststart.mcfunction index a08c7b96..651cfad7 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/teststart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/teststart.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.total,gamemode=adventure] run scoreboard players add wait.player tick 1 scoreboard players add gametotal state 0 # execute if score pw.state state matches 1.. run function minecraft:poolwar/spec execute unless score gametotal state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score gametotal state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute unless score gametotal state matches 1.. if score wait.player tick matches 2.. run function minecraft:small_games/total/start + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/tick.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/tick.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_all/data/minecraft/functions/small_games/total/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/small_games/total/tp.mcfunction index 9d7541ff..0b016352 100644 --- a/datapacks/map_all/data/minecraft/functions/small_games/total/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/small_games/total/tp.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set gametotal state 0 # gamemode survival @a[tag=play.total] execute as @a[tag=play.total] in overworld run gamemode adventure @s execute as @a[tag=play.total] in overworld run function small_games/total/join -tag @a[tag=play.total] remove play.total \ No newline at end of file +tag @a[tag=play.total] remove play.total diff --git a/datapacks/map_all/data/minecraft/functions/snow/final.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/final.mcfunction index de96defb..04af2e3d 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/final.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/final.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.snow,gamemode=adventure] ["\u00a7c死亡决赛开始!\n\u00a7c边缘开始缩圈！"] # fill -18 24 -78 -26 24 -70 snow_block # execute as @a[team=play.snow,gamemode=adventure] at @s run spreadplayers -22 -74 0 3 under 27 false @s # schedule function minecraft:snow/final 80s -schedule function minecraft:snow/smaller/remove1 5s \ No newline at end of file +schedule function minecraft:snow/smaller/remove1 5s diff --git a/datapacks/map_all/data/minecraft/functions/snow/join.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/join.mcfunction index 6ad15e99..1d346115 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s -22 31 -74 -90 0 clear @s effect clear @s @@ -5,4 +9,4 @@ gamemode adventure @s[gamemode=!creative] execute as @s run tellraw @a ["\u00a7a[MESSAGE] ",{"selector":"@s"},"\u00a77 Joined \u00a7fSnow \u00a77."] tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator -team join wait.snow @s \ No newline at end of file +team join wait.snow @s diff --git a/datapacks/map_all/data/minecraft/functions/snow/map/demo.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/map/demo.mcfunction index ba19d049..dbc36492 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/map/demo.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/map/demo.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # forceload add 3 -49 -47 -99 fill 3 8 -49 -47 8 -99 minecraft:snow_block fill 3 14 -49 -47 14 -99 minecraft:snow_block # forceload remove 3 -49 -47 -99 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/map/onlyone.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/map/onlyone.mcfunction index 634e7866..d6fdc5f5 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/map/onlyone.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/map/onlyone.mcfunction @@ -1 +1,5 @@ -fill 3 14 -49 -47 14 -99 minecraft:snow_block \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +fill 3 14 -49 -47 14 -99 minecraft:snow_block diff --git a/datapacks/map_all/data/minecraft/functions/snow/map/smallvillage.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/map/smallvillage.mcfunction index aa8972fc..ee8adfc9 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/map/smallvillage.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/map/smallvillage.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add -113 -113 -63 -63 clone -113 20 -113 -63 29 -63 -47 20 -99 clone -113 10 -113 -63 20 -63 -47 10 -99 @@ -5,3 +9,4 @@ clone -113 3 -113 -63 10 -63 -47 3 -99 fill -30 17 -49 -32 17 -83 dirt_path fill -47 17 -81 3 17 -83 dirt_path forceload remove -113 -113 -63 -63 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/map/towner.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/map/towner.mcfunction index 46b90762..51cb349b 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/map/towner.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/map/towner.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add -166 -113 -116 -63 clone -166 3 -113 -116 10 -63 -47 3 -99 @@ -5,3 +9,4 @@ clone -166 11 -113 -116 20 -63 -47 11 -99 clone -166 21 -113 -116 29 -63 -47 21 -99 forceload remove -166 -113 -116 -63 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/reset.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/reset.mcfunction index d4f74196..5a98c30e 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/reset.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 3 -49 -47 -99 fill 3 29 -49 -47 20 -99 air replace snow @@ -28,3 +32,4 @@ kill @e[tag=snow.tp] forceload remove 3 -49 -47 -99 schedule clear minecraft:snow/final schedule clear minecraft:snow/smaller/remove1 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/second.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/second.mcfunction index 61b99ca9..b3906c28 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.state state matches 1.. run function minecraft:snow/testfor effect give @a[team=wait.snow] resistance 2 25 true effect give @a[team=play.snow] resistance 2 25 true @@ -28,4 +32,4 @@ execute if score killer.state state matches 1.. run function minecraft:killereve execute if score duel.state state matches 1.. run function minecraft:duel/second -execute unless entity @a[team=job_pvp] run kill @e[tag=pvp.car] \ No newline at end of file +execute unless entity @a[team=job_pvp] run kill @e[tag=pvp.car] diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/doit.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/doit.mcfunction index f12eb79c..fe9dd74c 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/doit.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/doit.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 3 17 -74 -> 2 17 -74 # fill 3 3 -99 -47 29 -99 air replace #minecraft:snowmineable # fill 3 29 -49 -47 3 -49 air replace #minecraft:snowmineable @@ -40,3 +44,4 @@ execute as @e[tag=snow.tp] at @s run tp @s ~ ~ ~1 execute as @e[tag=snow.tp] at @s run fill ~-25 3 ~ ~25 29 ~ snow_block replace #minecraft:snowmineable kill @e[tag=snow.tp] + diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/move1.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/move1.mcfunction index 0d95ca9e..d3746240 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/move1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/move1.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.tp board matches 1.. at @s run tp @s ~-1 ~ ~ execute if score snow.tp board matches 1.. run scoreboard players remove snow.tp board 1 execute if score snow.tp board matches 1.. at @s run function snow/smaller/move1 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/move2.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/move2.mcfunction index 63ce068f..f12f9e41 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/move2.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/move2.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.tp board matches 1.. at @s run tp @s ~1 ~ ~ execute if score snow.tp board matches 1.. at @s run scoreboard players remove snow.tp board 1 execute if score snow.tp board matches 1.. at @s run function snow/smaller/move2 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/move3.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/move3.mcfunction index 21912ad8..19a5065a 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/move3.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/move3.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.tp board matches 1.. at @s run tp @s ~ ~ ~-1 execute if score snow.tp board matches 1.. at @s run scoreboard players remove snow.tp board 1 execute if score snow.tp board matches 1.. at @s run function snow/smaller/move3 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/move4.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/move4.mcfunction index be053953..3c7d3ff4 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/move4.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/move4.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.tp board matches 1.. at @s run tp @s ~ ~ ~1 execute if score snow.tp board matches 1.. at @s run scoreboard players remove snow.tp board 1 execute if score snow.tp board matches 1.. at @s run function snow/smaller/move4 + diff --git a/datapacks/map_all/data/minecraft/functions/snow/smaller/remove1.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/smaller/remove1.mcfunction index 6480aa00..9e863868 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/smaller/remove1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/smaller/remove1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score snow.sq board matches ..22 run schedule function minecraft:snow/smaller/remove1 5s execute if score snow.sq board matches ..22 run function snow/smaller/doit -execute if score snow.sq board matches ..22 run scoreboard players add snow.sq board 1 \ No newline at end of file +execute if score snow.sq board matches ..22 run scoreboard players add snow.sq board 1 diff --git a/datapacks/map_all/data/minecraft/functions/snow/start.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/start.mcfunction index c75fb89c..16a6ad3d 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:snow/reset scoreboard players set play.snow.debug state 0 scoreboard players set snow.state state 1 @@ -17,4 +21,4 @@ execute if score snow.tntrun state matches 0 run title @a[team=play.snow] title tellraw @a[team=play.snow,tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] execute as @a[team=play.snow,tag=GOABLE.SPEC] at @s run gamemode spectator -function fix:snow/start \ No newline at end of file +function fix:snow/start diff --git a/datapacks/map_all/data/minecraft/functions/snow/test.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/test.mcfunction index f0de16d0..a4d5bd9e 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/test.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/test.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:snow/start -scoreboard players set play.snow.debug state 1 \ No newline at end of file +scoreboard players set play.snow.debug state 1 diff --git a/datapacks/map_all/data/minecraft/functions/snow/testfor.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/testfor.mcfunction index de17773c..306a46fa 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/testfor.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/testfor.mcfunction @@ -1,3 +1,7 @@ -scoreboard players set play.snow.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set play.snow.player tick 0 execute as @a[team=play.snow,gamemode=adventure] run scoreboard players add play.snow.player tick 1 -execute if score play.snow.player tick matches ..1 unless score play.snow.debug state matches 1..1 run function minecraft:snow/over \ No newline at end of file +execute if score play.snow.player tick matches ..1 unless score play.snow.debug state matches 1..1 run function minecraft:snow/over diff --git a/datapacks/map_all/data/minecraft/functions/snow/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/tick.mcfunction index e66a1259..0b6d89df 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/tick.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.snow,gamemode=adventure] at @s if block ~ ~-1 ~ minecraft:magma_block run function minecraft:snow/died # execute if score snow.state state matches 1.. run kill @e[type=item,nbt={Item:{id:"minecraft:snowball"}}] -kill @e[type=item,nbt={Item:{tag:{snow:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{snow:1}}}}] clear @a[team=play.snow] #minecraft:snowmineable execute as @a[team=play.snow,gamemode=adventure] at @s run kill @e[type=item,distance=0..5] @@ -33,3 +37,4 @@ scoreboard players reset @a[scores={eat.glow=0..}] eat.glow scoreboard players reset @a[scores={zombie.died=1..}] zombie.died scoreboard players reset @a[scores={parkour=1..}] parkour + diff --git a/datapacks/map_all/data/minecraft/functions/snow/tntrun/setsnow.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/tntrun/setsnow.mcfunction index 1e775b3b..22ff56bb 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/tntrun/setsnow.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/tntrun/setsnow.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon minecraft:marker ~ ~-0.8 ~ {Tags:["snow.new"],Invulnerable:1b,Silent:1b,NoGravity:1b} summon minecraft:marker ~-1 ~-0.8 ~ {Tags:["snow.new"],Invulnerable:1b,Silent:1b,NoGravity:1b} summon minecraft:marker ~1 ~-0.8 ~ {Tags:["snow.new"],Invulnerable:1b,Silent:1b,NoGravity:1b} @@ -6,4 +10,4 @@ summon minecraft:marker ~ ~-0.8 ~1 {Tags:["snow.new"],Invulnerable:1b,Silent:1b, execute as @e[tag=snow.new,type=marker] at @s unless block ~ ~ ~ #minecraft:snowmineable run kill @s scoreboard players set @e[type=marker,tag=snow.new] snow.tick 12 tag @e[type=marker,tag=snow.new] add snow.disa -tag @e[type=marker,tag=snow.new] remove snow.new \ No newline at end of file +tag @e[type=marker,tag=snow.new] remove snow.new diff --git a/datapacks/map_all/data/minecraft/functions/snow/tntrun/setting/change.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/tntrun/setting/change.mcfunction index 493b47dd..3e7af9c3 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/tntrun/setting/change.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/tntrun/setting/change.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute if score snow.tntrun state matches 1..1 run tellraw @s ["\u00a7a[Settings] \u00a7bNow the game mode changes to \u00a7eTNTRUN \u00a7bmode."] execute unless score snow.tntrun state matches 1..1 unless score snow.tntrun state matches 2..2 run tellraw @s ["\u00a7a[Settings] \u00a7bNow the game mode changes to \u00a7eNormal \u00a7bmode."] execute if score snow.tntrun state matches 2..2 run tellraw @s ["\u00a7a[Settings] \u00a7bNow the game mode changes to \u00a7eDig and Run \u00a7bmode."] + diff --git a/datapacks/map_all/data/minecraft/functions/snow/tntrun/startfall.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/tntrun/startfall.mcfunction index 5d6b17ac..59397cce 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/tntrun/startfall.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/tntrun/startfall.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set snow.state state 1 -tellraw @a[team=play.snow] ["\u00a7a[TNTRUN] \u00a7bThe blocks started to fall!"] \ No newline at end of file +tellraw @a[team=play.snow] ["\u00a7a[TNTRUN] \u00a7bThe blocks started to fall!"] diff --git a/datapacks/map_all/data/minecraft/functions/snow/tntrun/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/tntrun/tick.mcfunction index 767ed9e3..550b9d98 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/tntrun/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/tntrun/tick.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.snow,gamemode=adventure] at @s unless entity @e[tag=snow.disa,distance=0..1] run function minecraft:snow/tntrun/setsnow execute as @e[tag=snow.disa,type=marker] at @s unless block ~ ~ ~ #minecraft:snowmineable run kill @s execute as @e[tag=snow.disa,type=marker] at @s if score @s snow.tick matches ..0 run tag @s add snow.die execute as @e[tag=snow.die,type=marker] at @s if block ~ ~ ~ #minecraft:snowmineable run setblock ~ ~ ~ air execute as @e[tag=snow.die,type=marker] at @s run kill @e[type=item,distance=0..2] execute as @e[tag=snow.die,type=marker] at @s run kill @s -scoreboard players remove @e[tag=snow.disa,type=marker] snow.tick 1 \ No newline at end of file +scoreboard players remove @e[tag=snow.disa,type=marker] snow.tick 1 diff --git a/datapacks/map_all/data/minecraft/functions/snow/trystart.mcfunction b/datapacks/map_all/data/minecraft/functions/snow/trystart.mcfunction index 9dc63350..f79adb70 100644 --- a/datapacks/map_all/data/minecraft/functions/snow/trystart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/snow/trystart.mcfunction @@ -1,7 +1,11 @@ -scoreboard players set wait.snow.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set wait.snow.player tick 0 playsound ui.button.click player @s execute as @a[team=wait.snow,gamemode=adventure] run scoreboard players add wait.snow.player tick 1 execute if score snow.state state matches 1.. run function minecraft:snow/spec execute unless score snow.state state matches 1.. if score wait.snow.player tick matches ..1 run function minecraft:snow/notenough -execute unless score snow.state state matches 1.. if score wait.snow.player tick matches 2.. run function minecraft:snow/start \ No newline at end of file +execute unless score snow.state state matches 1.. if score wait.snow.player tick matches 2.. run function minecraft:snow/start diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/calcpeople.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/calcpeople.mcfunction index fd74aa03..bec33ae1 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/calcpeople.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/calcpeople.mcfunction @@ -1,4 +1,8 @@ -scoreboard players set TNT.a.player tick 0 -scoreboard players set TNT.b.player tick 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set TNT.a.player tick 0 +scoreboard players set TNT.b.player tick 0 execute as @a[team=play.tntwars,tag=tntwars.a,gamemode=adventure] run scoreboard players add TNT.a.player tick 1 -execute as @a[team=play.tntwars,tag=tntwars.b,gamemode=adventure] run scoreboard players add TNT.b.player tick 1 \ No newline at end of file +execute as @a[team=play.tntwars,tag=tntwars.b,gamemode=adventure] run scoreboard players add TNT.b.player tick 1 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/cleanmap.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/cleanmap.mcfunction index f8ca06af..60e7c903 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/cleanmap.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/cleanmap.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 465 281 539 355 fill 465 -63 281 539 -61 355 air @@ -15,4 +19,4 @@ fill 465 -10 281 539 -6 355 air fill 465 -2 281 539 -5 355 air execute in overworld positioned 502 -38 315 run kill @e[type=item,distance=0..60] -forceload remove 465 281 539 355 \ No newline at end of file +forceload remove 465 281 539 355 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/die.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/die.mcfunction index 5e51aa5d..be91780f 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/die.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/die.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7c你掉入了虚空，淘汰了。\n"] gamemode spectator @s clear @s @@ -14,3 +18,4 @@ execute as @a[team=wait.tntwars] at @s run playsound entity.player.death player execute as @a[team=play.tntwars] at @s run playsound entity.player.death player @s ~ ~ ~ 1 1 0 + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/join.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/join.mcfunction index 3ad1139b..6a5e2e76 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/join.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n \u00a7e※ \u00a7c「TNT Wars」\n\n\u00a7e \u00a76游戏规则\n\n\u00a7b 游戏开始后，玩家将被分为两组。\n\u00a7b 一定的时间后会生成物资（TNT投掷蛋）\n\u00a7b 使用此道具向对方投掷TNT，将对方\u00a7l扔下虚空\u00a7b！\n"] title @s title ["\u00a7c\u00a7lTNT Wars"] title @s subtitle ["\u00a7fBoom Boom Boom!"] @@ -14,4 +18,4 @@ xp set @s 0 levels xp set @s 0 points tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/longsecond.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/longsecond.mcfunction index dcba5e12..b28b0b6b 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/longsecond.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/longsecond.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.tntwars,gamemode=adventure] at @s run loot give @s loot tntwars/tnttool -# execute as @a[team=play.tntwars,gamemode=adventure] at @s run loot give @s loot tntwars/tnttool \ No newline at end of file +# execute as @a[team=play.tntwars,gamemode=adventure] at @s run loot give @s loot tntwars/tnttool diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/last.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/last.mcfunction index 29f06e1b..81e89ccb 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/last.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/last.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score tntwars.map state matches 1.. run scoreboard players remove tntwars.map state 1 -function tntwars/mapselector/show \ No newline at end of file +function tntwars/mapselector/show diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/next.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/next.mcfunction index c726fc71..d563b019 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/next.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/next.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score tntwars.map state matches ..1 run scoreboard players add tntwars.map state 1 -function tntwars/mapselector/show \ No newline at end of file +function tntwars/mapselector/show diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/show.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/show.mcfunction index 19f23bea..e36b01a3 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/show.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/mapselector/show.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score tntwars.map state matches ..0 run data modify block 496 21 240 front_text.messages[2] set value '"\\u00a7aBoat"' execute if score tntwars.map state matches 1 run data modify block 496 21 240 front_text.messages[2] set value '"\\u00a7bBallon"' -execute if score tntwars.map state matches 2 run data modify block 496 21 240 front_text.messages[2] set value '"\\u00a7fCloud"' \ No newline at end of file +execute if score tntwars.map state matches 2 run data modify block 496 21 240 front_text.messages[2] set value '"\\u00a7fCloud"' diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/over/over.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/over/over.mcfunction index 338da699..3688d428 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/over/over.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/over/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove tntwars.a tag @a remove tntwars.b tellraw @a ["\u00a7cTNT Wars \u00a76游戏结束。"] @@ -11,3 +15,4 @@ kill @e[type=!player,tag=tntwars.tnt] schedule function tntwars/over/tp 5s kill @e[tag=tnt.tntrain] schedule function tntwars/cleanmap 2s + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/over/teama.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/over/teama.mcfunction index 79340f1b..2741d31f 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/over/teama.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/over/teama.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=play.tntwars] title ["\u00a7cGAME OVER"] title @a[team=play.tntwars,tag=tntwars.a] title ["\u00a76YOU WON!"] title @a[team=wait.tntwars] title ["\u00a7cGAME OVER"] -scoreboard players add @a[team=play.tntwars,tag=tntwars.a,tag=play.total] score 1 +scoreboard players add @a[team=play.tntwars,tag=play.total] score 1 title @a[team=play.tntwars] subtitle ["\u00a7a「队伍A」\u00a7f获胜！"] title @a[team=wait.tntwars] subtitle ["\u00a7a「队伍A」\u00a7f获胜！"] tellraw @a[team=wait.tntwars] ["\n\u00a7e ※ \u00a7c\u00a7lTNT Wars\n\u00a7a「队伍A」\u00a76获胜！\n"] tellraw @a[team=play.tntwars] ["\n\u00a7e ※ \u00a7c\u00a7lTNT Wars\n\u00a7a「队伍A」\u00a76获胜！\n"] -function tntwars/over/over \ No newline at end of file +function tntwars/over/over diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/over/teamb.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/over/teamb.mcfunction index a1bc519e..54fc8858 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/over/teamb.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/over/teamb.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=play.tntwars] title ["\u00a7cGAME OVER"] title @a[team=play.tntwars,tag=tntwars.b] title ["\u00a76YOU WON!"] -scoreboard players add @a[team=play.tntwars,tag=tntwars.b,tag=play.total] score 1 +scoreboard players add @a[team=play.tntwars,tag=play.total] score 1 title @a[team=wait.tntwars] title ["\u00a7cGAME OVER"] title @a[team=play.tntwars] subtitle ["\u00a7b「队伍B」\u00a7f获胜！"] title @a[team=wait.tntwars] subtitle ["\u00a7b「队伍B」\u00a7f获胜！"] tellraw @a[team=wait.tntwars] ["\n\u00a7e ※ \u00a7c\u00a7lTNT Wars\n\u00a7b「队伍B」\u00a76获胜！\n"] tellraw @a[team=play.tntwars] ["\n\u00a7e ※ \u00a7c\u00a7lTNT Wars\n\u00a7b「队伍B」\u00a76获胜！\n"] -function tntwars/over/over \ No newline at end of file +function tntwars/over/over diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/over/tp.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/over/tp.mcfunction index cdf13f1b..e737af0e 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/over/tp.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/over/tp.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tnt.state state 0 execute if entity @a[team=play.tntwars,tag=play.total] run function small_games/total/next_game execute as @a[team=play.tntwars,gamemode=spectator] at @s run function tntwars/join -# \ No newline at end of file +# diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/randomteam.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/randomteam.mcfunction index fe69bed2..7e281d56 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/randomteam.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/randomteam.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=tnt.tanteam,sort=random,limit=1] add tnt.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -7,3 +11,4 @@ execute if score rand board matches 2.. run tag @a[tag=tnt.ransel] add tntwars.b tag @a[tag=tnt.ransel] remove tnt.tanteam tag @a[tag=tnt.ransel] remove tnt.ransel + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/ballon1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/ballon1.mcfunction index 67387d8c..b0f8c287 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/ballon1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/ballon1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 542 205 616 279 forceload add 465 281 539 355 @@ -22,4 +26,4 @@ clone 542 -6 205 616 -2 279 465 -6 281 replace # clone 515 -15 279 490 -5 205 490 -15 281 replace execute in overworld positioned 502 -38 315 run kill @e[type=item,distance=0..60] forceload remove 542 205 616 279 -forceload remove 465 281 539 355 \ No newline at end of file +forceload remove 465 281 539 355 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/boat1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/boat1.mcfunction index 02f5f633..7169e6c2 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/boat1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/boat1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 465 205 539 279 forceload add 465 281 539 355 @@ -22,4 +26,4 @@ clone 465 -6 205 539 -2 279 465 -6 281 replace # clone 515 -15 279 490 -5 205 490 -15 281 replace execute in overworld positioned 502 -38 315 run kill @e[type=item,distance=0..60] forceload remove 465 205 539 279 -forceload remove 465 281 539 355 \ No newline at end of file +forceload remove 465 281 539 355 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/cloud1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/cloud1.mcfunction index d4c16fb0..db4c756d 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/cloud1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/resetmaps/cloud1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add 542 355 616 281 forceload add 465 281 539 355 @@ -24,4 +28,4 @@ clone 542 -6 355 616 -2 281 465 -6 281 replace # clone 515 -15 279 490 -5 205 490 -15 281 replace execute in overworld positioned 502 -38 315 run kill @e[type=item,distance=0..60] forceload remove 542 355 616 281 -forceload remove 465 281 539 355 \ No newline at end of file +forceload remove 465 281 539 355 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/second.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/second.mcfunction index 0d210dfe..042d9313 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/second.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## effect give @a[team=play.tntwars] resistance 2 25 true function tntwars/calcpeople execute as @a[team=play.tntwars,tag=tntwars.a] run title @s actionbar ["\u00a7a「队伍A」\u00a7c你的队友：",{"selector":"@a[tag=tntwars.a,gamemode=adventure]"}] @@ -13,4 +17,4 @@ execute if entity @e[tag=tnt.tntrain.fireball] run scoreboard players remove tnt execute if score tnt.tntrain board matches ..0 run kill @e[tag=tnt.tntrain.tnt] execute if score tnt.creeperrain board matches ..0 run kill @e[tag=tnt.tntrain.creeper] execute if score tnt.fireballrain board matches ..0 run kill @e[tag=tnt.tntrain.fireball] -effect give @a[team=play.tntwars] glowing 2 25 true \ No newline at end of file +effect give @a[team=play.tntwars] glowing 2 25 true diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/1.mcfunction index 5ac62fc2..e780a5f0 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^1 {Tags:["t.tmp"]} execute anchored eyes run summon tnt_minecart ^ ^ ^1 {Tags:["t.new","tntwars.tnt"]} @@ -13,4 +17,4 @@ execute as @e[tag=t.new] at @s run data modify entity @s Motion set from entity # execute as @e[tag=t.new] at @s run data modify entity @s Motion[1] set value 0.5 tag @e[tag=t.new] remove t.new -kill @e[tag=t.tmp,type=marker] \ No newline at end of file +kill @e[tag=t.tmp,type=marker] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/2.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/2.mcfunction index b2cda349..d92720d7 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/2.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/2.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} -execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^1.2 {Tags: ["t.tmp"]} -execute anchored eyes run summon tnt ^ ^ ^1 {Tags: ["t.new", "tntwars.tnt"], fuse: 50s} +execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^1.2 {Tags:["t.tmp"]} +execute anchored eyes run summon tnt ^ ^ ^1 {Tags:["t.new","tntwars.tnt"],fuse:50s} tag @s add t.t.tmp execute as @e[tag=t.new] run data modify entity @s Owner set from entity @a[limit=1,tag=t.t.tmp] UUID tag @s remove t.t.tmp @@ -11,4 +15,4 @@ execute as @e[tag=t.new] at @s run data modify entity @s Motion set from entity # execute as @e[tag=t.new] at @s run data modify entity @s Motion[1] set value 0.5 tag @e[tag=t.new] remove t.new -kill @e[tag=t.tmp,type=marker] \ No newline at end of file +kill @e[tag=t.tmp,type=marker] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/3.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/3.mcfunction index 6ba32bd7..8cabb3fb 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/3.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/3.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^2.5 {Tags:["t.tmp"]} execute anchored eyes run summon creeper ^ ^ ^1 {Tags:["t.new","tntwars.tnt"],ignited:1b,fuse:40s} @@ -11,4 +15,4 @@ execute as @e[tag=t.new] at @s run data modify entity @s Motion set from entity # execute as @e[tag=t.new] at @s run data modify entity @s Motion[1] set value 0.5 tag @e[tag=t.new] remove t.new -kill @e[tag=t.tmp,type=marker] \ No newline at end of file +kill @e[tag=t.tmp,type=marker] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/4.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/4.mcfunction index 3557288f..830abfe4 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/4.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/4.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^0.25 {Tags:["t.tmp"]} execute anchored eyes run summon fireball ^ ^ ^1 {Tags:["t.new","tntwars.tnt"],ExplosionPower:5} @@ -11,4 +15,4 @@ execute as @e[tag=t.new] at @s run data modify entity @s power set from entity @ # execute as @e[tag=t.new] at @s run data modify entity @s Motion[1] set value 0.5 tag @e[tag=t.new] remove t.new -kill @e[tag=t.tmp,type=marker] \ No newline at end of file +kill @e[tag=t.tmp,type=marker] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/5.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/5.mcfunction index 632741fe..ae47584c 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/5.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/5.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute unless entity @e[tag=tnt.tntrain.tnt] run function tntwars/tntrainspawn/tnt scoreboard players add tnt.tntrain board 10 tellraw @a[team=play.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a74TNT雨\u00a76。"] -tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a74TNT雨\u00a76。"] \ No newline at end of file +tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a74TNT雨\u00a76。"] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/6.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/6.mcfunction index c128954c..1983cfb3 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/6.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/6.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute unless entity @e[tag=tnt.tntrain.creeper] run function tntwars/tntrainspawn/creeper scoreboard players add tnt.creeperrain board 10 tellraw @a[team=play.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a72苦力怕雨\u00a76。"] -tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a72苦力怕雨\u00a76。"] \ No newline at end of file +tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a72苦力怕雨\u00a76。"] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/7.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/7.mcfunction index 73939c69..79b6d74e 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/7.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/7.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} execute unless entity @e[tag=tnt.tntrain.fireball] run function tntwars/tntrainspawn/fireball scoreboard players add tnt.fireballrain board 10 tellraw @a[team=play.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a7c火球雨\u00a76。"] -tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a7c火球雨\u00a76。"] \ No newline at end of file +tellraw @a[team=wait.tntwars] [{"selector":"@s"},"\u00a76召唤了\u00a7c火球雨\u00a76。"] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/longtnt.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/longtnt.mcfunction index 6cd48563..a80f0247 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/longtnt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/longtnt.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute at @s positioned 0.0 0.0 0.0 rotated as @s anchored eyes run summon marker ^ ^ ^3 {Tags:["tmp"]} -execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^2.0 {Tags: ["t.tmp"]} -execute anchored eyes run summon tnt ^ ^ ^1 {Tags: ["t.new", "tntwars.tnt"], fuse: 50s} +execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^2.0 {Tags:["t.tmp"]} +execute anchored eyes run summon tnt ^ ^ ^1 {Tags:["t.new","tntwars.tnt"],fuse:50s} tag @s add t.t.tmp execute as @e[tag=t.new] run data modify entity @s Owner set from entity @a[limit=1,tag=t.t.tmp] UUID tag @s remove t.t.tmp @@ -11,4 +15,4 @@ execute as @e[tag=t.new] at @s run data modify entity @s Motion set from entity # execute as @e[tag=t.new] at @s run data modify entity @s Motion[1] set value 0.5 tag @e[tag=t.new] remove t.new -kill @e[tag=t.tmp,type=marker] \ No newline at end of file +kill @e[tag=t.tmp,type=marker] diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/tntrain.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/tntrain.mcfunction index 6405260c..3b6dc7cf 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/tntrain.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/shoottnt/tntrain.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## spreadplayers 502 318 0 32 false @s # execute at @s run tp @s ~ ~ ~5 execute as @s[tag=tnt.tntrain.tnt] at @s run summon tnt ~ ~-3 ~ {fuse:50,Motion:[0.0,-0.8,0.0],Tags:["tntwars.tnt"]} -execute as @s[tag=tnt.tntrain.creeper] at @s run summon creeper ~ ~-3 ~ {fuse:30,ignited:true,Motion:[0.0,-0.5,0.0],Tags:["tntwars.tnt"],DeathLootTable:"",Invulnerable:1} +execute as @s[tag=tnt.tntrain.creeper] at @s run summon creeper ~ ~-3 ~ {fuse:30,ignited:"true",Motion:[0.0,-0.5,0.0],Tags:["tntwars.tnt"],DeathLootTable:"",Invulnerable:1} execute as @s[tag=tnt.tntrain.fireball] at @s run summon fireball ~ ~-3 ~ {power:[0.0,-0.3,0.0],Tags:["tntwars.tnt"],ExplosionPower:4} + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/spec.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/spec.mcfunction index 66e1bc44..0efe4e7c 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/spec.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/spec.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\n\u00a7c 很抱歉，游戏已经开始了。\n \u00a76请旁观游戏等待下一场游戏，\n \u00a76或者使用\u00a7e/trigger hub\u00a76返回大厅。\n"] -tp @s 471 -25 316 -90 0 \ No newline at end of file +tp @s 471 -25 316 -90 0 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/start.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/start.mcfunction index def2eb1d..a24e3624 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/start.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tnt.state state 1 function tntwars/resetsmap clear @a[team=wait.tntwars,gamemode=adventure] @@ -28,4 +32,4 @@ kill @e[type=tnt_minecart,tag=tntwars.tnt] scoreboard players set tnt.tntrain board 0 scoreboard players set tnt.creeperrain board 0 -scoreboard players set tnt.fireballrain board 0 \ No newline at end of file +scoreboard players set tnt.fireballrain board 0 diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/ballon1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/ballon1.mcfunction index f37d081a..488d36f4 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/ballon1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/ballon1.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function tntwars/resetmaps/ballon1 tp @a[team=play.tntwars,tag=tntwars.a] 502 -31 306 0 0 tp @a[team=play.tntwars,tag=tntwars.b] 502 -31 330 180 0 + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/boat1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/boat1.mcfunction index 705d18c0..4fef4bfa 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/boat1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/boat1.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function tntwars/resetmaps/boat1 tp @a[team=play.tntwars,tag=tntwars.a] 502 -37 342 180 0 tp @a[team=play.tntwars,tag=tntwars.b] 502 -37 289 0 0 + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/cloud1.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/cloud1.mcfunction index abe5b49b..0c40aeb9 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/cloud1.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/startmaps/cloud1.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function tntwars/resetmaps/cloud1 tp @a[team=play.tntwars,tag=tntwars.a] 502 -33 347 180 0 tp @a[team=play.tntwars,tag=tntwars.b] 500 -33 292 0 0 + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/tick.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/tick.mcfunction index 6604048d..1630883d 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/tick.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.tntwars,gamemode=!creative] at @s run kill @e[type=item,distance=0..5] -execute as @a[team=play.tntwars,gamemode=adventure] at @s as @s[y=-70,dy=10] run function tntwars/die \ No newline at end of file +execute as @a[team=play.tntwars,gamemode=adventure] at @s as @s[y=-70,dy=10] run function tntwars/die diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/creeper.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/creeper.mcfunction index d4072cf4..bc2f9c57 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/creeper.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/creeper.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker 502 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} summon marker 499 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} @@ -6,4 +10,4 @@ summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} -summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} \ No newline at end of file +summon marker 505 0 285 {Tags:["tnt.tntrain.creeper","tnt.tntrain"]} diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/fireball.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/fireball.mcfunction index b37ebfc9..263c6316 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/fireball.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/fireball.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker 502 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} summon marker 499 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} @@ -6,4 +10,4 @@ summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} -summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} \ No newline at end of file +summon marker 505 0 285 {Tags:["tnt.tntrain.fireball","tnt.tntrain"]} diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/tnt.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/tnt.mcfunction index 3b6e1711..7c60f290 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/tnt.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/tntrainspawn/tnt.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker 502 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} summon marker 499 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} summon marker 505 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} -summon marker 505 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} \ No newline at end of file +summon marker 505 0 285 {Tags:["tnt.tntrain.tnt","tnt.tntrain"]} diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/tnttool.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/tnttool.mcfunction index 4cb731b2..d21a80e9 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/tnttool.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/tnttool.mcfunction @@ -1,14 +1,18 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # title @s actionbar ["\u00a7"] playsound entity.arrow.shoot player @s ~ ~ ~ 1 2 1 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:1}}}] run tag @s add tnt.tool.1 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:2}}}] run tag @s add tnt.tool.2 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:3}}}] run tag @s add tnt.tool.3 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:4}}}] run tag @s add tnt.tool.4 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:5}}}] unless entity @e[tag=tnt.tntrain.tnt] run tag @s add tnt.tool.5 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:6}}}] unless entity @e[tag=tnt.tntrain.creeper] run tag @s add tnt.tool.6 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:7}}}] unless entity @e[tag=tnt.tntrain.fireball] run tag @s add tnt.tool.7 -execute if entity @s[nbt={SelectedItem:{tag:{tnt:8}}}] run tag @s add tnt.tool.8 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:1}}}}] run tag @s add tnt.tool.1 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:2}}}}] run tag @s add tnt.tool.2 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:3}}}}] run tag @s add tnt.tool.3 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:4}}}}] run tag @s add tnt.tool.4 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:5}}}}] unless entity @e[tag=tnt.tntrain.tnt] run tag @s add tnt.tool.5 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:6}}}}] unless entity @e[tag=tnt.tntrain.creeper] run tag @s add tnt.tool.6 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:7}}}}] unless entity @e[tag=tnt.tntrain.fireball] run tag @s add tnt.tool.7 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{tnt:8}}}}] run tag @s add tnt.tool.8 execute as @s[tag=tnt.tool.1] at @s run item replace entity @s weapon.mainhand with air execute as @s[tag=tnt.tool.2] at @s run item replace entity @s weapon.mainhand with air @@ -35,3 +39,4 @@ tag @s remove tnt.tool.5 tag @s remove tnt.tool.6 tag @s remove tnt.tool.7 tag @s remove tnt.tool.8 + diff --git a/datapacks/map_all/data/minecraft/functions/tntwars/trystart.mcfunction b/datapacks/map_all/data/minecraft/functions/tntwars/trystart.mcfunction index c07b18f4..628b11e5 100644 --- a/datapacks/map_all/data/minecraft/functions/tntwars/trystart.mcfunction +++ b/datapacks/map_all/data/minecraft/functions/tntwars/trystart.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.tntwars,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score tnt.state state matches 1.. run function minecraft:tntwars/spec execute unless score tnt.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score tnt.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score tnt.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:tntwars/start \ No newline at end of file +execute unless score tnt.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:tntwars/start diff --git a/datapacks/map_all/data/minecraft/loot_tables/hide2/item.json b/datapacks/map_all/data/minecraft/loot_tables/hide2/item.json index b1bfa651..35af608b 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hide2/item.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hide2/item.json @@ -12,8 +12,20 @@ "name": "minecraft:potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"speed\",duration:600,amplifier:1b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "speed", + "duration": 600, + "amplifier": 1, + "ambient": false, + "show_particles": false + } + ] + } + } }, { "function": "minecraft:set_count", @@ -51,8 +63,20 @@ "name": "minecraft:potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"jump_boost\",duration:600,amplifier:1b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "jump_boost", + "duration": 600, + "amplifier": 1, + "ambient": false, + "show_particles": false + } + ] + } + } }, { "function": "minecraft:set_count", @@ -94,8 +118,20 @@ "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"invisibility\",duration:300,amplifier:1b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "invisibility", + "duration": 300, + "amplifier": 1, + "ambient": false, + "show_particles": false + } + ] + } + } } ], "conditions": [ @@ -115,8 +151,20 @@ "name": "minecraft:lingering_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"slowness\",duration:200,amplifier:127b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "slowness", + "duration": 200, + "amplifier": 127, + "ambient": false, + "show_particles": false + } + ] + } + } }, { "function": "minecraft:set_count", @@ -150,8 +198,20 @@ "name": "minecraft:lingering_potion", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"mining_fatigue\",duration:200,amplifier:127b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "mining_fatigue", + "duration": 200, + "amplifier": 127, + "ambient": false, + "show_particles": false + } + ] + } + } }, { "function": "minecraft:set_count", @@ -199,8 +259,20 @@ ] }, { - "function": "minecraft:set_nbt", - "tag": "{custom_potion_effects:[{id:\"blindness\",duration:200,amplifier:127b,ambient:0b,show_particles:0b}]}" + "function": "set_components", + "components": { + "minecraft:potion_contents": { + "custom_effects": [ + { + "id": "blindness", + "duration": 200, + "amplifier": 127, + "ambient": false, + "show_particles": false + } + ] + } + } } ], "conditions": [ @@ -221,12 +293,25 @@ "name": "minecraft:stick", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Enchantments:[{id:\"knockback\",lvl:2b}],display:{Name:'\"\\\\u00a7a击退棍\"',Lore:['\"\\\\u00a7eKnockback LV.2\"']},HideFlag:63}" + "function": "set_components", + "components": { + "minecraft:enchantments": { + "levels": { + "minecraft:knockback": 2 + } + }, + "minecraft:custom_name": "\"\\u00a7a击退棍\"", + "minecraft:lore": [ + "\"\\u00a7eKnockback LV.2\"" + ], + "minecraft:custom_data": { + "HideFlag": 63 + } + } } ] } ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/armor.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/armor.json index c177ec39..d86e5ac7 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/armor.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/armor.json @@ -488,4 +488,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/chest.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/chest.json index 8a0e438b..e20cc9a5 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/chest.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/chest.json @@ -97,4 +97,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/other.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/other.json index 9836bfb2..77c6d9be 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/other.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/other.json @@ -143,4 +143,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/potion.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/potion.json index cc47a3b4..990ea9e0 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/potion.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/potion.json @@ -289,4 +289,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/skills.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/skills.json index 9e26dfee..0967ef42 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/skills.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/skills.json @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/datapacks/map_all/data/minecraft/loot_tables/hunger/sword.json b/datapacks/map_all/data/minecraft/loot_tables/hunger/sword.json index 0896577f..04fa8cfe 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/hunger/sword.json +++ b/datapacks/map_all/data/minecraft/loot_tables/hunger/sword.json @@ -236,8 +236,15 @@ "quality": 3, "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"§f击退棍\"'},Enchantments:[{id:\"knockback\",lvl:2}]}" + "function": "set_components", + "components": { + "minecraft:custom_name": "\"§f击退棍\"", + "minecraft:enchantments": { + "levels": { + "minecraft:knockback": 2 + } + } + } } ] }, @@ -248,12 +255,18 @@ "quality": 1, "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{Enchantments:[{id:\"knockback\",lvl:2}]}" + "function": "set_components", + "components": { + "minecraft:enchantments": { + "levels": { + "minecraft:knockback": 2 + } + } + } } ] } ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/loot_tables/tntwars/tnttool.json b/datapacks/map_all/data/minecraft/loot_tables/tntwars/tnttool.json index db61ae99..319412d7 100644 --- a/datapacks/map_all/data/minecraft/loot_tables/tntwars/tnttool.json +++ b/datapacks/map_all/data/minecraft/loot_tables/tntwars/tnttool.json @@ -1,108 +1,148 @@ { "type": "minecraft:command", "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:carrot_on_a_stick", + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 5, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a7c\\u00a7lFireball\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 4 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a7b\\u00a7lTNT Rain\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 5 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a72\\u00a7lCreeper\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 3 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a74\\u00a7lTNT\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 2 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a74\\u00a7lLong-Way TNT\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 8 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a7c\\u00a7lTNT - Minecart\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 1 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a72\\u00a7lCreeper Rain\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 6 + } + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:carrot_on_a_stick", + "functions": [ + { + "function": "set_components", + "components": { + "minecraft:custom_name": "\"\\u00a7c\\u00a7lFireball Rain\\u00a77 - 右键使用\"", + "minecraft:custom_data": { + "tnt": 7 + } + } + } + ] + } + ], "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a7c\\\\u00a7lFireball\\\\u00a77 - 右键使用\"'},tnt:4}" - } + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3 + }, + "add": true + } ] - },{ - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a7b\\\\u00a7lTNT Rain\\\\u00a77 - 右键使用\"'},tnt:5}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 3, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a72\\\\u00a7lCreeper\\\\u00a77 - 右键使用\"'},tnt:3}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 2, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a74\\\\u00a7lTNT\\\\u00a77 - 右键使用\"'},tnt:2}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 2, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a74\\\\u00a7lLong-Way TNT\\\\u00a77 - 右键使用\"'},tnt:8}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 3, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a7c\\\\u00a7lTNT - Minecart\\\\u00a77 - 右键使用\"'},tnt:1}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a72\\\\u00a7lCreeper Rain\\\\u00a77 - 右键使用\"'},tnt:6}" - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:carrot_on_a_stick", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"\\\\u00a7c\\\\u00a7lFireball Rain\\\\u00a77 - 右键使用\"'},tnt:7}" - } - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3 - }, - "add": true - } - ] - } + } ] - } - \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/predicates/minecraft/boat/ifintheboat.json b/datapacks/map_all/data/minecraft/predicates/minecraft/boat/ifintheboat.json index dff4609e..480d2b0c 100644 --- a/datapacks/map_all/data/minecraft/predicates/minecraft/boat/ifintheboat.json +++ b/datapacks/map_all/data/minecraft/predicates/minecraft/boat/ifintheboat.json @@ -6,4 +6,4 @@ "team": "boat" } } -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/blocks/chessglass.json b/datapacks/map_all/data/minecraft/tags/blocks/chessglass.json index 780a52aa..a97b68d2 100644 --- a/datapacks/map_all/data/minecraft/tags/blocks/chessglass.json +++ b/datapacks/map_all/data/minecraft/tags/blocks/chessglass.json @@ -3,4 +3,4 @@ "black_stained_glass", "white_stained_glass" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/blocks/color.json b/datapacks/map_all/data/minecraft/tags/blocks/color.json index 6e7e1d65..602aa169 100644 --- a/datapacks/map_all/data/minecraft/tags/blocks/color.json +++ b/datapacks/map_all/data/minecraft/tags/blocks/color.json @@ -6,4 +6,4 @@ "#minecraft:wool", "minecraft:clay" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/blocks/hideseek.json b/datapacks/map_all/data/minecraft/tags/blocks/hideseek.json index 9d36e5fe..965435d9 100644 --- a/datapacks/map_all/data/minecraft/tags/blocks/hideseek.json +++ b/datapacks/map_all/data/minecraft/tags/blocks/hideseek.json @@ -44,4 +44,4 @@ "minecraft:chest", "minecraft:barrel" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/blocks/snowmineable.json b/datapacks/map_all/data/minecraft/tags/blocks/snowmineable.json index 0d874e67..8dcd2b8e 100644 --- a/datapacks/map_all/data/minecraft/tags/blocks/snowmineable.json +++ b/datapacks/map_all/data/minecraft/tags/blocks/snowmineable.json @@ -40,4 +40,4 @@ "minecraft:white_terracotta", "#minecraft:walls" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/blocks/terracottas.json b/datapacks/map_all/data/minecraft/tags/blocks/terracottas.json index 185596bd..5e896905 100644 --- a/datapacks/map_all/data/minecraft/tags/blocks/terracottas.json +++ b/datapacks/map_all/data/minecraft/tags/blocks/terracottas.json @@ -19,4 +19,4 @@ "minecraft:red_terracotta", "minecraft:black_terracotta" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/items/fence_gates.json b/datapacks/map_all/data/minecraft/tags/items/fence_gates.json index f94523b9..80186af7 100644 --- a/datapacks/map_all/data/minecraft/tags/items/fence_gates.json +++ b/datapacks/map_all/data/minecraft/tags/items/fence_gates.json @@ -10,4 +10,4 @@ "minecraft:crimson_fence_gate", "minecraft:warped_fence_gate" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/items/snowmineable.json b/datapacks/map_all/data/minecraft/tags/items/snowmineable.json index d34c958c..58a7f5cc 100644 --- a/datapacks/map_all/data/minecraft/tags/items/snowmineable.json +++ b/datapacks/map_all/data/minecraft/tags/items/snowmineable.json @@ -35,4 +35,4 @@ "minecraft:white_terracotta", "#minecraft:walls" ] -} \ No newline at end of file +} diff --git a/datapacks/map_all/data/minecraft/tags/items/terracottas.json b/datapacks/map_all/data/minecraft/tags/items/terracottas.json index 185596bd..5e896905 100644 --- a/datapacks/map_all/data/minecraft/tags/items/terracottas.json +++ b/datapacks/map_all/data/minecraft/tags/items/terracottas.json @@ -19,4 +19,4 @@ "minecraft:red_terracotta", "minecraft:black_terracotta" ] -} \ No newline at end of file +} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/changemode.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/changemode.mcfunction index b63a9340..5aa97acb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/changemode.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/changemode.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute unless score boat.state state matches 1.. run scoreboard players add boat.type board 1 execute if score boat.state state matches 1.. run tellraw @s ["\u00a7c游戏已经开始，当前无法修改。"] @@ -13,4 +17,4 @@ execute if score boat.type board matches 4 run data modify block -12 146 -32 fro execute if score boat.type board matches 5 run data modify block -12 146 -32 front_text.messages[2] set value '"\\u00a7e[赛马]"' -# execute if score chest.type board matches 4 run data merge block 347 91 22 {Textx2:'"\\u00a7d\\u00a7l[五子棋]"'} \ No newline at end of file +# execute if score chest.type board matches 4 run data merge block 347 91 22 {Textx2:'"\\u00a7d\\u00a7l[五子棋]"'} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmoreitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmoreitem.mcfunction index 25c2afab..b1ffc1c8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmoreitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmoreitem.mcfunction @@ -1,8 +1,12 @@ -execute store result score boat.tmp board run clear @s compass{boatItem:1b} 0 -execute if score boat.tmp board matches 2.. run clear @s compass{boatItem:1b} -execute store result score boat.tmp board run clear @s carrot_on_a_stick{boatItem:1b} 0 -execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick{boatItem:1b} -execute store result score boat.tmp board run clear @s carrot_on_a_stick{boatItem:2b} 0 -execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick{boatItem:2b} -execute store result score boat.tmp board run clear @s carrot_on_a_stick{boatItem:-1b} 0 -execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick{boatItem:-1b} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score boat.tmp board run clear @s compass[custom_data~{boatItem:1b}] 0 +execute if score boat.tmp board matches 2.. run clear @s compass[custom_data~{boatItem:1b}] +execute store result score boat.tmp board run clear @s carrot_on_a_stick[custom_data~{boatItem:1b}] 0 +execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick[custom_data~{boatItem:1b}] +execute store result score boat.tmp board run clear @s carrot_on_a_stick[custom_data~{boatItem:2b}] 0 +execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick[custom_data~{boatItem:2b}] +execute store result score boat.tmp board run clear @s carrot_on_a_stick[custom_data~{boatItem:-1b}] 0 +execute if score boat.tmp board matches 2.. run clear @s carrot_on_a_stick[custom_data~{boatItem:-1b}] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmyboat.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmyboat.mcfunction index 890728b8..77ba9bc6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmyboat.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectmyboat.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add boat.sel execute as @e[tag=boat] if score @s park.uuid = @a[tag=boat.sel,limit=1] park.uuid run tag @s add boat.tmp1 # tag @e[tag=boat,limit=1,sort=nearest] add boat.tmp @@ -10,4 +14,4 @@ execute as @s[tag=!boat.ok] run tellraw @s ["\u00a7c这不是你的载具！\u00 tag @s remove boat.sel # tag @e remove boat.tmp tag @e remove boat.tmp1 -tag @s remove boat.ok \ No newline at end of file +tag @s remove boat.ok diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectreadygo.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectreadygo.mcfunction index 01e5514d..2fd5442e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/detectreadygo.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/detectreadygo.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## item replace entity @a[team=boat,tag=boat.notspawn] hotbar.7 with air item replace entity @a[team=boat,tag=boat.notspawn] hotbar.8 with air -execute unless entity @a[team=boat,tag=boat.notinboat,gamemode=adventure] run function boat/readygo \ No newline at end of file +execute unless entity @a[team=boat,tag=boat.notinboat,gamemode=adventure] run function boat/readygo diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/getrandomitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/getrandomitem.mcfunction index 2fbbefd0..b8db48e8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/getrandomitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/getrandomitem.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["boat.tmp.marker","1"]} summon marker ~ ~ ~ {Tags:["boat.tmp.marker","2"]} tag @e[type=marker,tag=boat.tmp.marker,limit=1,sort=random] add boat.sel -execute if entity @e[tag=boat.sel,tag=1] run give @s carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7a\\u00a7l失明陷阱 \\u00a77- 右键使用"'},boatItem:4b,trap:1,CustomModelData:17} -execute if entity @e[tag=boat.sel,tag=2] run give @s carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7c\\u00a7l下车陷阱 \\u00a77- 右键使用"'},boatItem:4b,trap:2,CustomModelData:17} +execute if entity @e[tag=1] run give @s carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7a\\u00a7l失明陷阱 \\u00a77- 右键使用"',custom_data={boatItem:4b,trap:1},custom_model_data=17] +execute if entity @e[tag=2] run give @s carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7c\\u00a7l下车陷阱 \\u00a77- 右键使用"',custom_data={boatItem:4b,trap:2},custom_model_data=17] title @s actionbar ["\u00a7e\u00a7l你获得了新的道具"] tag @e[tag=boat.sel] remove boat.sel kill @e[type=marker,tag=boat.tmp.marker] -playsound entity.player.levelup player @s ~ ~ ~ 10 1.5 1 \ No newline at end of file +playsound entity.player.levelup player @s ~ ~ ~ 10 1.5 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/givespeed.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/givespeed.mcfunction index 39c96576..9cb50b1a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/givespeed.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/givespeed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add boat.sel execute as @e[tag=boat] if score @s park.uuid = @a[tag=boat.sel,limit=1] park.uuid run tag @s add boat.tmp # tag @e[tag=boat,limit=1,sort=nearest] add boat.tmp @@ -12,4 +16,4 @@ execute unless score boat.type board matches 4 run execute unless entity @e[tag= # execute as @s[tag=!boat.ok] run tellraw @s ["\u00a7c这不是你的载具！这是",{"selector":"@e[tag=boat.tmp,limit=1]"},"\u00a7c，请乘坐你自己的载具。"] tag @s remove boat.sel tag @e remove boat.tmp -tag @s remove boat.ok \ No newline at end of file +tag @s remove boat.ok diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/goback.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/goback.mcfunction index 1585984b..20dd07f0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/goback.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/goback.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add boat.sel execute as @e[tag=boat] if score @s park.uuid = @a[tag=boat.sel,limit=1] park.uuid run tag @s add boat.tmp tp @s @e[tag=boat.tmp,limit=1] @@ -12,4 +16,4 @@ execute if entity @e[tag=boat.tmp,limit=1] run tellraw @s ["\u00a7a已将你传 # execute as @s[tag=!boat.ok] run tellraw @s ["\u00a7c这不是你的载具！这是",{"selector":"@e[tag=boat.tmp,limit=1]"},"\u00a7c，请乘坐你自己的载具。"] tag @s remove boat.sel tag @e remove boat.tmp -tag @s remove boat.ok \ No newline at end of file +tag @s remove boat.ok diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/ifgetrandomitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/ifgetrandomitem.mcfunction index 22b95401..083aa9c8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/ifgetrandomitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/ifgetrandomitem.mcfunction @@ -1,2 +1,6 @@ -execute store result score boat.tmp board run clear @s carrot_on_a_stick{boatItem:4b} 0 -execute if score boat.tmp board matches ..0 run function boat/getrandomitem \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score boat.tmp board run clear @s carrot_on_a_stick[custom_data~{boatItem:4b}] 0 +execute if score boat.tmp board matches ..0 run function boat/getrandomitem diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/join.mcfunction index dece79ed..1b6e2a84 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join boat @s title @s reset tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a79冰船游戏\u00a7a。"] @@ -16,4 +20,4 @@ execute if score boat.state state matches 1.. run function boat/spec xp set @s 0 levels xp set @s 0 points tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/letplayergetrandomitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/letplayergetrandomitem.mcfunction index d829b699..53cf4d15 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/letplayergetrandomitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/letplayergetrandomitem.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add boat.sel execute as @a[team=boat] if score @s park.uuid = @e[tag=boat.sel,limit=1] park.uuid run tag @s add boat.tmp1 execute as @a[tag=boat.tmp1] at @s run function boat/ifgetrandomitem tag @a remove boat.tmp1 -tag @s remove boat.sel \ No newline at end of file +tag @s remove boat.sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/listname.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/listname.mcfunction index e0b7bd55..6de04006 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/listname.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/listname.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # boat.rounds tellraw @a[team=boat] [""] execute as @a[team=boat,gamemode=spectator,scores={boat.rounds=1..}] at @s run tellraw @a[team=boat] [{"selector":"@s"},"\u00a76 是\u00a7a第",{"score":{"name": "@s","objective": "boat.rounds"},"color":"aqua"},"\u00a7a名"] @@ -6,3 +10,4 @@ execute as @a[team=boat,gamemode=spectator,scores={boat.rounds=1..}] at @s run t execute as @a[team=boat] at @s run title @s title ["\u00a76\u00a7l游戏结束"] execute as @a[team=boat,gamemode=adventure] at @s run title @s subtitle ["\u00a77你并未完成比赛"] execute as @a[team=boat,gamemode=spectator,scores={boat.rounds=1..}] at @s run title @s subtitle ["\u00a7a你是第",{"score":{"name": "@s","objective": "boat.rounds"},"color":"aqua"},"\u00a7a名\u00a77"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/over.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/over.mcfunction index 558f6b44..29058150 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/over.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team modify boat prefix ["\u00a7c[O]\u00a79 冰船\u00a78 | "] tellraw @a ["\u00a79\u00a7l冰船游戏 ＞ \u00a7a游戏结束。"] forceload add -32 88 -102 313 @@ -12,3 +16,4 @@ kill @e[tag=boat] # kill @e[typoe] kill @e[type=marker,tag=boat.trap] forceload remove -32 88 -102 313 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/tp.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/tp.mcfunction index c871930f..92388cfb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/over/tp.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/over/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team modify boat prefix ["\u00a7a[W]\u00a79 冰船\u00a78 | "] scoreboard players reset @e[tag=boat] @@ -8,3 +12,4 @@ gamemode adventure @a[team=boat] execute as @a[team=boat] run function boat/join kill @e[type=marker,tag=boat.trap] team modify hunger friendlyFire false + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/readycount.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/readycount.mcfunction index c97c975b..c5118df1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/readycount.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/readycount.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove boat.start board 1 execute if score boat.start board matches 1.. run tellraw @a[team=boat] ["\u00a7e游戏即将在",{"score":{"name": "boat.start","objective": "board"},"color":"red"},"\u00a7e秒后开始。"] execute if score boat.start board matches 1.. run title @a[team=boat] title ["\u00a79\u00a7l冰船游戏 Ice Boat Game"] @@ -5,8 +9,8 @@ execute if score boat.start board matches 1.. run title @a[team=boat] subtitle [ execute as @a[team=boat] at @s run playsound minecraft:block.note_block.pling player @s -62 160 -98 5 1 1 execute if score boat.start board matches ..0 run function boat/startgo -clear @a[team=boat] carrot_on_a_stick{boatItem:3b} +clear @a[team=boat] carrot_on_a_stick[custom_data~{boatItem:3b}] # clear @a[team=boat] carrot_on_a_stick{boatItem:2b} # clear @a[team=boat] carrot_on_a_stick{boatItem:1b} -# execute as @e[tag=boat,team=boat,nbt={NoAI:1b}] at @s run data merge entity @s {NoAI:0b} \ No newline at end of file +# execute as @e[tag=boat,team=boat,nbt={NoAI:1b}] at @s run data merge entity @s {NoAI:0b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/readygo.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/readygo.mcfunction index e4fa6090..40ef3ec9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/readygo.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/readygo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set boat.state state 3 scoreboard players set boat.start board 6 -tellraw @a[team=boat] ["\u00a7a游戏即将开始，请各就各位。"] \ No newline at end of file +tellraw @a[team=boat] ["\u00a7a游戏即将开始，请各就各位。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset.mcfunction index 07622211..5e754f82 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset.mcfunction @@ -1,14 +1,18 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute if score boat.type board matches ..1 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7b冰船"] # execute if score boat.type board matches 2 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7d猪"] # execute if score boat.type board matches 3 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7c炽足兽"] # execute if score boat.type board matches 4 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位准备\u00a76赛跑"] # execute if score boat.type board matches 5 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7e马"] -# execute if score boat.type board matches ..1 run -# execute if score boat.type board matches 2 run -# execute if score boat.type board matches 3 run -# execute if score boat.type board matches 4 run -# execute if score boat.type board matches 5 run +# execute if score boat.type board matches ..1 run +# execute if score boat.type board matches 2 run +# execute if score boat.type board matches 3 run +# execute if score boat.type board matches 4 run +# execute if score boat.type board matches 5 run forceload add -32 88 -102 313 tag @a remove boat.notspawn @@ -21,3 +25,4 @@ execute unless score boat.type board matches 4 run tag @a[team=boat] add boat.no schedule function minecraft:boat/reset_doit 5t forceload remove -32 88 -102 313 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_doit.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_doit.mcfunction index 95c5977e..378d5065 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_doit.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_doit.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=boat.reset.structure] at @s if score boat.type board matches 3 run fill ~ ~ ~ ~16 ~16 ~31 lava replace obsidian + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_marker.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_marker.mcfunction index 3405f5c8..b7b0a703 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_marker.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_marker.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # setblock ~ ~ ~ air fill ~ ~ ~ ~15 ~15 ~31 air kill @e[type=item,distance=0..30] @@ -12,4 +16,4 @@ execute as @s[tag=boat.reset.structure.water] if score boat.type board matches 5 # 炽足兽 execute as @s[tag=boat.reset.structure] if score boat.type board matches 3 run fill ~ ~ ~ ~16 ~16 ~31 lava replace water # /say @e[tag=boat.reset.structure.normal] -# /say @e[tag=boat.reset.structure.water] \ No newline at end of file +# /say @e[tag=boat.reset.structure.water] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_set_random.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_set_random.mcfunction index 8e889b56..b6fb58d1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_set_random.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/reset_set_random.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## $place template minecraft:boat_$(type)_$(random) + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/second.mcfunction index 803915b1..55072a37 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/second.mcfunction @@ -1,17 +1,21 @@ -item replace entity @a[team=boat] hotbar.8 with minecraft:compass{LodestoneDimension:"minecraft:boatworld2",LodestonePos:{X:-45,Y:135,Z:96},LodestoneTracked:0b,display:{Name:'"\\u00a7b\\u00a7l终点指南针"',Lore:['"\\u00a77你到终点的直线方向"']},boatItem:1b} -execute if score boat.type board matches 2 run item replace entity @a[team=boat] hotbar.0 with minecraft:carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"'},boatItem:2b,CustomModelData:13} -execute if score boat.type board matches 4..5 run item replace entity @a[team=boat] hotbar.0 with minecraft:carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"'},boatItem:2b,CustomModelData:13} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @a[team=boat] hotbar.8 with minecraft:compass[lodestone_tracker={target:{dimension:"minecraft:boatworld2",pos:[-45,135,96]},tracked:0b},custom_name='"\\u00a7b\\u00a7l终点指南针"',lore=['"\\u00a77你到终点的直线方向"'],custom_data={boatItem:1b}] +execute if score boat.type board matches 2 run item replace entity @a[team=boat] hotbar.0 with minecraft:carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"',custom_data={boatItem:2b},custom_model_data=13] +execute if score boat.type board matches 4..5 run item replace entity @a[team=boat] hotbar.0 with minecraft:carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"',custom_data={boatItem:2b},custom_model_data=13] # execute if score boat.type board matches 5 run item replace entity @a[team=boat] hotbar.0 with minecraft:carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"'},boatItem:2b} -execute if score boat.type board matches 3 run item replace entity @a[team=boat] hotbar.0 with minecraft:warped_fungus_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"'},boatItem:2b,CustomModelData:1} -item replace entity @a[team=boat,tag=boat.notspawn] hotbar.0 with minecraft:carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7a\\u00a7l生成载具 \\u00a77- 右键点击"'},boatItem:3b,CustomModelData:14} -execute unless score boat.type board matches 4 run item replace entity @a[team=boat] hotbar.7 with minecraft:carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7b\\u00a7l返回载具附近 \\u00a77- 右键点击"',Lore:['"\\u00a77传送到你的载具附近"']},boatItem:1b,CustomModelData:15} +execute if score boat.type board matches 3 run item replace entity @a[team=boat] hotbar.0 with minecraft:warped_fungus_on_a_stick[unbreakable={},custom_name='"\\u00a7b\\u00a7l加速冲刺 \\u00a77- 右键点击"',custom_data={boatItem:2b},custom_model_data=1] +item replace entity @a[team=boat,tag=boat.notspawn] hotbar.0 with minecraft:carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7a\\u00a7l生成载具 \\u00a77- 右键点击"',custom_data={boatItem:3b},custom_model_data=14] +execute unless score boat.type board matches 4 run item replace entity @a[team=boat] hotbar.7 with minecraft:carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7b\\u00a7l返回载具附近 \\u00a77- 右键点击"',lore=['"\\u00a77传送到你的载具附近"'],custom_data={boatItem:1b},custom_model_data=15] execute if score boat.type board matches 1 run item replace entity @a[team=boat] weapon.offhand with air -execute if score boat.type board matches 3 run item replace entity @a[team=boat] weapon.offhand with warped_fungus_on_a_stick{Unbreakable:1b,boatItem:-1b,CustomModelData:2,display:{Name:'"\\u00a78你居然发现了我！"'}} -execute if score boat.type board matches 2 run item replace entity @a[team=boat] weapon.offhand with carrot_on_a_stick{Unbreakable:1b,boatItem:-1b,CustomModelData:16,display:{Name:'"\\u00a78你居然发现了我！"'}} +execute if score boat.type board matches 3 run item replace entity @a[team=boat] weapon.offhand with warped_fungus_on_a_stick[unbreakable={},custom_data={boatItem:-1b},custom_model_data=2,custom_name='"\\u00a78你居然发现了我！"'] +execute if score boat.type board matches 2 run item replace entity @a[team=boat] weapon.offhand with carrot_on_a_stick[unbreakable={},custom_data={boatItem:-1b},custom_model_data=16,custom_name='"\\u00a78你居然发现了我！"'] execute if score boat.type board matches 4 run item replace entity @a[team=boat] weapon.offhand with air execute as @a[team=boat] at @s run function boat/detectmoreitem -execute if score boat.state state matches 1 run title @a[tag=boat.notinboat,team=boat] actionbar ["\u00a7e\u00a7l警告：您没有在您的载具里。请乘坐您的载具进行比赛！"] -execute if score boat.state state matches 2 run title @a[tag=boat.notinboat,team=boat] actionbar ["\u00a7a\u00a7l提示：请通过物品栏的工具召唤载具。"] +execute if score boat.state state matches 1 run title @a[tag=boat.notinboat,team=boat] actionbar ["\u00a7e\u00a7l警告：您没有在您的载具里。请乘坐您的载具进行比赛！"] +execute if score boat.state state matches 2 run title @a[tag=boat.notinboat,team=boat] actionbar ["\u00a7a\u00a7l提示：请通过物品栏的工具召唤载具。"] effect give @e[team=boat] resistance 4 25 true execute if score boat.state state matches 2 run function boat/detectreadygo execute if score boat.state state matches 3 run function boat/readycount @@ -22,4 +26,4 @@ xp add @a[team=boat,level=1..] -1 levels # 探测是否应该结束游戏 scoreboard players set boat.players tick 0 execute as @a[team=boat,gamemode=adventure] at @s run scoreboard players add boat.players tick 1 -execute if score boat.state state matches 1..9 if score boat.players tick matches ..1 run function boat/over/over \ No newline at end of file +execute if score boat.state state matches 1..9 if score boat.players tick matches ..1 run function boat/over/over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/skills.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/skills.mcfunction index b92b6c8f..4f63eaa4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/skills.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/skills.mcfunction @@ -1,15 +1,19 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s[level=..0] run tag @s add boat.skillok execute at @s run playsound ui.button.click player @s -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:3b}}},tag=boat.notspawn] run tag @s add skill.boat.3 -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:2b}}},tag=boat.skillok,tag=!boat.notspawn] run tag @s add skill.boat.2 -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:1b}}},tag=!boat.notspawn] run tag @s add skill.boat.1 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:3b}}}},tag=boat.notspawn] run tag @s add skill.boat.3 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:2b}}}},tag=!boat.notspawn] run tag @s add skill.boat.2 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:1b}}}},tag=!boat.notspawn] run tag @s add skill.boat.1 -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:4b}}},tag=!boat.notspawn] run tag @s add skill.boat.trap +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:4b}}}},tag=!boat.notspawn] run tag @s add skill.boat.trap -execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{tag:{trap:1}}}] run tag @s add boat.trap.1 -execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{tag:{trap:2}}}] run tag @s add boat.trap.2 -execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{tag:{trap:3}}}] run tag @s add boat.trap.3 -execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{tag:{trap:4}}}] run tag @s add boat.trap.4 +execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{trap:1}}}}] run tag @s add boat.trap.1 +execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{trap:2}}}}] run tag @s add boat.trap.2 +execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{trap:3}}}}] run tag @s add boat.trap.3 +execute as @s[tag=skill.boat.trap] if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{trap:4}}}}] run tag @s add boat.trap.4 # Trap 1 Slow and Blind # Trap 2 Stop! # Trap 3 to-do @@ -20,7 +24,7 @@ execute as @s[tag=boat.trap.2] at @s run function boat/trap/2/spawn # execute as @s[tag=boat.trap.4] at @s run function boat/trap/4/spawn execute as @s[tag=skill.boat.trap] at @s run playsound minecraft:block.piston.contract player @s ~ ~ ~ 5 1 1 -execute as @s[tag=skill.boat.3] at @s run function boat/spawn/spawnmain +execute as @s[tag=skill.boat.3] at @s run function boat/spawn/spawnmain execute as @s[tag=skill.boat.2] at @s run function boat/givespeed execute as @s[tag=skill.boat.2] at @s run playsound entity.experience_orb.pickup player @s ~ ~ ~ 5 1 1 execute as @s[tag=skill.boat.2] at @s run xp add @s 15 levels @@ -29,12 +33,12 @@ execute as @s[tag=skill.boat.1] at @s run function boat/goback execute as @s[tag=skill.boat.trap] at @s run xp add @s 3 levels execute as @s[tag=skill.boat.trap] at @s run xp set @s 0 points execute as @s[tag=skill.boat.trap] at @s run title @s actionbar ["\u00a7a\u00a7l已使用道具"] -execute as @s[tag=skill.boat.trap] at @s run clear @s carrot_on_a_stick{boatItem:4b} +execute as @s[tag=skill.boat.trap] at @s run clear @s carrot_on_a_stick[custom_data~{boatItem:4b}] -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:2b}}},tag=!boat.skillok,tag=!boat.notspawn] run title @s actionbar ["\u00a7c\u00a7l此技能冷却中"] -execute if entity @s[tag=boat.trap,tag=!boat.skillok] run title @s actionbar ["\u00a7c\u00a7l此技能冷却中"] -execute if entity @s[nbt={SelectedItem:{tag:{boatItem:2b}}},tag=!boat.skillok,tag=!boat.notspawn] run playsound entity.enderman.teleport player @s ~ ~ ~ 5 0 1 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:2b}}}},tag=!boat.notspawn] run title @s actionbar ["\u00a7c\u00a7l此技能冷却中"] +execute if entity @s[tag=!boat.skillok] run title @s actionbar ["\u00a7c\u00a7l此技能冷却中"] +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{boatItem:2b}}}},tag=!boat.notspawn] run playsound entity.enderman.teleport player @s ~ ~ ~ 5 0 1 tag @s remove skill.boat.3 tag @s remove skill.boat.2 @@ -47,4 +51,4 @@ tag @s remove boat.trap.5 tag @s remove boat.trap.6 tag @s remove boat.trap.7 tag @s remove skill.boat.trap -tag @s remove boat.skillok \ No newline at end of file +tag @s remove boat.skillok diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/spawn/spawnmain.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/spawn/spawnmain.mcfunction index 431f06a0..dbd28879 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/spawn/spawnmain.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/spawn/spawnmain.mcfunction @@ -1,4 +1,8 @@ -clear @s carrot_on_a_stick{boatItem:3b} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +clear @s carrot_on_a_stick[custom_data~{boatItem:3b}] tag @s remove boat.notspawn tag @s add boat.sel team leave @s @@ -8,13 +12,14 @@ team join boat @s execute if score boat.type board matches 1 run summon minecraft:boat ~ ~ ~ {CustomNameVisible:1b,Invulnerable:1b,Silent:1b,Tags:["boat","boat.new"]} execute if score boat.type board matches 2 run summon minecraft:pig ~ ~ ~ {CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Tags:["boat","boat.new"],DeathLootTable:"",Saddle:1b,Team:"boat",Attributes:[{Base:0.23d,Name:"generic.movement_speed"}],NoAI:1b} execute if score boat.type board matches 3 run summon minecraft:strider ~ ~ ~ {CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Tags:["boat","boat.new"],DeathLootTable:"",Saddle:1b,Team:"boat",Attributes:[{Base:0.22d,Name:"generic.movement_speed"}],NoAI:1b} -execute if score boat.type board matches 5 run summon minecraft:horse ~ ~ ~ {CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Tags:["boat","boat.new"],DeathLootTable:"",Team:"boat",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Name:"horse.jump_strength",Base:0.6d}],NoAI:1b,Tame:true,SaddleItem:{id:"minecraft:saddle",Count:1b},Temper:100} +execute if score boat.type board matches 5 run summon minecraft:horse ~ ~ ~ {CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Tags:["boat","boat.new"],DeathLootTable:"",Team:"boat",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Name:"horse.jump_strength",Base:0.6d}],NoAI:1b,Tame:"true",SaddleItem:{id:"minecraft:saddle",Count:1b},Temper:100} execute as @e[tag=boat.new] run scoreboard players operation @s park.uuid = @a[limit=1,tag=boat.sel] park.uuid execute as @e[tag=boat.new] run data modify entity @s CustomName set from block -54 160 -100 front_text.messages[0] + execute as @e[tag=boat.new] run data modify entity @s Owner set from entity @a[limit=1,tag=boat.sel] UUID execute as @e[tag=boat.new] run team join boat @s ride @s mount @e[tag=boat.new,limit=1] execute as @e[tag=boat.new] run tag @s remove boat.new tag @s remove boat.sel -tellraw @s ["\n\u00a7b你已经骑上载具！\n"] \ No newline at end of file +tellraw @s ["\n\u00a7b你已经骑上载具！\n"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/spec.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/spec.mcfunction index 3cdbbba1..8f293ffa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/spec.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。请等待下一场游戏。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。请等待下一场游戏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/start.mcfunction index 2529bb6e..664946cb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=boat] at @s run spreadplayers -82 299 0 3 false @s execute as @a[team=boat] at @s run tp @s ~ ~ ~ 180 0 # fill -66 165 -94 -60 160 -95 minecraft:stone_brick_wall keep @@ -6,7 +10,7 @@ fill -76 141 295 -89 135 294 cobblestone_wall keep scoreboard players set boat.state state 2 execute as @a[team=boat] at @s run playsound minecraft:block.anvil.land player @s ~ ~ ~ 5 2 1 title @a[team=boat] title ["\u00a79\u00a9\u00a7l 冰船游戏 Ice Boat Game"] -# execute if score boat.type state matches 1 run +# execute if score boat.type state matches 1 run team modify boat prefix ["\u00a7e[R]\u00a79 冰船\u00a78 | "] @@ -23,3 +27,4 @@ tag @a remove boat.notspawn execute unless score boat.type board matches 4 run tag @a[team=boat] add boat.notspawn # forceload remove -32 88 -102 313 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/startgo.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/startgo.mcfunction index 30678ee8..e658be75 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/startgo.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/startgo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @a[team=boat] subtitle ["\u00a7b游戏开始"] tellraw @a[team=boat] ["\u00a7e游戏开始！"] # fill -66 165 -94 -60 160 -95 air replace stone_brick_wall @@ -8,3 +12,4 @@ execute as @a[team=boat] at @s run playsound minecraft:block.note_block.pling pl team modify boat prefix ["\u00a76[P]\u00a79 冰船\u00a78 | "] scoreboard players set number boat.rounds 0 scoreboard players set boat.state state 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/tick.mcfunction index 96f08c9d..da313ff3 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/tick.mcfunction @@ -1,21 +1,25 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @a[team=golf,gamemode=adventure] at @s run kill @e[type=item,distance=0..5] # title @a[team=boat,x=-71,y=134,z=547,distance=0..3] actionbar ["\u00a76您已进入 \u00a7b[神秘区域]"] execute as @a[team=boat] at @s run kill @e[type=item,distance=0..5] -kill @e[type=item,nbt={Item:{tag:{boatItem:1b}}}] -kill @e[type=item,nbt={Item:{tag:{boatItem:2b}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{boatItem:1b}}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{boatItem:2b}}}}] # title @a[team=boat,x=-43,y=134,z=196,distance=0..4] actionbar ["\u00a76您已进入 \u00a7a[Part 2 - 街道]"] # title @a[team=boat,x=285,y=134,z=554,distance=0..5] actionbar ["\u00a76您已进入 \u00a7d[Part 3 - 隧道]"] # title @a[team=boat,x=285,y=134,z=560,distance=0..5] actionbar ["\u00a76您已进入 \u00a7d[Part 3 - 隧道]"] # title @a[team=boat,x=735,y=-61,z=582,distance=0..5] actionbar ["\u00a76您已进入 \u00a73[Part 4 - 地下桃园]"] -# 735 -61 582 +# 735 -61 582 # boat.notinboat 玩家不在载具里 tag @a[tag=boat.notinboat] remove boat.notinboat execute unless score boat.type board matches 4 run tag @a[team=boat] add boat.notinboat execute as @a[team=boat] if predicate minecraft/boat/ifintheboat run tag @s remove boat.notinboat -execute unless score boat.type board matches 4 run execute as @a[team=boat,tag=!boat.notinboat] at @s run function boat/detectmyboat +execute unless score boat.type board matches 4 run execute as @a[team=boat,tag=!boat.notinboat] at @s run function boat/detectmyboat execute as @e[team=boat,type=!player] at @s if block ~ ~-1 ~ target run scoreboard players reset @s execute as @e[team=boat,type=!player] at @s if block ~ ~-1 ~ target run kill @s @@ -36,4 +40,4 @@ execute as @a[team=boat,tag=!boat.notinboat] at @s if block ~ ~-1 ~ blue_ice run # execute as @e[type=marker,tag=boat.trap,tag=trap2] at @s if entity @a[team=boat,distance=0..4] run function boat/trap/2/active # execute as @e[type=marker,tag=boat.trap,tag=trap2] at @s run particle flame ~ ~ ~ 3 0 3 0 15 # execute as @e[tag=boat.trap,scores={park.uuid=1..}] at @s run tp ~ ~-0.1 ~ -# execute as @e[tag=boat.trap,scores={park.uuid=1..}] at @s run scoreboard players remove @s park.uuid 1 \ No newline at end of file +# execute as @e[tag=boat.trap,scores={park.uuid=1..}] at @s run scoreboard players remove @s park.uuid 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/active.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/active.mcfunction index 7d23bc73..f600b9ab 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/active.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/active.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## effect give @e[distance=0..6,team=boat] slowness 5 5 true effect give @a[distance=0..6,team=boat] blindness 5 5 true particle minecraft:explosion ~ ~ ~ 1 1 1 1 5 playsound entity.generic.explode player @a[distance=0..6,team=boat] ~ ~ ~ 5 1 1 title @a[distance=0..6,team=boat] title [""] title @a[distance=0..6,team=boat] subtitle ["\u00a7c你触发了陷阱"] -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/spawn.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/spawn.mcfunction index 27e469e7..c36849e6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/spawn.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/1/spawn.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~10 ~ {Tags:["boat.trap","trap1","boat.new"]} scoreboard players set @e[tag=boat.new] park.uuid 100 tag @e[tag=boat.new] remove boat.new -particle lava ~ ~ ~ 1 1 1 1 100 normal \ No newline at end of file +particle lava ~ ~ ~ 1 1 1 1 100 normal diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/active.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/active.mcfunction index 1ea580c1..8835a104 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/active.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/active.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=boat,distance=0..6] at @s run tp ~ ~0.5 ~ execute as @a[team=boat,distance=0..6] at @s run effect give @s slowness 1 25 true particle minecraft:explosion ~ ~ ~ 1 1 1 1 5 @@ -5,4 +9,4 @@ playsound entity.generic.explode player @a[distance=0..6,team=boat] ~ ~ ~ 5 1 1 title @a[distance=0..6,team=boat] title [""] title @a[distance=0..6,team=boat] subtitle ["\u00a7c你触发了陷阱"] -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/spawn.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/spawn.mcfunction index fbe6be0b..b22867f0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/spawn.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/trap/2/spawn.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~10 ~ {Tags:["boat.trap","trap2","boat.new"]} scoreboard players set @e[tag=boat.new] park.uuid 100 particle cloud ~ ~ ~ 1 1 1 1 100 normal -tag @e[tag=boat.new] remove boat.new \ No newline at end of file +tag @e[tag=boat.new] remove boat.new diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/trystart.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/trystart.mcfunction index fcdafb72..129dc61f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/trystart.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/trystart.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=boat,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score boat.state state matches 1.. run function minecraft:boat/spec execute unless score boat.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score boat.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score boat.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:boat/start \ No newline at end of file +execute unless score boat.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:boat/start diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boat/win.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boat/win.mcfunction index c340da5e..5b7a3961 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boat/win.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boat/win.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -scoreboard players add number boat.rounds 1 +scoreboard players add number boat.rounds 1 scoreboard players operation @s boat.rounds = number boat.rounds tellraw @s ["\n\u00a7a\u00a7l 您到达了终点。\n\u00a7b\u00a7l 您是\u00a76\u00a7l 第",{"score":{"name": "@s","objective": "boat.rounds"},"color":"gold","bold": true},"\u00a76\u00a7l名\n"] tellraw @a[team=boat,distance=1..] [{"selector":"@s"},"\n\u00a7a\u00a7l到达了终点。"] @@ -14,4 +18,4 @@ kill @e[tag=boat.tmp] # execute as @s[tag=!boat.ok] run tellraw @s ["\u00a7c这不是你的载具！这是",{"selector":"@e[tag=boat.tmp,limit=1]"},"\u00a7c，请乘坐你自己的载具。"] tag @s remove boat.sel tag @e remove boat.tmp -tag @s remove boat.ok \ No newline at end of file +tag @s remove boat.ok diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/boatdied.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/boatdied.mcfunction index 7a50cd24..3a68a97e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/boatdied.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/boatdied.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @e[tag=damage.boat] -kill @e[tag=damage.boat] \ No newline at end of file +kill @e[tag=damage.boat] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectboat.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectboat.mcfunction index 63198fc9..54a435e7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectboat.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectboat.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @e[tag=btw.boat,type=boat] if score @s park.uuid = @a[tag=sel,limit=1] park.uuid run tag @s add damage.boat execute unless entity @e[tag=damage.boat] at @s run function boatwars/diedbecausenoboat @@ -11,3 +15,4 @@ execute as @s[tag=btw.notonmyboat] run ride @s mount @e[tag=damage.boat,limit=1] tag @s remove btw.notonmyboat tag @e[tag=damage.boat] remove damage.boat tag @s remove sel + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectplayercount.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectplayercount.mcfunction index b02d5951..75859ce6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectplayercount.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/detectplayercount.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set btw.c.a board 0 scoreboard players set btw.c.b board 0 @@ -13,4 +17,4 @@ execute as @a[team=btw.play.a,gamemode=adventure] run scoreboard players add btw execute as @a[team=btw.play.b,gamemode=adventure] run scoreboard players add btw.d.b board 1 execute if score btw.state state matches 1 if score btw.d.a board matches ..0 run function boatwars/roundover/b -execute if score btw.state state matches 1 if score btw.d.b board matches ..0 run function boatwars/roundover/a \ No newline at end of file +execute if score btw.state state matches 1 if score btw.d.b board matches ..0 run function boatwars/roundover/a diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/died.mcfunction index 7d51d7c3..5f2834eb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/died.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\u00a7c很抱歉，你死了。"] tp @s 591 50 -6 0 90 tp @s[team=btw.play.a] 628 24 -40 45 0 -tp @s[team=btw.play.b] 554 24 28 -135 0 \ No newline at end of file +tp @s[team=btw.play.b] 554 24 28 -135 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/diedbecausenoboat.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/diedbecausenoboat.mcfunction index 0fa9d843..74aa70e5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/diedbecausenoboat.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/diedbecausenoboat.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s run function boatwars/died tellraw @a[team=btw.wait] [{"selector":"@s"},"\u00a77溺水死了。"] tellraw @a[team=btw.play.a] [{"selector":"@s"},"\u00a77溺水死了。"] -tellraw @a[team=btw.play.b] [{"selector":"@s"},"\u00a77溺水死了。"] \ No newline at end of file +tellraw @a[team=btw.play.b] [{"selector":"@s"},"\u00a77溺水死了。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/gunitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/gunitem.mcfunction index 83d153fd..927b957d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/gunitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/gunitem.mcfunction @@ -1 +1,5 @@ -give @s carrot_on_a_stick{display:{Name:'{"text":"枪 \\u00a77- 右键使用","color":"gold"}'},Unbreakable:1b} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s carrot_on_a_stick[custom_name='{"text":"枪 \\u00a77- 右键使用","color":"gold"}',unbreakable={}] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/info.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/info.mcfunction index 0956ff4b..22680e44 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/info.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/info.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add sel execute as @e[tag=btw.boat,type=boat] if score @s park.uuid = @a[tag=sel,limit=1] park.uuid run tag @s add damage.boat scoreboard players set boat.health board 0 @@ -6,4 +10,4 @@ title @s actionbar ["\u00a7b船等级：",{"score":{"objective": "btw.boattype", execute if score boat.health board matches ..0 run function boatwars/boatdied tag @e[type=boat,tag=damage.boat] remove damage.boat -tag @s remove sel \ No newline at end of file +tag @s remove sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/join.mcfunction index 091a9008..51d6a356 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7e游戏公开测试中...遇到BUG请及时反馈！\n"] title @s title [{"text":"\u00a7b\u00a7lBoat Wars","color":"#F28500"}] title @s subtitle ["\u00a77Shoot them down!"] @@ -12,4 +16,4 @@ effect give @s instant_health 1 25 true clear @s scoreboard players reset @s btw.boattype scoreboard players reset @s btw.gunspeed -scoreboard players reset @s btw.coin \ No newline at end of file +scoreboard players reset @s btw.coin diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/a.mcfunction index 61350602..d6cc41e8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=btw.play.a] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍A（你）"] tellraw @a[team=btw.play.b] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍A"] tellraw @a[team=btw.wait] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍A"] @@ -7,4 +11,4 @@ title @a[team=btw.play.b] title ["\u00a7c你输了"] title @a[team=btw.wait] subtitle ["\u00a7a队伍A\u00a7r赢了"] title @a[team=btw.play.a] subtitle ["\u00a7a队伍A（你）\u00a7r赢了"] title @a[team=btw.play.b] subtitle ["\u00a7a队伍A\u00a7r赢了"] -function boatwars/over/all \ No newline at end of file +function boatwars/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/aandb.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/aandb.mcfunction index 0d3acdd8..c8b63f99 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/aandb.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/aandb.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=btw.play.a] ["\u00a72\u00a7lBOATWARS：\u00a76平局"] tellraw @a[team=btw.play.b] ["\u00a72\u00a7lBOATWARS：\u00a76平局"] tellraw @a[team=btw.wait] ["\u00a72\u00a7lBOATWARS：\u00a76平局"] @@ -7,4 +11,4 @@ title @a[team=btw.play.b] title ["\u00a76你并没有输"] title @a[team=btw.wait] subtitle ["\u00a7a平局"] title @a[team=btw.play.a] subtitle ["\u00a7a平局"] title @a[team=btw.play.b] subtitle ["\u00a7a平局"] -function boatwars/over/all \ No newline at end of file +function boatwars/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/all.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/all.mcfunction index c6dcadc6..8f67932a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/all.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/all.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset * btw.coin scoreboard players set @a[team=btw.wait] btw.coin 0 scoreboard players reset * btw.score @@ -10,4 +14,4 @@ scoreboard players reset * btw.gunspeed schedule function boatwars/over/tp 5s schedule clear boatwars/startround kill @e[tag=btw.boat] -kill @e[tag=boat.gun.line] \ No newline at end of file +kill @e[tag=boat.gun.line] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/b.mcfunction index c35bbc77..9049f47f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=btw.play.a] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍B"] tellraw @a[team=btw.play.b] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍B（你）"] tellraw @a[team=btw.wait] ["\u00a72\u00a7lBOATWARS：\u00a76获胜队伍：\u00a7a队伍B"] @@ -7,4 +11,4 @@ title @a[team=btw.play.a] title ["\u00a7c你输了"] title @a[team=btw.wait] subtitle ["\u00a7a队伍B\u00a7r赢了"] title @a[team=btw.play.a] subtitle ["\u00a7a队伍B\u00a7r赢了"] title @a[team=btw.play.b] subtitle ["\u00a7a队伍B（你）\u00a7r赢了"] -function boatwars/over/all \ No newline at end of file +function boatwars/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/check.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/check.mcfunction index 1eebecf8..70c560ba 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/check.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/check.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score btw.state state matches 1.. if score btw.score.a board > btw.score.b board run function boatwars/over/a execute if score btw.state state matches 1.. if score btw.score.a board < btw.score.b board run function boatwars/over/b -execute if score btw.state state matches 1.. if score btw.score.a board = btw.score.b board run function boatwars/over/aandb \ No newline at end of file +execute if score btw.state state matches 1.. if score btw.score.a board = btw.score.b board run function boatwars/over/aandb diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/tp.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/tp.mcfunction index 74a719b2..4334104d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/tp.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/over/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=btw.play.a] add tmp tag @a[team=btw.play.b] add tmp tag @a[team=btw.wait] add tmp @@ -5,3 +9,4 @@ execute as @a[tag=tmp] run function boatwars/join tag @a[tag=tmp] remove tmp scoreboard players set btw.state state 0 schedule clear boatwars/startround + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/ranteam.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/ranteam.mcfunction index 08b0d9d1..db92f57a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/ranteam.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/ranteam.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=boat.out] remove boat.out tag @r[team=btw.wait,gamemode=adventure] add boat.out scoreboard players add duel.ranteam board 1 @@ -7,4 +11,4 @@ tellraw @a[tag=boat.out,team=btw.play.a] ["\u00a7a你加入了 \u00a7e战船A队 tellraw @a[tag=boat.out,team=btw.play.b] ["\u00a7a你加入了 \u00a79战船B队"] execute if score duel.ranteam board matches 2.. run scoreboard players set duel.ranteam board 0 -tag @a[tag=boat.out] remove boat.out \ No newline at end of file +tag @a[tag=boat.out] remove boat.out diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/a.mcfunction index 4db9f955..7071920f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add @a[team=btw.play.a,gamemode=adventure] btw.coin 150 scoreboard players add @a[team=btw.play.a,gamemode=spectator] btw.coin 75 scoreboard players add @a[team=btw.play.b] btw.coin 20 @@ -7,3 +11,4 @@ tellraw @a[team=btw.play.a] ["\n\u00a7a 本回合结束。获胜队伍：A（ tellraw @a[team=btw.play.b] ["\n\u00a7a 本回合结束。获胜队伍：A\n"] scoreboard players add btw.score.a board 1 function boatwars/roundover/waitnext + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/b.mcfunction index 587bde39..b0f361e5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add @a[team=btw.play.b,gamemode=adventure] btw.coin 100 scoreboard players add @a[team=btw.play.b,gamemode=spectator] btw.coin 50 scoreboard players add @a[team=btw.play.a] btw.coin 20 @@ -9,3 +13,4 @@ tellraw @a[team=btw.play.a] ["\n\u00a7a 本回合结束。获胜队伍：B\n"] tellraw @a[team=btw.play.b] ["\n\u00a7a 本回合结束。获胜队伍：B（你）\n"] scoreboard players add btw.score.b board 1 function boatwars/roundover/waitnext + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/waitnext.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/waitnext.mcfunction index d746cb36..702cf4f6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/waitnext.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/roundover/waitnext.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add btw.round board 1 scoreboard players set btw.state state 2 kill @e[type=boat,tag=btw.boat] @@ -14,4 +18,4 @@ execute as @a[team=btw.play.a,gamemode=spectator] at @s run gamemode adventure @ execute as @a[team=btw.play.b,gamemode=spectator] at @s run gamemode adventure @s execute as @a[team=btw.play.a] at @s run function boatwars/tpposition execute as @a[team=btw.play.b] at @s run function boatwars/tpposition -schedule function boatwars/startround 15s \ No newline at end of file +schedule function boatwars/startround 15s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/second.mcfunction index 32502df8..b7c99705 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in minecraft:airworld run spawnpoint @s 553 6 32 effect give @a[team=btw.wait] resistance 1 25 true effect give @a[team=btw.play.a] resistance 1 25 true @@ -9,3 +13,4 @@ execute if score btw.state state matches 1..2 run function boatwars/detectplayer execute if score btw.state state matches 1 as @a[team=btw.play.a,gamemode=adventure] run function boatwars/testgunitem execute if score btw.state state matches 1 as @a[team=btw.play.b,gamemode=adventure] run function boatwars/testgunitem + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spawnboat.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spawnboat.mcfunction index 43a268b5..2649c54d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spawnboat.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spawnboat.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tp @s[team=btw.play.a] 628 14 -40 45 0 # tp @s[team=btw.play.b] 554 14 28 -135 0 execute as @s[team=btw.play.a] if score @s btw.boattype matches 0 run summon boat 628 14 -40 {Type:"bamboo",Tags:["boat.new","btw.boat"],Invulnerable:1b} @@ -18,7 +22,7 @@ execute as @s[team=btw.play.a] run tp @s 628 14 -40 45 0 # execute as @s[team=btw.play.a] run tp @e[tag=boat.new] 628 14 -40 45 0 execute as @s[team=btw.play.b] run tp @s 554 14 28 -135 0 # execute as @s[team=btw.play.b] run tp @e[tag=boat.new] 554 14 28 -135 0 -scoreboard players operation @e[tag=boat.new] park.uuid = @s park.uuid +scoreboard players operation @e[tag=boat.new] park.uuid = @s park.uuid execute if score @s btw.boattype matches 0 run scoreboard players set @e[tag=boat.new] btw.score 10 execute if score @s btw.boattype matches 1 run scoreboard players set @e[tag=boat.new] btw.score 15 @@ -33,4 +37,4 @@ tag @e[tag=boat.new] remove boat.new title @s title ["\u00a7a游戏开始！"] title @s subtitle ["\u00a7f游戏开始！"] -playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound entity.player.levelup player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spec.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spec.mcfunction index 12762b0d..ea1e172f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spec.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/start.mcfunction index c9810c5e..84e5c7d0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset * btw.coin scoreboard players reset * btw.score scoreboard players set btw.state state 2 @@ -21,4 +25,4 @@ scoreboard players set @a[team=btw.wait] btw.gunspeed 0 xp set @a[team=btw.wait] 0 points xp set @a[team=btw.wait] 0 levels execute as @a[team=btw.wait,gamemode=adventure] at @s run function boatwars/ranteam -function boatwars/roundover/waitnext \ No newline at end of file +function boatwars/roundover/waitnext diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startposition.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startposition.mcfunction index 6b25144d..66cd23ff 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startposition.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startposition.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tp @s[team=btw.play.a] 628 14 -40 45 0 # tp @s[team=btw.play.b] 554 14 28 -135 0 -# # tp @s[team=btw.wait] 628 24 -40 45 0 \ No newline at end of file +# # tp @s[team=btw.wait] 628 24 -40 45 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startround.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startround.mcfunction index 82f61006..00979012 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startround.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/startround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=btw.play.a] at @s run function boatwars/spawnboat execute as @a[team=btw.play.b] at @s run function boatwars/spawnboat -scoreboard players set btw.state state 1 \ No newline at end of file +scoreboard players set btw.state state 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/testgunitem.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/testgunitem.mcfunction index d99e25b3..05dedd6c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/testgunitem.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/testgunitem.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute store result score tmp board run clear @s carrot_on_a_stick 0 execute if score tmp board matches ..0 run function boatwars/gunitem execute if score tmp board matches 2.. run clear @s carrot_on_a_stick -execute if score tmp board matches 2.. run function boatwars/gunitem \ No newline at end of file +execute if score tmp board matches 2.. run function boatwars/gunitem diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tick.mcfunction index 876ecc91..09ef761a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=boat.gun.line] at @s run function boatgun:gun/main execute in airworld as @a[x=553,y=6,z=32,distance=..1,gamemode=adventure] at @s run function boatwars/died @@ -15,4 +19,4 @@ execute as @a[team=btw.play.a,scores={btw.gunspeed=1..}] at @s run xp add @s -1 execute as @a[team=btw.play.b,scores={btw.gunspeed=1..}] at @s run xp add @s -1 points execute as @a[team=btw.play.a,scores={btw.gunspeed=3..}] at @s run xp add @s -1 points -execute as @a[team=btw.play.b,scores={btw.gunspeed=3..}] at @s run xp add @s -1 points \ No newline at end of file +execute as @a[team=btw.play.b,scores={btw.gunspeed=3..}] at @s run xp add @s -1 points diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tpposition.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tpposition.mcfunction index 3663ef77..ed349ee9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tpposition.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/tpposition.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s[team=btw.play.a] 628 24 -40 45 0 tp @s[team=btw.play.b] 554 24 28 -135 0 # tp @s[team=btw.wait] 628 24 -40 45 0 clear @s + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/trystart.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/trystart.mcfunction index 5b4b31ba..47a2b932 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/trystart.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/trystart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=btw.wait,gamemode=adventure] run scoreboard players add wait.player tick 1 # ## regoin 维护 @@ -12,4 +16,4 @@ execute as @a[team=btw.wait,gamemode=adventure] run scoreboard players add wait. execute if score btw.state state matches 1.. run function minecraft:boatwars/spec execute unless score btw.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score btw.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score btw.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:boatwars/start \ No newline at end of file +execute unless score btw.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:boatwars/start diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/boat.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/boat.mcfunction index 509a4061..325b6b5f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/boat.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/boat.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score @s btw.boattype matches 0 run scoreboard players set boat.needcoin board 500 execute if score @s btw.boattype matches 1 run scoreboard players set boat.needcoin board 500 @@ -12,4 +16,4 @@ execute if score @s btw.coin < boat.needcoin board run return 0 scoreboard players operation @s btw.coin -= boat.needcoin board scoreboard players add @s btw.boattype 1 playsound entity.player.levelup player @s ~ ~ ~ 1 2 1 -tellraw @s ["\u00a7a升级成功，当前等级：",{"score":{"name": "@s","objective": "btw.boattype"},"color": "aqua"}] \ No newline at end of file +tellraw @s ["\u00a7a升级成功，当前等级：",{"score":{"name": "@s","objective": "btw.boattype"},"color": "aqua"}] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/gun.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/gun.mcfunction index 5b4d8eb8..56f92252 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/gun.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/upgrade/gun.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score @s btw.gunspeed matches 0 run scoreboard players set boat.needcoin board 500 execute if score @s btw.gunspeed matches 1 run scoreboard players set boat.needcoin board 600 @@ -17,4 +21,4 @@ execute if score @s btw.coin < boat.needcoin board run return 0 scoreboard players operation @s btw.coin -= boat.needcoin board scoreboard players add @s btw.gunspeed 1 playsound entity.player.levelup player @s ~ ~ ~ 1 2 1 -tellraw @s ["\u00a7a升级成功，当前速度：",{"score":{"name": "@s","objective": "btw.gunspeed"},"color": "aqua"}] \ No newline at end of file +tellraw @s ["\u00a7a升级成功，当前速度：",{"score":{"name": "@s","objective": "btw.gunspeed"},"color": "aqua"}] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/usegun.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/usegun.mcfunction index 3c237236..0a374398 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/boatwars/usegun.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/boatwars/usegun.mcfunction @@ -1,8 +1,12 @@ -# scoreboard players +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# scoreboard players title @s[level=1..] actionbar ["\u00a7c冷却中..."] execute as @s[level=1..] at @s run playsound block.chest.locked player @s ~ ~ ~ 1 2 1 execute as @s[level=1..] at @s run return 0 execute as @s[team=btw.play.a] at @s run function boatgun:shoot/a execute as @s[team=btw.play.b] at @s run function boatgun:shoot/b xp set @s 0 points -xp set @s 3 levels \ No newline at end of file +xp set @s 3 levels diff --git a/datapacks/map_game_2nd/data/minecraft/functions/cloud/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/cloud/join.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/cloud/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/cloud/join.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/points/ungrassed.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/points/ungrassed.mcfunction index 60cb9982..ee0a21be 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/points/ungrassed.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/points/ungrassed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=sw.marker,type=marker] summon marker 735 3 323 {Tags:["sw.chest.side","sw.chests","sw.marker"]} summon marker 735 -4 321 {Tags:["sw.chest.side","sw.chests","sw.marker"]} @@ -59,4 +63,4 @@ summon marker 689 0 367 {Tags:["sw.marker","sw.chest.middle"]} summon marker 674 0 352 {Tags:["sw.marker","sw.chest.middle"]} summon marker 689 0 337 {Tags:["sw.marker","sw.chest.middle"]} -function minecraft:cloud/resetover \ No newline at end of file +function minecraft:cloud/resetover diff --git a/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/ungrassed.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/ungrassed.mcfunction index 62a41928..68e74223 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/ungrassed.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/cloud/maps/ungrassed.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in airworld if score cloud.reset board matches 0 run forceload add 365 266 546 442 execute in airworld if score cloud.reset board matches 1 run fill 599 -64 266 780 -64 442 air @@ -115,3 +119,4 @@ execute in airworld if score cloud.reset board matches ..105 run schedule functi execute in airworld if score cloud.reset board matches ..105 run scoreboard players add cloud.reset board 1 execute in airworld if score cloud.reset board matches 106.. run forceload remove 365 266 546 442 execute in airworld if score cloud.reset board matches 106.. run function minecraft:cloud/maps/points/ungrassed + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/cloud/reset.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/cloud/reset.mcfunction index 7ec707ce..067d77cd 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/cloud/reset.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/cloud/reset.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set cloud.reset board 0 forceload add 599 266 780 442 kill @e[tag=sw.marker,type=marker] schedule clear minecraft:cloud/maps/ungrassed function minecraft:cloud/maps/ungrassed -title @a[team=wait.sw] times 0 30 0 \ No newline at end of file +title @a[team=wait.sw] times 0 30 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/cloud/resetover.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/cloud/resetover.mcfunction index ca62e0e7..c0d81abf 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/cloud/resetover.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/cloud/resetover.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload remove 599 266 780 442 title @a[team=wait.sw] reset title @a[team=wait.sw] title ["\u00a7b地图准备完毕"] -title @a[team=wait.sw] subtitle ["\u00a7a重置完毕"] \ No newline at end of file +title @a[team=wait.sw] subtitle ["\u00a7a重置完毕"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/hftick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/hftick.mcfunction index 23cacf0e..948fa0de 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/hftick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/hftick.mcfunction @@ -1 +1,5 @@ -execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/hftick \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/hftick diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/join.mcfunction index ca8608ff..ff183553 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in lobby run tp @s 35 7 43 -90 0 tellraw @s ["\n\u00a7e该类游戏还在公开测试阶段！\n如发现BUG，最好请录制一个视频，然后向作者反馈。\n\u00a77从4000年前古埃及的塞尼特棋直至40,000年的茫茫星海，演绎于一桌之上!\n"] title @s title [{"text":"桌游","color":"#0099CC","bold": true}] @@ -12,4 +16,4 @@ execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator execute if score desk.state state matches 1.. run function minecraft:desk/spec # summon minecraft:text_display 39 8 43 {alignment:"center",billboard:"fixed",text:'[{"text":"桌游大厅","color":"#0099CC","bold": true},"\\n\\u00a77前方前往"]'} clear @s -effect clear @s \ No newline at end of file +effect clear @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/modify.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/modify.mcfunction index cf739d38..7dc8a131 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/modify.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/modify.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute unless score desk.state state matches 1.. run scoreboard players add desk.type board 1 execute if score desk.state state matches 1.. run tellraw @s ["\u00a7c游戏开始后无法修改。"] @@ -7,4 +11,4 @@ execute if score desk.type board matches ..1 run data modify block ~ ~ ~ front_t execute if score desk.type board matches 2 run data modify block ~ ~ ~ front_text.messages[1] set value '"\\u00a7b\\u00a7l[爆炸棋(Beta)]"' execute if score desk.type board matches 3 run data modify block ~ ~ ~ front_text.messages[1] set value '"\\u00a7d\\u00a7l[围棋]"' execute if score desk.type board matches 4 run data modify block ~ ~ ~ front_text.messages[1] set value '"\\u00a7e\\u00a7l[黑白棋(Alpha)]"' -# execute if score chest.type board matches 2 run data modify block 90 126 19 front_text.messages[(2-1)] set value '"\\u00a7b\\u00a7l[爆炸棋(Alpha)]"'} \ No newline at end of file +# execute if score chest.type board matches 2 run data modify block 90 126 19 front_text.messages[(2-1)] set value '"\\u00a7b\\u00a7l[爆炸棋(Alpha)]"'} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/second.mcfunction index 46eaf319..829fa267 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/second.mcfunction @@ -1 +1,5 @@ -execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/second \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/second diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/skill_handle.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/skill_handle.mcfunction index 8f272855..9d13cf3e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/skill_handle.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/skill_handle.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score desk.type board matches 1 run function minecraft:desk/touzi/skill_handle -scoreboard players reset @s use.skill \ No newline at end of file +scoreboard players reset @s use.skill diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/spec.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/spec.mcfunction index 12762b0d..ea1e172f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/spec.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/start.mcfunction index 52b4cd5c..8238f955 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/start.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.state state 1 scoreboard players set desk.time board -1 execute if score desk.type board matches 1 run function minecraft:desk/touzi/start + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/tick.mcfunction index 0bfc6570..3347b5c8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/tick.mcfunction @@ -1 +1,5 @@ -execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/tick \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute in lobby if score desk.type board matches 1 run function minecraft:desk/touzi/tick diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/all_touzi.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/all_touzi.mcfunction index 9f7fa367..bda10775 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/all_touzi.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/all_touzi.mcfunction @@ -1,79 +1,83 @@ -give @s minecraft:candle{touzit:0,CustomModelData:1,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e1"'},desk_item:1,touzi:1,number:1} -give @s minecraft:candle{touzit:0,CustomModelData:2,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e2"'},desk_item:1,touzi:1,number:2} -give @s minecraft:candle{touzit:0,CustomModelData:3,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e3"'},desk_item:1,touzi:1,number:3} -give @s minecraft:candle{touzit:0,CustomModelData:4,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e4"'},desk_item:1,touzi:1,number:4} -give @s minecraft:candle{touzit:0,CustomModelData:5,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e5"'},desk_item:1,touzi:1,number:5} -give @s minecraft:candle{touzit:0,CustomModelData:6,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e6"'},desk_item:1,touzi:1,number:6} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:1},custom_model_data=1,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e1"'] +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:2},custom_model_data=2,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e2"'] +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:3},custom_model_data=3,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e3"'] +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:4},custom_model_data=4,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e4"'] +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:5},custom_model_data=5,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e5"'] +give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:6},custom_model_data=6,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e6"'] # 木镐 -give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c⛏(2)"'},desk_item:1,touzi:2,number:2,touzit:1} -give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:1} -give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖石头"'},desk_item:1,touzi:4,number:2,touzit:1} +give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c⛏(2)"',custom_data={desk_item:1,touzi:2,number:2,touzit:1}] +give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:1}] +give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖石头"',custom_data={desk_item:1,touzi:4,number:2,touzit:1}] # 石镐 -give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"'},desk_item:1,touzi:2,number:3,touzit:2} -give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:2} -give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖石头"'},desk_item:1,touzi:4,number:2,touzit:2} -give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:2} +give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"',custom_data={desk_item:1,touzi:2,number:3,touzit:2}] +give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:2}] +give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖石头"',custom_data={desk_item:1,touzi:4,number:2,touzit:2}] +give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:2}] # 铁镐 -give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:4,touzit:3} -give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:3} -give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖石头"'},desk_item:1,touzi:4,number:2,touzit:3} -give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:3} -give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖钻石矿"'},desk_item:1,touzi:4,number:2,touzit:3} +give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:3}] +give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] +give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖石头"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] +give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] +give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖钻石矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] # 钻石镐 -give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:3,touzit:4} -give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:4,touzit:4} -give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖石头"'},desk_item:1,touzi:4,number:2,touzit:4} -give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:4} -give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖钻石矿"'},desk_item:1,touzi:4,number:2,touzit:4} +give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:3,touzit:4}] +give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:4}] +give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖石头"',custom_data={desk_item:1,touzi:4,number:2,touzit:4}] +give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:4}] +give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖钻石矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:4}] # 苦力怕 -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c点火(4)"'},desk_item:1,touzi:2,number:4,touzit:5} -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c大型爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:5} -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c爆炸"'},desk_item:1,touzi:4,number:0,touzit:5} -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c同归于尽"'},desk_item:1,touzi:4,number:0,touzit:5} -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c召唤同伴"'},desk_item:1,touzi:4,number:0,touzit:5} -give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:0,touzit:5} +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c点火(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:5}] +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c大型爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:5}] +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c爆炸"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c同归于尽"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c召唤同伴"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:0,touzit:5}] # 龙 -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c普通咆哮(4)"'},desk_item:1,touzi:2,number:4,touzit:6} -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c恶龙咆哮(6)"'},desk_item:1,touzi:2,number:6,touzit:6} -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c猛冲(5)"'},desk_item:1,touzi:2,number:5,touzit:6} -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c转圈"'},desk_item:1,touzi:4,number:0,touzit:6} -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c停留"'},desk_item:1,touzi:4,number:0,touzit:6} -give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c震翅"'},desk_item:1,touzi:4,number:0,touzit:6} +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c普通咆哮(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:6}] +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c恶龙咆哮(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:6}] +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c猛冲(5)"',custom_data={desk_item:1,touzi:2,number:5,touzit:6}] +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c转圈"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c停留"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] +give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c震翅"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] # TNT -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c爆炸(5)"'},desk_item:1,touzi:2,number:5,touzit:7} -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:7} -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:7} -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c引燃"'},desk_item:1,touzi:4,number:0,touzit:7} -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁反应"'},desk_item:1,touzi:4,number:0,touzit:7} -give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c剧烈的氧化还原反应"'},desk_item:1,touzi:4,number:0,touzit:7} +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c爆炸(5)"',custom_data={desk_item:1,touzi:2,number:5,touzit:7}] +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:7}] +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:7}] +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c引燃"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁反应"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] +give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c剧烈的氧化还原反应"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] # Command Block -give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c脉冲(6)"'},desk_item:1,touzi:2,number:6,touzit:10} -give @s minecraft:chain_command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c连锁(9)"'},desk_item:1,touzi:2,number:9,touzit:10} -give @s minecraft:repeating_command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c循环(12)"'},desk_item:1,touzi:2,number:12,touzit:10} -give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c激活"'},desk_item:1,touzi:4,number:0,touzit:10} -give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{auto:true}"'},desk_item:1,touzi:4,number:0,touzit:10} -give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{powered:true}"'},desk_item:1,touzi:4,number:0,touzit:10} +give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c脉冲(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:10}] +give @s minecraft:chain_command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c连锁(9)"',custom_data={desk_item:1,touzi:2,number:9,touzit:10}] +give @s minecraft:repeating_command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c循环(12)"',custom_data={desk_item:1,touzi:2,number:12,touzit:10}] +give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c激活"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] +give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{auto:true}"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] +give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{powered:true}"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] # 烟花 -give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b信号弹(3)"'},desk_item:1,touzi:3,number:3,touzit:8} -give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b闪光弹(3)"'},desk_item:1,touzi:3,number:3,touzit:8} -give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b发射"'},desk_item:1,touzi:5,number:0,touzit:8} -give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b升空"'},desk_item:1,touzi:5,number:0,touzit:8} -give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b烟花爆炸"'},desk_item:1,touzi:5,number:0,touzit:8} +give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b信号弹(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b闪光弹(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b发射"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b升空"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b烟花爆炸"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] # 不死图腾 -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b图腾保佑(3)"'},desk_item:1,touzi:3,number:3,touzit:9} -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b残血警告(6)"'},desk_item:1,touzi:3,number:6,touzit:9} -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b不死图腾(6)"'},desk_item:1,touzi:3,number:6,touzit:9} -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b激活图腾"'},desk_item:1,touzi:5,number:0,touzit:9} -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b保佑"'},desk_item:1,touzi:5,number:0,touzit:9} -give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b警告"'},desk_item:1,touzi:5,number:0,touzit:9} +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b图腾保佑(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:9}] +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b残血警告(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:9}] +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b不死图腾(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:9}] +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b激活图腾"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b保佑"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] +give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b警告"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] # 光 -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{6}(6)"'},desk_item:1,touzi:3,number:6,touzit:11} -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{9}(9)"'},desk_item:1,touzi:3,number:9,touzit:11} -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{12}(12)"'},desk_item:1,touzi:3,number:12,touzit:11} -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bBling~"'},desk_item:1,touzi:5,number:0,touzit:11} -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bTwinkle~"'},desk_item:1,touzi:5,number:0,touzit:11} -give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b你相信光吗？"'},desk_item:1,touzi:5,number:0,touzit:11} +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{6}(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:11}] +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{9}(9)"',custom_data={desk_item:1,touzi:3,number:9,touzit:11}] +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{12}(12)"',custom_data={desk_item:1,touzi:3,number:12,touzit:11}] +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bBling~"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bTwinkle~"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] +give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b你相信光吗？"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] # wdpick 1 攻击 # stpick 2 攻击 # irpick 3 攻击 @@ -91,4 +95,4 @@ give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u0 # 3: defend touzi # 4: attack role # 5: defend role -# 0: none \ No newline at end of file +# 0: none diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm.mcfunction index 73b9d1aa..b081712d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s run playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute as @s[tag=touzi.team.a] run function minecraft:desk/touzi/confirm/a -execute as @s[tag=touzi.team.b] run function minecraft:desk/touzi/confirm/b \ No newline at end of file +execute as @s[tag=touzi.team.b] run function minecraft:desk/touzi/confirm/b diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/a.mcfunction index bb8292a8..55bfff32 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless score desk.state state matches 3 run tellraw @s ["\u00a7c这不是你们的轮合。"] execute unless score desk.state state matches 3 run return 0 @@ -14,4 +18,4 @@ execute if score touzi.tmp.type board matches -1 run function desk/touzi/confirm tellraw @s ["\u00a77---------------------\n\u00a76\u00a7l本次出牌小结:\n\u00a7c攻击: ",{"score":{"name": "touzi.tmp.attack","objective": "board"},"color": "gold"},"\n\u00a7b防御: ",{"score":{"name": "touzi.tmp.defend","objective": "board"},"color": "gold"},"\n\u00a77---------------------"] scoreboard players operation touzi.a.attack board += touzi.tmp.attack board -scoreboard players operation touzi.a.defend board += touzi.tmp.defend board \ No newline at end of file +scoreboard players operation touzi.a.defend board += touzi.tmp.defend board diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/b.mcfunction index 31074e00..6a67f409 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless score desk.state state matches 4 run tellraw @s ["\u00a7c这不是你们的轮合。"] execute unless score desk.state state matches 4 run return 0 execute if score desk.time board matches ..59 run scoreboard players set desk.time board 60 @@ -6,12 +10,13 @@ scoreboard players set touzi.tmp.number board 0 scoreboard players set touzi.tmp.attack board 0 scoreboard players set touzi.tmp.type board 0 scoreboard players set touzi.tmp.defend board 0 -execute as @e[type=armor_stand,tag=desk.touzi.place,tag=touzi.b] at @s run function minecraft:desk/touzi/confirm/total +execute as @e[type=armor_stand,tag=touzi.b] at @s run function minecraft:desk/touzi/confirm/total execute if score touzi.tmp.type board matches 4..5 run function minecraft:desk/touzi/confirm/total_numbers -execute as @e[type=armor_stand,tag=desk.touzi.place,tag=touzi.b] at @s run function minecraft:desk/touzi/confirm/clear_item_b +execute as @e[type=armor_stand,tag=touzi.b] at @s run function minecraft:desk/touzi/confirm/clear_item_b execute if score touzi.tmp.type board matches -1 run function desk/touzi/confirm/failed tellraw @s ["\u00a77---------------------\n\u00a76\u00a7l本次出牌小结:\n\u00a7c攻击: ",{"score":{"name": "touzi.tmp.attack","objective": "board"},"color": "gold"},"\n\u00a7b防御: ",{"score":{"name": "touzi.tmp.defend","objective": "board"},"color": "gold"},"\n\u00a77---------------------"] scoreboard players operation touzi.b.attack board += touzi.tmp.attack board scoreboard players operation touzi.b.defend board += touzi.tmp.defend board + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_a.mcfunction index 211217ea..0ee92b8a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_a.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp.type board 0 scoreboard players set tmp.type1 board 0 -execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.touzi -execute store result score tmp.type1 board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.touzit +execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzi +execute store result score tmp.type1 board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzit execute if score tmp.type1 board matches 0 run scoreboard players remove touzit.a.number tick 1 @@ -9,4 +13,4 @@ execute if score tmp.type1 board = touzit.a.touzi1 board if score touzit.a.touzi execute unless score touzit.a.touzi1 tick matches 1 unless score tmp.type1 board = touzit.a.touzi1 board if score tmp.type1 board = touzit.a.touzi2 board run scoreboard players remove touzit.a.touzi2 tick 1 execute unless score tmp.type board matches 0 run data merge entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] {HandItems:[{},{}]} -execute unless score tmp.type board matches 0 run item replace entity @e[sort=nearest,limit=1,type=item_frame,distance=0..5] container.0 with air \ No newline at end of file +execute unless score tmp.type board matches 0 run item replace entity @e[sort=nearest,limit=1,type=item_frame,distance=0..5] container.0 with air diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_b.mcfunction index 0f39971d..6d420569 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/clear_item_b.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp.type board 0 scoreboard players set tmp.type1 board 0 -execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.touzi -execute store result score tmp.type1 board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.touzit +execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzi +execute store result score tmp.type1 board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzit execute if score tmp.type1 board matches 0 run scoreboard players remove touzit.b.number tick 1 @@ -9,4 +13,4 @@ execute if score touzit.b.touzi1 tick matches 1 if score tmp.type1 board = touzi execute unless score touzit.b.touzi1 tick matches 1 unless score tmp.type1 board = touzit.b.touzi1 board if score tmp.type1 board = touzit.b.touzi2 board run scoreboard players remove touzit.b.touzi2 tick 1 execute unless score tmp.type board matches 0 run data merge entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] {HandItems:[{},{}]} -execute unless score tmp.type board matches 0 run item replace entity @e[sort=nearest,limit=1,type=item_frame,distance=0..5] container.0 with air \ No newline at end of file +execute unless score tmp.type board matches 0 run item replace entity @e[sort=nearest,limit=1,type=item_frame,distance=0..5] container.0 with air diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/failed.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/failed.mcfunction index 0409a1b9..d8dbf58e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/failed.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/failed.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.tmp.type board -1 scoreboard players set touzi.tmp.attack board 0 scoreboard players set touzi.tmp.defend board 0 -scoreboard players set touzi.tmp.number board 0 \ No newline at end of file +scoreboard players set touzi.tmp.number board 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total.mcfunction index 60e8d566..03e5526c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players add touzi.tmp.attack board 0 # scoreboard players add touzi.tmp.defend board 0 # scoreboard players set touzi.tmp.number board 0 # scoreboard players set touzi.tmp.type board 0 execute if score touzi.tmp.type board matches -1 run return 0 scoreboard players set tmp.type board 0 -execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.touzi -execute store result score tmp.number board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].tag.number +execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzi +execute store result score tmp.number board run data get entity @e[type=armor_stand,tag=desk.touzi.place,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".number # 角色骰子 ## attack @@ -39,3 +43,4 @@ execute if score touzi.tmp.type board matches 1 if score tmp.type board matches execute if score touzi.tmp.type board matches 2 if score tmp.type board matches 2 run scoreboard players operation touzi.tmp.attack board += tmp.number board execute if score touzi.tmp.type board matches 3 if score tmp.type board matches 3 run scoreboard players operation touzi.tmp.defend board += tmp.number board + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total_numbers.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total_numbers.mcfunction index 7676be8c..5c4b5a3c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total_numbers.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirm/total_numbers.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score touzi.tmp.type board matches 4 run scoreboard players operation touzi.tmp.attack board = touzi.tmp.number board -execute if score touzi.tmp.type board matches 5 run scoreboard players operation touzi.tmp.defend board = touzi.tmp.number board \ No newline at end of file +execute if score touzi.tmp.type board matches 5 run scoreboard players operation touzi.tmp.defend board = touzi.tmp.number board diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround.mcfunction index f3a206ce..f9e29df0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s run playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute as @s[tag=touzi.team.a] run function minecraft:desk/touzi/confirmround/a -execute as @s[tag=touzi.team.b] run function minecraft:desk/touzi/confirmround/b \ No newline at end of file +execute as @s[tag=touzi.team.b] run function minecraft:desk/touzi/confirmround/b diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/a.mcfunction index ea426828..d426e9aa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/a.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless score desk.state state matches 3 run tellraw @s ["\u00a7c这不是你们的轮合。"] execute unless score desk.state state matches 3 run return 0 tellraw @a[team=deskgame,tag=touzi.team.a] ["\u00a77---------------------\n\u00a76\u00a7l出牌小结:\n\u00a7c攻击: ",{"score":{"name": "touzi.a.attack","objective": "board"},"color": "gold"},"\n\u00a7b防御: ",{"score":{"name": "touzi.a.defend","objective": "board"},"color": "gold"},"\n\u00a77---------------------"] execute as @e[type=armor_stand,tag=desk.touzi.place] at @s run function minecraft:desk/touzi/confirmround/clear_item function minecraft:desk/touzi/round/bturn + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/b.mcfunction index 20985617..b9a47887 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/b.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless score desk.state state matches 4 run tellraw @s ["\u00a7c这不是你们的轮合。"] execute unless score desk.state state matches 4 run return 0 tellraw @a[team=deskgame,tag=touzi.team.b] ["\u00a77---------------------\n\u00a76\u00a7l出牌小结:\n\u00a7c攻击: ",{"score":{"name": "touzi.b.attack","objective": "board"},"color": "gold"},"\n\u00a7b防御: ",{"score":{"name": "touzi.b.defend","objective": "board"},"color": "gold"},"\n\u00a77---------------------"] execute as @e[type=armor_stand,tag=desk.touzi.place] at @s run function minecraft:desk/touzi/confirmround/clear_item -function minecraft:desk/touzi/round/over \ No newline at end of file +function minecraft:desk/touzi/round/over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/clear_item.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/clear_item.mcfunction index c3d017e6..d1eae76f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/clear_item.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/confirmround/clear_item.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp.type board 0 -execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=desk.touzi.place,tag=touzi.b,limit=1,sort=nearest] HandItems[0].tag.touzi +execute store result score tmp.type board run data get entity @e[type=armor_stand,tag=touzi.b,limit=1,sort=nearest] HandItems[0].components."minecraft:custom_data".touzi data merge entity @s {HandItems:[{},{}]} -item replace entity @e[sort=nearest,limit=1,type=item_frame] container.0 with air \ No newline at end of file +item replace entity @e[sort=nearest,limit=1,type=item_frame] container.0 with air diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush.mcfunction index 4705a4c5..294a7f87 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score desk.time board matches ..59 run scoreboard players set desk.time board 60 execute if score @s touzi.count matches ..0 run tellraw @s ["\u00a7c你无法再刷新：你刷新的次数用光了。"] @@ -5,12 +9,12 @@ execute if score @s touzi.count matches ..0 at @s run playsound entity.enderman. execute if score @s touzi.count matches ..0 run return 0 scoreboard players remove @s touzi.count 1 clear @s -execute if score @s touzi.count matches 4.. run item replace entity @s hotbar.7 with white_dye{desk_item:1,desk_clear:1,display:{Name:'"\\u00a77刷新剩余次数：\\u00a7f4"'}} 4 -execute if score @s touzi.count matches 3 run item replace entity @s hotbar.7 with green_dye{desk_item:1,desk_clear:1,display:{Name:'"\\u00a77刷新剩余次数：\\u00a7a3"'}} 3 -execute if score @s touzi.count matches 2 run item replace entity @s hotbar.7 with yellow_dye{desk_item:1,desk_clear:1,display:{Name:'"\\u00a77刷新剩余次数：\\u00a7e2"'}} 2 -execute if score @s touzi.count matches 1 run item replace entity @s hotbar.7 with orange_dye{desk_item:1,desk_clear:1,display:{Name:'"\\u00a77刷新剩余次数：\\u00a761"'}} 1 -execute if score @s touzi.count matches ..0 run item replace entity @s hotbar.8 with red_dye{desk_item:1,desk_clear:1,display:{Name:'"\\u00a7c你无法再刷新骰子了"'}} 1 +execute if score @s touzi.count matches 4.. run item replace entity @s hotbar.7 with white_dye[custom_data={desk_item:1,desk_clear:1},custom_name='"\\u00a77刷新剩余次数：\\u00a7f4"'] 4 +execute if score @s touzi.count matches 3 run item replace entity @s hotbar.7 with green_dye[custom_data={desk_item:1,desk_clear:1},custom_name='"\\u00a77刷新剩余次数：\\u00a7a3"'] 3 +execute if score @s touzi.count matches 2 run item replace entity @s hotbar.7 with yellow_dye[custom_data={desk_item:1,desk_clear:1},custom_name='"\\u00a77刷新剩余次数：\\u00a7e2"'] 2 +execute if score @s touzi.count matches 1 run item replace entity @s hotbar.7 with orange_dye[custom_data={desk_item:1,desk_clear:1},custom_name='"\\u00a77刷新剩余次数：\\u00a761"'] 1 +execute if score @s touzi.count matches ..0 run item replace entity @s hotbar.8 with red_dye[custom_data={desk_item:1,desk_clear:1},custom_name='"\\u00a7c你无法再刷新骰子了"'] 1 execute if score @s touzi.count matches 1.. run function minecraft:desk/touzi/item/item_refrush function minecraft:desk/touzi/control/refrush_touzi -execute as @s at @s run playsound ui.button.click player @s ~ ~ ~ 1 2 1 \ No newline at end of file +execute as @s at @s run playsound ui.button.click player @s ~ ~ ~ 1 2 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/a.mcfunction index c2abe212..f2814def 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/a.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score touzit.a.number tick matches 3.. run function minecraft:desk/touzi/control/refrush/touzi/number execute if score touzit.a.number tick matches 2.. run function minecraft:desk/touzi/control/refrush/touzi/number execute if score touzit.a.number tick matches 1.. run function minecraft:desk/touzi/control/refrush/touzi/number @@ -38,4 +42,4 @@ execute if score touzit.a.touzi2 tick matches 1 if score touzit.a.touzi2 board m # firework 8 # undying 9 # cb 10 -# light 11 \ No newline at end of file +# light 11 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/b.mcfunction index d7319c20..68a46562 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/b.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score touzit.b.number tick matches 3.. run function minecraft:desk/touzi/control/refrush/touzi/number execute if score touzit.b.number tick matches 2.. run function minecraft:desk/touzi/control/refrush/touzi/number execute if score touzit.b.number tick matches 1.. run function minecraft:desk/touzi/control/refrush/touzi/number @@ -26,4 +30,4 @@ execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board m execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board matches 8 run function minecraft:desk/touzi/control/refrush/touzi/firework execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board matches 9 run function minecraft:desk/touzi/control/refrush/touzi/undying execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board matches 10 run function minecraft:desk/touzi/control/refrush/touzi/cb -execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board matches 11 run function minecraft:desk/touzi/control/refrush/touzi/light \ No newline at end of file +execute if score touzit.b.touzi2 tick matches 1 if score touzit.b.touzi2 board matches 11 run function minecraft:desk/touzi/control/refrush/touzi/light diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/cb.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/cb.mcfunction index 29ac0647..2a35faa5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/cb.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/cb.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c脉冲(6)"'},desk_item:1,touzi:2,number:6,touzit:10} -execute if score desk.random board matches 2 run give @s minecraft:chain_command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c连锁(9)"'},desk_item:1,touzi:2,number:9,touzit:10} -execute if score desk.random board matches 3 run give @s minecraft:repeating_command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c循环(12)"'},desk_item:1,touzi:2,number:12,touzit:10} -execute if score desk.random board matches 4 run give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c激活"'},desk_item:1,touzi:4,number:0,touzit:10} -execute if score desk.random board matches 5 run give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{auto:true}"'},desk_item:1,touzi:4,number:0,touzit:10} -execute if score desk.random board matches 6 run give @s minecraft:command_block{display:{Name:'"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{powered:true}"'},desk_item:1,touzi:4,number:0,touzit:10} +execute if score desk.random board matches 1 run give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c脉冲(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:10}] +execute if score desk.random board matches 2 run give @s minecraft:chain_command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c连锁(9)"',custom_data={desk_item:1,touzi:2,number:9,touzit:10}] +execute if score desk.random board matches 3 run give @s minecraft:repeating_command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c循环(12)"',custom_data={desk_item:1,touzi:2,number:12,touzit:10}] +execute if score desk.random board matches 4 run give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c激活"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] +execute if score desk.random board matches 5 run give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{auto:true}"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] +execute if score desk.random board matches 6 run give @s minecraft:command_block[custom_name='"\\u00a7dCommand Block骰子 \\u00a77- \\u00a7c{powered:true}"',custom_data={desk_item:1,touzi:4,number:0,touzit:10}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/creeper.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/creeper.mcfunction index 67e98887..17e70dbf 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/creeper.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/creeper.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c点火(4)"'},desk_item:1,touzi:2,number:4,touzit:5} -execute if score desk.random board matches 2 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c大型爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:5} -execute if score desk.random board matches 3 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c爆炸"'},desk_item:1,touzi:4,number:0,touzit:5} -execute if score desk.random board matches 4 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c同归于尽"'},desk_item:1,touzi:4,number:0,touzit:5} -execute if score desk.random board matches 5 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c召唤同伴"'},desk_item:1,touzi:4,number:0,touzit:5} -execute if score desk.random board matches 6 run give @s minecraft:gunpowder{display:{Name:'"\\u00a72苦力怕骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:0,touzit:5} +execute if score desk.random board matches 1 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c点火(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:5}] +execute if score desk.random board matches 2 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c大型爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:5}] +execute if score desk.random board matches 3 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c爆炸"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +execute if score desk.random board matches 4 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c同归于尽"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +execute if score desk.random board matches 5 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- \\u00a7c召唤同伴"',custom_data={desk_item:1,touzi:4,number:0,touzit:5}] +execute if score desk.random board matches 6 run give @s minecraft:gunpowder[custom_name='"\\u00a72苦力怕骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:0,touzit:5}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dmpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dmpick.mcfunction index 27d1ee9f..8d4a72ee 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dmpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dmpick.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:3,touzit:4} -execute if score desk.random board matches 2 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:4,touzit:4} -execute if score desk.random board matches 3 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:4} -execute if score desk.random board matches 4 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖钻石"'},desk_item:1,touzi:4,number:2,touzit:4} -execute if score desk.random board matches 5 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:4} -execute if score desk.random board matches 6 run give @s minecraft:diamond_pickaxe{display:{Name:'"\\u00a78钻石镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:4} +execute if score desk.random board matches 1 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:3,touzit:4}] +execute if score desk.random board matches 2 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:4}] +execute if score desk.random board matches 3 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:4}] +execute if score desk.random board matches 4 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- \\u00a7c挖钻石"',custom_data={desk_item:1,touzi:4,number:2,touzit:4}] +execute if score desk.random board matches 5 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:4}] +execute if score desk.random board matches 6 run give @s minecraft:diamond_pickaxe[custom_name='"\\u00a78钻石镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:4}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dragon.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dragon.mcfunction index 0a529a42..1e64a4a1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dragon.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/dragon.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c普通咆哮(4)"'},desk_item:1,touzi:2,number:4,touzit:6} -execute if score desk.random board matches 2 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c恶龙咆哮(6)"'},desk_item:1,touzi:2,number:6,touzit:6} -execute if score desk.random board matches 3 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c猛冲(5)"'},desk_item:1,touzi:2,number:5,touzit:6} -execute if score desk.random board matches 4 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c转圈"'},desk_item:1,touzi:4,number:0,touzit:6} -execute if score desk.random board matches 5 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c停留"'},desk_item:1,touzi:4,number:0,touzit:6} -execute if score desk.random board matches 6 run give @s minecraft:dragon_egg{display:{Name:'"\\u00a70龙骰子 \\u00a77- \\u00a7c震翅"'},desk_item:1,touzi:4,number:0,touzit:6} +execute if score desk.random board matches 1 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c普通咆哮(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:6}] +execute if score desk.random board matches 2 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c恶龙咆哮(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:6}] +execute if score desk.random board matches 3 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c猛冲(5)"',custom_data={desk_item:1,touzi:2,number:5,touzit:6}] +execute if score desk.random board matches 4 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c转圈"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] +execute if score desk.random board matches 5 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c停留"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] +execute if score desk.random board matches 6 run give @s minecraft:dragon_egg[custom_name='"\\u00a70龙骰子 \\u00a77- \\u00a7c震翅"',custom_data={desk_item:1,touzi:4,number:0,touzit:6}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/firework.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/firework.mcfunction index 8561179c..a79bfe90 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/firework.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/firework.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b信号弹(3)"'},desk_item:1,touzi:3,number:3,touzit:8} -execute if score desk.random board matches 2 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b闪光弹(3)"'},desk_item:1,touzi:3,number:3,touzit:8} -execute if score desk.random board matches 3 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b发射"'},desk_item:1,touzi:5,number:0,touzit:8} -execute if score desk.random board matches 4 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b升空"'},desk_item:1,touzi:5,number:0,touzit:8} -execute if score desk.random board matches 5 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- \\u00a7b烟花爆炸"'},desk_item:1,touzi:5,number:0,touzit:8} -execute if score desk.random board matches 6 run give @s minecraft:firework_star{display:{Name:'"\\u00a7b烟花骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:0,touzit:8} +execute if score desk.random board matches 1 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b信号弹(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +execute if score desk.random board matches 2 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b闪光弹(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +execute if score desk.random board matches 3 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b发射"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +execute if score desk.random board matches 4 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b升空"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +execute if score desk.random board matches 5 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- \\u00a7b烟花爆炸"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +execute if score desk.random board matches 6 run give @s minecraft:firework_star[custom_name='"\\u00a7b烟花骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:0,touzit:8}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/irpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/irpick.mcfunction index b93de8ab..1f6a5bb7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/irpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/irpick.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:4,touzit:3} -execute if score desk.random board matches 2 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"'},desk_item:1,touzi:2,number:4,touzit:3} -execute if score desk.random board matches 3 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:3} -execute if score desk.random board matches 4 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖钻石矿"'},desk_item:1,touzi:4,number:2,touzit:3} -execute if score desk.random board matches 5 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:3} -execute if score desk.random board matches 6 run give @s minecraft:iron_pickaxe{display:{Name:'"\\u00a78铁镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:3} +execute if score desk.random board matches 1 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:3}] +execute if score desk.random board matches 2 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c⛏(4)"',custom_data={desk_item:1,touzi:2,number:4,touzit:3}] +execute if score desk.random board matches 3 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] +execute if score desk.random board matches 4 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- \\u00a7c挖钻石矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:3}] +execute if score desk.random board matches 5 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:3}] +execute if score desk.random board matches 6 run give @s minecraft:iron_pickaxe[custom_name='"\\u00a78铁镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:3}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/light.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/light.mcfunction index 649eb5e2..3cd58414 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/light.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/light.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{6}(6)"'},desk_item:1,touzi:3,number:6,touzit:11} -execute if score desk.random board matches 2 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{9}(9)"'},desk_item:1,touzi:3,number:9,touzit:11} -execute if score desk.random board matches 3 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{12}(12)"'},desk_item:1,touzi:3,number:12,touzit:11} -execute if score desk.random board matches 4 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bBling~"'},desk_item:1,touzi:5,number:0,touzit:11} -execute if score desk.random board matches 5 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bTwinkle~"'},desk_item:1,touzi:5,number:0,touzit:11} -execute if score desk.random board matches 6 run give @s minecraft:light{display:{Name:'"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b你相信光吗？"'},desk_item:1,touzi:5,number:0,touzit:11} +execute if score desk.random board matches 1 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{6}(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:11}] +execute if score desk.random board matches 2 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{9}(9)"',custom_data={desk_item:1,touzi:3,number:9,touzit:11}] +execute if score desk.random board matches 3 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b{12}(12)"',custom_data={desk_item:1,touzi:3,number:12,touzit:11}] +execute if score desk.random board matches 4 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bBling~"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] +execute if score desk.random board matches 5 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7bTwinkle~"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] +execute if score desk.random board matches 6 run give @s minecraft:light[custom_name='"\\u00a7f\\u00a7l光骰子 \\u00a77- \\u00a7b你相信光吗？"',custom_data={desk_item:1,touzi:5,number:0,touzit:11}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/number.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/number.mcfunction index fb63c58a..bbddcfd5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/number.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/number.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:candle{touzit:0,CustomModelData:1,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e1"'},desk_item:1,touzi:1,number:1} -execute if score desk.random board matches 2 run give @s minecraft:candle{touzit:0,CustomModelData:2,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e2"'},desk_item:1,touzi:1,number:2} -execute if score desk.random board matches 3 run give @s minecraft:candle{touzit:0,CustomModelData:3,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e3"'},desk_item:1,touzi:1,number:3} -execute if score desk.random board matches 4 run give @s minecraft:candle{touzit:0,CustomModelData:4,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e4"'},desk_item:1,touzi:1,number:4} -execute if score desk.random board matches 5 run give @s minecraft:candle{touzit:0,CustomModelData:5,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e5"'},desk_item:1,touzi:1,number:5} -execute if score desk.random board matches 6 run give @s minecraft:candle{touzit:0,CustomModelData:6,display:{Name:'"\\u00a7a数字骰子 \\u00a77- \\u00a7e6"'},desk_item:1,touzi:1,number:6} +execute if score desk.random board matches 1 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:1},custom_model_data=1,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e1"'] +execute if score desk.random board matches 2 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:2},custom_model_data=2,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e2"'] +execute if score desk.random board matches 3 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:3},custom_model_data=3,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e3"'] +execute if score desk.random board matches 4 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:4},custom_model_data=4,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e4"'] +execute if score desk.random board matches 5 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:5},custom_model_data=5,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e5"'] +execute if score desk.random board matches 6 run give @s minecraft:candle[custom_data={touzit:0,desk_item:1,touzi:1,number:6},custom_model_data=6,custom_name='"\\u00a7a数字骰子 \\u00a77- \\u00a7e6"'] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/sheild.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/sheild.mcfunction index 48b75abe..9362c073 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/sheild.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/sheild.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- \\u00a7b防御(2)"'},desk_item:1,touzi:3,number:3,touzit:8} -execute if score desk.random board matches 2 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- 抵挡"'},desk_item:1,touzi:3,number:3,touzit:8} -execute if score desk.random board matches 3 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- 格挡"'},desk_item:1,touzi:5,number:0,touzit:8} -execute if score desk.random board matches 4 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- 抵挡"'},desk_item:1,touzi:5,number:0,touzit:8} -execute if score desk.random board matches 5 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:0,touzit:8} -execute if score desk.random board matches 6 run give @s minecraft:oak_sign{display:{Name:'"\\u00a7b基础盾牌骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:0,touzit:8} +execute if score desk.random board matches 1 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- \\u00a7b防御(2)"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +execute if score desk.random board matches 2 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- 抵挡"',custom_data={desk_item:1,touzi:3,number:3,touzit:8}] +execute if score desk.random board matches 3 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- 格挡"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +execute if score desk.random board matches 4 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- 抵挡"',custom_data={desk_item:1,touzi:5,number:0,touzit:8}] +execute if score desk.random board matches 5 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:0,touzit:8}] +execute if score desk.random board matches 6 run give @s minecraft:oak_sign[custom_name='"\\u00a7b基础盾牌骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:0,touzit:8}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/stpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/stpick.mcfunction index 08bc1f84..b2209fcc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/stpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/stpick.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"'},desk_item:1,touzi:2,number:3,touzit:2} -execute if score desk.random board matches 2 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"'},desk_item:1,touzi:2,number:3,touzit:2} -execute if score desk.random board matches 3 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:2} -execute if score desk.random board matches 4 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖铁矿"'},desk_item:1,touzi:4,number:2,touzit:2} -execute if score desk.random board matches 5 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:2} -execute if score desk.random board matches 6 run give @s minecraft:stone_pickaxe{display:{Name:'"\\u00a78石镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:2} +execute if score desk.random board matches 1 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"',custom_data={desk_item:1,touzi:2,number:3,touzit:2}] +execute if score desk.random board matches 2 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c⛏(3)"',custom_data={desk_item:1,touzi:2,number:3,touzit:2}] +execute if score desk.random board matches 3 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:2}] +execute if score desk.random board matches 4 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- \\u00a7c挖铁矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:2}] +execute if score desk.random board matches 5 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:2}] +execute if score desk.random board matches 6 run give @s minecraft:stone_pickaxe[custom_name='"\\u00a78石镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:2}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/tnt.mcfunction index 9aaf4b98..efd46472 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/tnt.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c爆炸(5)"'},desk_item:1,touzi:2,number:5,touzit:7} -execute if score desk.random board matches 2 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:7} -execute if score desk.random board matches 3 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"'},desk_item:1,touzi:2,number:6,touzit:7} -execute if score desk.random board matches 4 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c引燃"'},desk_item:1,touzi:4,number:0,touzit:7} -execute if score desk.random board matches 5 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁反应"'},desk_item:1,touzi:4,number:0,touzit:7} -execute if score desk.random board matches 6 run give @s minecraft:tnt{display:{Name:'"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c剧烈的氧化还原反应"'},desk_item:1,touzi:4,number:0,touzit:7} +execute if score desk.random board matches 1 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c爆炸(5)"',custom_data={desk_item:1,touzi:2,number:5,touzit:7}] +execute if score desk.random board matches 2 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:7}] +execute if score desk.random board matches 3 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁爆炸(6)"',custom_data={desk_item:1,touzi:2,number:6,touzit:7}] +execute if score desk.random board matches 4 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c引燃"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] +execute if score desk.random board matches 5 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c连锁反应"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] +execute if score desk.random board matches 6 run give @s minecraft:tnt[custom_name='"\\u00a7cTNT\\u00a7e骰子 \\u00a77- \\u00a7c剧烈的氧化还原反应"',custom_data={desk_item:1,touzi:4,number:0,touzit:7}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/undying.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/undying.mcfunction index 69caee99..56323601 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/undying.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/undying.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b图腾保佑(3)"'},desk_item:1,touzi:3,number:3,touzit:9} -execute if score desk.random board matches 2 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b残血警告(6)"'},desk_item:1,touzi:3,number:6,touzit:9} -execute if score desk.random board matches 3 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b不死图腾(6)"'},desk_item:1,touzi:3,number:6,touzit:9} -execute if score desk.random board matches 4 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b激活图腾"'},desk_item:1,touzi:5,number:0,touzit:9} -execute if score desk.random board matches 5 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b保佑"'},desk_item:1,touzi:5,number:0,touzit:9} -execute if score desk.random board matches 6 run give @s minecraft:totem_of_undying{display:{Name:'"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b警告"'},desk_item:1,touzi:5,number:0,touzit:9} +execute if score desk.random board matches 1 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b图腾保佑(3)"',custom_data={desk_item:1,touzi:3,number:3,touzit:9}] +execute if score desk.random board matches 2 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b残血警告(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:9}] +execute if score desk.random board matches 3 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b不死图腾(6)"',custom_data={desk_item:1,touzi:3,number:6,touzit:9}] +execute if score desk.random board matches 4 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b激活图腾"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] +execute if score desk.random board matches 5 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b保佑"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] +execute if score desk.random board matches 6 run give @s minecraft:totem_of_undying[custom_name='"\\u00a7e不死图腾骰子 \\u00a77- \\u00a7b警告"',custom_data={desk_item:1,touzi:5,number:0,touzit:9}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/wdpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/wdpick.mcfunction index a4ee6074..384f5b07 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/wdpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush/touzi/wdpick.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.random board 0 execute store result score desk.random board run random value 1..6 -execute if score desk.random board matches 1 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c⛏(2)"'},desk_item:1,touzi:2,number:2,touzit:1} -execute if score desk.random board matches 2 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:1} -execute if score desk.random board matches 3 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"'},desk_item:1,touzi:4,number:2,touzit:1} -execute if score desk.random board matches 4 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖石头"'},desk_item:1,touzi:4,number:2,touzit:1} -execute if score desk.random board matches 5 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:1} -execute if score desk.random board matches 6 run give @s minecraft:wooden_pickaxe{display:{Name:'"\\u00a7a木镐骰子 \\u00a77- 无属性面"'},desk_item:1,touzi:0,number:2,touzit:1} +execute if score desk.random board matches 1 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c⛏(2)"',custom_data={desk_item:1,touzi:2,number:2,touzit:1}] +execute if score desk.random board matches 2 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:1}] +execute if score desk.random board matches 3 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖煤矿"',custom_data={desk_item:1,touzi:4,number:2,touzit:1}] +execute if score desk.random board matches 4 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- \\u00a7c挖石头"',custom_data={desk_item:1,touzi:4,number:2,touzit:1}] +execute if score desk.random board matches 5 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:1}] +execute if score desk.random board matches 6 run give @s minecraft:wooden_pickaxe[custom_name='"\\u00a7a木镐骰子 \\u00a77- 无属性面"',custom_data={desk_item:1,touzi:0,number:2,touzit:1}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush_touzi.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush_touzi.mcfunction index 2470fb0b..a37a445a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush_touzi.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/control/refrush_touzi.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/control/refrush/a execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/control/refrush/b + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/hftick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/hftick.mcfunction index 6b8eadc3..e03678bc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/hftick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/hftick.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:desk/touzi/let_show_touzi + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/item_refrush.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/item_refrush.mcfunction index 9bff04ed..d9639bdd 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/item_refrush.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/item_refrush.mcfunction @@ -1 +1,5 @@ -item replace entity @s hotbar.8 with carrot_on_a_stick{Unbreakable:1b,display:{Name:'"\\u00a7a刷新骰子 \\u00a77- 右键点击"'},desk:1,desk_item:1} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s hotbar.8 with carrot_on_a_stick[unbreakable={},custom_name='"\\u00a7a刷新骰子 \\u00a77- 右键点击"',custom_data={desk:1,desk_item:1}] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/number.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/number.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/number.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/item/number.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/let_show_touzi.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/let_show_touzi.mcfunction index 903bbe46..997958fd 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/let_show_touzi.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/let_show_touzi.mcfunction @@ -1 +1,5 @@ -execute as @e[type=armor_stand,tag=desk.touzi.place] at @s run function minecraft:desk/touzi/show_touzi \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[type=armor_stand,tag=desk.touzi.place] at @s run function minecraft:desk/touzi/show_touzi diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/note.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/note.mcfunction index 62791fa8..5543c77c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/note.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/note.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 这只是一个笔记本，没有任何用处的方法 # wdpick 1 攻击 # stpick 2 攻击 @@ -16,4 +20,4 @@ # 3: defend touzi # 4: attack role # 5: defend role -# 0: none \ No newline at end of file +# 0: none diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/a.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/a.mcfunction index f46a63d0..2dbd7624 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/a.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/a.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\n\n\u00a76游戏结束！\n\u00a79队伍A\u00a7a获得胜利！"] title @a[team=deskgame] title ["\u00a7c游戏结束！"] title @a[team=deskgame] subtitle ["\u00a79队伍A\u00a7a获胜！"] title @a[tag=touzi.team.a] title ["\u00a76你赢了"] function minecraft:desk/touzi/over/all + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/all.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/all.mcfunction index 8697a350..820503f2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/all.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/all.mcfunction @@ -1,5 +1,9 @@ -kill @e[type=item,nbt={Item:{tag:{desk_item:1}}}] -kill @e[type=item,nbt={Item:{tag:{desk_clear:1}}}] +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_item:1}}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_clear:1}}}}] kill @e[type=armor_stand,tag=desk.touzi.place] kill @e[type=item_frame,tag=desk.touzi.show] kill @e[type=text_display,tag=touzi.show.text] @@ -9,8 +13,8 @@ effect clear @a[team=deskgame,gamemode=!creative] schedule function minecraft:desk/touzi/over/tp 5s replace tag @a remove touzi.team.a tag @a remove touzi.team.b -scoreboard players set desk.state state 10 +scoreboard players set desk.state state 10 scoreboard players set desk.time board -1 schedule clear minecraft:desk/touzi/round/atrun -schedule clear minecraft:desk/touzi/round/new_round \ No newline at end of file +schedule clear minecraft:desk/touzi/round/new_round diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/b.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/b.mcfunction index a823b379..55f8f610 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/b.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/b.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\n\n\u00a76游戏结束！\n\u00a7c队伍B\u00a7a获得胜利！"] title @a[team=deskgame] title ["\u00a7c游戏结束！"] title @a[team=deskgame] subtitle ["\u00a7c队伍B\u00a7a获胜！"] title @a[tag=touzi.team.b] title ["\u00a76你赢了"] function minecraft:desk/touzi/over/all + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/none.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/none.mcfunction index 38ad70f5..81048400 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/none.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/none.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\n\n\u00a76游戏结束！\n\u00a7c无人胜利。"] title @a[team=deskgame] title ["\u00a7c游戏结束！"] title @a[team=deskgame] subtitle ["\u00a7f无人胜利"] function minecraft:desk/touzi/over/all + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/pj.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/pj.mcfunction index 4f68e178..025a1ddc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/pj.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/pj.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\n\n\u00a76游戏结束！\n\u00a7a平局。"] title @a[team=deskgame] title ["\u00a7c游戏结束！"] title @a[team=deskgame] subtitle ["\u00a7a平局"] function minecraft:desk/touzi/over/all + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/tp.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/tp.mcfunction index 990b06b9..ef0b3be7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/tp.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/over/tp.mcfunction @@ -1,6 +1,10 @@ -scoreboard players set desk.state state 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players set desk.state state 0 execute as @a[team=deskgame,gamemode=!creative] at @s in lobby run gamemode adventure @s execute as @a[team=deskgame,gamemode=!creative] at @s in lobby run function desk/join schedule clear minecraft:desk/touzi/round/atrun -schedule clear minecraft:desk/touzi/round/new_round \ No newline at end of file +schedule clear minecraft:desk/touzi/round/new_round diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/overdetect.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/overdetect.mcfunction index 026dfb40..b6e73674 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/overdetect.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/overdetect.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.player.a tick 0 scoreboard players set desk.player.b tick 0 @@ -11,3 +15,4 @@ execute if score desk.state state matches 1..9 if score touzi.health.a board mat execute if score desk.state state matches 1..9 if score touzi.health.a board matches ..0 run function minecraft:desk/touzi/over/b execute if score desk.state state matches 1..9 if score touzi.health.b board matches ..0 run function minecraft:desk/touzi/over/a + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/ran_team.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/ran_team.mcfunction index 4f9bc0e0..f9d4ae24 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/ran_team.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/ran_team.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[tag=desk.ranteam] add chess.ransel scoreboard players add rand board 1 execute if score rand board matches 3.. run scoreboard players set rand board 1 @@ -5,3 +9,4 @@ execute if score rand board matches ..1 run tag @a[tag=chess.ransel] add touzi.t execute if score rand board matches 2.. run tag @a[tag=chess.ransel] add touzi.team.b tag @a[tag=chess.ransel] remove desk.ranteam tag @a[tag=chess.ransel] remove chess.ransel + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/reset.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/reset.mcfunction index e96e753b..ad4fa889 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/reset.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.health.a board 0 scoreboard players reset * touzi.count @@ -24,20 +28,20 @@ execute as @e[tag=touzi.text.health.a,type=marker] at @s as @e[distance=0..2,typ execute as @e[tag=touzi.text.health.b,type=marker] at @s as @e[distance=0..2,type=text_display] run data modify entity @s text set from block -19 4 71 front_text.messages[3] -execute as @e[tag=touzi.a,type=marker] at @s run summon minecraft:armor_stand ~ ~-1 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,DisabledSlots:1973790,Tags:["touzi.a","desk.touzi.place"],CustomNameVisible:1b,CustomName:'"\\u00a78(空)"',ShowArms:true} -execute as @e[tag=touzi.a,type=marker] at @s run summon minecraft:item_frame ~ ~0.5 ~ {Invulnerable:1b,Silent:1b,NoGravity:1b,Invisible:true,Fixed:1b,Tags:["touzi.a","desk.touzi.show"]} +execute as @e[tag=touzi.a,type=marker] at @s run summon minecraft:armor_stand ~ ~-1 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:"true",DisabledSlots:1973790,Tags:["touzi.a","desk.touzi.place"],CustomNameVisible:1b,CustomName:'"\\u00a78(空)"',ShowArms:"true"} +execute as @e[tag=touzi.a,type=marker] at @s run summon minecraft:item_frame ~ ~0.5 ~ {Invulnerable:1b,Silent:1b,NoGravity:1b,Invisible:"true",Fixed:1b,Tags:["touzi.a","desk.touzi.show"]} execute as @e[tag=touzi.a,type=item_frame] at @s run tp @s ~ ~ ~ -180 90 execute as @e[tag=touzi.a,type=armor_stand] at @s run tp @s ~ ~ ~ -180 0 -execute as @e[tag=touzi.b,type=marker] at @s run summon minecraft:armor_stand ~ ~-1 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,DisabledSlots:1973790,Tags:["touzi.b","desk.touzi.place"],CustomNameVisible:1b,CustomName:'"\\u00a78(空)"',ShowArms:true} -execute as @e[tag=touzi.b,type=marker] at @s run summon minecraft:item_frame ~ ~0.5 ~ {Invulnerable:1b,Silent:1b,NoGravity:1b,Invisible:true,Fixed:1b,Tags:["touzi.b","desk.touzi.show"]} +execute as @e[tag=touzi.b,type=marker] at @s run summon minecraft:armor_stand ~ ~-1 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:"true",DisabledSlots:1973790,Tags:["touzi.b","desk.touzi.place"],CustomNameVisible:1b,CustomName:'"\\u00a78(空)"',ShowArms:"true"} +execute as @e[tag=touzi.b,type=marker] at @s run summon minecraft:item_frame ~ ~0.5 ~ {Invulnerable:1b,Silent:1b,NoGravity:1b,Invisible:"true",Fixed:1b,Tags:["touzi.b","desk.touzi.show"]} execute as @e[tag=touzi.b,type=item_frame] at @s run tp @s ~ ~ ~ 0 -90 # /execute as @e[tag=desk.touzi.desktop] at @s run setblock ~ ~ ~ stone_bricks -kill @e[type=item,nbt={Item:{tag:{desk_item:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_item:1}}}}] scoreboard players set touzit.a.touzi1 board 1 scoreboard players set touzit.a.touzi2 board 0 scoreboard players set touzit.b.touzi1 board 1 -scoreboard players set touzit.b.touzi2 board 0 \ No newline at end of file +scoreboard players set touzit.b.touzi2 board 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/atrun.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/atrun.mcfunction index 103e72aa..c42c8a63 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/atrun.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/atrun.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\u00a77现在轮到\u00a79队伍A\u00a77操作。"] clear @a[team=deskgame] execute as @a[team=deskgame,tag=touzi.team.a] at @s run function minecraft:desk/touzi/control/refrush execute as @a[team=deskgame,tag=touzi.team.a] at @s run title @s title ["\u00a76该你操作了"] execute as @a[team=deskgame,tag=touzi.team.a] at @s run title @s subtitle ["\u00a7f现在是你们队伍的回合"] scoreboard players set desk.state state 3 -scoreboard players set desk.time board 120 \ No newline at end of file +scoreboard players set desk.time board 120 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/bturn.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/bturn.mcfunction index 25dcf7ae..9f684e67 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/bturn.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/bturn.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=deskgame] ["\u00a77现在轮到\u00a74队伍B\u00a77操作。"] clear @a[team=deskgame] execute as @a[team=deskgame,tag=touzi.team.b] at @s run function minecraft:desk/touzi/control/refrush @@ -5,3 +9,4 @@ execute as @a[team=deskgame,tag=touzi.team.b] at @s run title @s title ["\u00a76 execute as @a[team=deskgame,tag=touzi.team.b] at @s run title @s subtitle ["\u00a7f现在是你们队伍的回合"] scoreboard players set desk.state state 4 scoreboard players set desk.time board 120 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/new_round.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/new_round.mcfunction index a2d18e0c..e28bf07d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/new_round.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/new_round.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @a[team=deskgame,gamemode=!creative] -kill @e[type=item,nbt={Item:{tag:{desk_item:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_item:1}}}}] scoreboard players set touzi.a.attack board 0 scoreboard players set touzi.a.defend board 0 scoreboard players set touzi.b.attack board 0 @@ -20,3 +24,4 @@ scoreboard players set touzit.a.number tick 3 scoreboard players set touzit.b.touzi1 tick 1 scoreboard players set touzit.b.touzi2 tick 1 scoreboard players set touzit.b.number tick 3 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/over.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/over.mcfunction index e4a96ed6..8f67a247 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/over.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/round/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=deskgame] at @s run playsound block.anvil.place player @s ~ ~ ~ 1 1 1 scoreboard players set touzi.tmp.money board 0 scoreboard players operation touzi.tmp.money board = touzi.a.attack board @@ -28,4 +32,4 @@ execute if score touzi.health.b board matches ..0 run scoreboard players set tou tellraw @a[team=deskgame] ["\n\u00a77---------------------\n\u00a7a\u00a7l本轮总结:\n\u00a79队伍A\u00a77有效攻击: ",{"score":{"name": "touzi.a.attack","objective": "board"},"color": "green"},"\u00a7a⛏\n\u00a7c队伍B\u00a77有效攻击: ",{"score":{"name": "touzi.b.attack","objective": "board"},"color": "green"},"\u00a7a⛏\n\u00a77====================\n\u00a79队伍A\u00a77剩余生命: ",{"score":{"name": "touzi.health.a","objective": "board"},"color": "red"},"\u00a7c♥\n\u00a7c队伍B\u00a77剩余生命: ",{"score":{"name": "touzi.health.b","objective": "board"},"color": "red"},"\u00a7c♥\n\u00a77---------------------"] clear @a[team=deskgame] function minecraft:desk/touzi/overdetect -execute if score desk.state state matches 1..9 run schedule function minecraft:desk/touzi/round/new_round 4s replace \ No newline at end of file +execute if score desk.state state matches 1..9 run schedule function minecraft:desk/touzi/round/new_round 4s replace diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/second.mcfunction index 610bc6bf..ff1273d7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless score desk.time board matches 1.. run title @a[team=deskgame,tag=touzi.team.a] actionbar ["\u00a76你在\u00a79队伍A"] execute unless score desk.time board matches 1.. run title @a[team=deskgame,tag=touzi.team.b] actionbar ["\u00a76你在\u00a74队伍B"] @@ -9,9 +13,11 @@ data merge block -19 4 71 {front_text:{messages:['["\\u00a79队伍A\\u00a78 | \\ execute as @e[tag=touzi.text.money.a,type=marker] at @s as @e[distance=0..2,type=text_display] run data modify entity @s text set from block -19 4 71 front_text.messages[0] execute as @e[tag=touzi.text.money.b,type=marker] at @s as @e[distance=0..2,type=text_display] run data modify entity @s text set from block -19 4 71 front_text.messages[1] execute as @e[tag=touzi.text.health.a,type=marker] at @s as @e[distance=0..2,type=text_display] run data modify entity @s text set from block -19 4 71 front_text.messages[2] + execute as @e[tag=touzi.text.health.b,type=marker] at @s as @e[distance=0..2,type=text_display] run data modify entity @s text set from block -19 4 71 front_text.messages[3] function minecraft:desk/touzi/overdetect execute if score desk.state state matches 1..9 if score desk.time board matches 0 run function desk/touzi/timeout execute if score desk.state state matches 1..9 if score desk.time board matches 1.. run scoreboard players remove desk.time board 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/cb.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/cb.mcfunction index 47041043..dfe5c26b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/cb.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/cb.mcfunction @@ -1,13 +1,22 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 10 scoreboard players set touzi.shop.need board 12000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"Command Block骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/creeper.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/creeper.mcfunction index b73bb242..e3b878ce 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/creeper.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/creeper.mcfunction @@ -1,13 +1,22 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 5 scoreboard players set touzi.shop.need board 3000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"苦力怕骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dmpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dmpick.mcfunction index 8f7b6647..4922b8cc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dmpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dmpick.mcfunction @@ -1,13 +1,22 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 4 scoreboard players set touzi.shop.need board 2000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"钻石镐骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dragon.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dragon.mcfunction index f88b48de..41d21fc1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dragon.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/dragon.mcfunction @@ -1,14 +1,23 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 6 scoreboard players set touzi.shop.need board 6000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"龙骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/firework.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/firework.mcfunction index 92715ab0..8d5c8274 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/firework.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/firework.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 8 scoreboard players set touzi.shop.need board 2000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"烟花骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/irpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/irpick.mcfunction index 37f5d3f1..5799455f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/irpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/irpick.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 3 scoreboard players set touzi.shop.need board 1500 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"铁镐骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/light.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/light.mcfunction index c4f0990b..e6dd7069 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/light.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/light.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 11 scoreboard players set touzi.shop.need board 12000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"光骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/stpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/stpick.mcfunction index 6a402070..a0cfbae9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/stpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/stpick.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 2 scoreboard players set touzi.shop.need board 500 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"石镐骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/tnt.mcfunction index c3c4f86c..852f6ef6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/tnt.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 7 scoreboard players set touzi.shop.need board 8000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"TNT骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/undying.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/undying.mcfunction index 2ad41002..2541c431 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/undying.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/buy/undying.mcfunction @@ -1,12 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set touzi.shop.id board 9 scoreboard players set touzi.shop.need board 6000 scoreboard players set touzi.shop.success board 0 + $execute if score touzi.money.$(team) board >= touzi.shop.need board run scoreboard players set touzi.shop.success board 1 + $execute if score touzit.$(team).touzi$(place) board = touzi.shop.id board run scoreboard players set touzi.shop.success board 2 + $execute if score touzi.shop.success board matches 1 run tellraw @a[team=deskgame,tag=touzi.team.$(team)] [{"selector":"@s"},"\u00a7a购买了",{"text":"不死图腾骰子","color":"aqua"},"\u00a7a，将其替换了",{"text":"骰子$(place)","color": "yellow","bold": true}] + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzit.$(team).touzi$(place) board = touzi.shop.id board + $execute if score touzi.shop.success board matches 1 run scoreboard players operation touzi.money.$(team) board -= touzi.shop.need board execute unless score touzi.shop.success board matches 1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 execute if score touzi.shop.success board matches 0 run tellraw @s ["\u00a7c购买失败！金钱不够。"] -execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] \ No newline at end of file +execute if score touzi.shop.success board matches 2 run tellraw @s ["\u00a7c购买失败！该位置已为此骰子。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/cb.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/cb.mcfunction index 5294d16b..9a81142c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/cb.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/cb.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/cb {place:$(place),team:a} -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/cb {place:$(place),team:b} \ No newline at end of file +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/cb {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/creeper.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/creeper.mcfunction index 65600d8f..7b3bb75e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/creeper.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/creeper.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/creeper {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/creeper {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/creeper {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dmpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dmpick.mcfunction index 557480af..cbdae8ec 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dmpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dmpick.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/dmpick {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/dmpick {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/dmpick {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dragon.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dragon.mcfunction index 8b0e3af8..51839d43 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dragon.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/dragon.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/dragon {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/dragon {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/dragon {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/firework.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/firework.mcfunction index d4db687c..afe6971d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/firework.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/firework.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/firework {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/firework {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/firework {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/irpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/irpick.mcfunction index a372f57a..b85e2660 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/irpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/irpick.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/irpick {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/irpick {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/irpick {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/light.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/light.mcfunction index ee464c68..e022c450 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/light.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/light.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/light {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/light {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/light {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/stpick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/stpick.mcfunction index a4a1f250..605de23a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/stpick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/stpick.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/stpick {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/stpick {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/stpick {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/tnt.mcfunction index 37d6f1fa..d7a19e4e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/tnt.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/tnt {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/tnt {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/tnt {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/undying.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/undying.mcfunction index a995b9ea..66cfd3c8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/undying.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/shop/undying.mcfunction @@ -1,3 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $execute as @s[tag=touzi.team.a] at @s run function minecraft:desk/touzi/shop/buy/undying {place:$(place),team:a} playsound block.note_block.pling player @s ~ ~ ~ 1 2 1 -$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/undying {place:$(place),team:b} \ No newline at end of file + +$execute as @s[tag=touzi.team.b] at @s run function minecraft:desk/touzi/shop/buy/undying {place:$(place),team:b} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/show_touzi.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/show_touzi.mcfunction index 56d3b736..485362e4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/show_touzi.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/show_touzi.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## item replace entity @e[type=item_frame,sort=nearest,limit=1] container.0 from entity @s weapon.mainhand -data modify entity @s CustomName set from entity @s HandItems[0].tag.display.Name -execute unless data entity @s HandItems[0].tag run data merge entity @s {CustomName:'"\\u00a78(空)"'} \ No newline at end of file +data modify entity @s CustomName set from entity @s HandItems[0].components."minecraft:custom_name" +execute unless data entity @s HandItems[0].components."minecraft:custom_data" run data merge entity @s {CustomName:'"\\u00a78(空)"'} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/skill_handle.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/skill_handle.mcfunction index 0ae889a8..e48a7f49 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/skill_handle.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/skill_handle.mcfunction @@ -1,2 +1,7 @@ -execute if entity @s[nbt={SelectedItem:{tag:{desk:1}}}] run function desk/touzi/control/refrush +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{desk:1}}}}] run function desk/touzi/control/refrush # execute if entity @s[nbt={SelectedItem:{tag:{desk:2}}}] run tag @s add skill.old + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/start.mcfunction index b6034c59..c1867bd6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=deskgame,gamemode=adventure] run tag @s add desk.ranteam tag @a remove touzi.team.a tag @a remove touzi.team.b @@ -8,4 +12,4 @@ tp @a[team=deskgame,gamemode=!creative] -18 8 54 0 90 tp @a[tag=touzi.team.a] -18 0 49 0 0 tp @a[tag=touzi.team.b] -18 0 59 180 0 -function minecraft:desk/touzi/round/new_round \ No newline at end of file +function minecraft:desk/touzi/round/new_round diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tick.mcfunction index de375851..21b01791 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tick.mcfunction @@ -1,2 +1,6 @@ -kill @e[type=item,nbt={Item:{tag:{desk_clear:1}}}] -execute as @e[type=item,nbt={Item:{tag:{desk_item:1}}}] at @s run data merge entity @s {pickup:1b,PickupDelay:0} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_clear:1}}}}] +execute as @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{desk_item:1}}}}] at @s run data merge entity @s {pickup:1b,PickupDelay:0} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/timeout.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/timeout.mcfunction index 888decd5..76c4259f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/timeout.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/timeout.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set desk.time board -1 execute if score desk.state state matches 4 run function minecraft:desk/touzi/confirmround/b -execute if score desk.state state matches 3 run function minecraft:desk/touzi/confirmround/a \ No newline at end of file +execute if score desk.state state matches 3 run function minecraft:desk/touzi/confirmround/a diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tips.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tips.mcfunction index 5a6a19ba..a8527059 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tips.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/touzi/tips.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\n\u00a76\u00a7l ※ 骰子游戏\n\n\u00a7b 数字骰子 + 角色攻击技能骰子(不含大小) = 攻击，伤害由数字决定\n\u00a7b 数字骰子 + 角色防御技能骰子(不含大小) = 防御，减伤由数字决定\n\u00a7b 角色攻击技能骰子(含大小) = 攻击，伤害由数字决定\n\u00a7b 角色防御技能骰子(含大小) = 防御，减伤由数字决定\n\u00a76 请注意：上述操作仅允许同时一类操作，\n 多个角色骰子(不含大小)一个即可生效。\n\u00a7b 骰子上最后的红色字体表示为攻击牌；蓝色字体表示为防御牌。\n\u00a76金币由对对方造成的总计伤害增加。\n\u00a7a先将对方生命降为0方获胜。\n\u00a7e点击“确认出牌”进行操作。一局可以出牌多次。当所有操作结束后，点击“结束回合”即可。\n"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\n\u00a76\u00a7l ※ 骰子游戏\n\n\u00a7b 数字骰子 + 角色攻击技能骰子(不含大小) = 攻击，伤害由数字决定\n\u00a7b 数字骰子 + 角色防御技能骰子(不含大小) = 防御，减伤由数字决定\n\u00a7b 角色攻击技能骰子(含大小) = 攻击，伤害由数字决定\n\u00a7b 角色防御技能骰子(含大小) = 防御，减伤由数字决定\n\u00a76 请注意：上述操作仅允许同时一类操作，\n 多个角色骰子(不含大小)一个即可生效。\n\u00a7b 骰子上最后的红色字体表示为攻击牌；蓝色字体表示为防御牌。\n\u00a76金币由对对方造成的总计伤害增加。\n\u00a7a先将对方生命降为0方获胜。\n\u00a7e点击“确认出牌”进行操作。一局可以出牌多次。当所有操作结束后，点击“结束回合”即可。\n"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/desk/trystart.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/desk/trystart.mcfunction index da43a6c0..839df9ba 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/desk/trystart.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/desk/trystart.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # 重置人数统计 -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 # 计算人数 execute as @a[team=deskgame,gamemode=adventure] run scoreboard players add wait.player tick 1 # 判断人数、游戏状态 execute if score desk.state state matches 1.. run function minecraft:desk/spec execute unless score desk.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score desk.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score desk.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:desk/start \ No newline at end of file +execute unless score desk.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:desk/start diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/ballspawn.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/ballspawn.mcfunction index 256273d1..5d54486d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/ballspawn.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/ballspawn.mcfunction @@ -1 +1,5 @@ -execute as @e[type=marker,tag=golf.start] at @s run function golf/spawnball \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[type=marker,tag=golf.start] at @s run function golf/spawnball diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/item.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/item.mcfunction index 20367186..7d6efec5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/item.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/item.mcfunction @@ -1,8 +1,12 @@ -item replace entity @s hotbar.0 with minecraft:stick{display:{Name:'"\\u00a7a击退 I"'},Enchantments:[{id:"knockback",lvl:1}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.1 with minecraft:wooden_shovel{display:{Name:'"\\u00a7a击退 II"'},Enchantments:[{id:"knockback",lvl:2}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.2 with minecraft:stone_shovel{display:{Name:'"\\u00a7a击退 III"'},Enchantments:[{id:"knockback",lvl:3}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.3 with minecraft:golden_shovel{display:{Name:'"\\u00a7a击退 IV"'},Enchantments:[{id:"knockback",lvl:4}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.4 with minecraft:iron_shovel{display:{Name:'"\\u00a7a击退 V"'},Enchantments:[{id:"knockback",lvl:5}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.5 with minecraft:diamond_shovel{display:{Name:'"\\u00a7a击退 VI"'},Enchantments:[{id:"knockback",lvl:6}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s hotbar.6 with minecraft:netherite_shovel{display:{Name:'"\\u00a7a击退 VII"'},Enchantments:[{id:"knockback",lvl:7}],Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:0d,Operation:0,UUID:[I;2169,7724,3478,3358]}],HideFlags:6} -item replace entity @s weapon.offhand with air \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s hotbar.0 with minecraft:stick[custom_name='"\\u00a7a击退 I"',enchantments={levels:{"minecraft:knockback":1}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.1 with minecraft:wooden_shovel[custom_name='"\\u00a7a击退 II"',enchantments={levels:{"minecraft:knockback":2}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.2 with minecraft:stone_shovel[custom_name='"\\u00a7a击退 III"',enchantments={levels:{"minecraft:knockback":3}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.3 with minecraft:golden_shovel[custom_name='"\\u00a7a击退 IV"',enchantments={levels:{"minecraft:knockback":4}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.4 with minecraft:iron_shovel[custom_name='"\\u00a7a击退 V"',enchantments={levels:{"minecraft:knockback":5}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.5 with minecraft:diamond_shovel[custom_name='"\\u00a7a击退 VI"',enchantments={levels:{"minecraft:knockback":6}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s hotbar.6 with minecraft:netherite_shovel[custom_name='"\\u00a7a击退 VII"',enchantments={levels:{"minecraft:knockback":7}},unbreakable={show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[2169,7724,3478,3358],name:"noName",amount:0d,operation:"add_value"}],show_in_tooltip:false}] +item replace entity @s weapon.offhand with air diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/next.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/next.mcfunction index ab75669b..005800db 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/next.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/next.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=zombie,tag=golf.ball] gamemode spectator @a[team=golf,gamemode=adventure] execute if entity @a[team=golf,tag=golf.waitshoot] as @a[team=golf,tag=golf.waitshoot,limit=1,sort=nearest] run function golf/gaming/nextplayer execute unless entity @a[team=golf,tag=golf.waitshoot] run function golf/gaming/nextmap execute as @a[team=golf] at @s run playsound entity.player.levelup player @s ~ ~ ~ 3 1 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextmap.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextmap.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextmap.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextmap.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextplayer.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextplayer.mcfunction index 0f5a7f60..8fa483b3 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextplayer.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/nextplayer.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=golf] ["\u00a76 > 现在轮到 ",{"selector":"@s"},"\u00a76 了。"] tp @s @e[limit=1,tag=golf.start] tag @s remove golf.waitshoot gamemode adventure @s -clear @s \ No newline at end of file +clear @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/redo.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/redo.mcfunction index 0293c9c8..f3fd19a6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/redo.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/gaming/redo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[type=zombie,tag=golf.ball] gamemode spectator @a[team=golf,gamemode=adventure] # execute if entity @a[team=golf,tag=golf.waitshoot] as @a[team=golf,tag=golf.waitshoot,limit=1,sort=nearest] run function golf/gaming/nextplayer @@ -6,3 +10,4 @@ tellraw @a[team=golf] ["\n\u00a7c 击球失败！球出界！\n"] title @a[team=golf,gamemode=adventure] title ["\u00a7c击球失败！"] title @a[team=golf,gamemode=adventure] subtitle ["\u00a7b球出界了，所以你失败了。"] execute as @a[team=golf] at @s run playsound entity.player.levelup player @s ~ ~ ~ 3 1 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/join.mcfunction index 7424bdf8..f9022a96 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # team join golf @s # tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a7d高尔夫游戏\u00a7a。"] # title @s title ["\u00a7dGOLF 高尔夫游戏"] @@ -12,4 +16,4 @@ playsound entity.player.levelup player @s ~ ~ ~ 10 1 1 # tag @s remove golf.waitshoot # tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] # execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator -tellraw @s ["\n\u00a7c仍在制作，敬请期待。\n"] \ No newline at end of file +tellraw @s ["\n\u00a7c仍在制作，敬请期待。\n"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/player_hit_ball.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/player_hit_ball.mcfunction index 1ad68041..8a306748 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/player_hit_ball.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/player_hit_ball.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## advancement revoke @s only player_hit_ball scoreboard players set golf.scb.tmp board 5 @@ -11,4 +15,4 @@ execute if data entity @s {SelectedItem:{id:"minecraft:netherite_shovel"}} run s scoreboard players operation @s golf.nowroundscore += golf.scb.tmp board tellraw @s ["\u00a7c + ",{"score":{"name": "golf.scb.tmp","objective": "board"},"color": "red"},""] playsound entity.experience_orb.pickup player @s ~ ~ ~ 3 1 1 -effect give @e[tag=golf.ball] regeneration 2 25 true \ No newline at end of file +effect give @e[tag=golf.ball] regeneration 2 25 true diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/resets/1.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/resets/1.mcfunction index 5e4557e2..c75f488f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/resets/1.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/resets/1.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## forceload add -97 34 -22 86 forceload add -171 23 -250 79 clone -248 -60 25 -173 -53 77 -97 -63 34 clone -248 -52 25 -173 -46 77 -97 -55 34 -forceload remove -171 23 -250 79 \ No newline at end of file +forceload remove -171 23 -250 79 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/second.mcfunction index 3f87e2ff..036b6952 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/second.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## effect give @e[team=golf] resistance 3 25 true # effect give @e[tag=golf.ball] invisibility 3 25 true execute if score golf.state state matches 1.. as @e[type=zombie,tag=golf.ball] at @s if block ~ ~-1 ~ copper_block run function golf/gaming/next execute if score golf.state state matches 1.. as @e[type=zombie,tag=golf.ball] at @s if block ~ ~-1 ~ magma_block run function golf/gaming/redo clear @a[team=golf,gamemode=spectator] -execute as @a[team=golf,gamemode=adventure] run function golf/gaming/item \ No newline at end of file +execute as @a[team=golf,gamemode=adventure] run function golf/gaming/item diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/spawnball.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/spawnball.mcfunction index 5fb0faec..86761caa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/spawnball.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/spawnball.mcfunction @@ -1 +1,5 @@ -summon minecraft:zombie ~ ~1 ~ {CustomName:'["\\u00a7eBall"]',CustomNameVisible:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,Team:"golf",Tags:["golf.ball"],Attributes:[{Base:10d,Name:"generic.max_health"},{Base:0d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:0d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:0d,Name:"generic.attack_speed"},{Base:10d,Name:"generic.armor"},{Base:10d,Name:"generic.armor_toughness"}],ArmorItems:[{id:"minecraft:leather_boots",Count:1b,tag:{Unbreakable:1b,display:{color:1241313}}},{id:"minecraft:leather_leggings",Count:1b,tag:{Unbreakable:1b,display:{color:1241313}}},{id:"minecraft:leather_chestplate",Count:1b,tag:{Unbreakable:1b,display:{color:1241313}}},{id:"minecraft:player_head",Count:1b,tag:{SkullOwner:"MHF_OakLog"}}],ArmorDropChances:[0f,0f,0f,0f],CanBreakDoors:false,DeathLootTable:"",IsBaby:false} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:zombie ~ ~1 ~ {CustomName:'["\\u00a7eBall"]',CustomNameVisible:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,Team:"golf",Tags:["golf.ball"],Attributes:[{Base:10d,Name:"generic.max_health"},{Base:0d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:0d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:0d,Name:"generic.attack_speed"},{Base:10d,Name:"generic.armor"},{Base:10d,Name:"generic.armor_toughness"}],ArmorItems:[{id:"minecraft:leather_boots",count:1,components:{"minecraft:unbreakable":{},"minecraft:dyed_color":{rgb:1241313}}},{id:"minecraft:leather_leggings",count:1,components:{"minecraft:unbreakable":{},"minecraft:dyed_color":{rgb:1241313}}},{id:"minecraft:leather_chestplate",count:1,components:{"minecraft:unbreakable":{},"minecraft:dyed_color":{rgb:1241313}}},{id:"minecraft:player_head",count:1,components:{"minecraft:profile":"MHF_OakLog"}}],ArmorDropChances:[0f,0f,0f,0f],CanBreakDoors:"false",DeathLootTable:"",IsBaby:"false"} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/spec.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/spec.mcfunction index 12762b0d..ea1e172f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/spec.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/start.mcfunction index 0d6582eb..5ac13b18 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/start.mcfunction @@ -1 +1,5 @@ -scoreboard players reset * golf.score \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players reset * golf.score diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/tick.mcfunction index f7fb476c..a552fb8a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/tick.mcfunction @@ -1 +1,5 @@ -execute as @a[team=golf,gamemode=adventure] at @s run kill @e[type=item,distance=0..5] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @a[team=golf,gamemode=adventure] at @s run kill @e[type=item,distance=0..5] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/golf/trystart.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/golf/trystart.mcfunction index db823110..eff771b2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/golf/trystart.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/golf/trystart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=golf,gamemode=adventure] run scoreboard players add wait.player tick 1 ## regoin 维护 @@ -12,4 +16,4 @@ tellraw @s ["\n\u00a7c很抱歉，此游戏仍在测试阶段！\n"] execute if score golf.state state matches 1.. run function minecraft:golf/spec execute unless score golf.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score golf.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score golf.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:golf/start \ No newline at end of file +execute unless score golf.state state matches 1.. if score wait.player tick matches 2.. run function minecraft:golf/start diff --git a/datapacks/map_game_2nd/data/minecraft/functions/gunwars/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/gunwars/join.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/gunwars/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/gunwars/join.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/auto_settings.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/auto_settings.mcfunction index 895ef979..880a1ec2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/auto_settings.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/auto_settings.mcfunction @@ -1,4 +1,8 @@ -# execute if score +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute if score # 无论多少人都有啦 execute as @r[team=wait.wolfpeople,gamemode=adventure] run function twolf/job/wolf execute as @r[team=wait.wolfpeople,gamemode=adventure] run function twolf/job/witch @@ -43,4 +47,4 @@ execute if score wolf.total board matches 16 run scoreboard players set wolf.mod execute if score wolf.total board matches 18 run scoreboard players set wolf.mode board 1 execute if score wolf.total board matches 20 run scoreboard players set wolf.mode board 1 execute if score wolf.total board matches 22 run scoreboard players set wolf.mode board 1 -execute if score wolf.total board matches 24 run scoreboard players set wolf.mode board 1 \ No newline at end of file +execute if score wolf.total board matches 24 run scoreboard players set wolf.mode board 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/get_jobs.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/get_jobs.mcfunction index 28c68ad6..d30d6b88 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/get_jobs.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/get_jobs.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/job_dg_start {job:wolf} function twolf/action/job_dg_start {job:witch} function twolf/action/job_dg_start {job:predictor} @@ -9,4 +13,4 @@ function twolf/action/job_dg_start {job:knight} function twolf/action/job_dg_start {job:tnt} function twolf/action/job_dg_start {job:whitewolf} scoreboard players operation wolf.mode board = wolf.mode state -# function minecraft:twolf/action/job_dg \ No newline at end of file +# function minecraft:twolf/action/job_dg diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/givepoint.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/givepoint.mcfunction index 54520b87..e9f7cfed 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/givepoint.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/givepoint.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 应在初始化的时候分配 tag @e[tag=wolf.tppoint] remove wolf.used kill @e[tag=wolf.nametags] -scoreboard players reset @e[tag=wolf.tp.sell,limit=1] +scoreboard players reset @e[tag=wolf.tp.sell,limit=1] execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/givepoint + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg.mcfunction index 4d3d8d5e..21f5d697 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg.mcfunction @@ -1,3 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $scoreboard players remove wolf.$(job) board 1 + $execute as @r[team=wait.wolfpeople,gamemode=adventure] run function twolf/job/$(job) -$execute if score wolf.$(job) board matches 1.. run function minecraft:twolf/action/job_dg {job:$(job)} \ No newline at end of file + +$execute if score wolf.$(job) board matches 1.. run function minecraft:twolf/action/job_dg {job:$(job)} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg_start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg_start.mcfunction index af6a844a..6b5a966a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg_start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/job_dg_start.mcfunction @@ -1,2 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + $scoreboard players operation wolf.$(job) board = wolf.$(job) state + $execute if score wolf.$(job) board matches 1.. run function minecraft:twolf/action/job_dg {job:$(job)} + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom.mcfunction index 892b7199..a26a4bb5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @a[tag=wolf.tip,team=wolfpeople,gamemode=adventure] at @s run function minecraft:twolf/action/per/death/boom/whochooseme tag @s remove wolf.sell @@ -6,4 +10,4 @@ title @a[tag=wolf.tip] title [""] title @a[tag=wolf.tip] subtitle ["\u00a7c炸弹人 ",{"selector":"@s"},"\u00a7c 爆炸了。"] execute as @a[tag=wolf.boomed] run function twolf/action/per/death/boom/died -tag @a remove wolf.boomed \ No newline at end of file +tag @a remove wolf.boomed diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/died.mcfunction index 2bee7917..d8fe57b2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger execute if score @s LRS_JOB matches 9 run return 0 @@ -15,4 +19,4 @@ team join wait.wolfpeople tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 被炸弹人炸死了。"] tag @s remove wolf.sell function minecraft:twolf/action/per/death/died_all -tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] \ No newline at end of file +tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/whochooseme.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/whochooseme.mcfunction index f807a398..bd8c2213 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/whochooseme.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom/whochooseme.mcfunction @@ -1 +1,5 @@ -execute if score @s LRS_CS = @a[tag=wolf.sell,limit=1,team=wolfpeople] park.uuid run tag @s add wolf.boomed \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score @s LRS_CS = @a[tag=wolf.sell,limit=1,team=wolfpeople] park.uuid run tag @s add wolf.boomed diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom_died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom_died.mcfunction index 378b207a..adc422d5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom_died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/boom_died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (炸弹人，已阵亡)"]'} @@ -14,4 +18,4 @@ function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] function minecraft:twolf/persons -execute unless score twolf.state state matches 3 if score wolf.r.good board matches 0 if score wolf.r.bad board matches 0 run function twolf/over/boom \ No newline at end of file +execute unless score twolf.state state matches 3 if score wolf.r.good board matches 0 if score wolf.r.bad board matches 0 run function twolf/over/boom diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died.mcfunction index e6bb041c..1400d3ab 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger execute if score @s LRS_JOB matches 9 run return 0 @@ -5,7 +9,7 @@ tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (已阵亡)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -15,3 +19,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_all.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_all.mcfunction index fe096ee3..aa1a48ab 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_all.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_all.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator team join wait.wolfpeople @@ -17,4 +21,4 @@ tag @s remove wolf.lastprotected tag @s remove wolf.acting execute as @s[tag=wolf.connected] run function minecraft:twolf/action/per/death/died_cupid -tag @s remove wolf.connected \ No newline at end of file +tag @s remove wolf.connected diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_cupid.mcfunction index 08aab79a..593ca407 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_cupid.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=wolf.connected] add wolf.tmp tag @a remove wolf.connected execute as @a[gamemode=adventure,team=wolfpeople,tag=wolf.tmp] at @s run function minecraft:twolf/action/per/death/died -tag @a remove wolf.tmp \ No newline at end of file +tag @a remove wolf.tmp diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_fired.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_fired.mcfunction index a18a818e..f72fdb63 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_fired.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_fired.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/fire execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger @@ -6,7 +10,7 @@ tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (已阵亡)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -19,3 +23,4 @@ tag @a remove wolf.wolf say debug function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_no.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_no.mcfunction index a63cc5d5..9814c1b6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_no.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_no.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger execute if score @s LRS_JOB matches 9 run return 0 execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (已阵亡)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -13,3 +17,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_witch.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_witch.mcfunction index cfadab75..6c3cdb44 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_witch.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_witch.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (已阵亡)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -11,3 +15,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_withsaying.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_withsaying.mcfunction index de9eb37f..08c1b702 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_withsaying.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/died_withsaying.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger execute if score @s LRS_JOB matches 9 run return 0 tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (已阵亡)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -21,3 +25,4 @@ function minecraft:twolf/action/per/death/died_all tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。他可以说遗言。"] team join wolfpeople + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/detect.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/detect.mcfunction index 1d73ae88..f25a148a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/detect.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/detect.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger -# execute if score @s LRS_JOB matches 9 run return 0 \ No newline at end of file +# execute if score @s LRS_JOB matches 9 run return 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/died.mcfunction index ef497325..9fc5a28b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players set wolf.event board 18 function minecraft:twolf/action/per/death/hunter_died scoreboard players set wolf.time board -1 @@ -5,4 +9,4 @@ scoreboard players set wolf.ttime board 4 scoreboard players operation wolf.event board = wolf.save.event board schedule clear #wolffunctions function minecraft:twolf/action/tppoint_day -# schedule \ No newline at end of file +# schedule diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/fire.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/fire.mcfunction index 59078108..21f882fc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/fire.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/fire.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove wolf.protected tag @s remove wolf.killed tag @s remove wolf.fired @@ -8,3 +12,4 @@ tag @a remove wolf.wolf execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 4 run tag @s add wolf.wolf execute as @a[limit=1,sort=random,tag=wolf.wolf] run function minecraft:twolf/action/per/death/died tag @a remove wolf.wolf + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/trigger.mcfunction index bff144a7..698af296 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter/trigger.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.deathcount board 1 function minecraft:twolf/events/job/hunter @@ -12,4 +16,4 @@ scoreboard players set wolf.time board 60 function twolf/action/special_day_choose function twolf/action/per/tpback_real execute as @a[tag=wolf.acting] at @s run function twolf/items/hunter -schedule clear #wolffunctions \ No newline at end of file +schedule clear #wolffunctions diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter_died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter_died.mcfunction index a3067142..c54d664e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter_died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/hunter_died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (猎人，已阵亡)"]'} @@ -12,3 +16,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] tag @s remove wolf.sell function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died.mcfunction index 5179c035..14684e98 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，已阵亡)"]'} @@ -13,3 +17,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] tag @s remove wolf.sell function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died_t.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died_t.mcfunction index 1e47eb23..c6ff1bd7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died_t.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/knight_died_t.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/per/death/knight_died -function twolf/action/special_day_back \ No newline at end of file +function twolf/action/special_day_back diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/leaveaway.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/leaveaway.mcfunction index 72d571c7..faa885a9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/leaveaway.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/leaveaway.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 7 run function minecraft:twolf/action/per/death/boom execute if score @s LRS_JOB matches 9 run function minecraft:twolf/action/per/death/hunter/trigger @@ -7,7 +11,7 @@ tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute unless score @s LRS_JOB matches 7 as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (被放逐)"]'} execute if score @s LRS_JOB matches 7 as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (炸弹人，被放逐)"]'} -execute as @e[tag=wolf.tp.sell,limit=1,tag=wolf.knight] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，被放逐)"]'} +execute as @e[tag=wolf.knight,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (骑士，被放逐)"]'} tag @e[tag=wolf.tp.sell] add wolf.died tag @e[tag=wolf.tp.sell] remove wolf.tp.sell @@ -38,3 +42,4 @@ tag @s remove wolf.connected tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died.mcfunction index 7b241dc3..af349311 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (白狼王，已阵亡)"]'} @@ -12,3 +16,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] tag @s remove wolf.sell function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died_t.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died_t.mcfunction index 5d2d6fe8..a466b88b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died_t.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/white_wolf_died_t.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/per/death/white_wolf_died -function twolf/action/special_day_back \ No newline at end of file +function twolf/action/special_day_back diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/wolf_died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/wolf_died.mcfunction index f041ed2c..0472584f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/wolf_died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/death/wolf_died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7e※ ",{"selector":"@a[tag=wolf.sell]"},"\\u00a7c (狼，已阵亡)"]'} @@ -12,3 +16,4 @@ tellraw @a[tag=wolf.tip] [{"selector":"@s"},"\u00a7c 死了。"] tag @s remove wolf.sell function minecraft:twolf/action/per/death/died_all tellraw @s ["\n\u00a7e\u00a7lWARNING：\u00a76你不可以说遗言。\n"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/deletemypoint.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/deletemypoint.mcfunction index 8859ab79..4c35c6b0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/deletemypoint.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/deletemypoint.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run kill @e[tag=wolf.nametags,distance=0..2] -scoreboard players reset @e[tag=wolf.tp.sell,limit=1] +scoreboard players reset @e[tag=wolf.tp.sell,limit=1] tag @e[tag=wolf.tp.sell] remove wolf.used tag @e[tag=wolf.tp.sell] remove wolf.tp.sell # execute at @s run tp @s ~ -20 ~ -tag @s remove wolf.sell \ No newline at end of file +tag @s remove wolf.sell diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/getjobtype.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/getjobtype.mcfunction index db1c53c1..2f4a049e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/getjobtype.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/getjobtype.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 获取是什么属性的角色 # 1: good; 2: bad; 3: unknown @@ -11,4 +15,4 @@ execute if score @s LRS_JOB matches 6 run return 1 execute if score @s LRS_JOB matches 7 run return 3 execute if score @s LRS_JOB matches 8 run return 1 execute if score @s LRS_JOB matches 9 run return 1 -execute if score @s LRS_JOB matches 0 run return 1 \ No newline at end of file +execute if score @s LRS_JOB matches 0 run return 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/givepoint.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/givepoint.mcfunction index 6745ad20..322322b0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/givepoint.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/givepoint.mcfunction @@ -1,11 +1,15 @@ -execute positioned 29 16 31 run tag @e[tag=wolf.tppoint,tag=!wolf.used,limit=1,sort=nearest] add wolf.sel +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute positioned 29 16 31 run tag @e[tag=!wolf.used,limit=1,sort=nearest] add wolf.sel scoreboard players operation @e[tag=wolf.sel,limit=1] LRS_UUID = @s park.uuid tag @e[tag=wolf.sel] add wolf.used tag @e[tag=wolf.sel] remove wolf.knight tag @s add wolf.sell execute as @e[tag=wolf.sel] at @s run summon text_display ~ ~1.8 ~ {billboard:"vertical",Tags:["wolf.nametags"],text:'[{"selector":"@a[tag=wolf.sell]"}]'} -execute as @e[tag=wolf.sel] at @s run summon minecraft:armor_stand ~ ~-0.5 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,ShowArms:true,NoBasePlate:true,DisabledSlots:2039583,ArmorItems:[{id:"minecraft:leather_boots",Count:1b},{id:"minecraft:leather_leggings",Count:1b},{id:"minecraft:leather_chestplate",Count:1b},{id:"minecraft:player_head",Count:1b}],Tags:["wolf.new","wolf.nametags"],Marker:true,Glowing:1b} +execute as @e[tag=wolf.sel] at @s run summon minecraft:armor_stand ~ ~-0.5 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:"true",ShowArms:"true",NoBasePlate:"true",DisabledSlots:2039583,ArmorItems:[{id:"minecraft:leather_boots",count:1},{id:"minecraft:leather_leggings",count:1},{id:"minecraft:leather_chestplate",count:1},{id:"minecraft:player_head",count:1}],Tags:["wolf.new","wolf.nametags"],Marker:"true",Glowing:1b} item modify entity @e[tag=wolf.new] armor.head gethead tag @s remove wolf.sell tag @e[tag=wolf.new] remove wolf.new -tag @e[tag=wolf.sel] remove wolf.sel \ No newline at end of file +tag @e[tag=wolf.sel] remove wolf.sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight.mcfunction index 53ebb0cf..03940b89 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight.mcfunction @@ -1,19 +1,23 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell1 execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell1,limit=1] park.uuid run tag @s add wolf.selll execute as @e[tag=wolf.selll] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run tag @s add wolf.sell scoreboard players set wolf.tmp board 0 execute as @e[tag=wolf.sell] store result score wolf.tmp board run data get entity @s ArmorItems[2].tag.selcount -execute if score wolf.tmp board matches ..0 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate{display:{color:64659},selcount:1} +execute if score wolf.tmp board matches ..0 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:64659},custom_data={selcount:1}] -execute if score wolf.tmp board matches 1 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate{display:{color:15465472},selcount:2} +execute if score wolf.tmp board matches 1 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:15465472},custom_data={selcount:2}] -execute if score wolf.tmp board matches 2 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate{display:{color:51964},selcount:3} +execute if score wolf.tmp board matches 2 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:51964},custom_data={selcount:3}] -execute if score wolf.tmp board matches 3.. as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate{display:{color:16515227},selcount:4} +execute if score wolf.tmp board matches 3.. as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:16515227},custom_data={selcount:4}] # execute as @e[tag=wolf.selll] run say 1 # say 1 tag @e[tag=wolf.sell] remove wolf.sell tag @e[tag=wolf.selll] remove wolf.selll -tag @s remove wolf.sell1 \ No newline at end of file +tag @s remove wolf.sell1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight_acting.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight_acting.mcfunction index a8dde85e..17fb4931 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight_acting.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/highlight_acting.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell1 execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell1,limit=1] park.uuid run tag @s add wolf.selll execute as @e[tag=wolf.selll] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run tag @s add wolf.sell @@ -7,4 +11,4 @@ execute as @e[tag=wolf.sell] run item replace entity @s armor.legs with diamond_ execute as @e[tag=wolf.sell] run item replace entity @s armor.feet with diamond_boots tag @e[tag=wolf.sell] remove wolf.sell tag @e[tag=wolf.selll] remove wolf.selll -tag @s remove wolf.sell1 \ No newline at end of file +tag @s remove wolf.sell1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/loseobjective.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/loseobjective.mcfunction index 271c1b75..979a90db 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/loseobjective.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/loseobjective.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s LRS_CS -title @s actionbar ["\u00a7c丢失目标"] \ No newline at end of file +title @s actionbar ["\u00a7c丢失目标"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/resethighlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/resethighlight.mcfunction index 90432d4e..52a72720 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/resethighlight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/resethighlight.mcfunction @@ -1 +1,5 @@ -execute as @s at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate{} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @s at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate[] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showjob.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showjob.mcfunction index 0298c22f..bcc7f442 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showjob.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showjob.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_JOB matches 3 run title @s actionbar ["\u00a7b你的身份是：\u00a7a\u00a7l纵火犯"] execute if score @s LRS_JOB matches 1 run title @s actionbar ["\u00a7b你的身份是：\u00a7e\u00a7l丘比特"] execute if score @s LRS_JOB matches 2 run title @s actionbar ["\u00a7b你的身份是：\u00a7a\u00a7l守卫"] @@ -8,4 +12,4 @@ execute if score @s LRS_JOB matches 7 run title @s actionbar ["\u00a7b你的身 execute as @s[tag=wolf.white] if score @s LRS_JOB matches 4 run title @s actionbar ["\u00a7b你的身份是：\u00a74\u00a7l白狼王"] execute unless entity @s[tag=wolf.white] if score @s LRS_JOB matches 4 run title @s actionbar ["\u00a7b你的身份是：\u00a7c\u00a7l狼"] execute if score @s LRS_JOB matches 5 run title @s actionbar ["\u00a7b你的身份是：\u00a7a\u00a7l女巫"] -execute if score @s LRS_JOB matches 0 run title @s actionbar ["\u00a7b你的身份是：\u00a7b\u00a7l民"] \ No newline at end of file +execute if score @s LRS_JOB matches 0 run title @s actionbar ["\u00a7b你的身份是：\u00a7b\u00a7l民"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showselector.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showselector.mcfunction index d31b15a5..ba690455 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showselector.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/showselector.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sel execute as @a[team=wolfpeople,gamemode=adventure] if score @s park.uuid = @a[tag=wolf.sel,limit=1] LRS_CS run tag @s add wolf.tp.sel title @s actionbar ["\u00a76你当前的选择为：",{"selector":"@a[tag=wolf.tp.sel]"}] execute unless entity @a[tag=wolf.tp.sel] run function minecraft:twolf/action/per/loseobjective execute as @a[tag=wolf.tp.sel] run function minecraft:twolf/action/per/highlight tag @a[tag=wolf.tp.sel] remove wolf.tp.sel -tag @s remove wolf.sel \ No newline at end of file +tag @s remove wolf.sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/knight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/knight.mcfunction index 180295d5..fc158f4a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/knight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/knight.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute as @e[tag=wolf.tp.sell,limit=1] at @s run data merge entity @e[tag=wolf.nametags,distance=0..2,limit=1] {text:'["\\u00a7a\\u00a7l「骑士」 ",{"selector":"@a[tag=wolf.sell]"}]'} @@ -7,4 +11,4 @@ tag @e[tag=wolf.tp.sell] remove wolf.tp.sell # gamemode spectator # tellraw @s ["\u00a7c你死了"] # execute at @s run tp @s ~ -20 ~ -tag @s remove wolf.sell \ No newline at end of file +tag @s remove wolf.sell diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/protected.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/protected.mcfunction index 2f341012..5c40ab16 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/protected.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/protected.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove wolf.lastprotected tag @s remove wolf.protected tag @s remove wolf.rescued tag @s remove wolf.killed -tag @s add wolf.lastprotected \ No newline at end of file +tag @s add wolf.lastprotected diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/rescued.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/rescued.mcfunction index 709c2717..cf6e77a5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/rescued.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tag/rescued.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove wolf.killed tag @s remove wolf.rescued -tag @s remove wolf.fired \ No newline at end of file +tag @s remove wolf.fired diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tagselector.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tagselector.mcfunction index e0f9f360..bdc97afd 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tagselector.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tagselector.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sel execute as @a[team=wolfpeople,gamemode=adventure] if score @s park.uuid = @a[tag=wolf.sel,limit=1] LRS_CS run tag @s add wolf.selected -tag @s remove wolf.sel \ No newline at end of file +tag @s remove wolf.sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback.mcfunction index 366cf227..c0fc6250 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell tp @s @e[tag=wolf.tp.sell,limit=1] execute at @s run tp @s ~ -20 ~ tag @e[tag=wolf.tp.sell] remove wolf.tp.sell tag @s remove wolf.sell -clear @s \ No newline at end of file +clear @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_real.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_real.mcfunction index fa551e99..c3fe18b0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_real.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_real.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell tp @s @e[tag=wolf.tp.sell,limit=1] @@ -5,4 +9,4 @@ tp @s @e[tag=wolf.tp.sell,limit=1] tag @e[tag=wolf.tp.sell] remove wolf.tp.sell tag @s remove wolf.sell effect clear @s darkness -effect clear @s blindness \ No newline at end of file +effect clear @s blindness diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_special.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_special.mcfunction index 9309ef6a..5ec77f94 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_special.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/per/tpback_special.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sell execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell,limit=1] park.uuid run tag @s add wolf.tp.sell execute at @e[tag=wolf.tp.sell,limit=1] run tp @s ~ 41 ~ @@ -6,4 +10,4 @@ tag @e[tag=wolf.tp.sell] remove wolf.tp.sell tag @s remove wolf.sell clear @s effect clear @s darkness -effect clear @s blindness \ No newline at end of file +effect clear @s blindness diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/resethighlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/resethighlight.mcfunction index 28359d2d..3bef5ce8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/resethighlight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/resethighlight.mcfunction @@ -1 +1,5 @@ -execute as @e[tag=wolf.used] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate{} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[tag=wolf.used] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate[] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_back.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_back.mcfunction index c9ed9142..5c6059c7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_back.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_back.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_real scoreboard players operation wolf.time board = wolf.resttime board tellraw @a[tag=wolf.tip] ["\u00a7a继续发言。"] scoreboard players set wolf.event board 10 execute if score wolf.time board matches ..20 run scoreboard players add wolf.time board 30 clear @a[tag=wolf.tip] -execute as @a[tag=wolf.tip,gamemode=adventure] run function twolf/items/day \ No newline at end of file +execute as @a[tag=wolf.tip,gamemode=adventure] run function twolf/items/day diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_choose.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_choose.mcfunction index 1e5226c5..475d18d9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_choose.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_choose.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players operation wolf.resttime board = wolf.time board -execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_special \ No newline at end of file +execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_special diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_night.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_night.mcfunction index 2d5df717..6286b58d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_night.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/special_day_night.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_real # scoreboard players operation wolf.time board = wolf.resttime board execute unless score wolf.event board matches 12 run tellraw @a[tag=wolf.tip] ["\u00a7f\u00a7l直接进入黑夜。"] @@ -6,3 +10,4 @@ scoreboard players set wolf.time board -1 scoreboard players set wolf.ttime board 4 # execute as @a[tag=wolf.tip,gamemode=adventure] run function twolf/action clear @a[tag=wolf.tip] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected.mcfunction index cd628356..0e4b1952 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.selsss tag @a remove wolf.selected execute as @a[team=wolfpeople,gamemode=adventure] if score @s park.uuid = @a[tag=wolf.selsss,limit=1] LRS_CS run tag @s add wolf.tp.sels @@ -5,4 +9,4 @@ title @s actionbar ["\u00a76你当前的选择为：",{"selector":"@a[tag=wolf.t execute unless entity @a[tag=wolf.tp.sels] run function minecraft:twolf/action/per/loseobjective execute as @a[tag=wolf.tp.sels] run tag @s add wolf.selected tag @a[tag=wolf.tp.sels] remove wolf.tp.sels -tag @s remove wolf.selsss \ No newline at end of file +tag @s remove wolf.selsss diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected_notclear.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected_notclear.mcfunction index 057bb4b0..45b573f1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected_notclear.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tagselected_notclear.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.sel execute as @a[team=wolfpeople,gamemode=adventure] if score @s park.uuid = @a[tag=wolf.sel,limit=1] LRS_CS run tag @s add wolf.tp.sel title @s actionbar ["\u00a76你当前的选择为：",{"selector":"@a[tag=wolf.tp.sel]"}] execute unless entity @a[tag=wolf.tp.sel] run function minecraft:twolf/action/per/loseobjective execute as @a[tag=wolf.tp.sel] run tag @s add wolf.selected tag @a[tag=wolf.tp.sel] remove wolf.tp.sel -tag @s remove wolf.sel \ No newline at end of file +tag @s remove wolf.sel diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint.mcfunction index 83e88fca..d6e67c26 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint.mcfunction @@ -1 +1,5 @@ -execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint_day.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint_day.mcfunction index 879d2232..2cb86ef7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint_day.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/action/tppoint_day.mcfunction @@ -1 +1,5 @@ -execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_real \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @a[gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tpback_real diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/cancel.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/cancel.mcfunction index fa4b13b9..9ec97500 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/cancel.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/cancel.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s LRS_CS matches ..0 run playsound ui.button.click player @s ~ ~ ~ 1 1 1 execute if score @s LRS_CS matches ..0 run return 0 @@ -5,4 +9,4 @@ scoreboard players set @s LRS_CS 0 title @s actionbar ["\u00a7c取消选择！"] -playsound ui.button.click player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound ui.button.click player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/confirm.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/confirm.mcfunction index da547bb1..bcdc31b8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/confirm.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/confirm.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 确认操作 # 丘比特 execute if score wolf.event board matches 1..7 if score @s LRS_JOB matches 1 run function minecraft:twolf/control/job/cupid/connect @@ -27,3 +31,4 @@ execute if score wolf.event board matches 11 if score @s LRS_JOB matches 8 run f # 投票 execute if score wolf.event board matches 10 run function minecraft:twolf/control/day/select + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/detect.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/detect.mcfunction index 965a3e25..863da6e1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/detect.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/detect.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.peoplecount.all board 0 scoreboard players set wolf.peoplecount board 0 scoreboard players set wolf.peoplecount.skip board 0 @@ -10,7 +14,8 @@ scoreboard players operation wolf.OtoT board = wolf.peoplecount.all board scoreboard players operation wolf.OtoT board /= 3 board scoreboard players operation wolf.OtoT board += wolf.OtoT board -execute if score wolf.peoplecount.skip board >= wolf.OtoT board run function minecraft:twolf/control/day/skipp +execute if score wolf.peoplecount.skip board >= wolf.OtoT board run function minecraft:twolf/control/day/skipp execute if score wolf.peoplecount board >= wolf.peoplecount.all board run scoreboard players set wolf.event board 10 # say [debugdd]detect.mcfunction execute if score wolf.peoplecount board >= wolf.peoplecount.all board run function twolf/events/next_event + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/select.mcfunction index 80bb2ec1..22695a52 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/select.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 tellraw @a[tag=wolf.tip] ["\u00a7d[!] ",{"selector":"@s"},"\u00a76 确定投票给了 ",{"selector":"@a[tag=wolf.selected]"}] @@ -5,3 +9,4 @@ tag @a remove wolf.selected tag @s add wolf.toupaoed clear @s function minecraft:twolf/control/day/detect + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skip.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skip.mcfunction index f29496cc..9b5f714d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skip.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skip.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s add wolf.toupaoed tellraw @a[tag=wolf.tip] ["\u00a7d[!] ",{"selector":"@s"},"\u00a7e 放弃了投票。"] function minecraft:twolf/control/day/detect + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skipp.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skipp.mcfunction index dd4099dd..891df11c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skipp.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/day/skipp.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[tag=wolf.tip] ["\u00a762/3的玩家选择弃票。投票无效！"] scoreboard players set wolf.event board 18 # say [debugdd]skipp.mcfunction function twolf/events/next_event + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/arsonist/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/arsonist/select.mcfunction index 4b9426a7..7df491a1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/arsonist/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/arsonist/select.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 @@ -5,4 +9,4 @@ tellraw @a[tag=wolf.tip,gamemode=spectator] ["",{"selector":"@s"},"\u00a7c 烧 tellraw @a[tag=wolf.acting] ["\u00a7c你烧死了 ",{"selector":"@a[tag=wolf.selected]"}] tag @a[tag=wolf.selected] add wolf.fired -function twolf/events/event_over \ No newline at end of file +function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect.mcfunction index f044596d..11823b80 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 execute unless entity @a[tag=wolf.connected,team=wolfpeople] run function minecraft:twolf/events/job/cupid2 @@ -7,3 +11,4 @@ execute if entity @a[tag=wolf.connected,team=wolfpeople] run function minecraft: tag @a[tag=wolf.selected] add wolf.connected scoreboard players reset @a LRS_CS playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect_s.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect_s.mcfunction index 303472a8..e5eddb79 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect_s.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/cupid/connect_s.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=wolf.selected] add wolf.connected scoreboard players reset @a LRS_CS tellraw @s ["\u00a7a你连接了 ",{"selector":"@a[tag=wolf.connected,team=wolfpeople]"}] @@ -10,4 +14,4 @@ scoreboard players set wolf.event board 2 scoreboard players set wolf.ttime board 5 # tellraw @s ["\u00a7c请闭眼。"] title @s title [""] -title @s subtitle ["\u00a7f请闭眼。"] \ No newline at end of file +title @s subtitle ["\u00a7f请闭眼。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/kill.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/kill.mcfunction index 512900c1..a3846347 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/kill.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/kill.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/skip.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/skip.mcfunction index 8883cfdc..886fcded 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/skip.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/general/skip.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/per/tpback # tellraw @s ["\u00a7c请闭眼。"] title @s title [""] title @s subtitle ["\u00a7f请闭眼。"] scoreboard players set wolf.ttime board 5 -scoreboard players set wolf.time board -1 \ No newline at end of file +scoreboard players set wolf.time board -1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/guard/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/guard/select.mcfunction index c127f75f..0d50afc7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/guard/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/guard/select.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 -execute if entity @a[tag=wolf.selected,tag=wolf.lastprotected] run tellraw @a[tag=wolf.acting] ["\u00a7d[!] \u00a7c你无法守护 ",{"selector":"@a[tag=wolf.selected]"},"\u00a7c，因为你昨晚守护了他。"] -execute if entity @a[tag=wolf.selected,tag=wolf.lastprotected] run return 0 +execute if entity @a[tag=wolf.lastprotected] run tellraw @a[tag=wolf.acting] ["\u00a7d[!] \u00a7c你无法守护 ",{"selector":"@a[tag=wolf.selected]"},"\u00a7c，因为你昨晚守护了他。"] +execute if entity @a[tag=wolf.lastprotected] run return 0 tellraw @a[tag=wolf.tip,gamemode=spectator] ["",{"selector":"@s"},"\u00a76 守护了 ",{"selector":"@a[tag=wolf.selected]"}] tellraw @a[tag=wolf.acting] ["\u00a76你守护了 ",{"selector":"@a[tag=wolf.selected]"}] tag @a remove wolf.lastprotected tag @a[tag=wolf.selected] add wolf.protected -function twolf/events/event_over \ No newline at end of file +function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/hunter/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/hunter/select.mcfunction index efad5b5e..f7420fd0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/hunter/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/hunter/select.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 execute as @s[tag=wolf.selected] run tellraw @s ["\u00a7c你不能选择自己"] execute as @s[tag=wolf.selected] run return 0 -tellraw @a[tag=wolf.tip,tag=!wolf.acting] ["",{"selector":"@s"},"\u00a7c 带走了 ",{"selector":"@a[tag=wolf.selected]"}] +tellraw @a[tag=!wolf.acting] ["",{"selector":"@s"},"\u00a7c 带走了 ",{"selector":"@a[tag=wolf.selected]"}] tellraw @a[tag=wolf.acting] ["\u00a7c你带走了 ",{"selector":"@a[tag=wolf.selected]"}] execute as @a[tag=wolf.selected] run function twolf/action/per/death/died_no # tag @a[tag=wolf.selected] add wolf.protected # function twolf/events/event_over -function twolf/action/per/death/hunter/died \ No newline at end of file +function twolf/action/per/death/hunter/died diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/knight/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/knight/select.mcfunction index 896b1c41..7d58eb8d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/knight/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/knight/select.mcfunction @@ -1,17 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 execute as @s[tag=wolf.selected] run tellraw @s ["\u00a7c你不能选择自己"] execute as @s[tag=wolf.selected] run return 0 -tellraw @a[tag=wolf.tip,tag=!wolf.acting] ["",{"selector":"@s"},"\u00a76 与 ",{"selector":"@a[tag=wolf.selected]"}," \u00a76展开了对决"] +tellraw @a[tag=!wolf.acting] ["",{"selector":"@s"},"\u00a76 与 ",{"selector":"@a[tag=wolf.selected]"}," \u00a76展开了对决"] tellraw @a[tag=wolf.acting] ["\u00a76你与 ",{"selector":"@a[tag=wolf.selected]"},"\u00a76 开始对决。"] execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 as @a[tag=wolf.selected] run tellraw @a[tag=wolf.tip] ["\u00a7a\u00a7l骑士打败了它。对方是狼。"] -execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 as @a[tag=wolf.selected] run function twolf/action/per/death/wolf_died +execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 as @a[tag=wolf.selected] run function twolf/action/per/death/wolf_died execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run tellraw @a[tag=wolf.tip] ["\u00a7e\u00a7l骑士与他不分上下，对方是炸弹人。\n骑士和炸弹人都死了。"] -execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died -execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 as @a[tag=wolf.selected] run function twolf/action/per/death/boom_died +execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died +execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 as @a[tag=wolf.selected] run function twolf/action/per/death/boom_died execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run tellraw @a[tag=wolf.tip] ["\u00a7c\u00a7l骑士输了，对方是好人。"] -execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died +execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died # execute as @a[tag=wolf.selected] run function twolf/action/per/death/died # tag @a[tag=wolf.selected] add wolf.protected @@ -19,3 +23,4 @@ execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 run function tw execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/special_day_night # function twolf/events/event_over execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/special_day_back + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/predictor/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/predictor/select.mcfunction index 876a2f7e..456b1f77 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/predictor/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/predictor/select.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 @@ -16,4 +20,4 @@ execute if score wolf.1 board matches 2 run tellraw @s [{"selector":"@a[tag=wolf execute if score wolf.1 board matches 3 run tellraw @s [{"selector":"@a[tag=wolf.selected]"},"\u00a76是",{"text":"未知","color": "aqua"}] execute if score wolf.1 board matches 0 run tellraw @s [{"selector":"@a[tag=wolf.selected]"},"\u00a76是",{"text":"出错","color": "dark_red"}] -function twolf/events/event_over \ No newline at end of file +function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/whitewolf/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/whitewolf/select.mcfunction index 91c8a7f2..eae42016 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/whitewolf/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/whitewolf/select.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 execute as @s[tag=wolf.selected] run tellraw @s ["\u00a7c你不能选择自己"] execute as @s[tag=wolf.selected] run return 0 -tellraw @a[tag=wolf.tip,tag=!wolf.acting] ["",{"selector":"@s"},"\u00a7c 带走了 ",{"selector":"@a[tag=wolf.selected]"}] +tellraw @a[tag=!wolf.acting] ["",{"selector":"@s"},"\u00a7c 带走了 ",{"selector":"@a[tag=wolf.selected]"}] tellraw @a[tag=wolf.acting] ["\u00a7c你带走了 ",{"selector":"@a[tag=wolf.selected]"}] function twolf/action/per/death/white_wolf_died function twolf/action/special_day_night execute as @a[tag=wolf.selected] run function twolf/action/per/death/died_no # tag @a[tag=wolf.selected] add wolf.protected -# function twolf/events/event_over \ No newline at end of file +# function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/witch/potion.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/witch/potion.mcfunction index 900912df..d2c1ed1c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/witch/potion.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/witch/potion.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 @@ -6,4 +10,4 @@ tellraw @a[tag=wolf.acting] ["\u00a7c你毒死了 ",{"selector":"@a[tag=wolf.sel scoreboard players remove wolf.witch.kill board 1 tag @a[tag=wolf.selected] add wolf.poisoned -function twolf/events/event_over \ No newline at end of file +function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/kill_selector.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/kill_selector.mcfunction index 20a468b8..8754d7c8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/kill_selector.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/kill_selector.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless entity @a[tag=wolf.selected,gamemode=adventure] as @a[tag=wolf.acting] at @s run function minecraft:twolf/control/job/wolf/next execute unless entity @a[tag=wolf.acting,gamemode=adventure] run function minecraft:twolf/control/job/wolf/next execute unless entity @a[tag=wolf.selected,gamemode=adventure] run return 0 @@ -5,4 +9,4 @@ execute unless entity @a[tag=wolf.selected,gamemode=adventure] run return 0 tag @a[tag=wolf.selected] add wolf.killed tellraw @a[tag=wolf.acting] ["\u00a7c你们杀死了 ",{"selector":"@a[tag=wolf.killed]"}] tellraw @a[tag=wolf.tip,gamemode=spectator] [{"selector":"@a[tag=wolf.acting]"},"\u00a7c（狼人）杀死了 ",{"selector":"@a[tag=wolf.killed]"}] -function minecraft:twolf/control/job/wolf/next \ No newline at end of file +function minecraft:twolf/control/job/wolf/next diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/list_selectors.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/list_selectors.mcfunction index f32bd33a..f5bd99c2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/list_selectors.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/list_selectors.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove wolf.selected execute as @a[tag=wolf.acting,gamemode=adventure] run function minecraft:twolf/action/tagselected_notclear @@ -5,4 +9,4 @@ scoreboard players set wolf.tmp board 0 execute as @a[tag=wolf.selected,gamemode=adventure] run scoreboard players add wolf.tmp board 1 execute if score wolf.tmp board matches 2.. run tellraw @a[tag=wolf.acting] ["\u00a7d[!] \u00a76请统一意见。你们只能共同杀死一个人。\n\u00a78 | \u00a76请在统一意见后确认操作。"] -execute if score wolf.tmp board matches 1 run function minecraft:twolf/control/job/wolf/kill_selector \ No newline at end of file +execute if score wolf.tmp board matches 1 run function minecraft:twolf/control/job/wolf/kill_selector diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/next.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/next.mcfunction index 471c9294..16394198 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/next.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/next.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.time board -1 scoreboard players set wolf.ttime board -1 execute as @a[tag=wolf.acting] run function minecraft:twolf/action/per/tpback tellraw @s[tag=wolf.tip] ["\u00a7c请闭眼。"] title @s[tag=wolf.tip] title [""] title @s[tag=wolf.tip] subtitle ["\u00a7f请闭眼。"] -schedule function minecraft:twolf/events/next_event 4s \ No newline at end of file +schedule function minecraft:twolf/events/next_event 4s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/select.mcfunction index be0546cb..158ae516 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/select.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/action/tagselected execute unless entity @a[tag=wolf.selected] run return 0 execute if entity @a[tag=wolf.selected] run tellraw @a[tag=wolf.acting] ["\u00a7d[!] ",{"selector":"@s"},"\u00a76 想要杀死 ",{"selector":"@a[tag=wolf.selected]"}] @@ -8,4 +12,4 @@ execute as @a[tag=wolf.acting,gamemode=adventure,scores={LRS_CS=1..}] run scoreb scoreboard players set wolf.wolfcount board 0 execute as @a[tag=wolf.acting,gamemode=adventure] run scoreboard players add wolf.wolfcount board 1 -execute if score wolf.tmp board = wolf.wolfcount board run function minecraft:twolf/control/job/wolf/list_selectors \ No newline at end of file +execute if score wolf.tmp board = wolf.wolfcount board run function minecraft:twolf/control/job/wolf/list_selectors diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/skip.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/skip.mcfunction index 66ef4064..2fa1dcf0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/skip.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/skip.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[tag=wolf.acting] ["\u00a7d[!] ",{"selector":"@s"}," \u00a7c放弃了操作。"] function minecraft:twolf/action/per/tpback scoreboard players set wolf.tmp board 0 tag @s remove wolf.acting execute as @a[tag=wolf.acting,gamemode=adventure] run scoreboard players add wolf.tmp board 1 -execute if score wolf.tmp board matches ..0 run function minecraft:twolf/control/job/wolf/next \ No newline at end of file +execute if score wolf.tmp board matches ..0 run function minecraft:twolf/control/job/wolf/next diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/timeout.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/timeout.mcfunction index ec91ef7d..dbad6534 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/timeout.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/job/wolf/timeout.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a remove wolf.selected execute as @r[tag=wolf.acting,gamemode=adventure,scores={LRS_CS=1..}] run function minecraft:twolf/action/tagselected tag @a remove wolf.randomkilled @@ -9,4 +13,4 @@ tag @a remove wolf.randomkilled execute if entity @a[tag=wolf.selected,gamemode=adventure] run tellraw @a[tag=wolf.acting] ["\u00a7c操作超时，随机选择。"] execute unless entity @a[tag=wolf.selected,gamemode=adventure] run tellraw @a[tag=wolf.acting] ["\u00a7c操作超时，取消操作。"] -function minecraft:twolf/control/job/wolf/kill_selector \ No newline at end of file +function minecraft:twolf/control/job/wolf/kill_selector diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/knight/choose.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/knight/choose.mcfunction index d3c502e6..818d2a68 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/knight/choose.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/knight/choose.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/special_day_choose # 骑士 function twolf/action/per/tpback_real @@ -6,4 +10,4 @@ scoreboard players set wolf.time board 60 scoreboard players set wolf.event board 11 tag @s add wolf.acting execute as @a[tag=wolf.tip] run function twolf/tips/knight -function minecraft:twolf/action/per/tag/knight \ No newline at end of file +function minecraft:twolf/action/per/tag/knight diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/select.mcfunction index f123f332..5d05694e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/select.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/select.mcfunction @@ -1 +1,5 @@ -function minecraft:twolf/control/selector/trigger \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +function minecraft:twolf/control/selector/trigger diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/forward.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/forward.mcfunction index b3d4f403..33acef66 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/forward.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/forward.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s PSTJ 1 tp @s ^ ^ ^1 tag @e[tag=wolf.used,distance=0..0.8,limit=1] add wolf.ptdmarker @@ -7,4 +11,4 @@ execute as @a[team=wolfpeople,gamemode=adventure] if score @s park.uuid = @e[lim tag @e[tag=wolf.ptdmarker] remove wolf.ptdmarker execute at @s if entity @e[tag=wolf.pointed] run return 0 # execute at @s run particle dust 0 0 0 1 ~ ~ ~ 0 0 0 0 1 force -execute at @s if score @s PSTJ matches 1.. run function minecraft:twolf/control/selector/forward \ No newline at end of file +execute at @s if score @s PSTJ matches 1.. run function minecraft:twolf/control/selector/forward diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/trigger.mcfunction index b1828c4f..e9430783 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selector/trigger.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon marker ~ ~ ~ {Tags:["wolf.pointer","gun.new"]} tp @e[tag=gun.new] @s tp @e[tag=gun.new] ~ ~1 ~ @@ -7,7 +11,7 @@ scoreboard players set @e[tag=gun.new] PSTJ 30 tag @e[tag=gun.new] remove gun.new execute as @e[tag=wolf.pointer] at @s run function minecraft:twolf/control/selector/forward -execute if score wolf.event board matches 1..2 as @a[tag=wolf.pointed,tag=wolf.connected] run tag @s remove wolf.pointed +execute if score wolf.event board matches 1..2 as @a[tag=wolf.connected] run tag @s remove wolf.pointed execute if entity @a[tag=wolf.pointed] run title @s actionbar ["\u00a7a你选择了 ",{"selector":"@a[tag=wolf.pointed]"}] execute as @a[tag=wolf.pointed] run function minecraft:twolf/action/per/highlight execute if entity @a[tag=wolf.pointed] run playsound ui.button.click player @s ~ ~ ~ 1 1 1 @@ -16,4 +20,4 @@ execute unless entity @a[tag=wolf.pointed] run playsound block.chest.locked play scoreboard players operation @s LRS_CS = @a[tag=wolf.pointed,limit=1] park.uuid tag @a[tag=wolf.pointed] remove wolf.pointed kill @e[tag=wolf.pointer,type=marker] -# item modify entity @s weapon.mainhand usegun \ No newline at end of file +# item modify entity @s weapon.mainhand usegun diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selfdied.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selfdied.mcfunction index 57ab10e6..736117a5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selfdied.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/selfdied.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s if score @s LRS_JOB matches 8 run function twolf/action/per/death/knight_died -execute as @s if score @s LRS_JOB matches 4 run function twolf/action/per/death/white_wolf_died \ No newline at end of file +execute as @s if score @s LRS_JOB matches 4 run function twolf/action/per/death/white_wolf_died diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/skip.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/skip.mcfunction index 6be76f1c..adeb0c6e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/skip.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/skip.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_CS -1 tellraw @s ["\u00a7c你放弃了操作。"] clear @s @@ -6,5 +10,6 @@ execute if score wolf.event board matches 5 run function minecraft:twolf/control execute if score wolf.event board matches 2..4 run function minecraft:twolf/control/job/general/skip execute if score wolf.event board matches 6..8 run function minecraft:twolf/control/job/general/skip execute if score wolf.event board matches 6..8 run function minecraft:twolf/control/job/general/skip -# execute if score wolf.event board matches 9..10 run +# execute if score wolf.event board matches 9..10 run execute if score wolf.event board matches 9..10 run function minecraft:twolf/control/day/skip + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/whitewolf/choose.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/whitewolf/choose.mcfunction index 2fe16fa4..2e94af91 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/whitewolf/choose.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/whitewolf/choose.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/special_day_choose # 白狼 function twolf/action/per/tpback_real @@ -6,3 +10,4 @@ scoreboard players set wolf.time board 60 tag @s add wolf.acting scoreboard players set wolf.event board 11 execute as @a[tag=wolf.tip] run function twolf/tips/whitewolf + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/kill.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/kill.mcfunction index 9e4d484c..9b585115 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/kill.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/kill.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] function minecraft:twolf/items/selector -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/rescue.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/rescue.mcfunction index d05cd4c3..8aca1b5a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/rescue.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/control/witch/rescue.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] scoreboard players remove wolf.witch.rescue board 1 @@ -5,4 +9,4 @@ tag @a[tag=wolf.killed] add wolf.rescued tellraw @s ["\u00a7a你救援了 ",{"selector":"@a[tag=wolf.rescued]"}] tellraw @a[tag=wolf.tip,gamemode=spectator] [{"selector":"@s"},"\u00a7a 救援了 ",{"selector":"@a[tag=wolf.rescued]"}] function twolf/action/per/tpback -function twolf/events/event_over \ No newline at end of file +function twolf/events/event_over diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/controls.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/controls.mcfunction index 36922dd8..25f7955f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/controls.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/controls.mcfunction @@ -1,20 +1,25 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s use.skill.2 # 跳过 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:0}}}] run function twolf/control/skip +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:0}}}}] run function twolf/control/skip # 选择 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:1}}}] run function twolf/control/select -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:2}}}] run function twolf/control/confirm -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:3}}}] run function twolf/control/cancel +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:1}}}}] run function twolf/control/select +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:2}}}}] run function twolf/control/confirm +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:3}}}}] run function twolf/control/cancel # 女巫 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:4}}}] run function twolf/control/witch/rescue -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:5}}}] run function twolf/control/witch/kill +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:4}}}}] run function twolf/control/witch/rescue +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:5}}}}] run function twolf/control/witch/kill # 白狼 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:6}}}] run function twolf/control/whitewolf/choose +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:6}}}}] run function twolf/control/whitewolf/choose # 骑士 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:7}}}] run function twolf/control/knight/choose +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:7}}}}] run function twolf/control/knight/choose # 自爆 -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:10}}}] run function twolf/control/selfdied -execute if entity @s[nbt={SelectedItem:{tag:{wolfItem:12}}}] run function twolf/action/per/death/hunter/died +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:10}}}}] run function twolf/control/selfdied +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{wolfItem:12}}}}] run function twolf/action/per/death/hunter/died + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/debug.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/debug.mcfunction index 5f5945fc..99ac8b6e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/debug.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/debug.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join wait.wolfpeople @a gamemode adventure @a -function minecraft:twolf/start \ No newline at end of file +function minecraft:twolf/start diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/main.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/main.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/main.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/main.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/new_round.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/new_round.mcfunction index 09e499c2..14c94fa4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/new_round.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/new_round.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.cupid board matches 1.. if score wolf.round board matches 1 run function minecraft:twolf/events/job/cupid execute if score wolf.cupid board matches 1.. if score wolf.round board matches 1 run return 0 # guard @@ -5,4 +9,4 @@ scoreboard players set wolf.event board 2 # say new_round # say [debugdd]new_round.mcfunction function minecraft:twolf/events/next_event -scoreboard players set wolf.failed state 0 \ No newline at end of file +scoreboard players set wolf.failed state 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/trigger.mcfunction index 33d2a263..75f3b16d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/1/trigger.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.round board 1 scoreboard players set wolf.event board 0 function minecraft:twolf/time/night schedule function minecraft:twolf/events/1/new_round 5s -execute as @a[tag=wolf.tip] at @s run playsound minecraft:ambient.cave player @s ~ ~ ~ 1 1 0 \ No newline at end of file +execute as @a[tag=wolf.tip] at @s run playsound minecraft:ambient.cave player @s ~ ~ ~ 1 1 0 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/2/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/2/trigger.mcfunction index e0e1c0f9..c6f3f953 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/2/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/2/trigger.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.event board 1 execute unless score wolf.guard board matches 1.. run scoreboard players set wolf.failed state 1 # say [debugdd]2/trigger.mcfunction execute unless score wolf.guard board matches 1.. run function minecraft:twolf/events/next_event execute unless score wolf.guard board matches 1.. run return 0 -function minecraft:twolf/events/job/guard \ No newline at end of file +function minecraft:twolf/events/job/guard diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/3/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/3/trigger.mcfunction index 79f1e3ab..c6b849ca 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/3/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/3/trigger.mcfunction @@ -1,4 +1,8 @@ -# execute unless score wolf.arsonist board matches 1.. run +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute unless score wolf.arsonist board matches 1.. run scoreboard players add wolf.event board 1 # say [debugdd]3/trigger.mcfunction execute unless score wolf.arsonist board matches 1.. run scoreboard players set wolf.failed state 1 @@ -10,4 +14,4 @@ execute if score wolf.round board matches 2.. if score wolf.setting.arsonist sta execute if score wolf.round board matches 2.. if score wolf.setting.arsonist state matches 1.. run function minecraft:twolf/events/next_event execute if score wolf.round board matches 2.. if score wolf.setting.arsonist state matches 1.. run return 0 -function minecraft:twolf/events/job/arsonist \ No newline at end of file +function minecraft:twolf/events/job/arsonist diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/4/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/4/trigger.mcfunction index 206dd1f0..404ef622 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/4/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/4/trigger.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.event board 1 # say [debugdd]4/trigger.mcfunction execute unless score wolf.wolf board matches 1.. run scoreboard players set wolf.failed state 1 execute unless score wolf.wolf board matches 1.. run function minecraft:twolf/events/next_event execute unless score wolf.wolf board matches 1.. run return 0 -function minecraft:twolf/events/job/wolf \ No newline at end of file +function minecraft:twolf/events/job/wolf diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/5/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/5/trigger.mcfunction index 79bf72bf..8aa2433a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/5/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/5/trigger.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.event board 1 # say [debugdd]5/trigger.mcfunction execute unless score wolf.witch board matches 1.. run scoreboard players set wolf.failed state 1 execute unless score wolf.witch board matches 1.. run function minecraft:twolf/events/next_event execute unless score wolf.witch board matches 1.. run return 0 -function minecraft:twolf/events/job/witch \ No newline at end of file +function minecraft:twolf/events/job/witch diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/6/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/6/trigger.mcfunction index 5f4020ab..f39659d2 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/6/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/6/trigger.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add wolf.event board 1 # say [debugdd]6/trigger.mcfunction execute unless score wolf.predictor board matches 1.. run scoreboard players set wolf.failed state 1 execute unless score wolf.predictor board matches 1.. run function minecraft:twolf/events/next_event execute unless score wolf.predictor board matches 1.. run return 0 -function minecraft:twolf/events/job/predictor \ No newline at end of file +function minecraft:twolf/events/job/predictor diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/close_eye.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/close_eye.mcfunction index 23772cc9..8994dc24 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/close_eye.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/close_eye.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s[tag=wolf.tip] ["\u00a70请闭眼。"] title @s[tag=wolf.tip] title [""] title @s[tag=wolf.tip] subtitle ["\u00a7f请闭眼。"] -schedule function minecraft:twolf/events/next_event 3s \ No newline at end of file +schedule function minecraft:twolf/events/next_event 3s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/choose_leaveaway.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/choose_leaveaway.mcfunction index beb8fc4f..142e9be4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/choose_leaveaway.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/choose_leaveaway.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.peoplecount board 0 # execute as @a[tag=wolf.tip,team=wolfpeople,gamemode=adventure] at @s run scob @@ -20,4 +24,4 @@ function twolf/overdetect execute unless score twolf.state state matches 3 unless score wolf.event board matches 12 run scoreboard players set wolf.event board 18 # say [debugdd]choose_leaveaway.mcfunction -execute unless score twolf.state state matches 3 unless score wolf.event board matches 12 run function minecraft:twolf/events/next_event \ No newline at end of file +execute unless score twolf.state state matches 3 unless score wolf.event board matches 12 run function minecraft:twolf/events/next_event diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/chooseout.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/chooseout.mcfunction index 8fdbd651..12c09904 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/chooseout.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/chooseout.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.tmp board 0 execute as @a[tag=wolf.tip,team=wolfpeople,gamemode=adventure] at @s run function minecraft:twolf/events/day/toupiao/isme execute if score wolf.tmp board matches 2.. run tellraw @a[tag=wolf.tip] ["\u00a7c出现平票。投票无效。"] execute if score wolf.tmp board matches 1 as @a[tag=wolf.out] run function twolf/action/per/death/leaveaway -tag @a remove wolf.out \ No newline at end of file +tag @a remove wolf.out diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/died_special.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/died_special.mcfunction index a25de11b..ce66464b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/died_special.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/died_special.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 8 run function twolf/action/per/death/knight_died_t -# execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 8 run +# execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 8 run execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 4 run function twolf/action/per/death/white_wolf_died_t -# execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 4 run \ No newline at end of file +# execute as @a[tag=wolf.acting] if score @s LRS_JOB matches 4 run diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/show_death.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/show_death.mcfunction index 11da88c6..2986acec 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/show_death.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/show_death.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say day scoreboard players set wolf.ttime board 4 scoreboard players set wolf.event board 9 @@ -5,25 +9,25 @@ tellraw @a[tag=wolf.tip] ["\u00a76昨天晚上..."] scoreboard players set wolf.deathcount board 0 # 守卫 奶穿了 -execute unless score wolf.setting.milked state matches 1.. as @a[tag=wolf.killed,tag=wolf.protected,tag=wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died_no +execute unless score wolf.setting.milked state matches 1.. as @a[tag=wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died_no # 守卫 防住了 -execute as @a[tag=wolf.killed,tag=wolf.protected,tag=!wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/protected +execute as @a[tag=!wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/protected # 救援 成功了 -execute as @a[tag=wolf.killed,tag=!wolf.protected,tag=wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/rescued +execute as @a[tag=wolf.rescued,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/rescued # 守卫守了寂寞 -execute as @a[tag=!wolf.killed,tag=wolf.protected,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/protected +execute as @a[tag=wolf.protected,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/tag/protected # 女巫 毒药 execute as @a[tag=wolf.poisoned,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died_witch # 纵火犯 火烧 -execute as @a[tag=wolf.fired,tag=!wolf.killed,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died +execute as @a[tag=!wolf.killed,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died # 纵火犯 火烧，把狼带走咯 -execute as @a[tag=wolf.fired,tag=wolf.killed,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died_fired +execute as @a[tag=wolf.killed,gamemode=adventure,team=wolfpeople] at @s run function twolf/action/per/death/died_fired # 狼 杀死了 execute if score wolf.round board matches 1 as @a[tag=wolf.killed] at @s run function twolf/action/per/death/died_withsaying @@ -41,4 +45,4 @@ tag @a remove wolf.protected # tag @a[tag=wolf.tagtmp] add wolf.lastprotected tag @a remove wolf.tagtmp tag @a remove wolf.poisoned -tag @a remove wolf.rescued \ No newline at end of file +tag @a remove wolf.rescued diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/start_talking.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/start_talking.mcfunction index c1194e60..11b47e1b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/start_talking.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/start_talking.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say day tag @a remove wolf.toupaoed team join wait.wolfpeople @a[team=wolfpeople,gamemode=spectator] @@ -9,4 +13,4 @@ tellraw @a[tag=wolf.tip,gamemode=adventure] ["\u00a7b\u00a7l现在开始是发 scoreboard players set wolf.time board 150 scoreboard players set wolf.event board 10 -execute as @a[gamemode=adventure,team=wolfpeople,tag=wolf.tip] run function twolf/items/day \ No newline at end of file +execute as @a[gamemode=adventure,team=wolfpeople,tag=wolf.tip] run function twolf/items/day diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/findhighest.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/findhighest.mcfunction index 115f582f..24d37daa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/findhighest.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/findhighest.mcfunction @@ -1 +1,5 @@ -scoreboard players operation wolf.highest.score board > @s LRS_ZT \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players operation wolf.highest.score board > @s LRS_ZT diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/isme.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/isme.mcfunction index fbe0da83..ea393d0c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/isme.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/isme.mcfunction @@ -1,3 +1,8 @@ -# execute if entity @a[tag=wolf.out] run return 0 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute if entity @a[tag=wolf.out] run return 0 execute if score @s LRS_ZT = wolf.highest.score board run tag @s add wolf.out execute if score @s LRS_ZT = wolf.highest.score board run scoreboard players add wolf.tmp board 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/per.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/per.mcfunction index d418c8ae..3cb03beb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/per.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/toupiao/per.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/action/tagselected scoreboard players add @a[tag=wolf.selected] LRS_ZT 1 tag @a remove wolf.selected scoreboard players add wolf.peoplecount board 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/trigger.mcfunction index bd44ed66..684b7d4d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/day/trigger.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say day title @a[tag=wolf.tip] title [""] title @a[tag=wolf.tip] subtitle ["\u00a7f\u00a7l天亮了"] @@ -6,3 +10,4 @@ scoreboard players set wolf.ttime board 3 scoreboard players set wolf.event board 8 function twolf/time/day function twolf/action/tppoint_day + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/end/trigger.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/end/trigger.mcfunction index 9ea9402d..97ba8539 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/end/trigger.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/end/trigger.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/persons function twolf/overdetect execute if score twolf.state state matches 3 run return 0 @@ -12,4 +16,4 @@ scoreboard players set wolf.time board -1 scoreboard players set wolf.ttime board 4 schedule clear minecraft:twolf/events/next_event -schedule clear minecraft:twolf/events/1/new_round \ No newline at end of file +schedule clear minecraft:twolf/events/1/new_round diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/event_over.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/event_over.mcfunction index fad54c20..77ae81f4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/event_over.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/event_over.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.time board -1 scoreboard players set wolf.ttime board -1 execute as @a[tag=wolf.acting] run function minecraft:twolf/action/per/tpback # tellraw @s[tag=wolf.tip] ["\u00a7c请闭眼。"] # title @s[tag=wolf.tip] title [""] # title @s[tag=wolf.tip] subtitle ["\u00a7f请闭眼。"] -schedule function minecraft:twolf/events/next_event 4s \ No newline at end of file +schedule function minecraft:twolf/events/next_event 4s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/arsonist.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/arsonist.mcfunction index da086d2c..08359a0f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/arsonist.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/arsonist.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/arsonist tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 3 run tag @s add wolf.acting @@ -9,4 +13,4 @@ execute as @a[tag=wolf.acting] at @s run function twolf/items/arsonist execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board run random value 3..25 scoreboard players set wolf.time board 60 -scoreboard players set twolf.state state 2 \ No newline at end of file +scoreboard players set twolf.state state 2 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid.mcfunction index 1ff4f244..f0cdfbd1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/cupid tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 1 run tag @s add wolf.acting @@ -6,4 +10,4 @@ title @a[tag=wolf.tip] title [""] title @a[tag=wolf.tip] subtitle ["\u00a76\u00a7l丘比特\u00a7a请睁眼。"] execute as @a[tag=wolf.acting] at @s run function twolf/action/per/tpback_real execute as @a[tag=wolf.acting] at @s run function twolf/items/cupid -scoreboard players set wolf.event board 1 \ No newline at end of file +scoreboard players set wolf.event board 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid2.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid2.mcfunction index 448ea5c5..92d0fb8b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid2.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupid2.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 1 run tag @s add wolf.acting execute as @a[tag=wolf.acting] at @s run function twolf/items/cupid2 scoreboard players set wolf.event board 2 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection.mcfunction index f8c0a3b3..e61395a6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tag @s add wolf.acting # function minecraft:twolf/action/tppoint_day title @s title [""] title @s subtitle ["\u00a7c你被丘比特连接了"] -playsound minecraft:block.chain.place player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound minecraft:block.chain.place player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection_s.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection_s.mcfunction index 8cba0f34..b7f18658 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection_s.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/cupidconnection_s.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=wolf.connected,limit=1,team=wolfpeople] add wolf.1 -tag @a[tag=wolf.connected,tag=!wolf.1,team=wolfpeople,limit=1] add wolf.2 +tag @a[tag=!wolf.1,team=wolfpeople,limit=1] add wolf.2 execute store result score wolf.1 board as @a[tag=wolf.1] run function twolf/action/per/getjobtype execute store result score wolf.2 board as @a[tag=wolf.2] run function twolf/action/per/getjobtype @@ -27,3 +31,4 @@ tellraw @a[tag=wolf.cupidmsg] ["\u00a76-----------------------"] tag @a remove wolf.1 tag @a remove wolf.2 tag @a remove wolf.cupidmsg + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/guard.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/guard.mcfunction index cb2d1616..0e1c16aa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/guard.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/guard.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/guard tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 2 run tag @s add wolf.acting @@ -9,4 +13,4 @@ execute as @a[tag=wolf.acting] at @s run function twolf/items/guard execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board run random value 3..25 scoreboard players set wolf.time board 60 -scoreboard players set twolf.state state 2 \ No newline at end of file +scoreboard players set twolf.state state 2 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/hunter.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/hunter.mcfunction index 3a49fd3b..0e676384 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/hunter.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/hunter.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[tag=wolf.tip] at @s run function twolf/tips/hunter -# 白天特殊 \ No newline at end of file +# 白天特殊 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/knight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/knight.mcfunction index 8d00776b..58e533b4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/knight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/knight.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/knight + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/predictor.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/predictor.mcfunction index ebfa4c59..4c7af9f1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/predictor.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/predictor.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/predictor tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 6 run tag @s add wolf.acting @@ -10,4 +14,4 @@ execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board ru execute as @a[tag=wolf.tip] at @s run playsound entity.cow.ambient player @s ~ ~ ~ 1 0 1 scoreboard players set wolf.time board 60 -scoreboard players set twolf.state state 2 \ No newline at end of file +scoreboard players set twolf.state state 2 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/tnt.mcfunction index 901fe46b..7838e14c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/tnt.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/tnt -# 这个。。。投票有用。。。好吧 \ No newline at end of file +# 这个。。。投票有用。。。好吧 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/whitewolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/whitewolf.mcfunction index 40065682..4ed948d7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/whitewolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/whitewolf.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/whitewolf -# 先wolf，这个白天的 \ No newline at end of file +# 先wolf，这个白天的 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/witch.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/witch.mcfunction index 82c87208..f8050761 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/witch.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/witch.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/witch tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 5 run tag @s add wolf.acting @@ -12,4 +16,4 @@ execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board ru execute as @a[tag=wolf.tip] at @s run playsound entity.witch.celebrate player @s ~ ~ ~ 1 1 1 scoreboard players set wolf.time board 60 -scoreboard players set twolf.state state 2 \ No newline at end of file +scoreboard players set twolf.state state 2 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/wolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/wolf.mcfunction index adfa07f1..227dedfe 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/wolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/job/wolf.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.round board matches 1 as @a[tag=wolf.tip] at @s run function twolf/tips/wolf tag @a remove wolf.acting execute as @a[team=wolfpeople,gamemode=adventure] if score @s LRS_JOB matches 4 run tag @s add wolf.acting @@ -11,4 +15,4 @@ execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board ru execute as @a[tag=wolf.tip] at @s run playsound entity.wolf.howl player @s ~ ~ ~ 1 1 1 scoreboard players set wolf.time board 120 -scoreboard players set twolf.state state 2 \ No newline at end of file +scoreboard players set twolf.state state 2 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/next_event.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/next_event.mcfunction index b37288bc..68ae5a97 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/next_event.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/next_event.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a ["!",{"score":{"name": "wolf.time","objective": "board"}},":",{"score":{"name": "wolf.ttime","objective": "board"}},"[]",{"score":{"name": "wolf.event","objective": "board"}},":",{"score":{"name": "wolf.ttime","objective": "board"}}] scoreboard players set wolf.return board 0 tag @a remove wolf.acting @@ -59,3 +63,4 @@ tag @a remove wolf.selected # tellraw @a ["@",{"score":{"name": "wolf.time","objective": "board"}},":",{"score":{"name": "wolf.ttime","objective": "board"}},"[]",{"score":{"name": "wolf.event","objective": "board"}},":",{"score":{"name": "wolf.ttime","objective": "board"}}] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/player/died.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/player/died.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/player/died.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/player/died.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/reset.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/reset.mcfunction index 5903a9c7..1a8edb0c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/reset.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/reset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.arsonist board 0 scoreboard players set wolf.cupid board 0 scoreboard players set wolf.guard board 0 @@ -54,6 +58,6 @@ tag @a remove wolf.connected tag @e[tag=wolf.tppoint] remove wolf.used kill @e[tag=wolf.nametags] -scoreboard players reset @e[tag=wolf.tp.sell,limit=1] +scoreboard players reset @e[tag=wolf.tp.sell,limit=1] -schedule clear #wolffunctions \ No newline at end of file +schedule clear #wolffunctions diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/timeout.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/timeout.mcfunction index 0e22b392..44f3f482 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/timeout.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/events/timeout.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say timeout scoreboard players set wolf.time board -1 scoreboard players set wolf.ttime board -1 @@ -11,4 +15,4 @@ execute unless score wolf.event board matches 11 unless score wolf.event board m execute if score wolf.event board matches 11 run function minecraft:twolf/events/day/died_special execute if score wolf.event board matches 12 as @a[tag=wolf.acting] run function minecraft:twolf/action/per/death/hunter/died execute if score wolf.event board matches 12 run return 0 -schedule function minecraft:twolf/events/next_event 2s \ No newline at end of file +schedule function minecraft:twolf/events/next_event 2s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/arsonist.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/arsonist.mcfunction index 9466a899..370747b8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/arsonist.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/arsonist.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择你今晚要烧死的人"] @@ -6,4 +10,4 @@ tellraw @s ["\u00a7a请选择你今晚要烧死的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid.mcfunction index a7447a53..2be1dc79 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择第1个人"] @@ -7,4 +11,4 @@ execute unless entity @a[tag=wolf.acting] store result score wolf.ttime board ru scoreboard players set wolf.time board 60 scoreboard players set twolf.state state 2 function minecraft:twolf/items/selector -execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 \ No newline at end of file +execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid2.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid2.mcfunction index 5502c314..f448a7ee 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid2.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/cupid2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择第2个人"] @@ -5,4 +9,4 @@ tellraw @s ["\u00a7a请选择第2个人"] scoreboard players set wolf.time board 60 scoreboard players set twolf.state state 2 # scoreboard players set wolf.event board 2 -function minecraft:twolf/items/selector \ No newline at end of file +function minecraft:twolf/items/selector diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/day.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/day.mcfunction index 291b9fe3..e922e6d7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/day.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/day.mcfunction @@ -1,14 +1,19 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] execute as @s[tag=!wolf.toupaoed] run function minecraft:twolf/items/selector -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e放弃投票 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e放弃投票 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] # 特殊工具 -execute if score @s[tag=wolf.white] LRS_JOB matches 4 run item replace entity @s hotbar.7 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e白狼之牙 - \\u00a77右键发动技能"'},wolfItem:6,CustomModelData:4} -execute if score @s LRS_JOB matches 8 unless entity @a[tag=wolf.knight,team=wolfpeople,gamemode=adventure] run item replace entity @s hotbar.7 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e骑士之刃 - \\u00a77右键发动技能"'},wolfItem:7,CustomModelData:4} +execute if score @s[tag=wolf.white] LRS_JOB matches 4 run item replace entity @s hotbar.7 with warped_fungus_on_a_stick[custom_name='"\\u00a7e白狼之牙 - \\u00a77右键发动技能"',custom_data={wolfItem:6},custom_model_data=4] +execute if score @s LRS_JOB matches 8 unless entity @a[tag=wolf.knight,team=wolfpeople,gamemode=adventure] run item replace entity @s hotbar.7 with warped_fungus_on_a_stick[custom_name='"\\u00a7e骑士之刃 - \\u00a77右键发动技能"',custom_data={wolfItem:7},custom_model_data=4] # wolf.setting.knight - 1: 只有一次 -execute if score @s LRS_JOB matches 8 if entity @a[tag=wolf.knight,team=wolfpeople,gamemode=adventure] unless score wolf.setting.knight state matches 1.. run item replace entity @s hotbar.7 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e骑士之刃 - \\u00a77右键发动技能"'},wolfItem:7,CustomModelData:4} +execute if score @s LRS_JOB matches 8 if entity @a[tag=wolf.knight,team=wolfpeople,gamemode=adventure] unless score wolf.setting.knight state matches 1.. run item replace entity @s hotbar.7 with warped_fungus_on_a_stick[custom_name='"\\u00a7e骑士之刃 - \\u00a77右键发动技能"',custom_data={wolfItem:7},custom_model_data=4] execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 tellraw @s ["\u00a7a您可以使用工具进行投票。"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/guard.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/guard.mcfunction index 36055a31..5379ebb1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/guard.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/guard.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择守卫的人"] @@ -7,4 +11,5 @@ execute if entity @a[tag=wolf.lastprotected] run tellraw @s ["\u00a7c你上次 function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/hunter.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/hunter.mcfunction index f078efe6..20a364d7 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/hunter.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/hunter.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择你要带走的人"] @@ -5,4 +9,4 @@ tellraw @s ["\u00a7a请选择你要带走的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e放弃带人 - \\u00a77右键点击"'},wolfItem:12,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e放弃带人 - \\u00a77右键点击"',custom_data={wolfItem:12},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/knight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/knight.mcfunction index 7e34426b..0ddc27ec 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/knight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/knight.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择你要对决的人"] @@ -5,4 +9,4 @@ tellraw @s ["\u00a7a请选择你要对决的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e自爆 - \\u00a77右键点击"'},wolfItem:10,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e自爆 - \\u00a77右键点击"',custom_data={wolfItem:10},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/predictor.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/predictor.mcfunction index 04dc31b7..ea87fd73 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/predictor.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/predictor.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择预言的人"] @@ -6,4 +10,5 @@ tellraw @s ["\u00a7a请选择预言的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/selector.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/selector.mcfunction index 943424e0..f7e64570 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/selector.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/selector.mcfunction @@ -1,5 +1,9 @@ -item replace entity @s hotbar.0 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7b选择玩家 - \\u00a77右键点击"'},wolfItem:1,CustomModelData:5} -item replace entity @s hotbar.1 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7a确认选择 - \\u00a77右键点击"'},wolfItem:2,CustomModelData:4} -item replace entity @s hotbar.2 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7c取消选择 - \\u00a77右键点击"'},wolfItem:3,CustomModelData:6} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s hotbar.0 with warped_fungus_on_a_stick[custom_name='"\\u00a7b选择玩家 - \\u00a77右键点击"',custom_data={wolfItem:1},custom_model_data=5] +item replace entity @s hotbar.1 with warped_fungus_on_a_stick[custom_name='"\\u00a7a确认选择 - \\u00a77右键点击"',custom_data={wolfItem:2},custom_model_data=4] +item replace entity @s hotbar.2 with warped_fungus_on_a_stick[custom_name='"\\u00a7c取消选择 - \\u00a77右键点击"',custom_data={wolfItem:3},custom_model_data=6] # tellraw @s ["\u00a78 | \u00a7b\u00a7l选择：\u00a76使用手上的工具选择\u00a7d玩家玩偶\u00a76，选择后请使用 \u00a7a“确认选择” \u00a76确认操作\n\u00a78 | \u00a76当前活跃（正在操作的）玩家将会被\u00a7b钻石护腿\u00a76标记。\n\u00a78 | \u00a76当前选择玩家将会被有颜色的\u00a7e皮革盔甲\u00a76标记。"] -scoreboard players reset @s LRS_CS \ No newline at end of file +scoreboard players reset @s LRS_CS diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/whitewolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/whitewolf.mcfunction index 34034259..a65fbd6d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/whitewolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/whitewolf.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择你要带走的人"] @@ -6,4 +10,4 @@ tellraw @s ["\u00a7a请选择你要带走的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e自爆 - \\u00a77右键点击"'},wolfItem:10,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e自爆 - \\u00a77右键点击"',custom_data={wolfItem:10},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/witch.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/witch.mcfunction index 685ccfa0..14ada158 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/witch.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/witch.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] # function minecraft:twolf/items/selector @@ -8,8 +12,9 @@ execute if entity @a[tag=wolf.killed,gamemode=adventure] run tellraw @s ["\u00a7 execute if entity @a[tag=wolf.killed,gamemode=adventure] run title @s subtitle ["\u00a7f昨天晚上，",{"selector":"@a[tag=wolf.killed,gamemode=adventure]"},"\u00a7c 死了。"] execute as @s[tag=wolf.killed] if score wolf.round board matches 2.. run tellraw @s ["\u00a78 | \u00a7c你被杀了。\n\u00a78 | \u00a7c但今夜不是第一晚，\u00a7l你无法对自己使用解药。"] -execute if entity @a[tag=wolf.killed] as @s[tag=!wolf.killed] if score wolf.witch.rescue board matches 1.. run item replace entity @s hotbar.2 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7a使用解药 - \\u00a77右键点击"'},wolfItem:4,CustomModelData:8} -execute as @s[tag=wolf.killed] if score wolf.round board matches ..1 if score wolf.witch.rescue board matches 1.. run item replace entity @s hotbar.2 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7a使用解药 - \\u00a77右键点击"'},wolfItem:4,CustomModelData:8} -execute if score wolf.witch.kill board matches 1.. run item replace entity @s hotbar.4 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7c使用毒药 - \\u00a77右键点击"'},wolfItem:5,CustomModelData:7} -item replace entity @s hotbar.6 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} +execute if entity @a[tag=wolf.killed] as @s[tag=!wolf.killed] if score wolf.witch.rescue board matches 1.. run item replace entity @s hotbar.2 with warped_fungus_on_a_stick[custom_name='"\\u00a7a使用解药 - \\u00a77右键点击"',custom_data={wolfItem:4},custom_model_data=8] +execute as @s[tag=wolf.killed] if score wolf.round board matches ..1 if score wolf.witch.rescue board matches 1.. run item replace entity @s hotbar.2 with warped_fungus_on_a_stick[custom_name='"\\u00a7a使用解药 - \\u00a77右键点击"',custom_data={wolfItem:4},custom_model_data=8] +execute if score wolf.witch.kill board matches 1.. run item replace entity @s hotbar.4 with warped_fungus_on_a_stick[custom_name='"\\u00a7c使用毒药 - \\u00a77右键点击"',custom_data={wolfItem:5},custom_model_data=7] +item replace entity @s hotbar.6 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/wolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/wolf.mcfunction index 7e706209..75fa7808 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/wolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/items/wolf.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## clear @s execute positioned 29 16 31 run kill @e[type=item,distance=..50] tellraw @s ["\u00a7a请选择你们今晚要杀死的人"] @@ -6,4 +10,4 @@ tellraw @s ["\u00a7a请选择你们今晚要杀死的人"] function minecraft:twolf/items/selector execute at @s run playsound entity.firework_rocket.blast player @s ~ ~ ~ 1 1 1 -item replace entity @s hotbar.8 with warped_fungus_on_a_stick{display:{Name:'"\\u00a7e啥也不干 - \\u00a77右键点击"'},wolfItem:0,CustomModelData:3} \ No newline at end of file +item replace entity @s hotbar.8 with warped_fungus_on_a_stick[custom_name='"\\u00a7e啥也不干 - \\u00a77右键点击"',custom_data={wolfItem:0},custom_model_data=3] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/arsonist.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/arsonist.mcfunction index 7c5cea31..57513dae 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/arsonist.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/arsonist.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/tips/arsonist tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l纵火犯\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] scoreboard players set @s LRS_JOB 3 team join wolfpeople title @s title ["\u00a7a\u00a7l纵火犯"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/cupid.mcfunction index 45add354..82fb07f3 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/cupid.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/tips/cupid tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l丘比特\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople scoreboard players set @s LRS_JOB 1 title @s title ["\u00a7e\u00a7l丘比特"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/guard.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/guard.mcfunction index 9672c85d..8ee4adfb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/guard.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/guard.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/tips/guard tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l守卫\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople scoreboard players set @s LRS_JOB 2 title @s title ["\u00a7a\u00a7l守卫"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/human.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/human.mcfunction index 6fe0d21b..9f550958 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/human.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/human.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # scoreboard players set @s LRS_JOB 0 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l平民\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/day title @s title ["\u00a7b\u00a7l平民"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/hunter.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/hunter.mcfunction index 3ae0ebe0..a0a3a51d 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/hunter.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/hunter.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 9 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l猎人\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/hunter title @s title ["\u00a7a\u00a7l猎人"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/knight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/knight.mcfunction index 37eb0ecf..1ac06e6e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/knight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/knight.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 8 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l骑士\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/knight title @s title ["\u00a7a\u00a7l骑士"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/predictor.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/predictor.mcfunction index 1572016e..dcfc3bae 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/predictor.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/predictor.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 6 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l预言家\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/predictor title @s title ["\u00a7a\u00a7l预言家"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/tnt.mcfunction index 7f9e1e75..8364fcce 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/tnt.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 7 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l炸弹人\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/tnt title @s title ["\u00a7d\u00a7l炸弹人"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/whitewolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/whitewolf.mcfunction index bdd51dcb..522716f5 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/whitewolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/whitewolf.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 4 tag @s add wolf.white tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l白狼王\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/whitewolf title @s title ["\u00a7c\u00a7l白狼王"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/witch.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/witch.mcfunction index c9410864..35ff9db1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/witch.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/witch.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 5 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l女巫\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/witch title @s title ["\u00a7a\u00a7l女巫"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/wolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/wolf.mcfunction index 5f9be41d..111e5db8 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/wolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/job/wolf.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set @s LRS_JOB 4 tellraw @s ["\u00a7a你的身份是：\u00a76\u00a7l狼人\n\u00a7c为保证游戏公平请不要告诉别人。请仅在发言阶段说话。"] team join wolfpeople function twolf/tips/wolf title @s title ["\u00a7c\u00a7l狼"] -title @s subtitle ["\u00a7f这是你的身份"] \ No newline at end of file +title @s subtitle ["\u00a7f这是你的身份"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/join.mcfunction index 8140a1a0..cbd51b26 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/join.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7e该游戏还在公开测试阶段！\n如发现BUG，最好请录制一个视频，然后向作者反馈。\n"] title @s title ["\u00a7b\u00a7l狼人杀"] title @s subtitle ["\u00a77Who Killed me?"] @@ -10,3 +14,4 @@ tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模 execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator execute if score twolf.state state matches 1.. run function minecraft:twolf/spec + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/all.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/all.mcfunction index 552fcf5f..71f21d7b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/all.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/all.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set wolf.event board 100 scoreboard players set wolf.time board 6 scoreboard players set wolf.ttime board -1 @@ -18,3 +22,4 @@ tag @a remove wolf.white tag @a remove wolf.connected schedule clear #wolffunctions execute unless score wolf.time board matches 1.. run bossbar set minecraft:wolfkiller name ["\u00a76狼人杀 \u00a78| \u00a7c游戏结束"] + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/bad.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/bad.mcfunction index 762d7999..e4292481 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/bad.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/bad.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/over/show_jobs title @a[tag=wolf.tip] title ["\u00a7c\u00a7l游戏结束"] title @a[tag=wolf.tip] subtitle ["\u00a7c狼阵营\u00a76胜利"] tellraw @a[tag=wolf.tip] ["\n\u00a7c【狼阵营】\u00a76获得了胜利。\n"] -function minecraft:twolf/over/all \ No newline at end of file +function minecraft:twolf/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/boom.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/boom.mcfunction index f6549335..67717cdb 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/boom.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/boom.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/over/show_jobs execute if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] run function twolf/over/cupid execute if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] run return 0 title @a[tag=wolf.tip] title ["\u00a7c\u00a7l游戏结束"] title @a[tag=wolf.tip] subtitle ["\u00a7b炸弹人阵营\u00a76胜利"] tellraw @a[tag=wolf.tip] ["\n\u00a7b【炸弹人阵营】\u00a76获得了胜利。\n"] -function minecraft:twolf/over/all \ No newline at end of file +function minecraft:twolf/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/cupid.mcfunction index b3a83193..1d8ff99c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/cupid.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/over/show_jobs title @a[tag=wolf.tip] title ["\u00a7c\u00a7l游戏结束"] @@ -8,4 +12,4 @@ title @a[tag=wolf.connected] title ["\u00a7a\u00a7l你赢了"] tellraw @a[tag=wolf.tip] ["\n\u00a7e【丘比特阵营】\u00a76获得了胜利。\n"] tag @a remove wolf.tmp -function minecraft:twolf/over/all \ No newline at end of file +function minecraft:twolf/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/good.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/good.mcfunction index daa58339..45cbedfc 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/good.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/good.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/over/show_jobs title @a[tag=wolf.tip] title ["\u00a7c\u00a7l游戏结束"] title @a[tag=wolf.tip] subtitle ["\u00a7e好人阵营\u00a76胜利"] tellraw @a[tag=wolf.tip] ["\n\u00a7a【好人阵营】\u00a76获得了胜利。\n"] -function minecraft:twolf/over/all \ No newline at end of file +function minecraft:twolf/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs.mcfunction index e1708e1a..868a23e9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[tag=wolf.tip] ["\u00a76-------------------------\n\u00a7b\u00a7l ※ \u00a7a\u00a7l职业详情："] execute as @a[tag=wolf.tip] at @s run function minecraft:twolf/over/show_jobs_per -tellraw @a[tag=wolf.tip] ["\u00a76-------------------------"] \ No newline at end of file +tellraw @a[tag=wolf.tip] ["\u00a76-------------------------"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs_per.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs_per.mcfunction index 3e49fc12..1af94bcf 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs_per.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/show_jobs_per.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team leave @s execute if score @s LRS_JOB matches 3 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7a纵火犯"] execute if score @s LRS_JOB matches 1 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7e丘比特"] @@ -8,9 +12,9 @@ execute if score @s LRS_JOB matches 6 run tellraw @a[tag=wolf.tip] ["\u00a7d - " execute if score @s LRS_JOB matches 7 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7d炸弹人"] execute if score @s LRS_JOB matches 4 if entity @s[tag=wolf.white] run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a74白狼"] execute if score @s LRS_JOB matches 5 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7a女巫"] -execute if score @s LRS_JOB matches 4 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7c狼"] +execute if score @s LRS_JOB matches 4 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7c狼"] execute if score @s LRS_JOB matches 0 run tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a7e：\u00a7b民"] execute as @s[tag=wolf.connected] run tellraw @a[tag=wolf.tip] ["\u00a78 | \u00a7e该玩家被丘比特连接"] # tellraw @a[tag=wolf.tip] ["\u00a7d - ",{"selector":"@s"},"\u00a70未知"] team join wait.wolfpeople -gamemode spectator @s \ No newline at end of file +gamemode spectator @s diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/tpback.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/tpback.mcfunction index 044fa3d5..3cec614f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/tpback.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/tpback.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function twolf/events/reset gamemode adventure @a[tag=wolf.tip] scoreboard players set twolf.state state 0 execute as @a[tag=wolf.tip] run function twolf/join execute unless score wolf.time board matches 1.. run bossbar set minecraft:wolfkiller name ["\u00a76狼人杀 \u00a78| \u00a7a等待游戏开始"] -scoreboard players set wolf.return board 1 \ No newline at end of file +scoreboard players set wolf.return board 1 diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/unexpected.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/unexpected.mcfunction index 8c29a1df..5ca988a6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/unexpected.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/over/unexpected.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/over/show_jobs title @a[tag=wolf.tip] title ["\u00a7c\u00a7l游戏结束"] title @a[tag=wolf.tip] subtitle ["\u00a7c无人获胜"] tellraw @a[tag=wolf.tip] ["\n\u00a7c玩家全部死亡。游戏结束。\n"] -function minecraft:twolf/over/all \ No newline at end of file +function minecraft:twolf/over/all diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/overdetect.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/overdetect.mcfunction index 69ecd336..8ec91728 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/overdetect.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/overdetect.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 屠城 ## 没炸弹人 普通丘比特 execute unless score twolf.state state matches 3 unless score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches ..0 run function minecraft:twolf/over/good @@ -12,7 +16,7 @@ execute unless score twolf.state state matches 3 if score wolf.cupid.type board execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches ..0 if score wolf.r.cupids board matches ..0 run function minecraft:twolf/over/boom execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..0 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..1 if score wolf.r.bad board matches ..1 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid -execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] if score wolf.mode board matches 2 if score wolf.r.good board matches ..0 if score wolf.r.good board matches ..0 unless entity @a[tag=wolf.tip,gamemode=adventure,scores={LRS_JOB=4},tag=!wolf.connected] run function minecraft:twolf/over/cupid +execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] if score wolf.mode board matches 2 if score wolf.r.good board matches ..0 if score wolf.r.good board matches ..0 unless entity @a[tag=!wolf.connected,gamemode=adventure,scores={LRS_JOB=4}] run function minecraft:twolf/over/cupid # 屠边 ## 没炸弹人 普通丘比特 @@ -32,7 +36,7 @@ execute unless score twolf.state state matches 3 if score wolf.cupid.type board execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 1 if score wolf.tnt board matches ..0 if score wolf.r.good board matches ..1 if score wolf.r.bad board matches ..1 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid -execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] if score wolf.mode board matches 1 if score wolf.r.good board matches ..0 if score wolf.r.good board matches ..0 unless entity @a[tag=wolf.tip,gamemode=adventure,scores={LRS_JOB=4},tag=!wolf.connected] run function minecraft:twolf/over/cupid +execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] if score wolf.mode board matches 1 if score wolf.r.good board matches ..0 if score wolf.r.good board matches ..0 unless entity @a[tag=!wolf.connected,gamemode=adventure,scores={LRS_JOB=4}] run function minecraft:twolf/over/cupid execute unless score twolf.state state matches 3 if score wolf.r.all board matches ..1 if score wolf.r.good board matches 1.. run function minecraft:twolf/over/good execute unless score twolf.state state matches 3 if score wolf.r.all board matches ..1 if score wolf.r.bad board matches 1.. run function minecraft:twolf/over/bad @@ -41,4 +45,4 @@ execute unless score twolf.state state matches 3 if score wolf.r.all board match # 全部 execute unless score twolf.state state matches 3 unless entity @a[tag=wolf.connected] unless score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches 1.. if score wolf.r.good board matches ..1 run function minecraft:twolf/over/bad -execute unless score twolf.state state matches 3 unless entity @a[tag=wolf.connected] unless score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches ..0 run function minecraft:twolf/over/good \ No newline at end of file +execute unless score twolf.state state matches 3 unless entity @a[tag=wolf.connected] unless score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches ..0 run function minecraft:twolf/over/good diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/persons.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/persons.mcfunction index b12abec4..390b039e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/persons.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/persons.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 统计人数 scoreboard players set wolf.r.all board 0 scoreboard players set wolf.r.bad board 0 @@ -14,7 +18,7 @@ execute if score wolf.cupid.type board matches 1 as @a[tag=wolf.tip,gamemode=adv execute if score wolf.cupid.type board matches 0 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 1 run scoreboard players add wolf.r.bad board 1 execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 1 run scoreboard players add wolf.r.cupids board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=wolf.connected] unless score @s LRS_JOB matches 1 run scoreboard players add wolf.r.cupids board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.connected,gamemode=adventure,team=wolfpeople] unless score @s LRS_JOB matches 1 run scoreboard players add wolf.r.cupids board 1 ## 好人 execute if score wolf.cupid.type board matches 0..1 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 0 run scoreboard players add wolf.r.person board 1 @@ -24,11 +28,11 @@ execute if score wolf.cupid.type board matches 0..1 as @a[tag=wolf.tip,gamemode= execute if score wolf.cupid.type board matches 0..1 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 8 run scoreboard players add wolf.r.god board 1 execute if score wolf.cupid.type board matches 0..1 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 9 run scoreboard players add wolf.r.person board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 0 run scoreboard players add wolf.r.person board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 2..3 run scoreboard players add wolf.r.god board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 5..6 run scoreboard players add wolf.r.god board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 8 run scoreboard players add wolf.r.god board 1 -execute if score wolf.cupid.type board matches 2 as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 9 run scoreboard players add wolf.r.person board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 0 run scoreboard players add wolf.r.person board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 2..3 run scoreboard players add wolf.r.god board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 5..6 run scoreboard players add wolf.r.god board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 8 run scoreboard players add wolf.r.god board 1 +execute if score wolf.cupid.type board matches 2 as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 9 run scoreboard players add wolf.r.person board 1 scoreboard players operation wolf.r.good board += wolf.r.god board scoreboard players operation wolf.r.good board += wolf.r.person board @@ -38,5 +42,6 @@ scoreboard players operation wolf.r.good board += wolf.r.person board execute as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 4 run scoreboard players add wolf.r.bad board 1 ## 炸弹人 -execute as @a[tag=wolf.tip,gamemode=adventure,team=wolfpeople,tag=!wolf.connected] if score @s LRS_JOB matches 7 run scoreboard players add wolf.r.tnt board 1 +execute as @a[tag=!wolf.connected,gamemode=adventure,team=wolfpeople] if score @s LRS_JOB matches 7 run scoreboard players add wolf.r.tnt board 1 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/second.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/second.mcfunction index ecd2aae9..88698932 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/second.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score wolf.time board matches 0 run function minecraft:twolf/events/timeout execute if score wolf.ttime board matches 0 run function minecraft:twolf/events/next_event @@ -26,3 +30,4 @@ execute unless score twolf.state state matches 3 if score wolf.event board match execute unless score twolf.state state matches 3 if score wolf.event board matches 18 run function minecraft:twolf/overdetect + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/automode.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/automode.mcfunction index 84dd5d04..8cd65c26 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/automode.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/automode.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 scoreboard players add wolf.auto state 1 execute if score wolf.auto state matches 3.. run scoreboard players set wolf.auto state 1 execute if score wolf.auto state matches 1 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7a[自动模式]"' execute if score wolf.auto state matches 2 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7e[手动设定]"' + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/jobcountroot.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/jobcountroot.mcfunction index 11e61f20..c3dce0aa 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/jobcountroot.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/jobcountroot.mcfunction @@ -1,10 +1,17 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 + $scoreboard players $(control) wolf.$(job) state 1 + $execute if score wolf.$(job) state matches ..-1 run scoreboard players set wolf.$(job) state 0 execute if score wolf.predictor state matches 1.. run scoreboard players set wolf.predictor state 1 execute if score wolf.witch state matches 1.. run scoreboard players set wolf.witch state 1 execute if score wolf.guard state matches 1.. run scoreboard players set wolf.guard state 1 execute if score wolf.cupid state matches 1.. run scoreboard players set wolf.cupid state 1 execute if score wolf.arsonist state matches 1.. run scoreboard players set wolf.arsonist state 1 + $data modify block ~ 8 ~ front_text.messages[3] set value '{"score":{"objective":"state","name":"wolf.$(job)"},"color":"light_purple"}' -execute if score wolf.auto state matches 1 run title @s actionbar ["\u00a7e\u00a7l注意：\u00a7c您已启用\u00a7a[自动模式]\u00a7c，设置此处将无效。若希望其能生效，请切换至\u00a7e[手动模式]"] \ No newline at end of file +execute if score wolf.auto state matches 1 run title @s actionbar ["\u00a7e\u00a7l注意：\u00a7c您已启用\u00a7a[自动模式]\u00a7c，设置此处将无效。若希望其能生效，请切换至\u00a7e[手动模式]"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/mode.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/mode.mcfunction index cca83e29..299ba65b 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/mode.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/mode.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 scoreboard players add wolf.mode state 1 execute if score wolf.mode state matches 3.. run scoreboard players set wolf.mode state 1 execute if score wolf.mode state matches 1 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7a[屠边]"' execute if score wolf.mode state matches 2 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7c[屠城]"' + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/truefalsesettings.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/truefalsesettings.mcfunction index a1f36e77..b238ce5e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/truefalsesettings.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/settings/truefalsesettings.mcfunction @@ -1,5 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 + $scoreboard players add wolf.setting.$(setting) state 1 + $execute if score wolf.setting.$(setting) state matches 2.. run scoreboard players set wolf.setting.$(setting) state 0 + $execute if score wolf.setting.$(setting) state matches 1 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7a[启用]"' + $execute if score wolf.setting.$(setting) state matches 0 run data modify block ~ ~ ~ front_text.messages[2] set value '"\\u00a7c[禁用]"' + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/spec.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/spec.mcfunction index 12762b0d..ea1e172f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/spec.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，当前游戏已经开始。你将在下一轮进入游戏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/start.mcfunction index 45d63b52..223bc3a1 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/start.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:twolf/events/reset scoreboard players reset * LRS_JOB @@ -49,3 +53,4 @@ execute if score wolf.mode board matches 1 run tellraw @a[tag=wolf.tip] ["\u00a7 execute if score wolf.mode board matches 2 run tellraw @a[tag=wolf.tip] ["\u00a76游戏模式：\u00a7c\u00a7l屠城"] execute as @a[tag=wolf.tip] run function minecraft:twolf/tips/new_game schedule clear #wolffunctions + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tick.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tick.mcfunction index 43436210..68311e5a 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tick.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tick.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[tag=wolf.tip] remove wolf.tip tag @a[team=wolfpeople] add wolf.tip tag @a[team=wait.wolfpeople] add wolf.tip -execute as @a[team=wolfpeople,gamemode=adventure] at @s as @e[type=item,distance=..3] run data merge entity @s {PickupDelay:0s} \ No newline at end of file +execute as @a[team=wolfpeople,gamemode=adventure] at @s as @e[type=item,distance=..3] run data merge entity @s {PickupDelay:0s} diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/day.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/day.mcfunction index 0c953ae7..e4a2efd0 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/day.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/day.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=wolf.tppoint] at @s run fill ~1 ~ ~1 ~-1 ~3 ~-1 air replace minecraft:barrier scoreboard players set twolf.time state 1 team modify wolfpeople nametagVisibility always # MOD： -## 0 for nothing; 1 ban other team; 2 ban own team; 4 ban +## 0 for nothing; 1 ban other team; 2 ban own team; 4 ban scoreboard players set wait.wolfpeople BAMBOO_MOD_SAYING 2 scoreboard players set wolfpeople BAMBOO_MOD_SAYING 0 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/night.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/night.mcfunction index 359e83d6..f5b6bd62 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/night.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/time/night.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=wolf.tppoint] at @s run fill ~1 ~ ~1 ~-1 ~3 ~-1 minecraft:black_concrete # execute as @e[tag=wolf.tppoint] at @s run fill ~ ~1 ~ ~ ~2 ~ air replace barrier scoreboard players set twolf.time state 2 @@ -14,3 +18,4 @@ function twolf/action/tppoint ## 0 for nothing; 1 other team; 2 own team; 3 all banned; 4 ban /tshout scoreboard players set wait.wolfpeople BAMBOO_MOD_SAYING 2 scoreboard players set wolfpeople BAMBOO_MOD_SAYING 3 + diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/arsonist.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/arsonist.mcfunction index 7160e1bb..6f6fc2e6 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/arsonist.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/arsonist.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l纵火犯：\u00a7a【神】\u00a7r每天晚上选择烧死一名玩家。\n\u00a78 | \u00a7f如果狼人将被烧死的玩家杀害，将会随机死亡一匹狼。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l纵火犯：\u00a7a【神】\u00a7r每天晚上选择烧死一名玩家。\n\u00a78 | \u00a7f如果狼人将被烧死的玩家杀害，将会随机死亡一匹狼。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/cupid.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/cupid.mcfunction index ae72853d..20190246 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/cupid.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/cupid.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l丘比特：\u00a7e【条件】\u00a7r可以在第一晚连接2人。2人中1人死亡，会一同死亡。\n\u00a78 | \u00a7b若两人为不同阵营：丘比特和两人各成阵营。\n\u00a78 | \u00a7a若为好人阵营：丘比特属于好人。\n\u00a78 | \u00a7c若为坏人阵营：丘比特属于坏人。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l丘比特：\u00a7e【条件】\u00a7r可以在第一晚连接2人。2人中1人死亡，会一同死亡。\n\u00a78 | \u00a7b若两人为不同阵营：丘比特和两人各成阵营。\n\u00a78 | \u00a7a若为好人阵营：丘比特属于好人。\n\u00a78 | \u00a7c若为坏人阵营：丘比特属于坏人。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/day.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/day.mcfunction index e3c10337..b7ca1f8f 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/day.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/day.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a7d\u00a7l白天阶段：\u00a7r宣布死者，活着的人自由发言。\n\u00a78 | \u00a7f发言结束后进行投票，最高选票（要求被票的人票数大于1/3）则出局。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a7d\u00a7l白天阶段：\u00a7r宣布死者，活着的人自由发言。\n\u00a78 | \u00a7f发言结束后进行投票，最高选票（要求被票的人票数大于1/3）则出局。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/guard.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/guard.mcfunction index f415ca1f..6376ded9 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/guard.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/guard.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l守卫：\u00a7a【神】\u00a7r每天晚上选择保护一名玩家免受狼人杀害以及火烧，\n\u00a78 | \u00a7f但无法避免被\u00a7c毒药\u00a7f毒死。\n\u00a78 | \u00a7f不能连续两晚保护一个玩家。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l守卫：\u00a7a【神】\u00a7r每天晚上选择保护一名玩家免受狼人杀害以及火烧，\n\u00a78 | \u00a7f但无法避免被\u00a7c毒药\u00a7f毒死。\n\u00a78 | \u00a7f不能连续两晚保护一个玩家。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/hunter.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/hunter.mcfunction index 14282808..d9c464e3 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/hunter.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/hunter.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l猎人：\u00a7b【好人】\u00a7r可以在被狼人杀死或被驱逐时带走一个人。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l猎人：\u00a7b【好人】\u00a7r可以在被狼人杀死或被驱逐时带走一个人。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/knight.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/knight.mcfunction index 3a7c8772..2e358cd4 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/knight.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/knight.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l骑士：\u00a7a【神】\u00a7r可以在白天选择一人进行对跳。\n\u00a78 | \u00a7f若被选择者为狼人，则狼人死亡，进入下一夜。\n\u00a78 | \u00a7f若为炸弹人，两者都死亡，继续发言。\n\u00a78 | \u00a7f若为好人，则骑士死亡，继续发言。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l骑士：\u00a7a【神】\u00a7r可以在白天选择一人进行对跳。\n\u00a78 | \u00a7f若被选择者为狼人，则狼人死亡，进入下一夜。\n\u00a78 | \u00a7f若为炸弹人，两者都死亡，继续发言。\n\u00a78 | \u00a7f若为好人，则骑士死亡，继续发言。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/new_game.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/new_game.mcfunction index 0b286be7..9e3a866c 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/new_game.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/new_game.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7e----------------------------\n\u00a78 | \u00a7c\u00a7l屠城：\u00a7f狼人必须杀死所有好人\n\u00a78 | \u00a7a\u00a7l屠边：\u00a7f狼人只需要杀死平民或者神任意一方\n\u00a7e============================"] -tellraw @s "\u00a78 | \u00a7b\u00a7l选择：\u00a76使用手上的工具选择\u00a7d玩家玩偶\u00a76，选择后请使用 \u00a7a“确认选择” \u00a76确认操作\n\u00a78 | \u00a76当前活跃（正在操作的）玩家将会被\u00a7b钻石护腿\u00a76标记。\n\u00a78 | \u00a76当前选择玩家将会被有颜色的\u00a7e皮革盔甲\u00a76标记。\n\u00a7e----------------------------" \ No newline at end of file +tellraw @s "\u00a78 | \u00a7b\u00a7l选择：\u00a76使用手上的工具选择\u00a7d玩家玩偶\u00a76，选择后请使用 \u00a7a“确认选择” \u00a76确认操作\n\u00a78 | \u00a76当前活跃（正在操作的）玩家将会被\u00a7b钻石护腿\u00a76标记。\n\u00a78 | \u00a76当前选择玩家将会被有颜色的\u00a7e皮革盔甲\u00a76标记。\n\u00a7e----------------------------" diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/predictor.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/predictor.mcfunction index c0410caa..5681ae99 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/predictor.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/predictor.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l预言家：\u00a7a【神】\u00a7r每天晚上选择一名玩家，可以得知他的好坏。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l预言家：\u00a7a【神】\u00a7r每天晚上选择一名玩家，可以得知他的好坏。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/show_all.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/show_all.mcfunction index 953dd1b5..b5adac55 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/show_all.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/show_all.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7e----------------------------"] function minecraft:twolf/tips/wolf function minecraft:twolf/tips/whitewolf @@ -11,4 +15,4 @@ function minecraft:twolf/tips/cupid function minecraft:twolf/tips/tnt function minecraft:twolf/tips/day tellraw @s ["\u00a7e============================\n\u00a78 | \u00a7c\u00a7l屠城：\u00a7f狼人必须杀死所有好人\n\u00a78 | \u00a7a\u00a7l屠边：\u00a7f狼人只需要杀死平民或者神任意一方\n\u00a7e============================"] -tellraw @s "\u00a78 | \u00a7b\u00a7l选择：\u00a76使用手上的工具选择\u00a7d玩家玩偶\u00a76，选择后请使用 \u00a7a“确认选择” \u00a76确认操作\n\u00a78 | \u00a76当前活跃（正在操作的）玩家将会被\u00a7b钻石护腿\u00a76标记。\n\u00a78 | \u00a76当前选择玩家将会被有颜色的\u00a7e皮革盔甲\u00a76标记。\n\u00a7e----------------------------" \ No newline at end of file +tellraw @s "\u00a78 | \u00a7b\u00a7l选择：\u00a76使用手上的工具选择\u00a7d玩家玩偶\u00a76，选择后请使用 \u00a7a“确认选择” \u00a76确认操作\n\u00a78 | \u00a76当前活跃（正在操作的）玩家将会被\u00a7b钻石护腿\u00a76标记。\n\u00a78 | \u00a76当前选择玩家将会被有颜色的\u00a7e皮革盔甲\u00a76标记。\n\u00a7e----------------------------" diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/tnt.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/tnt.mcfunction index dcf64dbb..94cd9f36 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/tnt.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/tnt.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l炸弹人：\u00a7e【独立】\u00a7r在被驱逐时，投票给他的人将会被炸死。\n\u00a78 | \u00a7f不属于任何一个阵营，获胜条件为炸死所有人。\n\u00a78 | \u00a7f若和好人一起活到最后，炸弹人单独胜利。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l炸弹人：\u00a7e【独立】\u00a7r在被驱逐时，投票给他的人将会被炸死。\n\u00a78 | \u00a7f不属于任何一个阵营，获胜条件为炸死所有人。\n\u00a78 | \u00a7f若和好人一起活到最后，炸弹人单独胜利。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/whitewolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/whitewolf.mcfunction index 3febcd54..0604fb7e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/whitewolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/whitewolf.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l白狼王：\u00a7c【坏人】\u00a7r除了和狼一起行动外，还可以在白天选择自爆身份，\n\u00a78 | \u00a7f带走一名玩家并自己死亡。然后直接进入下一夜。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l白狼王：\u00a7c【坏人】\u00a7r除了和狼一起行动外，还可以在白天选择自爆身份，\n\u00a78 | \u00a7f带走一名玩家并自己死亡。然后直接进入下一夜。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/witch.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/witch.mcfunction index f1c6625a..7bae1ae3 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/witch.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/witch.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a78 | \u00a76\u00a7l女巫：\u00a7a【神】\u00a7r拥有一瓶\u00a7a解药\u00a7r和\u00a7c毒药\u00a7r。\n\u00a78 | \u00a7f女巫只能在\u00a7b第一晚\u00a7r对自己使用解药。"] -execute unless score wolf.setting.milked state matches 1.. run tellraw @s ["\u00a78 | \u00a7f若玩家同时被保护、狼杀、女巫救后，\u00a7c会被奶穿死亡。"] \ No newline at end of file +execute unless score wolf.setting.milked state matches 1.. run tellraw @s ["\u00a78 | \u00a7f若玩家同时被保护、狼杀、女巫救后，\u00a7c会被奶穿死亡。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/wolf.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/wolf.mcfunction index 363dbcde..7362128e 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/wolf.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/tips/wolf.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a78 | \u00a76\u00a7l狼人：\u00a7c【坏人】\u00a7r每天晚上选择一名玩家进行杀害。\n\u00a78 | \u00a7f白狼王也被算在狼人队列中。"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a78 | \u00a76\u00a7l狼人：\u00a7c【坏人】\u00a7r每天晚上选择一名玩家进行杀害。\n\u00a78 | \u00a7f白狼王也被算在狼人队列中。"] diff --git a/datapacks/map_game_2nd/data/minecraft/functions/twolf/trystart.mcfunction b/datapacks/map_game_2nd/data/minecraft/functions/twolf/trystart.mcfunction index d60ec772..5f95f914 100644 --- a/datapacks/map_game_2nd/data/minecraft/functions/twolf/trystart.mcfunction +++ b/datapacks/map_game_2nd/data/minecraft/functions/twolf/trystart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s ~ ~ ~ 1 1 1 # playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.wolfpeople,gamemode=adventure] run scoreboard players add wait.player tick 1 # ## regoin 维护 @@ -14,4 +18,4 @@ execute unless score twolf.state state matches 1.. if score wait.player tick mat execute unless score twolf.state state matches 1.. if score wait.player tick matches 25.. run tellraw @s ["\u00a7c人数过多！最多支持24人！"] execute unless score twolf.state state matches 1.. if score wait.player tick matches ..2 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute unless score twolf.state state matches 1.. if score wait.player tick matches 25.. run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score twolf.state state matches 1.. if score wait.player tick matches 3..24 run function minecraft:twolf/start \ No newline at end of file +execute unless score twolf.state state matches 1.. if score wait.player tick matches 3..24 run function minecraft:twolf/start diff --git a/datapacks/map_game_2nd/data/minecraft/item_modifiers/gethead.json b/datapacks/map_game_2nd/data/minecraft/item_modifiers/gethead.json index 8f030eed..666c9037 100644 --- a/datapacks/map_game_2nd/data/minecraft/item_modifiers/gethead.json +++ b/datapacks/map_game_2nd/data/minecraft/item_modifiers/gethead.json @@ -3,4 +3,4 @@ "function": "minecraft:fill_player_head", "entity": "this" } -] \ No newline at end of file +] diff --git a/datapacks/map_game_2nd/data/minecraft/tags/functions/wolffunctions.json b/datapacks/map_game_2nd/data/minecraft/tags/functions/wolffunctions.json index 1fb8ffc9..0efe502e 100644 --- a/datapacks/map_game_2nd/data/minecraft/tags/functions/wolffunctions.json +++ b/datapacks/map_game_2nd/data/minecraft/tags/functions/wolffunctions.json @@ -4,4 +4,4 @@ "twolf/events/next_event", "minecraft:twolf/events/1/new_round" ] -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/chat.json b/datapacks/map_main/data/minecraft/chat_type/chat.json index 29a4d3c3..bedb8c5e 100644 --- a/datapacks/map_main/data/minecraft/chat_type/chat.json +++ b/datapacks/map_main/data/minecraft/chat_type/chat.json @@ -13,4 +13,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/emote_command.json b/datapacks/map_main/data/minecraft/chat_type/emote_command.json index ba4e6dae..7e574d4b 100644 --- a/datapacks/map_main/data/minecraft/chat_type/emote_command.json +++ b/datapacks/map_main/data/minecraft/chat_type/emote_command.json @@ -13,4 +13,4 @@ ], "translation_key": "chat.type.emote" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/msg_command_incoming.json b/datapacks/map_main/data/minecraft/chat_type/msg_command_incoming.json index beb70119..6373dbb4 100644 --- a/datapacks/map_main/data/minecraft/chat_type/msg_command_incoming.json +++ b/datapacks/map_main/data/minecraft/chat_type/msg_command_incoming.json @@ -17,4 +17,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/msg_command_outgoing.json b/datapacks/map_main/data/minecraft/chat_type/msg_command_outgoing.json index 9aefd830..1d28fa13 100644 --- a/datapacks/map_main/data/minecraft/chat_type/msg_command_outgoing.json +++ b/datapacks/map_main/data/minecraft/chat_type/msg_command_outgoing.json @@ -17,4 +17,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/say_command.json b/datapacks/map_main/data/minecraft/chat_type/say_command.json index 8a587a05..91a67d34 100644 --- a/datapacks/map_main/data/minecraft/chat_type/say_command.json +++ b/datapacks/map_main/data/minecraft/chat_type/say_command.json @@ -13,4 +13,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/team_msg_command_incoming.json b/datapacks/map_main/data/minecraft/chat_type/team_msg_command_incoming.json index 4bb18597..f13195cb 100644 --- a/datapacks/map_main/data/minecraft/chat_type/team_msg_command_incoming.json +++ b/datapacks/map_main/data/minecraft/chat_type/team_msg_command_incoming.json @@ -14,4 +14,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/chat_type/team_msg_command_outgoing.json b/datapacks/map_main/data/minecraft/chat_type/team_msg_command_outgoing.json index 4bb18597..f13195cb 100644 --- a/datapacks/map_main/data/minecraft/chat_type/team_msg_command_outgoing.json +++ b/datapacks/map_main/data/minecraft/chat_type/team_msg_command_outgoing.json @@ -14,4 +14,4 @@ ], "translation_key": "chat.type.text.narrate" } -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/damage_type/player_gun.json b/datapacks/map_main/data/minecraft/damage_type/player_gun.json index 38cd5498..56b86c4a 100644 --- a/datapacks/map_main/data/minecraft/damage_type/player_gun.json +++ b/datapacks/map_main/data/minecraft/damage_type/player_gun.json @@ -4,4 +4,4 @@ "scaling": "never", "death_message_type": "default", "effects": "freezing" -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/functions/check_rename.mcfunction b/datapacks/map_main/data/minecraft/functions/check_rename.mcfunction index 7340579f..d447c90f 100644 --- a/datapacks/map_main/data/minecraft/functions/check_rename.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/check_rename.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in overworld run tp @s 188 124 26 gamemode survival @s team leave @s execute as @s[tag=map.old] run tellraw @a ["\u00a7b[玩家] ",{"selector":"@s","color":"gray"},"\u00a7e 貌似更换了一个新的名字重新加入了游戏。"] -scoreboard players set @s old 1 \ No newline at end of file +scoreboard players set @s old 1 diff --git a/datapacks/map_main/data/minecraft/functions/inits/itemlock.mcfunction b/datapacks/map_main/data/minecraft/functions/inits/itemlock.mcfunction index 5358a59f..8ac909bf 100644 --- a/datapacks/map_main/data/minecraft/functions/inits/itemlock.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/inits/itemlock.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[type=item_frame] run data merge entity @s {Fixed:1b,Invisible:1b} -execute as @e[type=painting] run data merge entity @s {Fixed:1b,Invisible:1b,Invulnerable:1b} \ No newline at end of file +execute as @e[type=painting] run data merge entity @s {Fixed:1b,Invisible:1b,Invulnerable:1b} diff --git a/datapacks/map_main/data/minecraft/functions/inits/reset_lobby_title.mcfunction b/datapacks/map_main/data/minecraft/functions/inits/reset_lobby_title.mcfunction index fd36bf5c..1b92e80a 100644 --- a/datapacks/map_main/data/minecraft/functions/inits/reset_lobby_title.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/inits/reset_lobby_title.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## kill @e[tag=lobby,type=area_effect_cloud] kill @e[tag=lobby,type=armor_stand] @@ -40,7 +44,7 @@ summon minecraft:area_effect_cloud 74 116.7 37 {CustomName:'["\\u00a77Event Plaz summon minecraft:area_effect_cloud 123 117 5 {CustomName:'["\\u00a7e\\u00a7l神庙"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} summon minecraft:area_effect_cloud 123 116.7 5 {CustomName:'["\\u00a77Temple"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} - + summon minecraft:area_effect_cloud 108 117 5 {CustomName:'["\\u00a7e\\u00a7l神庙"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} summon minecraft:area_effect_cloud 108 116.7 5 {CustomName:'["\\u00a77Temple"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} @@ -67,3 +71,4 @@ summon minecraft:area_effect_cloud 183 125.7 50 {CustomName:'["\\u00a773rd Floor summon minecraft:area_effect_cloud 238 116 66 {CustomName:'["\\u00a7a\\u00a7l迷宫"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} summon minecraft:area_effect_cloud 238 115.7 66 {CustomName:'["\\u00a77寻找出口吧！"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Tags:["lobby"],Duration:2147483647} + diff --git a/datapacks/map_main/data/minecraft/functions/inits/reset_random.mcfunction b/datapacks/map_main/data/minecraft/functions/inits/reset_random.mcfunction index c90a9052..32e73011 100644 --- a/datapacks/map_main/data/minecraft/functions/inits/reset_random.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/inits/reset_random.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## 清除 kill @e[tag=random_game,type=marker] ## 生成 @@ -52,7 +56,7 @@ tag @e[tag=neww] remove neww # Snow TNTRUN 2 # Snow Pick 3 # Repeling 4 -# Color 5 +# Color 5 # Block Believer 6 # Muder Mystery 7 # Duel 8 @@ -93,3 +97,4 @@ scoreboard players set @e[tag=neww] board 11 tag @e[tag=neww] remove neww # forceload remove 168 -45 168 -45 + diff --git a/datapacks/map_main/data/minecraft/functions/inits/resetuuid.mcfunction b/datapacks/map_main/data/minecraft/functions/inits/resetuuid.mcfunction index 6392a94e..e98708d6 100644 --- a/datapacks/map_main/data/minecraft/functions/inits/resetuuid.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/inits/resetuuid.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset * park.uuid scoreboard players set p.uid park.uuid 0 execute as @a run function npark/getuuid @@ -7,4 +11,4 @@ scoreboard players reset * leave scoreboard players reset * dropper.level scoreboard players reset * old -# function ttsecond \ No newline at end of file +# function ttsecond diff --git a/datapacks/map_main/data/minecraft/functions/inits/undoitem.mcfunction b/datapacks/map_main/data/minecraft/functions/inits/undoitem.mcfunction index 849a388d..ab6e4650 100644 --- a/datapacks/map_main/data/minecraft/functions/inits/undoitem.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/inits/undoitem.mcfunction @@ -1 +1,5 @@ -execute as @e[type=item_frame] run data merge entity @s {Fixed:0b} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[type=item_frame] run data merge entity @s {Fixed:0b} diff --git a/datapacks/map_main/data/minecraft/functions/language/chinese.mcfunction b/datapacks/map_main/data/minecraft/functions/language/chinese.mcfunction index eb43d5ca..e69b3b12 100644 --- a/datapacks/map_main/data/minecraft/functions/language/chinese.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/language/chinese.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7a[INFO] \u00a76当前语言切换为 \u00a7e[简体中文]\u00a76！"] + diff --git a/datapacks/map_main/data/minecraft/functions/language/english.mcfunction b/datapacks/map_main/data/minecraft/functions/language/english.mcfunction index b6366478..0ac8aa91 100644 --- a/datapacks/map_main/data/minecraft/functions/language/english.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/language/english.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7cSorry. 'English' translation didn't support anymore."] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7cSorry. 'English' translation didn't support anymore."] diff --git a/datapacks/map_main/data/minecraft/functions/live/gameover_killer.mcfunction b/datapacks/map_main/data/minecraft/functions/live/gameover_killer.mcfunction index 05ab8094..2ca6e461 100644 --- a/datapacks/map_main/data/minecraft/functions/live/gameover_killer.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/gameover_killer.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a76[Live Longest] \u00a7a游戏结束！获胜玩家：",{"selector":"@a[team=play.live.killer]"}] title @a[team=play.live.killer] title ["\u00a76You won!"] title @a[team=play.live.runner] title ["\u00a7cYou lost!"] -function minecraft:live/over \ No newline at end of file +function minecraft:live/over diff --git a/datapacks/map_main/data/minecraft/functions/live/gameover_runner.mcfunction b/datapacks/map_main/data/minecraft/functions/live/gameover_runner.mcfunction index 2b41e4c3..f9fe3021 100644 --- a/datapacks/map_main/data/minecraft/functions/live/gameover_runner.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/gameover_runner.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a76[Live Longest] \u00a7a游戏结束！获胜玩家： ",{"selector":"@a[team=play.live.runner]"}] title @a[team=play.live.runner] title ["\u00a76You won!"] title @a[team=play.live.killer] title ["\u00a7cYou lost!"] -function minecraft:live/over \ No newline at end of file +function minecraft:live/over diff --git a/datapacks/map_main/data/minecraft/functions/live/gamereallystart.mcfunction b/datapacks/map_main/data/minecraft/functions/live/gamereallystart.mcfunction index cbb63fbd..c1770655 100644 --- a/datapacks/map_main/data/minecraft/functions/live/gamereallystart.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/gamereallystart.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 106 92 169 104 92 167 minecraft:air effect give @a[team=play.live.runner] slow_falling 10 1 true -scoreboard players set live.state state 2 \ No newline at end of file +scoreboard players set live.state state 2 diff --git a/datapacks/map_main/data/minecraft/functions/live/ingame/died.mcfunction b/datapacks/map_main/data/minecraft/functions/live/ingame/died.mcfunction index 804ea907..700067b6 100644 --- a/datapacks/map_main/data/minecraft/functions/live/ingame/died.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/ingame/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title ["\u00a7c\u00a7lYou Died"] title @s subtitle ["\u00a7aLoading..."] gamemode spectator @s[team=play.live.runner] @@ -17,4 +21,4 @@ execute if score live.set.mode live.all matches 1..1 as @s[team=play.live.killer title @s[gamemode=spectator] subtitle ["对不起，你淘汰了！"] -tp @s[gamemode=spectator] 101 70 172 0 90 \ No newline at end of file +tp @s[gamemode=spectator] 101 70 172 0 90 diff --git a/datapacks/map_main/data/minecraft/functions/live/ingame/selkiller.mcfunction b/datapacks/map_main/data/minecraft/functions/live/ingame/selkiller.mcfunction index fc677633..b9782cab 100644 --- a/datapacks/map_main/data/minecraft/functions/live/ingame/selkiller.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/ingame/selkiller.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @r[team=play.live.runner,gamemode=adventure] add live.Killer tellraw @a[team=play.live.runner] ["\u00a7a[Info] \u00a7bKiller 已经选出！请小心！"] title @a[tag=live.Killer] title ["\u00a7c你是 Killer"] @@ -9,4 +13,4 @@ title @a[team=play.live.runner] title ["\u00a7b你是 Runner"] title @a[tag=play.live.runner] subtitle ["\u00a7e快跑！"] scoreboard players set live.time live.all -20 -give @a[team=play.live.killer] minecraft:bow{Unbreakable:1b,display:{Name:'["§aR§ba§ci§dn §eB§fo§6w"]',Lore:['["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]']},Enchantments:[{id:"minecraft:power",lvl:2s}]} 1 \ No newline at end of file +give @a[team=play.live.killer] minecraft:bow[unbreakable={},custom_name='["§aR§ba§ci§dn §eB§fo§6w"]',lore=['["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]','["§aR§ba§ci§dn §eB§fo§6w"]'],enchantments={levels:{"minecraft:power":2s}}] diff --git a/datapacks/map_main/data/minecraft/functions/live/over.mcfunction b/datapacks/map_main/data/minecraft/functions/live/over.mcfunction index 4f0cc030..66d33dd0 100644 --- a/datapacks/map_main/data/minecraft/functions/live/over.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set live.state state 0 gamemode adventure @a[team=wait.live] gamemode adventure @a[team=play.live.killer] @@ -8,4 +12,4 @@ tag @a[team=play.live.runner] add join.livelongest clear @a[team=play.live.killer] clear @a[team=play.live.runner] clear @a[team=wait.live] -bossbar set minecraft:live players \ No newline at end of file +bossbar set minecraft:live players diff --git a/datapacks/map_main/data/minecraft/functions/live/settings/settoguess.mcfunction b/datapacks/map_main/data/minecraft/functions/live/settings/settoguess.mcfunction index 799112e9..22187117 100644 --- a/datapacks/map_main/data/minecraft/functions/live/settings/settoguess.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/settings/settoguess.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## data modify block 36 8 0 front_text.messages[1] set value "[{\"text\":\"Normal Mode\",\"color\":\"aqua\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/function minecraft:live/settings/settonormal\"}}]" data modify block 36 8 0 front_text.messages[2] set value "[{\"text\":\"\\u00a7a[\\u00a76Guess Killer\\u00a7a]\",\"color\":\"gold\"}]" playsound minecraft:ui.button.click player @s scoreboard players set live.set.mode live.all 1 team modify play.live.runner friendlyFire false -tellraw @a[team=wait.live] ["\u00a7a[INFO] \u00a7b模式变成了 \u00a76[Guess Killer]\u00a7b.\n\u00a7e在这个模式中，Killer 不会获得发光效果。"] \ No newline at end of file +tellraw @a[team=wait.live] ["\u00a7a[INFO] \u00a7b模式变成了 \u00a76[Guess Killer]\u00a7b.\n\u00a7e在这个模式中，Killer 不会获得发光效果。"] diff --git a/datapacks/map_main/data/minecraft/functions/live/settings/settonormal.mcfunction b/datapacks/map_main/data/minecraft/functions/live/settings/settonormal.mcfunction index dfad6a96..a19d4b85 100644 --- a/datapacks/map_main/data/minecraft/functions/live/settings/settonormal.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/settings/settonormal.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## data modify block 36 8 0 front_text.messages[1] set value "[{\"text\":\"\\u00a7a[\\u00a7bNormal Mode\\u00a7a]\",\"color\":\"aqua\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/function minecraft:live/settings/settoguess\"}}]" data modify block 36 8 0 front_text.messages[2] set value "[{\"text\":\"Guess Killer\",\"color\":\"gold\"}]" playsound minecraft:ui.button.click player @s scoreboard players set live.set.mode live.all 0 tellraw @a[team=wait.live] ["\u00a7a[INFO] \u00a7b模式变成了 \u00a7d[Normal Mode]\u00a7b.\n\u00a7e在这个模式中，杀手会发光！你可以轻松辨别！"] -team modify play.live.runner friendlyFire false \ No newline at end of file +team modify play.live.runner friendlyFire false diff --git a/datapacks/map_main/data/minecraft/functions/live/sign.mcfunction b/datapacks/map_main/data/minecraft/functions/live/sign.mcfunction index e748ed5d..fa97bc97 100644 --- a/datapacks/map_main/data/minecraft/functions/live/sign.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/sign.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score live.timelimit live.all matches ..29 run tellraw @s ["\u00a7e[Warn] \u00a7e这个时间太短了！"] execute if score live.timelimit live.all matches ..29 run scoreboard players set live.timelimit live.all 30 execute if score live.timelimit live.all matches 301.. run tellraw @s ["\u00a7e[Warn] \u00a7e这个时间太长了！"] execute if score live.timelimit live.all matches 301.. run scoreboard players set live.timelimit live.all 300 tellraw @s ["\u00a7a[INFO] \u00a7d时间限制: ",{"score":{"objective":"live.all","name":"live.timelimit"},"color":"aqua"},"\u00a7b s"] data modify block 25 7 11 front_text.messages[2] set value "[{\"score\":{\"objective\":\"live.all\",\"name\":\"live.timelimit\"},\"color\":\"aqua\"},\"\\u00a7b s\"]" + diff --git a/datapacks/map_main/data/minecraft/functions/live/specthegame.mcfunction b/datapacks/map_main/data/minecraft/functions/live/specthegame.mcfunction index 809e3a64..8868714b 100644 --- a/datapacks/map_main/data/minecraft/functions/live/specthegame.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/specthegame.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tp @s 101 70 172 0 90 team join wait.live -tellraw @s ["\n\u00a7a\u00a7l[MESSAGE] \u00a7c游戏已经开始 !\n\n\u00a77返回大厅: \u00a7b/trigger hub set 1"] \ No newline at end of file +tellraw @s ["\n\u00a7a\u00a7l[MESSAGE] \u00a7c游戏已经开始 !\n\n\u00a77返回大厅: \u00a7b/trigger hub set 1"] diff --git a/datapacks/map_main/data/minecraft/functions/live/start.mcfunction b/datapacks/map_main/data/minecraft/functions/live/start.mcfunction index 20b9df61..ec955380 100644 --- a/datapacks/map_main/data/minecraft/functions/live/start.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set live.state state 3 tp @a[team=wait.live] 105 93 168 0 90 team join play.live.runner @a[team=wait.live] @@ -10,4 +14,4 @@ clear @a[team=play.live.runner] execute store result bossbar minecraft:live max run scoreboard players get live.timelimit live.all scoreboard players set live.time live.all -20 effect give @a[team=play.live.runner] resistance 25 25 true -effect give @a[team=play.live.runner] regeneration 2 25 true \ No newline at end of file +effect give @a[team=play.live.runner] regeneration 2 25 true diff --git a/datapacks/map_main/data/minecraft/functions/live/testfor.mcfunction b/datapacks/map_main/data/minecraft/functions/live/testfor.mcfunction index 2ac88983..4e224c7d 100644 --- a/datapacks/map_main/data/minecraft/functions/live/testfor.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/testfor.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=wait.live] add liveshowboss tag @a[team=play.live.killer] add liveshowboss tag @a[team=play.live.runner] add liveshowboss @@ -7,8 +11,8 @@ tag @a remove liveshowboss title @a[tag=live.Killer] actionbar ["\u00a7c你是 Killer"] title @a[team=play.live.runner] actionbar ["\u00a7b你是 Runner"] ## the number of runners -scoreboard players set live.runner tick 0 +scoreboard players set live.runner tick 0 execute as @a[team=play.live.runner,gamemode=adventure] run scoreboard players add live.runner tick 1 execute if score live.state state matches 1.. if score live.runner tick matches ..0 run function minecraft:live/gameover_killer execute if score live.state state matches 1.. if score live.time live.all >= live.timelimit live.all as @a[team=play.live.killer] run function minecraft:live/ingame/died -execute if score live.state state matches 1.. unless entity @a[team=play.live.killer] run function minecraft:live/gameover_runner \ No newline at end of file +execute if score live.state state matches 1.. unless entity @a[team=play.live.killer] run function minecraft:live/gameover_runner diff --git a/datapacks/map_main/data/minecraft/functions/live/teststart.mcfunction b/datapacks/map_main/data/minecraft/functions/live/teststart.mcfunction index 41609bea..a9fa1bcc 100644 --- a/datapacks/map_main/data/minecraft/functions/live/teststart.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/teststart.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound minecraft:ui.button.click player @s ## scoreboard players set live.state state 0 execute if score live.state state matches 1.. run tellraw @s ["\n\u00a7a\u00a7l[MESSAGE] \u00a7c游戏已经开始啦！\n\u00a77\u00a7o如果这是个bug，请报告给制作者！\n\u00a77\u00a7o你现在可以旁观游戏。\n"] execute if score live.state state matches 1.. run function minecraft:live/specthegame execute unless score live.state state matches 1.. if score wait.live.player tick matches 2.. run function minecraft:live/start -execute unless score live.state state matches 1.. unless score wait.live.player tick matches 2.. run tellraw @a[team=wait.live] ["\n\u00a7a\u00a7l[MESSAGE] \u00a7c开始失败！ Reason:\n \u00a7e游戏需要至少 \u00a7b2\u00a7e 个玩家；\n 但现在只有 ",{"score":{"objective":"tick","name":"wait.live.player"},"color":"aqua"}," \u00a7e个玩家 ! \n"] \ No newline at end of file +execute unless score live.state state matches 1.. unless score wait.live.player tick matches 2.. run tellraw @a[team=wait.live] ["\n\u00a7a\u00a7l[MESSAGE] \u00a7c开始失败！ Reason:\n \u00a7e游戏需要至少 \u00a7b2\u00a7e 个玩家；\n 但现在只有 ",{"score":{"objective":"tick","name":"wait.live.player"},"color":"aqua"}," \u00a7e个玩家 ! \n"] diff --git a/datapacks/map_main/data/minecraft/functions/live/tick.mcfunction b/datapacks/map_main/data/minecraft/functions/live/tick.mcfunction index 7b978003..a9c61773 100644 --- a/datapacks/map_main/data/minecraft/functions/live/tick.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/live/tick.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## spawnpoint @a[team=play.live.killer] 29 15 -3 spawnpoint @a[team=play.live.runner] 29 15 -3 spawnpoint @a[team=wait.live] 25 7 0 -# spawnpoint @a[team=lobby] 0 7 0 \ No newline at end of file +# spawnpoint @a[team=lobby] 0 7 0 diff --git a/datapacks/map_main/data/minecraft/functions/lobby/car.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/car.mcfunction index aa7ed6a6..4ca8aa9f 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/car.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/car.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute positioned 122 120 59 unless entity @e[tag=lobby.car,type=minecart,distance=0..10] run setblock 123 121 59 stone_button[powered=true] # execute positioned 122 120 59 unless entity @e[tag=lobby.car,type=minecart,distance=0..10] run summon minecart 122 120 59 {Invulnerable:1b,Silent:1b,Tags:["lobby.car"],CustomName:'["观光车"]',CustomNameVisible:1b} -# execute as @e[tag=lobby.car] run team join lobby @s \ No newline at end of file +# execute as @e[tag=lobby.car] run team join lobby @s diff --git a/datapacks/map_main/data/minecraft/functions/lobby/car/detectdie.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/car/detectdie.mcfunction index 002c2c45..0cc7d506 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/car/detectdie.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/car/detectdie.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tag @s add car.tmp # scoreboard players set car.detect board 0 # execute as @a[team=lobby] if data entity @s {RootVehicle:{Entity:{Tags:["car.tmp"]}}} run scoreboard players set car.detect board 1 # execute if score car.detect board matches 0 run kill @s[type=minecart] -# tag @s remove car.tmp \ No newline at end of file +# tag @s remove car.tmp diff --git a/datapacks/map_main/data/minecraft/functions/lobby/car/detectgo.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/car/detectgo.mcfunction index 4e14b720..d9ce3c42 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/car/detectgo.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/car/detectgo.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tag @s add car.tmp # scoreboard players set car.detect board 0 # execute as @a[team=lobby] if data entity @s {RootVehicle:{Entity:{Tags:["car.tmp"]}}} run scoreboard players set car.detect board 1 # execute if score car.detect board matches 1 run setblock 121 120 60 minecraft:redstone_torch -# tag @s remove car.tmp \ No newline at end of file +# tag @s remove car.tmp diff --git a/datapacks/map_main/data/minecraft/functions/lobby/cleartags.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/cleartags.mcfunction index 8537a4bb..3eb03582 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/cleartags.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/cleartags.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @s remove wolf.acting tag @s remove wolf.protected tag @s remove wolf.killed @@ -19,4 +23,4 @@ tag @s remove tntwars.a tag @s remove tntwars.b tag @s remove touzi.team.a tag @s remove touzi.team.b -# tag @s remove \ No newline at end of file +# tag @s remove diff --git a/datapacks/map_main/data/minecraft/functions/lobby/elevent.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/elevent.mcfunction index 8801f537..86e11de2 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/elevent.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/elevent.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## Effects -execute if score speed lobby.effect matches 1 run effect give @a[team=lobby,tag=!parkouring,tag=!mazing] speed 1 0 true -execute if score speed lobby.effect matches 2 run effect give @a[team=lobby,tag=!parkouring,tag=!mazing] speed 1 1 true -execute if score jump lobby.effect matches 1 run effect give @a[team=lobby,tag=!parkouring,tag=!mazing] jump_boost 1 1 true -execute if score jump lobby.effect matches 2 run effect give @a[team=lobby,tag=!parkouring,tag=!mazing] jump_boost 1 3 true +execute if score speed lobby.effect matches 1 run effect give @a[team=lobby,tag=!mazing] speed 1 0 true +execute if score speed lobby.effect matches 2 run effect give @a[team=lobby,tag=!mazing] speed 1 1 true +execute if score jump lobby.effect matches 1 run effect give @a[team=lobby,tag=!mazing] jump_boost 1 1 true +execute if score jump lobby.effect matches 2 run effect give @a[team=lobby,tag=!mazing] jump_boost 1 3 true execute run effect give @a[team=lobby,tag=mazing] speed 1 0 true @@ -39,7 +43,7 @@ stopsound @a[tag=NEWENTER1] record stopsound @a[tag=NEWENTER1] voice tag @a[tag=NEWENTER1] remove mazing tellraw @a[tag=NEWENTER1] ["\n\u00a7a 您可以随时使用 \u00a76/trigger hub \u00a7a返回大厅。\n \u00a7a全局音乐可以通过\u00a76游戏设置 - 声音设置 - 玩家语音\u00a7a调节声音大小\n"] -tellraw @a[tag=NEWENTER1,tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] +tellraw @a[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] execute as @a[tag=NEWENTER1] run attribute @s generic.max_health base set 20 execute as @a[tag=NEWENTER1] at @s run effect clear @s execute in overworld run tp @a[tag=NEWENTER1] 188 124 26 0 0 @@ -61,10 +65,11 @@ clear @a[tag=join.hit] gamemode adventure @a[tag=join.hit] team leave @a[tag=join.hit] execute as @a[tag=join.hit] run tellraw @a ["\u00a7a\u00a7l[MESSAGE] \u00a77",{"selector":"@s","color":"yellow"},"\u00a77 加入了 \u00a7eRepeling War\u00a77。"] -tellraw @a[tag=join.hit,tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @a[tag=join.hit,tag=GOABLE.SPEC] at @s run gamemode spectator +tellraw @a[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] +execute as @a[tag=GOABLE.SPEC] at @s run gamemode spectator team join wait.repel @a[tag=join.hit] execute as @a[tag=join.hit] at @s run attribute @s minecraft:generic.max_health base set 20 execute as @a[tag=join.hit] at @s run effect clear @s tag @a[tag=join.hit] remove join.hit + diff --git a/datapacks/map_main/data/minecraft/functions/lobby/firework.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/firework.mcfunction index b9cc294b..7d2acb22 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/firework.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/firework.mcfunction @@ -1,9 +1,13 @@ -summon firework_rocket 230 118 22 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon firework_rocket 230 118 30 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon firework_rocket 230 118 22 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon firework_rocket 230 118 30 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} # summon firework_rocket 230 118 26 {LifeTime:20,FireworksItem:{id:firework_rocket,Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} # summon firework_rocket 230 116 34 {LifeTime:20,FireworksItem:{id:firework_rocket,Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} # summon firework_rocket 230 116 18 {LifeTime:20,FireworksItem:{id:firework_rocket,Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon firework_rocket 230 114 14 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon firework_rocket 230 114 38 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +summon firework_rocket 230 114 14 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon firework_rocket 230 114 38 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} -# summon firework_rocket 230 118 26 {LifeTime:20,FireworksItem:{id:firework_rocket,Count:1,tag:{Fireworks:{Explosions:[{Type:3,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} \ No newline at end of file +# summon firework_rocket 230 118 26 {LifeTime:20,FireworksItem:{id:firework_rocket,Count:1,tag:{Fireworks:{Explosions:[{Type:3,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} diff --git a/datapacks/map_main/data/minecraft/functions/lobby/firework2.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/firework2.mcfunction index f0f68053..f8c65325 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/firework2.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/firework2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} # 166 115 4 # 166 115 48 @@ -18,17 +22,17 @@ # 296 121 -93 # 310 116 -44 -summon minecraft:firework_rocket 166 115 4 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 166 115 48 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 219 118 40 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 219 118 12 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 102 133 -20 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 101 115 4 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 58 115 28 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 74 115 79 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 156 115 -15 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 220 115 -15 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 235 115 -33 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 239 116 -84 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 296 121 -93 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} -summon minecraft:firework_rocket 310 116 -44 {LifeTime:30,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,920588,15790320]}],Flight:1}}}} \ No newline at end of file +summon minecraft:firework_rocket 166 115 4 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 166 115 48 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 219 118 40 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 219 118 12 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 102 133 -20 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 101 115 4 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 58 115 28 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 74 115 79 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 156 115 -15 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 220 115 -15 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 235 115 -33 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 239 116 -84 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 296 121 -93 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} +summon minecraft:firework_rocket 310 116 -44 {LifeTime:30,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,920588,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} diff --git a/datapacks/map_main/data/minecraft/functions/lobby/getrandom1.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/getrandom1.mcfunction index 241e5afa..3e15d232 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/getrandom1.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/getrandom1.mcfunction @@ -1 +1,5 @@ -scoreboard players operation random board = @e[limit=1,tag=random_saying,sort=random,scores={board=1..11}] board \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players operation random board = @e[limit=1,tag=random_saying,sort=random,scores={board=1..11}] board diff --git a/datapacks/map_main/data/minecraft/functions/lobby/getrandom2.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/getrandom2.mcfunction index 7df48998..8a64f6ed 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/getrandom2.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/getrandom2.mcfunction @@ -1 +1,5 @@ -scoreboard players operation random board = @e[limit=1,tag=random_saying,sort=random,scores={board=1..9}] board \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +scoreboard players operation random board = @e[limit=1,tag=random_saying,sort=random,scores={board=1..9}] board diff --git a/datapacks/map_main/data/minecraft/functions/lobby/jump.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/jump.mcfunction index c82e6d29..0f1d8b85 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/jump.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/jump.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add jump lobby.effect 0 execute if score jump lobby.effect matches -10..0 run function lobby/jump_one execute if score jump lobby.effect matches 1..1 run function lobby/jump_two execute if score jump lobby.effect matches 2..2 run function lobby/jump_off scoreboard players add jump lobby.effect 1 -execute if score jump lobby.effect matches 3.. run scoreboard players set jump lobby.effect 0 \ No newline at end of file +execute if score jump lobby.effect matches 3.. run scoreboard players set jump lobby.effect 0 diff --git a/datapacks/map_main/data/minecraft/functions/lobby/jump_off.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/jump_off.mcfunction index 02c900dc..6b4f2c88 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/jump_off.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/jump_off.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7c大厅效果已禁用：\u00a72\u00a7l跳跃提升"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7c大厅效果已禁用：\u00a72\u00a7l跳跃提升"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/jump_one.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/jump_one.mcfunction index 947ece85..6b50dd99 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/jump_one.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/jump_one.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7a大厅效果已启用：\u00a72\u00a7l跳跃提升 II"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7a大厅效果已启用：\u00a72\u00a7l跳跃提升 II"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/jump_two.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/jump_two.mcfunction index 43f27f47..37fd0fad 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/jump_two.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/jump_two.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7a大厅效果已启用：\u00a72\u00a7l跳跃提升 IV"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7a大厅效果已启用：\u00a72\u00a7l跳跃提升 IV"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/oneword.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/oneword.mcfunction index 1c92d230..395003b7 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/oneword.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/oneword.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function lobby/getrandom1 execute if score random board matches 1 run title @s title ["\u00a7a世间万物皆有裂痕，那是光照进来的地方。"] execute if score random board matches 1 run title @s subtitle ["\u00a7e —— 莱昂纳德·科恩《颂歌》"] @@ -33,4 +37,4 @@ execute if score random board matches 6 run tellraw @s [" \u00a7b今日永远 execute if score random board matches 7 run tellraw @s [" \u00a7b青春总是焦急的，连一勺砂糖溶于杯中的时间都等不及。"] execute if score random board matches 8 run tellraw @s [" \u00a7b后悔带来的苦涩，是对过去的见证，终将逐一化为杯中咖啡的味道。"] execute if score random board matches 9 run tellraw @s [" \u00a7b有些东西，只有放手后才能得到，也许并不是只有握在手里才是幸福的。"] -tellraw @s ["\u00a77 —— 玉子市场 · 咖啡店人生导师\n"] \ No newline at end of file +tellraw @s ["\u00a77 —— 玉子市场 · 咖啡店人生导师\n"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/quickplay.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/quickplay.mcfunction index b5fe8369..3c88ffff 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/quickplay.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/quickplay.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players enable @s quickplay execute if score @s quickplay matches 1 run tellraw @s ["\n\u00a76 ※ 快速加入游戏 ※ \u00a7b游戏ID列表：\n","\n\u00a7a2 \u00a77- \u00a7bBattle Box\n\u00a7a3 \u00a77- \u00a7b信仰方块\n\u00a7a4 \u00a77- \u00a7b冰船\n\u00a7a5 \u00a77- \u00a7b赛车\n\u00a7a6 \u00a77- \u00a7b色盲大战\n\u00a7a7 \u00a77- \u00a7b星跳水立方\n\u00a7a8 \u00a77- \u00a7b战桥\n\u00a7a9 \u00a77- \u00a7b高尔夫\n\u00a7a10 \u00a77- \u00a7b躲猫猫（道具）\n\u00a7a11 \u00a77- \u00a7b躲猫猫（方块）\n\u00a7a12 \u00a77- \u00a7b烫手的山芋\n\u00a7a13 \u00a77- \u00a7b饥饿游戏\n\u00a7a14 \u00a77- \u00a7b职业战争\n\u00a7a15 \u00a77- \u00a7b密室杀手\n\u00a7a16 \u00a77- \u00a7bLive Longest\n\u00a7a17 \u00a77- \u00a7b关卡跑酷\n\u00a7a18 \u00a77- \u00a7b冬泳怪鸽\n\u00a7a19 \u00a77- \u00a7b棋类游戏\n\u00a7a20 \u00a77- \u00a7b狼人杀\n\u00a7a21 \u00a77- \u00a7b小游戏合集\n\u00a7a22 \u00a77- \u00a7bSnow\n\u00a7a23 \u00a77- \u00a7bTNT Wars\n\u00a7a24 \u00a77- \u00a7bZombie Days（PVE）\n\u00a7a25 \u00a77- \u00a7b生存游戏\n\u00a7a26 \u00a77- \u00a7b起床战争\n\n\u00a7e使用 \u00a76/trigger quickplay set <游戏ID>\u00a7b 快速进入"] @@ -29,4 +33,4 @@ execute if score @s quickplay matches 26 run function bedwars/message/join execute if score @s quickplay matches 1.. run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute if score @s quickplay matches 27.. run tellraw @s ["\u00a7c很抱歉，未知游戏的ID！"] -execute if score @s quickplay matches 1.. run scoreboard players reset @s quickplay \ No newline at end of file +execute if score @s quickplay matches 1.. run scoreboard players reset @s quickplay diff --git a/datapacks/map_main/data/minecraft/functions/lobby/quickplay_refused.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/quickplay_refused.mcfunction index 70792a24..8278ee8d 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/quickplay_refused.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/quickplay_refused.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 1 tellraw @s ["\u00a7c您无法在进行游戏时快速加入其他游戏队列！"] -scoreboard players reset @s quickplay \ No newline at end of file +scoreboard players reset @s quickplay diff --git a/datapacks/map_main/data/minecraft/functions/lobby/rejoin.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/rejoin.mcfunction index 2c68d96f..bd53663c 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/rejoin.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/rejoin.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add @s globle.game 0 execute unless score @s leave matches 1.. if score @s globle.game matches ..1 run tellraw @s ["\u00a7c很抱歉，您无法重新加入游戏！"] execute unless score @s leave matches 1.. if score @s globle.game matches 2.. run tellraw @s ["\u00a76正在为您检查游戏状态！如果游戏仍在运行且支持重新加入，您将会重新进入游戏！\n\u00a77您的游戏状态码：",{"score":{"objective": "globle.game","name": "@s"},"color":"gray","bold": true}] @@ -6,4 +10,4 @@ execute if score zombie.state state matches 1.. if score @s globle.game = zombie execute if score gametotal state matches 1.. if score @s globle.game = game.total globle.game run function small_games/total/rejoin execute if score twolf.state state matches 1.. as @s[team=wolfpeople] run function twolf/rejoin execute if score twolf.state state matches 1.. as @s[team=wait.wolfpeople] run function twolf/rejoin -execute if score @s globle.game matches ..1 run scoreboard players reset @s globle.game \ No newline at end of file +execute if score @s globle.game matches ..1 run scoreboard players reset @s globle.game diff --git a/datapacks/map_main/data/minecraft/functions/lobby/spawncar.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/spawncar.mcfunction index d94e611a..eeefe976 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/spawncar.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/spawncar.mcfunction @@ -1 +1,5 @@ -summon minecraft:minecart ~ ~ ~ {Invulnerable:1b,Silent:1b,Tags:["lobby.car"],Passengers:[{id:"minecraft:strider",Saddle:true,CustomName:'["观光车"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Tags:["lobby.car"]}]} \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +summon minecraft:minecart ~ ~ ~ {Invulnerable:1b,Silent:1b,Tags:["lobby.car"],Passengers:[{id:"minecraft:strider",Saddle:"true",CustomName:'["观光车"]',CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,PersistenceRequired:1b,Tags:["lobby.car"]}]} diff --git a/datapacks/map_main/data/minecraft/functions/lobby/specintroduce.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/specintroduce.mcfunction index 382778e0..687c853c 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/specintroduce.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/specintroduce.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7b\u00a7l 旁观者模式操作面板\n \u00a77你可以点击对应的命令并且补全到聊天栏。\n\n",{"text":"\u00a76\u00a7l/trigger spec set 1 \u00a77- \u00a7e打开这个菜单","bold":true,"clickEvent": {"action": "suggest_command","value": "/trigger spec set 1"},"hoverEvent": {"action": "show_text","contents": "\u00a77点击此处补全到聊天栏"}},"\n",{"text":"\u00a76\u00a7l/trigger spec set 2 \u00a77- \u00a7e开启全局旁观者模式","bold":true,"clickEvent": {"action": "suggest_command","value": "/trigger spec set 2"},"hoverEvent": {"action": "show_text","contents": "\u00a77点击此处补全到聊天栏"}},"\n",{"text":"\u00a76\u00a7l/trigger spec set 3 \u00a77- \u00a7e退出全局旁观者模式","bold":true,"clickEvent": {"action": "suggest_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a77点击此处补全到聊天栏"}},"\n"] + diff --git a/datapacks/map_main/data/minecraft/functions/lobby/speed.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/speed.mcfunction index 359ccbd8..ae53a3b3 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/speed.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/speed.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add speed lobby.effect 0 execute if score speed lobby.effect matches -10..0 run function lobby/speed_one execute if score speed lobby.effect matches 1..1 run function lobby/speed_two execute if score speed lobby.effect matches 2..2 run function lobby/speed_off scoreboard players add speed lobby.effect 1 -execute if score speed lobby.effect matches 3.. run scoreboard players set speed lobby.effect 0 \ No newline at end of file +execute if score speed lobby.effect matches 3.. run scoreboard players set speed lobby.effect 0 diff --git a/datapacks/map_main/data/minecraft/functions/lobby/speed_off.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/speed_off.mcfunction index 3fbcab18..c4c5a2fb 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/speed_off.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/speed_off.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7c大厅效果已禁用：\u00a7f\u00a7l速度"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7c大厅效果已禁用：\u00a7f\u00a7l速度"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/speed_one.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/speed_one.mcfunction index baab97a6..791f1ffc 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/speed_one.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/speed_one.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7a大厅效果已启用：\u00a7f\u00a7l速度 I"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7a大厅效果已启用：\u00a7f\u00a7l速度 I"] diff --git a/datapacks/map_main/data/minecraft/functions/lobby/speed_two.mcfunction b/datapacks/map_main/data/minecraft/functions/lobby/speed_two.mcfunction index f7cdc512..0aa73d3e 100644 --- a/datapacks/map_main/data/minecraft/functions/lobby/speed_two.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/lobby/speed_two.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7a大厅效果已启用：\u00a7f\u00a7l速度 II"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7a大厅效果已启用：\u00a7f\u00a7l速度 II"] diff --git a/datapacks/map_main/data/minecraft/functions/main.mcfunction b/datapacks/map_main/data/minecraft/functions/main.mcfunction index 00df2e0e..f4d1d14f 100644 --- a/datapacks/map_main/data/minecraft/functions/main.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/main.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function minecraft:lobby/elevent execute if block 123 121 59 oak_button[powered=true] run function lobby/car function foodparty:tick @@ -34,7 +38,7 @@ execute as @a[tag=NEWENTER] at @s run attribute @s minecraft:generic.attack_spee execute as @a[tag=NEWENTER] run bossbar set surgame:time players @a[team=wait.sur] execute as @a[tag=NEWENTER] unless score @s park.uuid matches 0.. run function minecraft:npark/getuuid -tellraw @a[tag=NEWENTER,tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] +tellraw @a[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] effect clear @a[tag=NEWENTER] tag @a[tag=NEWENTER] remove zombie.nehelp tag @a[tag=NEWENTER] remove parkouring @@ -95,9 +99,9 @@ execute as @a[scores={use.skill=1..},level=..0,team=hide.play.ani] at @s run fun -execute in airworld as @a[gamemode=!creative,gamemode=!spectator,team=play.sur,x=-46,y=-26,z=3,distance=0..4] run function surgame:died -execute in airworld as @a[gamemode=!creative,gamemode=!spectator,team=play.sur.zom,x=-46,y=-26,z=3,distance=0..4] run function surgame:died -execute in airworld as @a[gamemode=!creative,gamemode=!spectator,team=wait.sur,x=-46,y=-26,z=3,distance=0..4] run function surgame:join +execute in airworld as @a[gamemode=!spectator,team=play.sur,x=-46,y=-26,z=3,distance=0..4] run function surgame:died +execute in airworld as @a[gamemode=!spectator,team=play.sur.zom,x=-46,y=-26,z=3,distance=0..4] run function surgame:died +execute in airworld as @a[gamemode=!spectator,team=wait.sur,x=-46,y=-26,z=3,distance=0..4] run function surgame:join # execute as @a[scores={use.skill=1..,cooldowntime=1..},team=play.zombie] at @s run title @s actionbar ["\u00a7c\u00a7l冷却中: ",{"score":{"objective": "cooldowntime","name": "@s"},"color":"yellow"},"\u00a7et"] execute as @a[scores={cooldowntime=1..},team=play.zombie] at @s run scoreboard players remove @s cooldowntime 1 @@ -147,7 +151,7 @@ effect give @a[team=car.wait] minecraft:resistance 1 25 true effect give @a[team=wait.repel] minecraft:resistance 1 25 true kill @e[type=arrow,nbt={inGround:1b}] kill @e[type=spectral_arrow,nbt={inGround:1b}] -# execute as @e[type=area_effect_cloud,tag=title] at @s run data modify +# execute as @e[type=area_effect_cloud,tag=title] at @s run data modify execute if score gametotal state matches 1.. run function minecraft:small_games/total/tick # execute if score @a[team=wait.total] run function minecraft:small_games/total/tick @@ -165,17 +169,17 @@ execute as @a[tag=join.livelongest] run tp @s 25 7 0 0 0 execute as @a[tag=join.livelongest] run team leave @s execute as @a[tag=join.livelongest] run tellraw @a ["\u00a7a\u00a7l[MESSAGE] \u00a7a",{"selector":"@s","color":"gray"},"\u00a7e joined \u00a76Live Longest \u00a7e."] -tellraw @a[tag=GOABLE.SPEC,tag=join.livelongest] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @a[tag=GOABLE.SPEC,tag=join.livelongest] at @s run gamemode spectator +tellraw @a[tag=join.livelongest] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] +execute as @a[tag=join.livelongest] at @s run gamemode spectator execute as @a[tag=join.livelongest] run team join wait.live @s execute as @a[tag=join.livelongest] run tag @s remove join.livelongest execute if score pw.state state matches 1.. run function minecraft:poolwar/tick execute if score car.state state matches 1.. run function minecraft:car_race/tick # execute if score pw.state state matches 1.. run function minecraft:poolwar/tick -execute as @a[tag=parkouring,team=!lobby] run function npark/cancel +execute as @a[tag=parkouring,team=!lobby] run function npark/cancel execute as @a[tag=mazing,team=!lobby] run function maze/cancelnottp -kill @e[type=item,nbt={Item:{tag:{park:1}}}] +kill @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{park:1}}}}] scoreboard players reset @a[scores={die=1..},tag=!bw.play] die @@ -190,6 +194,6 @@ scoreboard players reset @a[tag=!bw.play] bw.kill execute in hungerworld as @a[x=101,y=-60,z=0,distance=..2] at @s run function hunger/died -execute as @e[type=minecart,tag=lobby.car] at @s if block ~ ~-1 ~ piston_head run data modify entity @s Motion[2] set value -1.0 +execute as @e[type=minecart,tag=lobby.car] at @s if block ~ ~-1 ~ piston_head run data modify entity @s Motion[2] set value -1 -execute positioned 29 17 -4 as @a[distance=0..3,gamemode=adventure] at @s run function minecraft:live/ingame/died \ No newline at end of file +execute positioned 29 17 -4 as @a[distance=0..3,gamemode=adventure] at @s run function minecraft:live/ingame/died diff --git a/datapacks/map_main/data/minecraft/functions/o_f_tick.mcfunction b/datapacks/map_main/data/minecraft/functions/o_f_tick.mcfunction index 07b5a43b..6aff15ff 100644 --- a/datapacks/map_main/data/minecraft/functions/o_f_tick.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/o_f_tick.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.zombie,gamemode=adventure] run function zombieever/guninfo execute if score color.state state matches 1.. run function minecraft:color/half_second execute if score desk.state state matches 1.. run function minecraft:desk/hftick + diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/died.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/died.mcfunction index 7fb01bb7..1ec34f2e 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/died.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/died.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s -6 3 41 -90 0 effect clear @s tellraw @a[team=play.parkour] ["\u00a7a[INFO] \u00a7b玩家 ",{"selector":"@s"},"\u00a7c 死了。"] -playsound minecraft:entity.player.burp player @s \ No newline at end of file +playsound minecraft:entity.player.burp player @s diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/join.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/join.mcfunction index 12c5b73f..786c7150 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/join.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s -5 41 67 180 0 team join wait.parkour -tellraw @a[team=wait.parkour] [{"selector":"@s"},"\u00a7d 加入了游戏。"] \ No newline at end of file +tellraw @a[team=wait.parkour] [{"selector":"@s"},"\u00a7d 加入了游戏。"] diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/jointhegame.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/jointhegame.mcfunction index 0dd2a83b..ed23a68f 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/jointhegame.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/jointhegame.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7a[INFO] \u00a7b游戏已经开始了！ 你已加入游戏 ！"] team join play.parkour @s tellraw @a[team=play.parkour] ["\n",{"selector":"@s"},"\u00a7b 加入了 \u00a7aParkour Race\u00a7b.\n"] -function minecraft:parkourrace/died \ No newline at end of file +function minecraft:parkourrace/died diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/over.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/over.mcfunction index 59116290..49edf699 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/over.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/over.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set park.state state 0 tellraw @a ["\u00a7a[INFO] \u00a7b[Parkour Race] \u00a7d游戏结束！"] gamemode adventure @a[team=play.parkour] -execute as @a[team=play.parkour] run function minecraft:parkourrace/join \ No newline at end of file +execute as @a[team=play.parkour] run function minecraft:parkourrace/join diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/start.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/start.mcfunction index 6a528e9c..a096b590 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/start.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/start.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join play.parkour @a[team=wait.parkour] tp @a[team=play.parkour] -6 3 41 -90 0 scoreboard players set park.state state 1 tellraw @a ["\u00a7a[INFO] \u00a7bParkour Race \u00a7a开始了！"] -execute as @a[team=play.parkour] at @s run playsound minecraft:entity.ender_dragon.growl player @s \ No newline at end of file +execute as @a[team=play.parkour] at @s run playsound minecraft:entity.ender_dragon.growl player @s diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/testfor.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/testfor.mcfunction index 7b440aa0..7ada8cad 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/testfor.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/testfor.mcfunction @@ -1 +1,5 @@ -execute if score park.state state matches 1.. if score play.park.player tick matches ..0 run function minecraft:parkourrace/over \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score park.state state matches 1.. if score play.park.player tick matches ..0 run function minecraft:parkourrace/over diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/tick.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/tick.mcfunction index 40bcbb04..f1c5de7e 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/tick.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.parkour] at @s if block ~ ~-1 ~ minecraft:light_blue_concrete run effect give @s minecraft:speed 1 3 true execute as @a[team=play.parkour] at @s if block ~ ~-1 ~ minecraft:lime_concrete run effect give @s minecraft:jump_boost 1 3 true @@ -15,4 +19,4 @@ execute as @a[team=play.parkour] at @s if block ~ ~-1 ~ minecraft:yellow_concret execute as @a[team=play.parkour] at @s if block ~ ~-1 ~ minecraft:glass run effect clear @s effect give @a[team=play.parkour] saturation 2 25 true -effect give @a[team=play.parkour] minecraft:resistance 2 25 true \ No newline at end of file +effect give @a[team=play.parkour] minecraft:resistance 2 25 true diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/trystart.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/trystart.mcfunction index d7219f85..bb8b0950 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/trystart.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/trystart.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute if score park.state state matches 1..1 run function minecraft:parkourrace/jointhegame -execute unless score park.state state matches 1.. if score wait.park.player tick matches 1.. run function minecraft:parkourrace/start \ No newline at end of file +execute unless score park.state state matches 1.. if score wait.park.player tick matches 1.. run function minecraft:parkourrace/start diff --git a/datapacks/map_main/data/minecraft/functions/parkourrace/win.mcfunction b/datapacks/map_main/data/minecraft/functions/parkourrace/win.mcfunction index c658b6ae..5b314c6e 100644 --- a/datapacks/map_main/data/minecraft/functions/parkourrace/win.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/parkourrace/win.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @a[team=play.parkour] ["\n",{"selector":"@s"},"\u00a7a 完成了跑酷！\n"] -execute as @a[team=play.parkour] at @s run playsound minecraft:entity.player.levelup player @s \ No newline at end of file +execute as @a[team=play.parkour] at @s run playsound minecraft:entity.player.levelup player @s diff --git a/datapacks/map_main/data/minecraft/functions/repel/givethings.mcfunction b/datapacks/map_main/data/minecraft/functions/repel/givethings.mcfunction index 359c6b0b..1c292c74 100644 --- a/datapacks/map_main/data/minecraft/functions/repel/givethings.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/repel/givethings.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.repel] ["\u00a7a\u00a7lYou was be able to attack!"] title @a[team=play.repel] title ["\u00a7e\u00a7lWARNING"] title @a[team=play.repel] subtitle ["\u00a7rYou was be able to attack!"] -give @a[team=play.repel] minecraft:stick{display:{Name:'["§aRepel"]',Lore:['["§rUse it to Shoot Down Other Players"]']},HideFlags:63,Enchantments:[{id:"minecraft:knockback",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"noName",Amount:4d,Operation:0,UUID:[I;4651,1568,3158,3284]}]} 1 -give @a[team=play.repel] minecraft:bow{display:{Name:'["§cRepel Bow"]',Lore:['["§rUse it to Shoot Down Other Players"]']},HideFlags:63,Enchantments:[{id:"minecraft:punch",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"noName",Amount:4d,Operation:0,UUID:[I;4651,1568,3158,3284]}]} 1 -give @a[team=play.repel] arrow 15 -team modify play.repel friendlyFire true \ No newline at end of file +give @a[team=play.repel] minecraft:stick[custom_name='["§aRepel"]',lore=['["§rUse it to Shoot Down Other Players"]'],enchantments={levels:{"minecraft:knockback":1s},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_speed",slot:"any",uuid:[4651,1568,3158,3284],name:"noName",amount:4d,operation:"add_value"}],show_in_tooltip:false}] +give @a[team=play.repel] minecraft:bow[custom_name='["§cRepel Bow"]',lore=['["§rUse it to Shoot Down Other Players"]'],enchantments={levels:{"minecraft:punch":1s},show_in_tooltip:false},attribute_modifiers={modifiers:[{type:"generic.attack_speed",slot:"any",uuid:[4651,1568,3158,3284],name:"noName",amount:4d,operation:"add_value"}],show_in_tooltip:false}] +give @a[team=play.repel] arrow +team modify play.repel friendlyFire true diff --git a/datapacks/map_main/data/minecraft/functions/repel/main.mcfunction b/datapacks/map_main/data/minecraft/functions/repel/main.mcfunction index cd0321b4..9553282f 100644 --- a/datapacks/map_main/data/minecraft/functions/repel/main.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/repel/main.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[team=play.repel,gamemode=adventure] at @s if block ~ ~-2 ~ minecraft:orange_stained_glass run tag @s add out.repel execute as @a[tag=out.repel] run tellraw @a[team=play.repel] [{"selector":"@s"},"\u00a7c 淘汰了 ！"] execute as @a[tag=out.repel] run scoreboard players operation @s number = cnt.repel number @@ -6,9 +10,9 @@ gamemode spectator @a[tag=out.repel] clear @a[tag=out.repel] tp @a[tag=out.repel] -94 40 62 0 90 tag @a[tag=out.repel] remove out.repel -scoreboard players set play.repel.player tick 0 +scoreboard players set play.repel.player tick 0 execute as @a[team=play.repel,gamemode=adventure] run scoreboard players add play.repel.player tick 1 execute unless score play.repel.player tick matches 2.. run function minecraft:repel/over execute as @a[team=play.repel,gamemode=adventure] at @s if block ~ ~-0.2 ~ end_portal_frame run playsound minecraft:entity.ender_dragon.flap player @s ~ ~ ~ 0.5 1 0.5 -execute as @a[team=play.repel,gamemode=adventure] at @s if block ~ ~-0.2 ~ end_portal_frame run effect give @s levitation 1 15 true \ No newline at end of file +execute as @a[team=play.repel,gamemode=adventure] at @s if block ~ ~-0.2 ~ end_portal_frame run effect give @s levitation 1 15 true diff --git a/datapacks/map_main/data/minecraft/functions/repel/over.mcfunction b/datapacks/map_main/data/minecraft/functions/repel/over.mcfunction index d80e3d8e..9c14afd4 100644 --- a/datapacks/map_main/data/minecraft/functions/repel/over.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/repel/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set repel state 0 execute as @a[team=play.repel,gamemode=adventure] run scoreboard players operation @s number = cnt.repel number execute as @a[team=play.repel,gamemode=adventure] run scoreboard players add cnt.repel number 1 @@ -10,4 +14,4 @@ execute if entity @a[team=play.repel,tag=play.total] run function small_games/to tag @a[team=play.repel,gamemode=!creative] add join.hit schedule clear minecraft:repel/givethings #/summon armor_stand ~ ~-1.98 ~ {NoGravity:1b,Invisible:1b,Passengers:[{Tags:["block_entity"],Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,id:"minecraft:falling_block",Time:-1000000,DropItem:true,BlockState:{Name:"orange_wool"}}]} -#minecraft:orange_stained_glass \ No newline at end of file +#minecraft:orange_stained_glass diff --git a/datapacks/map_main/data/minecraft/functions/repel/start.mcfunction b/datapacks/map_main/data/minecraft/functions/repel/start.mcfunction index e1c07824..0930c2c5 100644 --- a/datapacks/map_main/data/minecraft/functions/repel/start.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/repel/start.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set repel state 1 scoreboard players set cnt.repel number 1 scoreboard players set start.repel.second tick 30 execute as @a[team=wait.repel,gamemode=adventure] run spreadplayers -93 62 0 20 under 42 false @s -team join play.repel @a[team=wait.repel,gamemode=adventure] +team join play.repel @a[team=wait.repel,gamemode=adventure] tellraw @a ["\u00a7b\u00a7l[GAMESTART] \u00a7eRepeling War\u00a7a 开始了！"] title @a[team=play.repel] title ["\u00a7e\u00a7lRepeling War"] team modify play.repel friendlyFire false @@ -13,4 +17,4 @@ tellraw @a[team=play.repel] ["\n\u00a76提示：如果您使用投影MOD，建 schedule function minecraft:repel/givethings 10s tellraw @a[tag=GOABLE.SPEC,team=play.repel] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @a[tag=GOABLE.SPEC,team=play.repel] at @s run gamemode spectator \ No newline at end of file +execute as @a[tag=GOABLE.SPEC,team=play.repel] at @s run gamemode spectator diff --git a/datapacks/map_main/data/minecraft/functions/second.mcfunction b/datapacks/map_main/data/minecraft/functions/second.mcfunction index d1f3f8b6..0f283a4e 100644 --- a/datapacks/map_main/data/minecraft/functions/second.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tick tick 0 scoreboard players add tick2 tick 1 @@ -23,8 +27,8 @@ execute as @e[type=minecart,tag=lobby.car] at @s if block ~ ~ ~ lava run kill @s ## Car # execute as @e[tag=lobby.car.start] at @s unless entity @e[tag=lobby.car,type=!player,distance=0..1] run function lobby/spawncar # execute as @e[tag=lobby.car.end] at @s run kill @e[tag=lobby.car,type=!player,distance=0..3] -xp add @a[team=play.live.runner,level=1..] -1 levels -xp add @a[team=play.live.killer,level=1..] -1 levels +xp add @a[team=play.live.runner,level=1..] -1 levels +xp add @a[team=play.live.killer,level=1..] -1 levels effect give @a[team=wait.sur] resistance 2 25 true execute if score golf.state state matches 1.. in golfworld run function golf/second execute if score boat.state state matches 1.. in boatworld2 run function boat/second @@ -38,7 +42,7 @@ tag @a[team=lobby] add music.playing tag @a[team=dropper] add music.playing tag @a[team=chestgame] add music.playing tag @a[team=parkour] add music.playing -tag @a[tag=music.playing,team=!lobby,team=!dropper,team=!parkour,team=!chestgame] remove music_kano -tag @a[tag=music.playing,team=!lobby,team=!dropper,team=!parkour,team=!chestgame] remove music_little_stars -tag @a[tag=music.playing,team=!lobby,team=!dropper,team=!parkour,team=!chestgame] remove music.playing -scoreboard players reset @a[tag=!music.playing] time \ No newline at end of file +tag @a[tag=music.playing,team=!chestgame] remove music_kano +tag @a[tag=music.playing,team=!chestgame] remove music_little_stars +tag @a[tag=music.playing,team=!chestgame] remove music.playing +scoreboard players reset @a[tag=!music.playing] time diff --git a/datapacks/map_main/data/minecraft/functions/seconds/1.mcfunction b/datapacks/map_main/data/minecraft/functions/seconds/1.mcfunction index 6b8aeda9..cc3dbc7b 100644 --- a/datapacks/map_main/data/minecraft/functions/seconds/1.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/seconds/1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say 1 function o_f_tick @@ -6,13 +10,13 @@ execute if score zombie.state state matches 1.. run function zombieever/o_f_tick spawnpoint @a[team=wait.zombie] -202 17 353 spawnpoint @a[team=lobby] 188 124 26 0 -scoreboard players set wait.hit.player tick 0 +scoreboard players set wait.hit.player tick 0 execute as @a[team=wait.repel] run scoreboard players add wait.hit.player tick 1 -scoreboard players set wait.live.player tick 0 +scoreboard players set wait.live.player tick 0 execute as @a[team=wait.live] run scoreboard players add wait.live.player tick 1 -scoreboard players set wait.park.player tick 0 +scoreboard players set wait.park.player tick 0 execute as @a[team=wait.parkour] run scoreboard players add wait.park.player tick 1 execute if score zombie.debug state matches 1 run function zombieever/test/display @@ -31,3 +35,4 @@ effect give @a[team=hide.killer] strength 2 20 true effect give @a[team=hide.killer] glowing 2 2 true execute if score btw.state state matches 1.. in overworld run function boatwars/second + diff --git a/datapacks/map_main/data/minecraft/functions/seconds/2.mcfunction b/datapacks/map_main/data/minecraft/functions/seconds/2.mcfunction index 59877fa4..35127d44 100644 --- a/datapacks/map_main/data/minecraft/functions/seconds/2.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/seconds/2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say 2 execute if score hide2.state state matches 1.. run function minecraft:hide2/second @@ -13,7 +17,7 @@ bossbar set zombie:zombiecount players @a[team=play.zombie] execute if entity @a[team=dropper] in dropperworld run function dropper/second -scoreboard players set play.park.player tick 0 +scoreboard players set play.park.player tick 0 execute as @a[team=play.parkour,gamemode=adventure] run scoreboard players add play.park.player tick 1 execute if score chess.state state matches 1.. run function small_games/chess/second @@ -33,3 +37,4 @@ execute in killerworld if score twolf.state state matches 1.. run function minec effect give @a[team=wait.wolfpeople] resistance 2 25 true effect give @a[team=wolfpeople] resistance 2 25 true + diff --git a/datapacks/map_main/data/minecraft/functions/seconds/3.mcfunction b/datapacks/map_main/data/minecraft/functions/seconds/3.mcfunction index 711a38f8..e248db76 100644 --- a/datapacks/map_main/data/minecraft/functions/seconds/3.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/seconds/3.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say 3 # execute if score zombie.state state matches 1 run function zombieever/o_f_tick execute if score zombie.state state matches 1.. run function zombieever/o_f_tick @@ -25,3 +29,4 @@ execute if entity @a[team=wait.total] run function minecraft:small_games/total/s # execute unless entity @a[team=wait.total] if entity @a[tag=play.total] run function minecraft:small_games/total/start_second execute if score gametotal state matches 1.. run function minecraft:small_games/total/second execute if score desk.state state matches 1.. run function minecraft:desk/second + diff --git a/datapacks/map_main/data/minecraft/functions/seconds/4.mcfunction b/datapacks/map_main/data/minecraft/functions/seconds/4.mcfunction index 748acd5a..5b7e6c8a 100644 --- a/datapacks/map_main/data/minecraft/functions/seconds/4.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/seconds/4.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # setblock 121 120 60 minecraft:air # /data get entity @s RootVehicle # execute positioned 122 120 59 as @e[tag=lobby.car,type=minecart,distance=3..] run function lobby/car/detectdie function o_f_tick -# execute positioned 122 120 59 as @e[tag=lobby.car,type=minecart,distance=..3] run function lobby/car/detectgo \ No newline at end of file +# execute positioned 122 120 59 as @e[tag=lobby.car,type=minecart,distance=..3] run function lobby/car/detectgo diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/check.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/check.mcfunction index 3c26460a..78b1cc6a 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/check.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/check.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute run tellraw @a ["\u00a7b [SYS] 地图自检信息："] say §b [SYS] 地图自检信息： function version/version1 @@ -8,4 +12,4 @@ setblock 31 17 -10 air setblock 31 15 -10 air execute run tellraw @a ["\u00a78\u00a7o 检查是否支持命令方块中..."] setblock 31 15 -10 command_block{Command:"/setblock 31 17 -10 redstone_block",auto:1b} replace -schedule function selfcheck/cmd 1s replace \ No newline at end of file +schedule function selfcheck/cmd 1s replace diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/check_random.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/check_random.mcfunction index e9c81998..288e5b80 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/check_random.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/check_random.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 execute as @e[tag=random_game,type=marker] run scoreboard players add tmp board 1 tellraw @a ["\u00a7e随机数数量（大概在10个左右是正常的）：",{"score":{"objective": "board","name": "tmp"},"color": "red"}] @@ -5,3 +9,4 @@ tellraw @a ["\u00a76随机游戏（与随机数相关）：",{"selector":"@e[tag execute if score tmp board matches 15.. run scoreboard players add syserror board 1 execute if score tmp board matches 15.. run say §c [×] 随机数数量错误！§e解决办法：§f不要使用插件端，请使用forge服务端、§efabric服务端§f或者原版服务端！ function selfcheck/final + diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/checkpack.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/checkpack.mcfunction index 164f5dd1..f37b5bc0 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/checkpack.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/checkpack.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\n\u00a76 ※ \u00a7b资源包加载情况： [",{"translate":"optimizeWorld.stage.failed","color":"red"},"\u00a7b]\n"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\n\u00a76 ※ \u00a7b资源包加载情况： [",{"translate":"optimizeWorld.stage.failed","color":"red"},"\u00a7b]\n"] diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/cmd.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/cmd.mcfunction index 2c72fdf8..9c04ad66 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/cmd.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/cmd.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if block 31 17 -10 redstone_block run say §a [√] 支持命令方块 execute unless block 31 17 -10 redstone_block run say §c [×] 不支持命令方块。解决方法：在服务器设置中启用命令方块。 execute unless block 31 17 -10 redstone_block run scoreboard players add syserror board 1 function selfcheck/give function selfcheck/next + diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/final.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/final.mcfunction index f7ac9a79..1c24f758 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/final.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/final.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a76 [SYS] 自检完成。结果："] execute if score syserror board matches 1.. run tellraw @a [" \u00a7e[!] \u00a7c发现 ",{"score":{"objective": "board","name": "syserror"},"color":"yellow"},"\u00a7c 个错误。"] execute unless score syserror board matches 1.. run tellraw @a [" \u00a7a[OK] \u00a76未发现错误。若有问题请向作者反馈！"] say §6 [SYS] 自检完毕 -execute as @a run function selfcheck/checkpack \ No newline at end of file +execute as @a run function selfcheck/checkpack diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/give.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/give.mcfunction index 96543d58..dcf4e2cb 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/give.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/give.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon armor_stand 164 115 21 {Tags:["temp"]} ## 检测是否为 ess -give @a paper{display:{Name:'"\\u00a76服务器检测纸"'},testfor:1b} +give @a paper[custom_name='"\\u00a76服务器检测纸"',custom_data={testfor:1b}] + diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/next.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/next.mcfunction index 4447e9c1..818f1440 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/next.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/next.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[limit=1,sort=random] add check.sel -execute store result score check.tmp board run clear @a paper{testfor:1b} +execute store result score check.tmp board run clear @a paper[custom_data~{testfor:1b}] execute if score check.tmp board matches 1.. run say §a [√] /give 命令未受影响 execute unless entity @a[team=lobby] run say §e [-] /give 命令暂时无法检测：服务器大厅无人。§6解决办法：请在服务器大厅有人时测试。 execute if entity @a[team=lobby] unless score check.tmp board matches 1.. run say §c [×] /give 命令受到影响。§6解决方法：如果服务器无人，请等待服务器有人后重新执行检查命令；请删除 ESS 等修改指令的游戏插件。 execute unless score check.tmp board matches 1.. run scoreboard players add syserror board 1 tag @a remove check.sel -function selfcheck/teamtest \ No newline at end of file +function selfcheck/teamtest diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/teamtest.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/teamtest.mcfunction index e3fa3072..ff73e8f1 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/teamtest.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/teamtest.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set debug board 0 execute if entity @a[team=lobby] run scoreboard players set debug board 1 team join selfcheck.debug @a[team=lobby] @@ -8,4 +12,4 @@ execute unless entity @a[team=selfcheck.debug] if score debug board matches 1 ru tag @a remove check.sel function selfcheck/worldtest -team join lobby @a[team=selfcheck.debug] \ No newline at end of file +team join lobby @a[team=selfcheck.debug] diff --git a/datapacks/map_main/data/minecraft/functions/selfcheck/worldtest.mcfunction b/datapacks/map_main/data/minecraft/functions/selfcheck/worldtest.mcfunction index c24a46ca..3f4675d1 100644 --- a/datapacks/map_main/data/minecraft/functions/selfcheck/worldtest.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/selfcheck/worldtest.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in airworld run forceload add 1 0 1 0 execute in airworld run setblock 1 -64 0 air execute in airworld run setblock 1 -64 0 diamond_block @@ -6,4 +10,4 @@ execute in airworld unless block 1 -64 0 diamond_block run say §c [×] 不支 execute in airworld unless block 1 -64 0 diamond_block run scoreboard players add syserror board 1 execute in airworld run forceload remove 1 0 1 0 -function selfcheck/check_random \ No newline at end of file +function selfcheck/check_random diff --git a/datapacks/map_main/data/minecraft/functions/setup.mcfunction b/datapacks/map_main/data/minecraft/functions/setup.mcfunction index b4fb88dd..cc8448df 100644 --- a/datapacks/map_main/data/minecraft/functions/setup.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/setup.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a7b\u00a7l[Gamom Datapacks] \u00a7aReloaded successfully ! \u00a7e[Language: 简体中文]"] function minecraft:bedwars/setup scoreboard objectives remove level scoreboard objectives remove sneaking -scoreboard objectives add sneaking minecraft.custom:minecraft.sneak_time +scoreboard objectives add sneaking minecraft.custom:minecraft.sneak_time scoreboard objectives add level level scoreboard objectives remove zombie.villager.click scoreboard objectives add zombie.villager.click minecraft.custom:minecraft.talked_to_villager @@ -64,3 +68,4 @@ forceload add 0 0 0 0 scoreboard objectives add touzi.count dummy "还能刷新几次骰子" execute unless score hunger.state state matches 1.. run execute in hungerworld run forceload remove all + diff --git a/datapacks/map_main/data/minecraft/functions/skills.mcfunction b/datapacks/map_main/data/minecraft/functions/skills.mcfunction index b001598d..53c3f28d 100644 --- a/datapacks/map_main/data/minecraft/functions/skills.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/skills.mcfunction @@ -1,14 +1,18 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s actionbar ["\u00a7b\u00a7lSkills Actived"] playsound ui.button.click player @s ~ ~ ~ 1 2 1 -execute if entity @s[nbt={SelectedItem:{tag:{job:1}}}] run tag @s add skill.old -execute if entity @s[nbt={SelectedItem:{tag:{job:2}}}] run tag @s add skill.scientist -execute if entity @s[nbt={SelectedItem:{tag:{job:3}}}] run tag @s add skill.tp -execute if entity @s[nbt={SelectedItem:{tag:{job:4}}}] run tag @s add skill.creeper -execute if entity @s[nbt={SelectedItem:{tag:{job:7}}}] run tag @s add skill.7 -execute if entity @s[nbt={SelectedItem:{tag:{job:5}}}] run tag @s add skill.5 -execute if entity @s[nbt={SelectedItem:{tag:{job:6}}}] run tag @s add skill.6 -execute if entity @s[nbt={SelectedItem:{tag:{job:9}}}] run tag @s add skill.9 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:1}}}}] run tag @s add skill.old +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:2}}}}] run tag @s add skill.scientist +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:3}}}}] run tag @s add skill.tp +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:4}}}}] run tag @s add skill.creeper +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:7}}}}] run tag @s add skill.7 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:5}}}}] run tag @s add skill.5 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:6}}}}] run tag @s add skill.6 +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{job:9}}}}] run tag @s add skill.9 execute as @s[tag=skill.7] at @s run function gun/job_1/shoot execute as @s[tag=skill.6] at @s run function gun/job_2/shoot @@ -39,9 +43,10 @@ execute as @s[tag=skill.tp] run tp @s @e[limit=1,tag=pvp.tp,sort=random] # Creeper execute as @s[tag=skill.creeper] run execute as @s at @s positioned 0.0 0.0 0.0 run summon marker ^ ^ ^2 {Tags:["f.tmp"]} # execute if entity @s[team=job_pvp] anchored eyes run summon fireball ^ ^ ^1 {Tags:["f.new"],ExplosionPower:1} -execute as @s[tag=skill.creeper] run execute anchored eyes run summon minecraft:spectral_arrow ^ ^ ^1 {Glowing:1b,damage:1d,pickup:0b,Passengers:[{id:"minecraft:creeper",CustomName:'["CREEPER"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:true,ignited:true,ExplosionRadius:2b,fuse:30s}],Tags:["f.new"]} +execute as @s[tag=skill.creeper] run execute anchored eyes run summon minecraft:spectral_arrow ^ ^ ^1 {Glowing:1b,damage:1d,pickup:0b,Passengers:[{id:"minecraft:creeper",CustomName:'["CREEPER"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Glowing:1b,powered:"true",ignited:"true",ExplosionRadius:2b,fuse:30s}],Tags:["f.new"]} execute as @s[tag=skill.creeper] run execute as @e[tag=f.new] run data modify entity @s Owner set from entity @p[tag=skill.creeper] UUID # execute as @e[tag=f.new] run data modify entity @s Motion set from entity @e[limit=1,sort=nearest,tag=f.tmp] Pos + execute as @s[tag=skill.creeper] run execute as @e[tag=f.new] run data modify entity @s Motion set from entity @e[limit=1,tag=f.tmp] Pos tag @e[tag=f.new] remove f.new # kill @e[type=snowball,distance=0..5,sort=nearest] @@ -72,3 +77,4 @@ tag @s remove skill.tp tag @s remove skill.creeper tag @s remove gun.1 tag @s remove skill.9 + diff --git a/datapacks/map_main/data/minecraft/functions/skills/haerkala.mcfunction b/datapacks/map_main/data/minecraft/functions/skills/haerkala.mcfunction index 7d98cf56..42651394 100644 --- a/datapacks/map_main/data/minecraft/functions/skills/haerkala.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/skills/haerkala.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function lobby/getrandom1 # 1~11 @@ -30,4 +34,4 @@ execute if score random board matches 11.. run tellraw @s ["\u00a7a\u00a7l你喝 title @s actionbar ["\u00a7f你饮用了\u00a76\u00a7l哈尔克拉特制营养酒"] stopsound @s * entity.ender_dragon.flap -playsound minecraft:entity.wandering_trader.drink_potion player @s ~ ~ ~ 1 1 1 \ No newline at end of file +playsound minecraft:entity.wandering_trader.drink_potion player @s ~ ~ ~ 1 1 1 diff --git a/datapacks/map_main/data/minecraft/functions/snow/died.mcfunction b/datapacks/map_main/data/minecraft/functions/snow/died.mcfunction index 38a85139..bf4b9ae4 100644 --- a/datapacks/map_main/data/minecraft/functions/snow/died.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/snow/died.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c对不起，你死了。\n\u00a7a请等待下一局游戏！"] \ No newline at end of file +tellraw @s ["\u00a7c对不起，你死了。\n\u00a7a请等待下一局游戏！"] diff --git a/datapacks/map_main/data/minecraft/functions/snow/notenough.mcfunction b/datapacks/map_main/data/minecraft/functions/snow/notenough.mcfunction index 3301ba10..dbdb165b 100644 --- a/datapacks/map_main/data/minecraft/functions/snow/notenough.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/snow/notenough.mcfunction @@ -1 +1,5 @@ -tellraw @s ["\u00a7c对不起，当前玩家数小于2 ！"] \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +tellraw @s ["\u00a7c对不起，当前玩家数小于2 ！"] diff --git a/datapacks/map_main/data/minecraft/functions/snow/over.mcfunction b/datapacks/map_main/data/minecraft/functions/snow/over.mcfunction index a1d6bf44..fadd1e6b 100644 --- a/datapacks/map_main/data/minecraft/functions/snow/over.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/snow/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set snow.state state 0 tellraw @a ["\u00a7f[SNOW] \u00a7c游戏结束 ! \u00a7a获胜者: ",{"selector":"@a[team=play.snow,gamemode=adventure]"}] title @a[team=play.snow,gamemode=adventure] title ["\u00a76You won!"] @@ -10,3 +14,4 @@ gamemode adventure @a[team=wait.snow] execute as @a[team=wait.snow] run function snow/join kill @e[type=marker,tag=snow.disa] function minecraft:snow/reset + diff --git a/datapacks/map_main/data/minecraft/functions/snow/spec.mcfunction b/datapacks/map_main/data/minecraft/functions/snow/spec.mcfunction index b6294e2a..a98ec1b3 100644 --- a/datapacks/map_main/data/minecraft/functions/snow/spec.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/snow/spec.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s -tellraw @s ["\u00a7c抱歉！游戏已经开始了！\n\u00a7a请等待下一局游戏！"] \ No newline at end of file +tellraw @s ["\u00a7c抱歉！游戏已经开始了！\n\u00a7a请等待下一局游戏！"] diff --git a/datapacks/map_main/data/minecraft/functions/snowtofire.mcfunction b/datapacks/map_main/data/minecraft/functions/snowtofire.mcfunction index 4c021ed5..c5efe0f7 100644 --- a/datapacks/map_main/data/minecraft/functions/snowtofire.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/snowtofire.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # data modify entity @e[type=fireball,limit=1,sort=nearest] Motion set from entity @s Motion # data modify entity @e[type=fireball,limit=1,sort=nearest] power set from entity @s Motion @@ -12,4 +16,4 @@ tag @e[tag=f.new] remove f.new kill @e[type=snowball,distance=0..5,sort=nearest] scoreboard players reset @s fireball kill @e[tag=f.tmp] -# say 1 \ No newline at end of file +# say 1 diff --git a/datapacks/map_main/data/minecraft/functions/test/getegg.mcfunction b/datapacks/map_main/data/minecraft/functions/test/getegg.mcfunction index 6830116a..cccad139 100644 --- a/datapacks/map_main/data/minecraft/functions/test/getegg.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/test/getegg.mcfunction @@ -1 +1,5 @@ -give @s minecraft:sheep_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["getnbt"]},display:{Name:'"\\u00a7aGet Block NBT"'}} 1 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s minecraft:sheep_spawn_egg[entity_data={id:"minecraft:marker",Tags:["getnbt"]},custom_name='"\\u00a7aGet Block NBT"'] diff --git a/datapacks/map_main/data/minecraft/functions/test/shownbt.mcfunction b/datapacks/map_main/data/minecraft/functions/test/shownbt.mcfunction index 812c3007..43a1e5f0 100644 --- a/datapacks/map_main/data/minecraft/functions/test/shownbt.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/test/shownbt.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute store result score tmp.x tick run data get entity @s Pos[0] execute store result score tmp.y tick run data get entity @s Pos[1] execute store result score tmp.z tick run data get entity @s Pos[2] tellraw @a [{"score":{"name": "tmp.x","objective": "tick"},"color":"aqua"}," ",{"score":{"name": "tmp.x","objective": "tick"},"color":"aqua"}," ",{"score":{"name": "tmp.x","objective": "tick"},"color":"aqua"}] kill @s + diff --git a/datapacks/map_main/data/minecraft/functions/tsecond.mcfunction b/datapacks/map_main/data/minecraft/functions/tsecond.mcfunction index 3999f032..d23ccf27 100644 --- a/datapacks/map_main/data/minecraft/functions/tsecond.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/tsecond.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tick2 tick 0 effect give @a regeneration 2 1 true -give @a[team=play.live.killer,gamemode=adventure] arrow 1 +give @a[team=play.live.killer,gamemode=adventure] arrow -# execute positioned 122 120 59 unless entity @e[tag=lobby.car,type=minecart,distance=0..10] run execute if block 123 121 59 stone_button[powered=true] run setblock 121 120 60 minecraft:air \ No newline at end of file +# execute positioned 122 120 59 unless entity @e[tag=lobby.car,type=minecart,distance=0..10] run execute if block 123 121 59 stone_button[powered=true] run setblock 121 120 60 minecraft:air diff --git a/datapacks/map_main/data/minecraft/functions/ttsecond.mcfunction b/datapacks/map_main/data/minecraft/functions/ttsecond.mcfunction index bbeb29c1..7f99345d 100644 --- a/datapacks/map_main/data/minecraft/functions/ttsecond.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/ttsecond.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tick3 tick 0 -give @a[team=play.live.runner,gamemode=adventure] arrow 1 +give @a[team=play.live.runner,gamemode=adventure] arrow # give arrow 1 ## 210 116 30 拉杆2 - 烟花 execute if block 210 116 22 lever[powered=true] run function lobby/firework @@ -11,3 +15,4 @@ execute if score killer.state state matches 1.. run function minecraft:killereve execute if score tnt.state state matches 1.. run function minecraft:tntwars/longsecond # item replace entity @a[team=hide.play.ani] inventory.26 with arrow + diff --git a/datapacks/map_main/data/minecraft/functions/twolf/rejoin.mcfunction b/datapacks/map_main/data/minecraft/functions/twolf/rejoin.mcfunction index 203db0df..0f9db584 100644 --- a/datapacks/map_main/data/minecraft/functions/twolf/rejoin.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/twolf/rejoin.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s leave -function twolf/join \ No newline at end of file +function twolf/join diff --git a/datapacks/map_main/data/minecraft/functions/version/gamev.mcfunction b/datapacks/map_main/data/minecraft/functions/version/gamev.mcfunction index 5ca11644..34fafac9 100644 --- a/datapacks/map_main/data/minecraft/functions/version/gamev.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/version/gamev.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## say §a§l当前地图兼容 Minecraft 游戏版本：§b§l1.20.4 + diff --git a/datapacks/map_main/data/minecraft/functions/version/version.mcfunction b/datapacks/map_main/data/minecraft/functions/version/version.mcfunction index 7dfaed76..07e23cd9 100644 --- a/datapacks/map_main/data/minecraft/functions/version/version.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/version/version.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7aMap Version: \u00a7b\u00a7l2024.04.05 (09:54:09)"] + diff --git a/datapacks/map_main/data/minecraft/functions/version/version1.mcfunction b/datapacks/map_main/data/minecraft/functions/version/version1.mcfunction index 255aafd9..38a67017 100644 --- a/datapacks/map_main/data/minecraft/functions/version/version1.mcfunction +++ b/datapacks/map_main/data/minecraft/functions/version/version1.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## say §aMap Version: §b§l2024.04.05 (09:54:09) + diff --git a/datapacks/map_main/data/minecraft/loot_tables/blocks/shulker_box.json b/datapacks/map_main/data/minecraft/loot_tables/blocks/shulker_box.json index 6bd49db1..88fca178 100644 --- a/datapacks/map_main/data/minecraft/loot_tables/blocks/shulker_box.json +++ b/datapacks/map_main/data/minecraft/loot_tables/blocks/shulker_box.json @@ -69,4 +69,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/tags/blocks/gunblock.json b/datapacks/map_main/data/minecraft/tags/blocks/gunblock.json index dcfbf6da..d0fd754f 100644 --- a/datapacks/map_main/data/minecraft/tags/blocks/gunblock.json +++ b/datapacks/map_main/data/minecraft/tags/blocks/gunblock.json @@ -66,4 +66,4 @@ "sea_lantern", "prismarine" ] -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/tags/entity_types/mobs.json b/datapacks/map_main/data/minecraft/tags/entity_types/mobs.json index ca2879f7..e009e690 100644 --- a/datapacks/map_main/data/minecraft/tags/entity_types/mobs.json +++ b/datapacks/map_main/data/minecraft/tags/entity_types/mobs.json @@ -24,4 +24,4 @@ "minecraft:piglin_brute", "minecraft:wither_skeleton" ] -} \ No newline at end of file +} diff --git a/datapacks/map_main/data/minecraft/tags/functions/load.json b/datapacks/map_main/data/minecraft/tags/functions/load.json index 4e7d3584..342b612d 100644 --- a/datapacks/map_main/data/minecraft/tags/functions/load.json +++ b/datapacks/map_main/data/minecraft/tags/functions/load.json @@ -3,3 +3,4 @@ "minecraft:setup" ] } + diff --git a/datapacks/map_main/data/minecraft/tags/functions/tick.json b/datapacks/map_main/data/minecraft/tags/functions/tick.json index fab5e5e0..41129e15 100644 --- a/datapacks/map_main/data/minecraft/tags/functions/tick.json +++ b/datapacks/map_main/data/minecraft/tags/functions/tick.json @@ -6,3 +6,4 @@ "minecraft:snow/tick" ] } + diff --git a/datapacks/map_rpg/data/rpg/functions/players/join.mcfunction b/datapacks/map_rpg/data/rpg/functions/players/join.mcfunction index 543a3e6d..cd75f910 100644 --- a/datapacks/map_rpg/data/rpg/functions/players/join.mcfunction +++ b/datapacks/map_rpg/data/rpg/functions/players/join.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7c 此游戏需要 MiniGames RPG 附加包，但服务器尚未安装。\n \u00a76附加包介绍：",{"text":"[点击打开 GitLab]","color":"aqua","bold": true,"clickEvent": {"action":"open_url","value": "https://gitlab.com/wifi-left/map-minigames-rpg/-/blob/master/README.md"}},"\n"] -playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 \ No newline at end of file +playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 diff --git a/datapacks/map_surgame/data/surgame/advancements/player_was_killed.json b/datapacks/map_surgame/data/surgame/advancements/player_was_killed.json index a31033c7..157bb168 100644 --- a/datapacks/map_surgame/data/surgame/advancements/player_was_killed.json +++ b/datapacks/map_surgame/data/surgame/advancements/player_was_killed.json @@ -17,4 +17,4 @@ "rewards": { "function": "surgame:lootitem" } -} \ No newline at end of file +} diff --git a/datapacks/map_surgame/data/surgame/advancements/testfordeath.json b/datapacks/map_surgame/data/surgame/advancements/testfordeath.json index 91db278d..b8b6e7c8 100644 --- a/datapacks/map_surgame/data/surgame/advancements/testfordeath.json +++ b/datapacks/map_surgame/data/surgame/advancements/testfordeath.json @@ -18,4 +18,4 @@ "rewards": { "function": "surgame:ismedied" } -} \ No newline at end of file +} diff --git a/datapacks/map_surgame/data/surgame/functions/changemode.mcfunction b/datapacks/map_surgame/data/surgame/functions/changemode.mcfunction index d038f509..6f3fa9fb 100644 --- a/datapacks/map_surgame/data/surgame/functions/changemode.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/changemode.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s scoreboard players add sur.zommode state 1 execute if score sur.zommode state matches 2.. run scoreboard players set sur.zommode state 0 execute if score sur.zommode state matches 1 run data modify block -43 182 -116 front_text.messages[1] set value '"\\u00a7c[感染模式]"' -execute if score sur.zommode state matches 0 run data modify block -43 182 -116 front_text.messages[1] set value '"\\u00a7a[竞赛模式]"' \ No newline at end of file +execute if score sur.zommode state matches 0 run data modify block -43 182 -116 front_text.messages[1] set value '"\\u00a7a[竞赛模式]"' diff --git a/datapacks/map_surgame/data/surgame/functions/died.mcfunction b/datapacks/map_surgame/data/surgame/functions/died.mcfunction index c67e3455..b0ab165f 100644 --- a/datapacks/map_surgame/data/surgame/functions/died.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/died.mcfunction @@ -1,6 +1,10 @@ -# execute if score sur.zommode state matches 1 run +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute if score sur.zommode state matches 1 run execute if score sur.zommode state matches 1 as @s[tag=!sur.killedbyzom,team=!play.sur.zom] run function surgame:out execute if score sur.zommode state matches 1 as @s[team=play.sur.zom] run function surgame:joinzom execute if score sur.zommode state matches 1 as @s[tag=sur.killedbyzom] run function surgame:joinzom execute if score sur.zommode state matches 0 run function surgame:out -# execute if score sur.zommode state matches 0 run tellraw @s ["\n\u00a7c你淘汰了。\n"] \ No newline at end of file +# execute if score sur.zommode state matches 0 run tellraw @s ["\n\u00a7c你淘汰了。\n"] diff --git a/datapacks/map_surgame/data/surgame/functions/enablepvp.mcfunction b/datapacks/map_surgame/data/surgame/functions/enablepvp.mcfunction index 5fb45268..5ebaaaa2 100644 --- a/datapacks/map_surgame/data/surgame/functions/enablepvp.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/enablepvp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score sur.zommode state matches 0 run team modify play.sur friendlyFire true execute if score sur.zommode state matches 0 run tellraw @a[team=play.sur] ["\n\u00a7c PVP 已被启用。\n"] execute if score sur.zommode state matches 0 run tellraw @a[team=play.sur.zom] ["\n\u00a7c PVP 已被启用。\n"] @@ -5,4 +9,4 @@ execute if score sur.zommode state matches 1 run tellraw @a[team=play.sur] ["\n\ execute if score sur.zommode state matches 1 run tellraw @a[team=play.sur.zom] ["\n\u00a7c 一名玩家已被感染。\n"] execute if score sur.zommode state matches 1 unless entity @a[team=play.sur.zom] run execute as @a[team=play.sur,limit=1,sort=random] run function surgame:joinzom execute as @a[team=play.sur] at @s run playsound block.anvil.destroy player @a ~ ~ ~ 10 1 1 -schedule clear surgame:enablepvp \ No newline at end of file +schedule clear surgame:enablepvp diff --git a/datapacks/map_surgame/data/surgame/functions/ismedied.mcfunction b/datapacks/map_surgame/data/surgame/functions/ismedied.mcfunction index ec8e5b0e..e4f6e5b2 100644 --- a/datapacks/map_surgame/data/surgame/functions/ismedied.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/ismedied.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## advancement revoke @s only surgame:testfordeath -tag @s[team=play.sur] add sur.killedbyzom \ No newline at end of file +tag @s[team=play.sur] add sur.killedbyzom diff --git a/datapacks/map_surgame/data/surgame/functions/join.mcfunction b/datapacks/map_surgame/data/surgame/functions/join.mcfunction index dd578493..7ac07690 100644 --- a/datapacks/map_surgame/data/surgame/functions/join.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in minecraft:airworld run tp @s -40 182 -116 0 0 execute as @s at @s run playsound entity.player.levelup player @s xp set @s 0 levels @@ -14,4 +18,4 @@ execute if score sur.state state matches 1 run function surgame:spec execute if score sur.state state matches 2 run function surgame:joinlist execute if score sur.state state matches 3 run function surgame:spec tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_surgame/data/surgame/functions/joinlist.mcfunction b/datapacks/map_surgame/data/surgame/functions/joinlist.mcfunction index 1b1a71dd..a0d8be07 100644 --- a/datapacks/map_surgame/data/surgame/functions/joinlist.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/joinlist.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\n\u00a7e 游戏正在进行重置，您已加入等待队列。\n"] title @s times 0 200 0 title @s title ["\u00a7e重置地图中..."] title @s subtitle ["\u00a7a等待响应..."] -gamemode spectator @s \ No newline at end of file +gamemode spectator @s diff --git a/datapacks/map_surgame/data/surgame/functions/joinzom.mcfunction b/datapacks/map_surgame/data/surgame/functions/joinzom.mcfunction index 044ea621..8e5b674b 100644 --- a/datapacks/map_surgame/data/surgame/functions/joinzom.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/joinzom.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7c你已被感染。你的目标是：感染所有玩家。"] -gamemode adventure +gamemode adventure execute in airworld run tp @s -68 -51 9 team join play.sur.zom @s tag @s remove sur.killedbyzom tellraw @a[team=play.sur] ["\u00a7f\u00a7l感染 ＞ ",{"selector":"@s"},"\u00a76 被感染了。"] tellraw @a[team=wait.sur] ["\u00a7f\u00a7l感染 ＞ ",{"selector":"@s"},"\u00a76 被感染了。"] tellraw @a[team=play.sur.zom] ["\u00a7f\u00a7l感染 ＞ ",{"selector":"@s"},"\u00a76 被感染了。"] + diff --git a/datapacks/map_surgame/data/surgame/functions/lootitem.mcfunction b/datapacks/map_surgame/data/surgame/functions/lootitem.mcfunction index e805122a..9da41c9b 100644 --- a/datapacks/map_surgame/data/surgame/functions/lootitem.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/lootitem.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # say @a[scores={bw.kill=1..},team=sur] # scoreboard players reset @a[scores={bw.kill=1..},team=sur] bw.kill advancement revoke @s only surgame:player_was_killed @@ -7,13 +11,13 @@ forceload add -46 3 -46 3 data modify block -46 -20 3 front_text.messages[0] set value '[{"selector":"@a[tag=sur.sel]","color":"aqua"},"\\u00a7a 的背包"]' forceload remove -46 3 -46 3 team join play.sur @s -summon item ~ ~ ~ {Item:{id:"minecraft:bundle",Count:1b,tag:{surItem:1b}},Tags:["sur.loot.new"],CustomNameVisible:1b} -data modify entity @e[limit=1,type=item,tag=sur.loot.new] Item.tag.Items set from entity @s Inventory -data modify entity @e[limit=1,type=item,tag=sur.loot.new] Item.tag.display.Name set from block -46 -20 3 front_text.messages[0] +summon item ~ ~ ~ {Item:{id:"minecraft:bundle",count:1,components:{"minecraft:custom_data":{surItem:1b}}},Tags:["sur.loot.new"],CustomNameVisible:1b} +data modify entity @e[limit=1,type=item,tag=sur.loot.new] Item.components."minecraft:bundle_contents" set from entity @s Inventory +data modify entity @e[limit=1,type=item,tag=sur.loot.new] Item.components."minecraft:custom_name" set from block -46 -20 3 front_text.messages[0] data modify entity @e[limit=1,type=item,tag=sur.loot.new] CustomName set from block -46 -20 3 front_text.messages[0] tag @e[tag=sur.loot.new] remove sur.loot.new # execute as @a[team=sur] if predicate minecraft:sur/killed scoreboard players reset @s die tag @s remove sur.sel clear @s -tellraw @s ["\u00a7c你的物品已经掉落。"] \ No newline at end of file +tellraw @s ["\u00a7c你的物品已经掉落。"] diff --git a/datapacks/map_surgame/data/surgame/functions/out.mcfunction b/datapacks/map_surgame/data/surgame/functions/out.mcfunction index 0160dc94..b7c92254 100644 --- a/datapacks/map_surgame/data/surgame/functions/out.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/out.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\n\u00a7c你淘汰了。\n"] tellraw @a[team=play.sur] ["\u00a7b\u00a7l玩家淘汰 ＞ ",{"selector":"@s"},"\u00a7c淘汰了。"] tellraw @a[team=play.sur.zom] ["\u00a7b\u00a7l玩家淘汰 ＞ ",{"selector":"@s"},"\u00a7c淘汰了。"] -tellraw @a[team=wait.sur] ["\u00a7b\u00a7l玩家淘汰 ＞ ",{"selector":"@s"},"\u00a7c淘汰了。"] \ No newline at end of file +tellraw @a[team=wait.sur] ["\u00a7b\u00a7l玩家淘汰 ＞ ",{"selector":"@s"},"\u00a7c淘汰了。"] diff --git a/datapacks/map_surgame/data/surgame/functions/over/normal.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/normal.mcfunction index cc7e0e90..8e88f3d9 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/normal.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/normal.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a79生存游戏 ＞ \u00a7c游戏结束。\n\u00a76获胜者：",{"selector":"@a[gamemode=survival,team=play.sur]"},""] title @a[team=play.sur] title ["\u00a7cGame Over"] title @a[team=play.sur.zom] title ["\u00a7cGame Over"] title @a[team=wait.sur] title ["\u00a7cGame Over"] title @a[gamemode=survival,team=play.sur] title ["\u00a76You won!"] -function surgame:over/over \ No newline at end of file +function surgame:over/over diff --git a/datapacks/map_surgame/data/surgame/functions/over/over.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/over.mcfunction index e3f2314f..2da08613 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/over.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/over.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set sur.state state 3 tag @a[team=play.sur] add surback tag @a[team=wait.sur] add surback @@ -10,4 +14,4 @@ bossbar set surgame:time name ["\u00a79生存游戏 \u00a7aSurvival Game"] bossbar set surgame:time max 1 bossbar set surgame:time value 1 bossbar set surgame:time players @a[team=wait.sur] -tag @a remove sur.killedbyzom \ No newline at end of file +tag @a remove sur.killedbyzom diff --git a/datapacks/map_surgame/data/surgame/functions/over/playerwin.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/playerwin.mcfunction index ab4d0fe2..73774b82 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/playerwin.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/playerwin.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a79生存游戏 ＞ \u00a7c游戏结束。\n\u00a76获胜者：幸存者队 (",{"selector":"@a[gamemode=survival,team=play.sur]"},")"] title @a[team=play.sur] title ["\u00a7cGame Over"] title @a[team=play.sur.zom] title ["\u00a7cGame Over"] title @a[team=wait.sur] title ["\u00a7cGame Over"] title @a[gamemode=survival,team=play.sur] title ["\u00a76You won!"] -function surgame:over/over \ No newline at end of file +function surgame:over/over diff --git a/datapacks/map_surgame/data/surgame/functions/over/special.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/special.mcfunction index 6c2a9304..1b1a65e5 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/special.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/special.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\n\u00a79生存游戏 ＞ \u00a7c游戏结束。\n\u00a76获胜者：",{"selector":"@a[gamemode=survival,team=play.sur]"},""] title @a[team=play.sur] title ["\u00a7cGame Over"] title @a[team=play.sur.zom] title ["\u00a7cGame Over"] title @a[team=wait.sur] title ["\u00a7cGame Over"] -function surgame:over/over \ No newline at end of file +function surgame:over/over diff --git a/datapacks/map_surgame/data/surgame/functions/over/tp.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/tp.mcfunction index eaecb5fe..8602b745 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/tp.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/tp.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[team=play.sur] add surback tag @a[team=wait.sur] add surback tag @a[team=play.sur.zom] add surback @@ -9,3 +13,4 @@ tag @a remove surback schedule clear surgame:enablepvp schedule clear surgame:reset/process schedule clear surgame:reset/start + diff --git a/datapacks/map_surgame/data/surgame/functions/over/zomwin.mcfunction b/datapacks/map_surgame/data/surgame/functions/over/zomwin.mcfunction index ae4e1ace..2daf46b8 100644 --- a/datapacks/map_surgame/data/surgame/functions/over/zomwin.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/over/zomwin.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a ["\u00a79生存游戏 ＞ \u00a7c游戏结束。\n\u00a76获胜者：僵尸队 (",{"selector":"@a[team=play.sur.zom]"},")"] title @a[team=play.sur] title ["\u00a7cGame Over"] title @a[team=play.sur.zom] title ["\u00a7cGame Over"] title @a[team=wait.sur] title ["\u00a7cGame Over"] title @a[team=play.sur.zom] title ["\u00a76You won!"] -function surgame:over/over \ No newline at end of file +function surgame:over/over diff --git a/datapacks/map_surgame/data/surgame/functions/reset/end.mcfunction b/datapacks/map_surgame/data/surgame/functions/reset/end.mcfunction index 2946c3ea..f40fe3b6 100644 --- a/datapacks/map_surgame/data/surgame/functions/reset/end.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/reset/end.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=wait.sur] ["\u00a7a重置地图完毕！"] title @a[team=wait.sur] reset title @a[team=wait.sur] title ["\u00a7b地图重置完毕"] @@ -6,3 +10,4 @@ scoreboard players set sur.reset board -64 execute in airworld run forceload remove -104 -142 0 1 execute in airworld run forceload remove -103 28 1 171 function surgame:startafterreset + diff --git a/datapacks/map_surgame/data/surgame/functions/reset/process.mcfunction b/datapacks/map_surgame/data/surgame/functions/reset/process.mcfunction index 269a730e..fc302b0e 100644 --- a/datapacks/map_surgame/data/surgame/functions/reset/process.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/reset/process.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in airworld if score sur.reset board matches -64 run clone -104 -64 1 0 -64 -142 -103 -64 28 execute in airworld if score sur.reset board matches -63 run clone -104 -63 1 0 -63 -142 -103 -63 28 execute in airworld if score sur.reset board matches -62 run clone -104 -62 1 0 -62 -142 -103 -62 28 @@ -247,4 +251,4 @@ scoreboard players add sur.reset board 1 title @a[team=wait.sur] title ["\u00a7e正在重置地图中..."] title @a[team=wait.sur] subtitle ["\u00a7b进度：",{"score":{"objective": "board","name": "sur.reset"},"color":"green"},"\u00a7b / \u00a7c180"] execute if score sur.reset board matches ..180 run schedule function surgame:reset/process 1t -execute if score sur.reset board matches 181.. run function surgame:reset/end \ No newline at end of file +execute if score sur.reset board matches 181.. run function surgame:reset/end diff --git a/datapacks/map_surgame/data/surgame/functions/reset/start.mcfunction b/datapacks/map_surgame/data/surgame/functions/reset/start.mcfunction index 63f7f6cd..34aa781b 100644 --- a/datapacks/map_surgame/data/surgame/functions/reset/start.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/reset/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set sur.reset board -64 tellraw @a[team=wait.sur] ["\u00a7e正在开始重置地图"] title @a[team=wait.sur] times 0 200 0 @@ -11,3 +15,4 @@ schedule clear surgame:reset/start team modify play.sur friendlyFire false bossbar set surgame:time name ["\u00a79生存游戏 \u00a7aSurvival Game \u00a76- \u00a7e重置地图中..."] function surgame:reset/process + diff --git a/datapacks/map_surgame/data/surgame/functions/second.mcfunction b/datapacks/map_surgame/data/surgame/functions/second.mcfunction index 7029ca5e..cf26619a 100644 --- a/datapacks/map_surgame/data/surgame/functions/second.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/second.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in airworld run spawnpoint @a[team=play.sur] -46 -26 3 execute in airworld run spawnpoint @a[team=play.sur.zom] -46 -26 3 @@ -35,3 +39,4 @@ effect give @e[team=play.sur.zom] jump_boost 2 1 true effect give @e[team=play.sur.zom] minecraft:strength 3 2 true effect give @e[team=play.sur.zom] minecraft:haste 3 0 true effect give @e[team=play.sur] minecraft:haste 3 1 true + diff --git a/datapacks/map_surgame/data/surgame/functions/spec.mcfunction b/datapacks/map_surgame/data/surgame/functions/spec.mcfunction index ec9a55ca..40866a44 100644 --- a/datapacks/map_surgame/data/surgame/functions/spec.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/spec.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## team join play.sur @s gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n\u00a7c请等待下一局游戏，或者使用\u00a76/trigger hub\u00a7c返回大厅。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n\u00a7c请等待下一局游戏，或者使用\u00a76/trigger hub\u00a7c返回大厅。"] diff --git a/datapacks/map_surgame/data/surgame/functions/start.mcfunction b/datapacks/map_surgame/data/surgame/functions/start.mcfunction index 17236a21..b2a4d16d 100644 --- a/datapacks/map_surgame/data/surgame/functions/start.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function surgame:reset/start gamemode spectator @a[team=wait.sur] @@ -9,3 +13,4 @@ tag @a remove sur.killedbyzom # 1: 游戏中 # 2: 重置中 # 3: 结束中 + diff --git a/datapacks/map_surgame/data/surgame/functions/startafterreset.mcfunction b/datapacks/map_surgame/data/surgame/functions/startafterreset.mcfunction index 1e627b67..6abdb560 100644 --- a/datapacks/map_surgame/data/surgame/functions/startafterreset.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/startafterreset.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set sur.state state 1 execute in airworld run kill @e[type=item,distance=0..] execute as @a[team=wait.sur] run tp @s @e[limit=1,sort=random,tag=sur.tp,type=marker] @@ -7,7 +11,7 @@ schedule function surgame:enablepvp 180s team modify play.sur friendlyFire false gamemode survival @a[team=play.sur,tag=!GOABLE.SPEC] gamemode spectator @a[team=play.sur,tag=GOABLE.SPEC] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=play.sur,gamemode=survival] run scoreboard players add wait.player tick 1 scoreboard players operation sur.maxtime board = wait.player tick scoreboard players set 90 board 90 @@ -18,3 +22,4 @@ execute if score sur.maxtime board matches 2400.. run scoreboard players set sur execute store result bossbar surgame:time max run scoreboard players get sur.maxtime board scoreboard players set sur.time board 0 execute if score sur.zommode state matches 0 run bossbar set surgame:time max 180 + diff --git a/datapacks/map_surgame/data/surgame/functions/testfor/normal.mcfunction b/datapacks/map_surgame/data/surgame/functions/testfor/normal.mcfunction index 6d33e81c..020c5ed6 100644 --- a/datapacks/map_surgame/data/surgame/functions/testfor/normal.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/testfor/normal.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set sur.player tick 0 execute as @a[team=play.sur,gamemode=survival] run scoreboard players add sur.player tick 1 -execute if score sur.player tick matches ..1 run function surgame:over/normal \ No newline at end of file +execute if score sur.player tick matches ..1 run function surgame:over/normal diff --git a/datapacks/map_surgame/data/surgame/functions/testfor/zombie.mcfunction b/datapacks/map_surgame/data/surgame/functions/testfor/zombie.mcfunction index 5f3fcd17..ce253002 100644 --- a/datapacks/map_surgame/data/surgame/functions/testfor/zombie.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/testfor/zombie.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score sur.time board >= sur.maxtime board run function surgame:over/playerwin -scoreboard players set sur.player tick 0 +scoreboard players set sur.player tick 0 execute as @a[team=play.sur,gamemode=survival] run scoreboard players add sur.player tick 1 execute if score sur.player tick matches ..0 run function surgame:over/zomwin execute as @a[team=play.sur.zom] run scoreboard players add sur.player tick 1 execute if score sur.player tick matches ..1 run function surgame:over/special + diff --git a/datapacks/map_surgame/data/surgame/functions/tick.mcfunction b/datapacks/map_surgame/data/surgame/functions/tick.mcfunction index 542bfcf5..b603acc0 100644 --- a/datapacks/map_surgame/data/surgame/functions/tick.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/tick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tag @a[nbt={Dimension:"minecraft:the_nether"},gamemode=!creative,team=play.sur] add sur.needtp tag @a[nbt={Dimension:"minecraft:the_nether"},gamemode=!creative,team=play.sur.zom] add sur.needtp @@ -7,4 +11,4 @@ tellraw @a[tag=sur.needtp] ["\n\u00a7c 进入地狱是禁止的事情！\n"] execute as @a[tag=sur.needtp] in airworld run tp @s @e[limit=1,sort=random,tag=sur.tp,type=marker] tag @a remove sur.needtp -function compasstrack:tick \ No newline at end of file +function compasstrack:tick diff --git a/datapacks/map_surgame/data/surgame/functions/trystart.mcfunction b/datapacks/map_surgame/data/surgame/functions/trystart.mcfunction index e8b676f3..6a3ffe26 100644 --- a/datapacks/map_surgame/data/surgame/functions/trystart.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/trystart.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.sur,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score sur.state state matches 1 run function surgame:spec @@ -8,4 +12,4 @@ execute if score sur.state state matches 3 run function surgame:spec execute unless score sur.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score sur.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score sur.state state matches 1.. if score wait.player tick matches 2.. run function surgame:start \ No newline at end of file +execute unless score sur.state state matches 1.. if score wait.player tick matches 2.. run function surgame:start diff --git a/datapacks/map_surgame/data/surgame/functions/zomstart.mcfunction b/datapacks/map_surgame/data/surgame/functions/zomstart.mcfunction index a10d132d..54cf2719 100644 --- a/datapacks/map_surgame/data/surgame/functions/zomstart.mcfunction +++ b/datapacks/map_surgame/data/surgame/functions/zomstart.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @s @e[limit=1,sort=random,tag=sur.tp,type=marker] tellraw @s ["\n\u00a7e你获得了更多物资。\n"] gamemode survival @s -give @s stone_sword 1 -give @s stone_pickaxe 1 -give @s stone_axe 1 -give @s stone_shovel 1 -give @s zombie_spawn_egg 2 -give @s skeleton_spawn_egg 2 +give @s stone_sword +give @s stone_pickaxe +give @s stone_axe +give @s stone_shovel +give @s zombie_spawn_egg +give @s skeleton_spawn_egg execute unless score sur.state state matches 1.. run scoreboard players set @s hub 1 execute unless score sur.state state matches 1.. run tellraw @s ["\n\u00a7c游戏出错。你已返回大厅。\n"] -item replace entity @s armor.head with minecraft:zombie_head{Enchantments:[{id:"binding_curse",lvl:1}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"noName",Amount:20d,Operation:0,UUID:[I;1041,1467,7334,9500],Slot:head},{AttributeName:"generic.armor_toughness",Name:"noName",Amount:4d,Operation:0,UUID:[I;2169,7724,3478,3358],Slot:head}]} \ No newline at end of file +item replace entity @s armor.head with minecraft:zombie_head[enchantments={levels:{"minecraft:binding_curse":1}},attribute_modifiers={modifiers:[{type:"generic.armor",slot:head,uuid:[1041,1467,7334,9500],name:"noName",amount:20d,operation:"add_value"},{type:"generic.armor_toughness",slot:head,uuid:[2169,7724,3478,3358],name:"noName",amount:4d,operation:"add_value"}]}] diff --git a/datapacks/map_woolwars/data/woolwar/functions/died.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/died.mcfunction index db0cdb36..aef33e6e 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/died.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/died.mcfunction @@ -1,5 +1,9 @@ -# execute if score sur.zommode state matches 1 run +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +# execute if score sur.zommode state matches 1 run execute if score sur.zommode state matches 1 as @s[tag=!sur.killedbyzom] run function surgame:out execute if score sur.zommode state matches 1 as @s[tag=sur.killedbyzom] run function surgame:joinzom execute if score sur.zommode state matches 0 run function surgame:out -# execute if score sur.zommode state matches 0 run tellraw @s ["\n\u00a7c你淘汰了。\n"] \ No newline at end of file +# execute if score sur.zommode state matches 0 run tellraw @s ["\n\u00a7c你淘汰了。\n"] diff --git a/datapacks/map_woolwars/data/woolwar/functions/join.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/join.mcfunction index 74f633d3..b38e1926 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/join.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/join.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute in minecraft:airworld run tp @s -40 182 -116 0 0 execute as @s at @s run playsound entity.player.levelup player @s xp set @s 0 levels @@ -14,4 +18,4 @@ execute if score sur.state state matches 1 run function surgame:spec execute if score sur.state state matches 2 run function surgame:joinlist execute if score sur.state state matches 3 run function surgame:spec tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模式\u00a77。\n \u00a77由于你进入游戏后会变为旁观模式，请使用 \u00a76/trigger hub\u00a77 返回大厅。\n ",{"text":"\u00a7a\u00a7l点击此处，或者使用 \u00a76\u00a7l/trigger spec set 3 \u00a7a\u00a7l退出全局旁观者模式","bold":true,"clickEvent": {"action": "run_command","value": "/trigger spec set 3"},"hoverEvent": {"action": "show_text","contents": "\u00a7c点击此处退出全局旁观者模式"}},"\n"] -execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator \ No newline at end of file +execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator diff --git a/datapacks/map_woolwars/data/woolwar/functions/second.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/second.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/second.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/second.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_woolwars/data/woolwar/functions/spec.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/spec.mcfunction index e477f923..331bce5d 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/spec.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/spec.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # team join play.sur @s gamemode spectator @s -tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n\u00a7c请等待下一局游戏，或者使用\u00a76/trigger hub\u00a7c返回大厅。"] \ No newline at end of file +tellraw @s ["\u00a7c很抱歉，游戏已经开始了！\n\u00a7c请等待下一局游戏，或者使用\u00a76/trigger hub\u00a7c返回大厅。"] diff --git a/datapacks/map_woolwars/data/woolwar/functions/start.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/start.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/start.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/start.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_woolwars/data/woolwar/functions/tick.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/tick.mcfunction index e69de29b..277a839f 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/tick.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/tick.mcfunction @@ -0,0 +1,5 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + diff --git a/datapacks/map_woolwars/data/woolwar/functions/trystart.mcfunction b/datapacks/map_woolwars/data/woolwar/functions/trystart.mcfunction index e8b676f3..6a3ffe26 100644 --- a/datapacks/map_woolwars/data/woolwar/functions/trystart.mcfunction +++ b/datapacks/map_woolwars/data/woolwar/functions/trystart.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.sur,gamemode=adventure] run scoreboard players add wait.player tick 1 execute if score sur.state state matches 1 run function surgame:spec @@ -8,4 +12,4 @@ execute if score sur.state state matches 3 run function surgame:spec execute unless score sur.state state matches 1.. if score wait.player tick matches ..1 run tellraw @s ["\u00a7c人数不够！请等待至少2人！"] execute unless score sur.state state matches 1.. if score wait.player tick matches ..1 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 -execute unless score sur.state state matches 1.. if score wait.player tick matches 2.. run function surgame:start \ No newline at end of file +execute unless score sur.state state matches 1.. if score wait.player tick matches 2.. run function surgame:start diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/airworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/airworld.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/airworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/airworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/bedwars_backup.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/bedwars_backup.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/bedwars_backup.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/bedwars_backup.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/boatworld2.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/boatworld2.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/boatworld2.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/boatworld2.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/dropperworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/dropperworld.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/dropperworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/dropperworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/golfworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/golfworld.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/golfworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/golfworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/hungerworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/hungerworld.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/hungerworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/hungerworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/killerworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/killerworld.json index 682af5f7..96004f6e 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/killerworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/killerworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/lobby.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/lobby.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/lobby.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/lobby.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/mulitiworld_datapack/data/minecraft/dimension/parkourworld.json b/datapacks/mulitiworld_datapack/data/minecraft/dimension/parkourworld.json index 90659e2c..43f50b43 100644 --- a/datapacks/mulitiworld_datapack/data/minecraft/dimension/parkourworld.json +++ b/datapacks/mulitiworld_datapack/data/minecraft/dimension/parkourworld.json @@ -15,4 +15,4 @@ "structure_overrides": [] } } -} \ No newline at end of file +} diff --git a/datapacks/tag_pack_1_20_2/data/minecraft/tags/blocks/bwplace.json b/datapacks/tag_pack_1_20_2/data/minecraft/tags/blocks/bwplace.json index fee15e18..907e0749 100644 --- a/datapacks/tag_pack_1_20_2/data/minecraft/tags/blocks/bwplace.json +++ b/datapacks/tag_pack_1_20_2/data/minecraft/tags/blocks/bwplace.json @@ -80,4 +80,4 @@ "glowstone", "sea_lantern" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/functions/tnt/lootblock.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tnt/lootblock.mcfunction index 591446ee..3a158c29 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tnt/lootblock.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tnt/lootblock.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if block ~ ~ ~ #cmdtnt:bw_tnt_3 run loot spawn ~ ~ ~ mine ~ ~ ~ execute if block ~ ~ ~ #cmdtnt:bw_tnt_0_8 run loot spawn ~ ~ ~ mine ~ ~ ~ execute if block ~ ~ ~ #cmdtnt:bw_tnt_9 run loot spawn ~ ~ ~ mine ~ ~ ~ execute if block ~ ~ ~ #cmdtnt:bw_tnt_9 run setblock ~ ~ ~ air execute if block ~ ~ ~ #cmdtnt:bw_tnt_0_8 run setblock ~ ~ ~ air execute if block ~ ~ ~ #cmdtnt:bw_tnt_3 run setblock ~ ~ ~ air -kill @s \ No newline at end of file +kill @s diff --git a/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_x.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_x.mcfunction index 6f25a447..9dca78e9 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_x.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_x.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add tnt.round.x board 1 scoreboard players set tnt.round.y board 0 function cmdtnt:tnt/roundandshoot_y execute at @s run tp @s ~ ~ ~ ~30 ~ -execute if score tnt.round.x board matches ..12 run function cmdtnt:tnt/roundandshoot_x \ No newline at end of file +execute if score tnt.round.x board matches ..12 run function cmdtnt:tnt/roundandshoot_x diff --git a/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_y.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_y.mcfunction index 7e2af423..0838e44d 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_y.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tnt/roundandshoot_y.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add tnt.round.y board 1 summon marker ~ ~ ~ {Tags:["cmd.tnt","cmd.tnt.new"]} execute as @s at @s run tp @e[tag=cmd.tnt.new] @s @@ -6,4 +10,4 @@ execute as @e[tag=cmd.tnt.new] at @s run function cmdtnt:tnt/tntgo execute at @s run tp @s ~ ~ ~ ~ ~15 kill @e[tag=cmd.tnt.new] execute if score tnt.round.y board matches 12.. at @s run tp @s ~ ~ ~ ~ -90 -execute if score tnt.round.y board matches ..12 run function cmdtnt:tnt/roundandshoot_y \ No newline at end of file +execute if score tnt.round.y board matches ..12 run function cmdtnt:tnt/roundandshoot_y diff --git a/datapacks/tntboom/data/cmdtnt/functions/tnt/tntgo.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tnt/tntgo.mcfunction index 64c5fb35..5f45a41c 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tnt/tntgo.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tnt/tntgo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a [{"score":{"objective": "board","name": "tnt.round.go"}}] scoreboard players remove tnt.round.go board 10 # execute as @s at @s run particle dust 1 1 1 1 ~ ~ ~ 0 0 0 1 1 @@ -16,4 +20,4 @@ execute if block ~ ~ ~ #cmdtnt:tnt_0_8 run scoreboard players remove tnt.round.g execute as @s at @s run tp @s ^ ^ ^0.5 -execute if score tnt.round.go board matches 1.. at @s run function cmdtnt:tnt/tntgo \ No newline at end of file +execute if score tnt.round.go board matches 1.. at @s run function cmdtnt:tnt/tntgo diff --git a/datapacks/tntboom/data/cmdtnt/functions/tntpick.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tntpick.mcfunction index 21d0f7de..eeb79600 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tntpick.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tntpick.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## TNT 基本信息 # 威力：默认 4 # 爆炸可以破坏周围的方块。 @@ -18,4 +22,4 @@ execute run playsound entity.generic.explode block @a ~ ~ ~ 6 0.7 0 particle minecraft:explosion ~ ~ ~ 1 1 1 1 10 normal execute as @e[tag=cmd.tnt.boom] at @s run kill @e[type=item,distance=0..1.2] execute as @e[tag=cmd.tnt.boom] at @s run function cmdtnt:tnt/lootblock -kill @e[tag=cmd.tnt] \ No newline at end of file +kill @e[tag=cmd.tnt] diff --git a/datapacks/tntboom/data/cmdtnt/functions/tntpick2.mcfunction b/datapacks/tntboom/data/cmdtnt/functions/tntpick2.mcfunction index 9f164d97..0221405f 100644 --- a/datapacks/tntboom/data/cmdtnt/functions/tntpick2.mcfunction +++ b/datapacks/tntboom/data/cmdtnt/functions/tntpick2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## TNT 基本信息 @@ -14,11 +18,11 @@ # 最大爆炸半径:6.9（默认） summon marker ~ ~ ~ {Tags:["cmd.tnt","cmd.tnt.spawn"]} scoreboard players set tnt.round.x board 0 -summon creeper ~ ~ ~ {DeathLootTable:"",Tags:["cmd.tnt.boom"],fuse:0,CustomName:'["\\u00a7c\\u00a7lTNT SHEEP"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Attributes:[{Base:1d,Name:"generic.max_health"},{Base:1d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:1d,Name:"generic.armor"},{Base:1d,Name:"generic.armor_toughness"}],ignited:true,ExplosionRadius:4b} +summon creeper ~ ~ ~ {DeathLootTable:"",Tags:["cmd.tnt.boom"],fuse:0,CustomName:'["\\u00a7c\\u00a7lTNT SHEEP"]',CustomNameVisible:1b,Invulnerable:1b,Silent:1b,PersistenceRequired:1b,Attributes:[{Base:1d,Name:"generic.max_health"},{Base:1d,Name:"generic.knockback_resistance"},{Base:0d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.follow_range"},{Base:0d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:1d,Name:"generic.armor"},{Base:1d,Name:"generic.armor_toughness"}],ignited:"true",ExplosionRadius:4b} execute as @e[tag=cmd.tnt.spawn] at @s run tp @s ~ ~ ~ 0 -90 execute as @e[tag=cmd.tnt.spawn] run function cmdtnt:tnt/roundandshoot_x execute run playsound entity.generic.explode block @a ~ ~ ~ 6 0.7 0 particle minecraft:explosion ~ ~ ~ 1 1 1 1 10 normal execute as @e[tag=cmd.tnt.boom] at @s run kill @e[type=item,distance=0..1.2] execute as @e[tag=cmd.tnt.boom] at @s run function cmdtnt:tnt/lootblock -kill @e[tag=cmd.tnt] \ No newline at end of file +kill @e[tag=cmd.tnt] diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_0_8.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_0_8.json index c2aa92ad..c701bd1e 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_0_8.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_0_8.json @@ -3,4 +3,4 @@ "values":[ "#wool" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_3.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_3.json index 2edfa2a0..792b3b8c 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_3.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_3.json @@ -4,4 +4,4 @@ "dark_oak_planks", "ladder" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_9.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_9.json index 5aca6fd2..e7cb54e8 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_9.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/bw_tnt_9.json @@ -3,4 +3,4 @@ "values":[ "end_stone" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_0_8.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_0_8.json index 15c8f8d8..51089eac 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_0_8.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_0_8.json @@ -3,4 +3,4 @@ "values": [ "#wool" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_3.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_3.json index 8637dd9a..a1b3eafc 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_3.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_3.json @@ -4,4 +4,4 @@ "dark_oak_planks", "ladder" ] -} \ No newline at end of file +} diff --git a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_9.json b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_9.json index 6c32585b..b6cd97f6 100644 --- a/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_9.json +++ b/datapacks/tntboom/data/cmdtnt/tags/blocks/tnt_9.json @@ -3,4 +3,4 @@ "values": [ "end_stone" ] -} \ No newline at end of file +} diff --git a/datapacks/viaversion_changer/data/via/functions/use1_18.mcfunction b/datapacks/viaversion_changer/data/via/functions/use1_18.mcfunction index 54b85ed5..1651edd2 100644 --- a/datapacks/viaversion_changer/data/via/functions/use1_18.mcfunction +++ b/datapacks/viaversion_changer/data/via/functions/use1_18.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # tellraw @a ["\u00a7e兼容性切换中！ [1.8 -> 1.18]"] # datapack disable "file/viaversion_support_1_8" # datapack enable "file/viaversion_support_1_18" -tellraw @s ["\u00a7a无法切换兼容性。此功能已被弃用。"] \ No newline at end of file +tellraw @s ["\u00a7a无法切换兼容性。此功能已被弃用。"] diff --git a/datapacks/viaversion_changer/data/via/functions/use1_8.mcfunction b/datapacks/viaversion_changer/data/via/functions/use1_8.mcfunction index 5d56aaff..13109157 100644 --- a/datapacks/viaversion_changer/data/via/functions/use1_8.mcfunction +++ b/datapacks/viaversion_changer/data/via/functions/use1_8.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7a无法切换兼容性。此功能已被弃用。"] + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/armor.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/armor.mcfunction index fa3814a2..eb391546 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/armor.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/armor.mcfunction @@ -1,15 +1,19 @@ -give @a[tag=bwneeds,gamemode=!spectator,tag=bw.play] minecraft:wooden_sword{bw:1,Unbreakable:1b,HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @a[tag=bw.play,gamemode=!spectator] minecraft:wooden_sword[custom_data={bw:1},unbreakable={show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] tag @a remove bwneeds -give @a[tag=bw.shears,gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:shears"}]}] shears{Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} +give @a[tag=bw.play,gamemode=!spectator,nbt=!{Inventory:[{id:"minecraft:shears"}]}] shears[unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] -give @a[scores={bw.pickaxe=1..1},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_pickaxe"}]}] wooden_pickaxe{Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} -give @a[scores={bw.axe=1..1},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_axe"}]}] wooden_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:1d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} +give @a[scores={bw.pickaxe=1..1},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_pickaxe"}]}] wooden_pickaxe[enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +give @a[scores={bw.axe=1..1},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_axe"}]}] wooden_axe[attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[7777,8425,9963,3879],name:"noName",amount:1d,operation:"add_value"}],show_in_tooltip:false},enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] -give @a[scores={bw.pickaxe=2..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:iron_pickaxe"}]}] iron_pickaxe{Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} -give @a[scores={bw.axe=2..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:iron_axe"}]}] iron_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:2d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} +give @a[scores={bw.pickaxe=2..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:iron_pickaxe"}]}] iron_pickaxe[enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +give @a[scores={bw.axe=2..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:iron_axe"}]}] iron_axe[attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[7777,8425,9963,3879],name:"noName",amount:2d,operation:"add_value"}],show_in_tooltip:false},enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] -give @a[scores={bw.pickaxe=3..3},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_pickaxe{Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} -give @a[scores={bw.axe=3..3},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_axe"}]}] diamond_axe{AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"noName",Amount:3d,Operation:0,UUID:[I;7777,8425,9963,3879]}],Enchantments:[{id:"minecraft:efficiency",lvl:1s}],Unbreakable:1b,bw:1,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} +give @a[scores={bw.pickaxe=3..3},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_pickaxe[enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +give @a[scores={bw.axe=3..3},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_axe"}]}] diamond_axe[attribute_modifiers={modifiers:[{type:"generic.attack_damage",slot:"any",uuid:[7777,8425,9963,3879],name:"noName",amount:3d,operation:"add_value"}],show_in_tooltip:false},enchantments={levels:{"minecraft:efficiency":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},custom_data={bw:1},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] clear @a[scores={bw.pickaxe=..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_pickaxe clear @a[scores={bw.axe=..2},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:diamond_pickaxe"}]}] diamond_axe @@ -20,4 +24,4 @@ clear @a[scores={bw.axe=..1},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{i clear @a[scores={bw.pickaxe=..0},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_pickaxe"}]}] wooden_pickaxe clear @a[scores={bw.axe=..0},gamemode=!spectator,tag=bw.play,nbt=!{Inventory:[{id:"minecraft:wooden_pickaxe"}]}] wooden_axe -clear @a[tag=!bw.shears,gamemode=!spectator,tag=bw.play,nbt={Inventory:[{id:"minecraft:shears"}]}] shears \ No newline at end of file +clear @a[tag=bw.play,gamemode=!spectator,nbt={Inventory:[{id:"minecraft:shears"}]}] shears diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/dmspan.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/dmspan.mcfunction index 6d233381..8137c78c 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/dmspan.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/dmspan.mcfunction @@ -1 +1,6 @@ -execute if score temp board matches ..7 run summon item ~ ~ ~ {Item:{id:"minecraft:diamond",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score temp board matches ..7 run summon item ~ ~ ~ {Item:{id:"minecraft:diamond",count:1,components:{"minecraft:can_break":{predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},"minecraft:can_place_on":{predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}}}} + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/editnbt.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/editnbt.mcfunction index 750388bf..0ad762d3 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/editnbt.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/editnbt.mcfunction @@ -1 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score bw.state state matches 1.. as @a[tag=bw.play] at @s as @e[distance=0..5,type=item,tag=!flaged] run data merge entity @s {Item:{tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/emspan.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/emspan.mcfunction index 4ed7bb9d..0ef8fd98 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/emspan.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/emspan.mcfunction @@ -1 +1,6 @@ -execute if score temp board matches ..5 run summon item ~ ~ ~ {Item:{id:"minecraft:emerald",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score temp board matches ..5 run summon item ~ ~ ~ {Item:{id:"minecraft:emerald",count:1,components:{"minecraft:can_break":{predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},"minecraft:can_place_on":{predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}}}} + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/getitem.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/getitem.mcfunction index 8f5aed37..21152f6a 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/getitem.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/getitem.mcfunction @@ -1,4 +1,9 @@ -execute if score @s bw.tmp.ir matches 1.. run give @s iron_ingot{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} 1 -execute if score @s bw.tmp.dm matches 1.. run give @s diamond{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} 1 -execute if score @s bw.tmp.gd matches 1.. run give @s gold_ingot{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} 1 -execute if score @s bw.tmp.em matches 1.. run give @s emerald{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score @s bw.tmp.ir matches 1.. run give @s iron_ingot[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.dm matches 1.. run give @s diamond[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.gd matches 1.. run give @s gold_ingot[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.em matches 1.. run give @s emerald[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gogive.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gogive.mcfunction index 61cf2799..93a36ecc 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gogive.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gogive.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute if score temp board matches ..15 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:gold_ingot",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} -give @a[tag=bw.play,gamemode=!spectator,distance=0..2] gold_ingot{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} +give @a[tag=bw.play,gamemode=!spectator,distance=0..2] gold_ingot[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gospan.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gospan.mcfunction index 3d74c8c5..2ec55cfb 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gospan.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/gospan.mcfunction @@ -1 +1,6 @@ -execute if score temp board matches ..15 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:gold_ingot",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score temp board matches ..15 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:gold_ingot",count:1,components:{"minecraft:can_break":{predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},"minecraft:can_place_on":{predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}}}} + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irgive.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irgive.mcfunction index b1e13e6a..6bbcda4c 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irgive.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irgive.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute if score temp board matches ..11 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:iron_ingot",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} -give @a[tag=bw.play,gamemode=!spectator,distance=0..2] iron_ingot{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]} \ No newline at end of file +give @a[tag=bw.play,gamemode=!spectator,distance=0..2] iron_ingot[can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irspan.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irspan.mcfunction index f307d0f8..f1580344 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irspan.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/bw/irspan.mcfunction @@ -1 +1,6 @@ -execute if score temp board matches ..63 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:iron_ingot",Count:1b,tag:{HideFlags:63,CanDestroy:["#minecraft:bedblocks"],CanPlaceOn:["#minecraft:bwplace"]}}} +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if score temp board matches ..63 run summon item ~ ~-0.5 ~ {Item:{id:"minecraft:iron_ingot",count:1,components:{"minecraft:can_break":{predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false},"minecraft:can_place_on":{predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false}}}} + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/duel/thing.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/duel/thing.mcfunction index 202c471c..7d0646a3 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/duel/thing.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/duel/thing.mcfunction @@ -1,13 +1,18 @@ -item replace entity @s container.0 with iron_sword{duel:1,HideFlags:63,Unbreakable:1b,CanDestroy:["#minecraft:terracottas"]} -item replace entity @s container.1 with diamond_pickaxe{duel:1,HideFlags:63,Unbreakable:1b,CanDestroy:["#minecraft:terracottas"]} -item replace entity @s[team=play.duel.yellow] container.2 with yellow_terracotta{Enchantments:[{id:"efficiency",lvl:2s}],duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.yellow] container.3 with yellow_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.yellow] container.4 with yellow_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.yellow] container.5 with yellow_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.blue] container.2 with blue_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.blue] container.3 with blue_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.blue] container.4 with blue_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s[team=play.duel.blue] container.5 with blue_terracotta{duel:1,Unbreakable:1b,HideFlags:63,CanPlaceOn:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"],CanDestroy:["#minecraft:terracottas"]} 64 -item replace entity @s container.6 with bow{duel:1,Unbreakable:1b,CanDestroy:["#minecraft:terracottas"]} -item replace entity @s container.7 with arrow{duel:1,Unbreakable:1b,CanDestroy:["#minecraft:terracottas"]} 4 -item replace entity @s container.8 with golden_apple{duel:1,Unbreakable:1b,CanDestroy:["#minecraft:terracottas"]} 3 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +item replace entity @s container.0 with iron_sword[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] +item replace entity @s container.1 with diamond_pickaxe[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] +item replace entity @s[team=play.duel.yellow] container.2 with yellow_terracotta[enchantments={levels:{"minecraft:efficiency":2s},show_in_tooltip:false},custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.yellow] container.3 with yellow_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.yellow] container.4 with yellow_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.yellow] container.5 with yellow_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.blue] container.2 with blue_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.blue] container.3 with blue_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.blue] container.4 with blue_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s[team=play.duel.blue] container.5 with blue_terracotta[custom_data={duel:1},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["glass","oak_wood","yellow_wool","light_blue_wool","#minecraft:terracottas","#minecraft:concrete"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:terracottas"]}],show_in_tooltip:false}] 64 +item replace entity @s container.6 with bow[custom_data={duel:1},unbreakable={},can_break={predicates:[{blocks:["#minecraft:terracottas"]}]}] +item replace entity @s container.7 with arrow[custom_data={duel:1},unbreakable={},can_break={predicates:[{blocks:["#minecraft:terracottas"]}]}] 4 +item replace entity @s container.8 with golden_apple[custom_data={duel:1},unbreakable={},can_break={predicates:[{blocks:["#minecraft:terracottas"]}]}] 3 + diff --git a/datapacks/we_do_not_support_via_1_8/data/fix/functions/snow/start.mcfunction b/datapacks/we_do_not_support_via_1_8/data/fix/functions/snow/start.mcfunction index 9e85a1e4..87dae303 100644 --- a/datapacks/we_do_not_support_via_1_8/data/fix/functions/snow/start.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/fix/functions/snow/start.mcfunction @@ -1,3 +1,7 @@ -execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_pickaxe{snow:1,Unbreakable:1b,display:{Name:'["§fGolden Pickaxe"]',Lore:['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]']},HideFlags:63,Enchantments:[{id:"minecraft:efficiency",lvl:15s}],CanDestroy:["#minecraft:snowmineable"]} 1 -execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_axe{snow:1,Unbreakable:1b,display:{Name:'["§fGolden Axe"]',Lore:['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]']},HideFlags:63,Enchantments:[{id:"minecraft:efficiency",lvl:15s}],CanDestroy:["#minecraft:snowmineable"]} 1 -execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_shovel{snow:1,Unbreakable:1b,display:{Name:'["§fGolden Shovel"]',Lore:['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]']},HideFlags:63,Enchantments:[{id:"minecraft:efficiency",lvl:15s}],CanDestroy:["#minecraft:snowmineable"]} 1 \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_pickaxe[custom_data={snow:1},unbreakable={show_in_tooltip:false},custom_name='["§fGolden Pickaxe"]',lore=['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]'],enchantments={levels:{"minecraft:efficiency":15s},show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:snowmineable"]}],show_in_tooltip:false}] +execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_axe[custom_data={snow:1},unbreakable={show_in_tooltip:false},custom_name='["§fGolden Axe"]',lore=['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]'],enchantments={levels:{"minecraft:efficiency":15s},show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:snowmineable"]}],show_in_tooltip:false}] +execute unless score snow.tntrun state matches 1..1 run give @a[team=play.snow,gamemode=adventure] minecraft:diamond_shovel[custom_data={snow:1},unbreakable={show_in_tooltip:false},custom_name='["§fGolden Shovel"]',lore=['["§aIIIIIIIIIIIIIIIIIIII§7IIIIIIIIIIII"]'],enchantments={levels:{"minecraft:efficiency":15s},show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:snowmineable"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buy9.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buy9.mcfunction index 1713ffaa..be6e7a00 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buy9.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buy9.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,4 +11,5 @@ execute if score @s bw.tmp.gd matches 3.. run clear @s gold_ingot 3 execute unless score @s bw.tmp.gd matches 3.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 3.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 3.. run tellraw @s ["\u00a7a你购买了\u00a76Golden Apple * 1"] -execute if score @s bw.tmp.gd matches 3.. run give @s golden_apple{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.gd matches 3.. run give @s golden_apple[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf10.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf10.mcfunction index 2940d40f..9afce621 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf10.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf10.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-10 +## Buy.-10 tellraw @s[scores={bw.armor=1..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.armor=1..}] ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run clear @s iron_ingot 40 execute unless score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Chainmail Armor"] -execute if score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run scoreboard players set @s bw.armor 1 \ No newline at end of file +execute if score @s[scores={bw.armor=..0}] bw.tmp.ir matches 40.. run scoreboard players set @s bw.armor 1 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf11.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf11.mcfunction index 6dd4f443..a0b9a6c2 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf11.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf11.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-11 +## Buy.-11 tellraw @s[scores={bw.armor=2..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.armor=2..}] ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run clear @s gold_ingot 12 execute unless score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Iron Armor"] -execute if score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run scoreboard players set @s bw.armor 2 \ No newline at end of file +execute if score @s[scores={bw.armor=..1}] bw.tmp.gd matches 12.. run scoreboard players set @s bw.armor 2 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf12.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf12.mcfunction index 1291fe97..2a8e05c9 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf12.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf12.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-12 +## Buy.-12 tellraw @s[scores={bw.armor=3..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.armor=3..}] ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run clear @s emerald 6 execute unless score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Emerald Armor"] -execute if score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run scoreboard players set @s bw.armor 3 \ No newline at end of file +execute if score @s[scores={bw.armor=..2}] bw.tmp.em matches 6.. run scoreboard players set @s bw.armor 3 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf15.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf15.mcfunction index a6cdc6f2..deb3effc 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf15.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf15.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-15 +## Buy.-15 tellraw @s[scores={bw.pickaxe=1..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.pickaxe=1..}] ~ ~ ~ 1 0 1 execute if score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run clear @s iron_ingot 10 execute unless score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Pickaxe (I)"] -execute if score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run scoreboard players set @s bw.pickaxe 1 \ No newline at end of file +execute if score @s[scores={bw.pickaxe=..0}] bw.tmp.ir matches 10.. run scoreboard players set @s bw.pickaxe 1 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf16.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf16.mcfunction index 05f4650b..7871cec0 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf16.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf16.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-16 +## Buy.-16 tellraw @s[scores={bw.axe=1..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.axe=1..}] ~ ~ ~ 1 0 1 execute if score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run clear @s iron_ingot 10 execute unless score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Axe (I)"] -execute if score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run scoreboard players set @s bw.axe 1 \ No newline at end of file +execute if score @s[scores={bw.axe=..0}] bw.tmp.ir matches 10.. run scoreboard players set @s bw.axe 1 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf17.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf17.mcfunction index a776bd0b..14a6fdb8 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf17.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf17.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-17 +## Buy.-17 tellraw @s[scores={bw.pickaxe=2..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.pickaxe=2..}] ~ ~ ~ 1 0 1 tellraw @s[scores={bw.pickaxe=..0}] ["\u00a7c你需要先购买上一级镐子！"] @@ -11,4 +15,4 @@ execute if score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run clear @ execute unless score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Pickaxe (II) (死亡降级)"] -execute if score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run scoreboard players set @s bw.pickaxe 2 \ No newline at end of file +execute if score @s[scores={bw.pickaxe=1..1}] bw.tmp.ir matches 20.. run scoreboard players set @s bw.pickaxe 2 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf18.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf18.mcfunction index 2a7982bd..83f2c447 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf18.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf18.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-18 +## Buy.-18 tellraw @s[scores={bw.axe=2..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.axe=2..}] ~ ~ ~ 1 0 1 tellraw @s[scores={bw.axe=..0}] ["\u00a7c你需要先购买上一级斧子！"] @@ -11,4 +15,4 @@ execute if score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run clear @s ir execute unless score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Axe (II) (死亡降级)"] -execute if score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run scoreboard players set @s bw.axe 2 \ No newline at end of file +execute if score @s[scores={bw.axe=1..1}] bw.tmp.ir matches 20.. run scoreboard players set @s bw.axe 2 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf19.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf19.mcfunction index 765d1016..5c939999 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf19.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf19.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-19 +## Buy.-19 tellraw @s[scores={bw.pickaxe=3..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.pickaxe=3..}] ~ ~ ~ 1 0 1 tellraw @s[scores={bw.pickaxe=..1}] ["\u00a7c你需要先购买上一级镐子！"] @@ -11,4 +15,4 @@ execute if score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run clear @s execute unless score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Pickaxe (III) (死亡降级)"] -execute if score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run scoreboard players set @s bw.pickaxe 3 \ No newline at end of file +execute if score @s[scores={bw.pickaxe=2..2}] bw.tmp.gd matches 6.. run scoreboard players set @s bw.pickaxe 3 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf2.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf2.mcfunction index 5db811fa..98cc5dfc 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf2.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,7 +11,7 @@ execute if score @s bw.tmp.ir matches 4.. run clear @s iron_ingot 4 execute unless score @s bw.tmp.ir matches 4.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.ir matches 4.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.ir matches 4.. run tellraw @s ["\u00a7a你购买了\u00a76羊毛 * 16"] -execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.blue] blue_wool{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 -execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.yellow] yellow_wool{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 -execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.green] lime_wool{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 -execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.red] red_wool{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 \ No newline at end of file +execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.blue] blue_wool[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.yellow] yellow_wool[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.green] lime_wool[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] +execute if score @s bw.tmp.ir matches 4.. run give @s[team=bw.red] red_wool[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf20.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf20.mcfunction index 0cc93dd6..a06d4e21 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf20.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf20.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-20 +## Buy.-20 tellraw @s[scores={bw.axe=3..}] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[scores={bw.axe=3..}] ~ ~ ~ 1 0 1 tellraw @s[scores={bw.axe=..1}] ["\u00a7c你需要先购买上一级斧！"] @@ -11,4 +15,4 @@ execute if score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run clear @s gol execute unless score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Axe (III) (死亡降级)"] -execute if score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run scoreboard players set @s bw.axe 3 \ No newline at end of file +execute if score @s[scores={bw.axe=2..2}] bw.tmp.gd matches 6.. run scoreboard players set @s bw.axe 3 diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf21.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf21.mcfunction index 980f8317..4b37205d 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf21.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf21.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-21 +## Buy.-21 execute if score @s bw.tmp.gd matches 8.. run clear @s gold_ingot 8 execute unless score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 8.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7a你购买了\u00a76Water Bucket * 1"] -execute if score @s bw.tmp.gd matches 8.. run give @s water_bucket{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.gd matches 8.. run give @s water_bucket[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf22.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf22.mcfunction index b5ed7d86..47bbfe0e 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf22.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf22.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-22 +## Buy.-22 execute if score @s bw.tmp.gd matches 8.. run clear @s gold_ingot 8 execute unless score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 8.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 8.. run tellraw @s ["\u00a7a你购买了\u00a76击退棍 * 1"] -execute if score @s bw.tmp.gd matches 8.. run give @s stick{display:{Name:'"\\u00a7f击退棍"'},Enchantments:[{id:"knockback",lvl:1}],HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 \ No newline at end of file +execute if score @s bw.tmp.gd matches 8.. run give @s stick[custom_name='"\\u00a7f击退棍"',enchantments={levels:{"minecraft:knockback":1},show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf23.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf23.mcfunction index c94f8b5e..a3aaf33c 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf23.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf23.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-23 +## Buy.-23 execute if score @s bw.tmp.em matches 1.. run clear @s emerald 1 execute unless score @s bw.tmp.em matches 1.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 1.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 1.. run tellraw @s ["\u00a7a你购买了\u00a76Bridge Egg * 1"] -execute if score @s bw.tmp.em matches 1.. run give @s egg{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.em matches 1.. run give @s egg[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf24.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf24.mcfunction index 6a5e5681..0ef2b789 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf24.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf24.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-24 +## Buy.-24 execute if score @s bw.tmp.gd matches 1.. run clear @s gold_ingot 1 execute unless score @s bw.tmp.gd matches 1.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 1.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 1.. run tellraw @s ["\u00a7a你购买了\u00a76Arrow * 4"] -execute if score @s bw.tmp.gd matches 1.. run give @s arrow{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 4 +execute if score @s bw.tmp.gd matches 1.. run give @s arrow[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf25.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf25.mcfunction index 8a26b8d0..5fc1774a 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf25.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf25.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-25 +## Buy.-25 execute if score @s bw.tmp.ir matches 10.. run clear @s iron_ingot 10 execute unless score @s bw.tmp.ir matches 10.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.ir matches 10.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.ir matches 10.. run tellraw @s ["\u00a7a你购买了\u00a76Stone Sword * 1"] clear @s wooden_sword -execute if score @s bw.tmp.ir matches 10.. run give @s stone_sword{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 \ No newline at end of file +execute if score @s bw.tmp.ir matches 10.. run give @s stone_sword[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf26.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf26.mcfunction index 33c3eeb0..1fa0a827 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf26.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf26.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-26 +## Buy.-26 execute if score @s bw.tmp.gd matches 7.. run clear @s gold_ingot 7 execute unless score @s bw.tmp.gd matches 7.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 7.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 7.. run tellraw @s ["\u00a7a你购买了\u00a76Iron Sword * 1"] -execute if score @s bw.tmp.gd matches 7.. run give @s iron_sword{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.gd matches 7.. run give @s iron_sword[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] clear @s wooden_sword + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf27.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf27.mcfunction index d7467bcf..dc65e5af 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf27.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf27.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-27 +## Buy.-27 execute if score @s bw.tmp.em matches 3.. run clear @s emerald 3 execute unless score @s bw.tmp.em matches 3.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 3.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 3.. run tellraw @s ["\u00a7a你购买了\u00a76Diamond Sword ([W]) * 1"] -execute if score @s bw.tmp.em matches 3.. run give @s diamond_sword{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.em matches 3.. run give @s diamond_sword[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] clear @s wooden_sword + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf3.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf3.mcfunction index a9d9133b..349e7180 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf3.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf3.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-3 +## Buy.-3 execute if score @s bw.tmp.ir matches 24.. run clear @s iron_ingot 24 execute unless score @s bw.tmp.ir matches 24.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.ir matches 24.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.ir matches 24.. run tellraw @s ["\u00a7a你购买了\u00a76End Stone * 12"] -execute if score @s bw.tmp.ir matches 24.. run give @s end_stone{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 12 \ No newline at end of file +execute if score @s bw.tmp.ir matches 24.. run give @s end_stone[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf30.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf30.mcfunction index b2565a5e..286ade6d 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf30.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf30.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-30 +## Buy.-30 execute if score @s bw.tmp.gd matches 12.. run clear @s gold_ingot 12 execute unless score @s bw.tmp.gd matches 12.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 12.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 12.. run tellraw @s ["\u00a7a你购买了\u00a76Normal Bow"] -execute if score @s bw.tmp.gd matches 12.. run give @s bow{Unbreakable:1b,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.gd matches 12.. run give @s bow[unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf31.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf31.mcfunction index 0d11d81d..a83a48c0 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf31.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf31.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-31 +## Buy.-31 execute if score @s bw.tmp.em matches 3.. run clear @s emerald 3 execute unless score @s bw.tmp.em matches 3.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 3.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 3.. run tellraw @s ["\u00a7a你购买了\u00a76Better Bow * 1"] -execute if score @s bw.tmp.em matches 3.. run give @s bow{Enchantments:[{id:"minecraft:power",lvl:1s},{id:"minecraft:punch",lvl:1s}],Unbreakable:1b,HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.em matches 3.. run give @s bow[enchantments={levels:{"minecraft:power":1s,"minecraft:punch":1s},show_in_tooltip:false},unbreakable={show_in_tooltip:false},can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf32.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf32.mcfunction index e084e844..9134f0a7 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf32.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf32.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,6 +11,6 @@ execute if score @s bw.tmp.em matches 2.. run clear @s emerald 2 execute unless score @s bw.tmp.em matches 2.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 2.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 2.. run tellraw @s ["\u00a7a你购买了\u00a76Inv Potion * 1"] -execute if score @s bw.tmp.em matches 2.. run give @s minecraft:potion{custom_potion_effects:[{id:"invisibility",duration:600}],CustomPotionColor:2424628,display:{Name:'"隐身药水"'}} +execute if score @s bw.tmp.em matches 2.. run give @s minecraft:potion[potion_contents={custom_effects:[{id:"invisibility",duration:600}],custom_color:2424628},custom_name='"隐身药水"'] -#/give @p \ No newline at end of file +#/give @p diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf33.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf33.mcfunction index e2e136a5..5590b70c 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf33.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf33.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,4 +11,5 @@ execute if score @s bw.tmp.em matches 2.. run clear @s emerald 2 execute unless score @s bw.tmp.em matches 2.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 2.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 2.. run tellraw @s ["\u00a7a你购买了\u00a76Speed Jump Potion * 1"] -execute if score @s bw.tmp.em matches 2.. run give @s minecraft:potion{custom_potion_effects:[{id:"speed",amplifier:1,duration:1200},{id:"jump_boost",amplifier:3,duration:1200}],CustomPotionColor:63205,display:{Name:'"雷碧"'}} +execute if score @s bw.tmp.em matches 2.. run give @s minecraft:potion[potion_contents={custom_effects:[{id:"speed",amplifier:1,duration:1200},{id:"jump_boost",amplifier:3,duration:1200}],custom_color:63205},custom_name='"雷碧"'] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf34.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf34.mcfunction index c1cde69a..cfcb297c 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf34.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf34.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 @@ -7,4 +11,5 @@ execute if score @s bw.tmp.em matches 4.. run clear @s emerald 4 execute unless score @s bw.tmp.em matches 4.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 4.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 4.. run tellraw @s ["\u00a7a你购买了\u00a76End Pearl * 1"] -execute if score @s bw.tmp.em matches 4.. run give @s ender_pearl{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 1 +execute if score @s bw.tmp.em matches 4.. run give @s ender_pearl[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf4.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf4.mcfunction index 337785d4..7395ca24 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf4.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf4.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-4 +## Buy.-4 tellraw @s[tag=bw.shears] ["\u00a7c你已经购买过这个东西了！"] playsound minecraft:entity.enderman.teleport player @s[tag=bw.shears] ~ ~ ~ 1 0 1 execute if score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run clear @s iron_ingot 20 execute unless score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run tellraw @s ["\u00a7a你购买了\u00a76永久的Shears"] -execute if score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run tag @s add bw.shears \ No newline at end of file +execute if score @s[tag=!bw.shears] bw.tmp.ir matches 20.. run tag @s add bw.shears diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf5.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf5.mcfunction index d84a0542..3ee89139 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf5.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf5.mcfunction @@ -1,10 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-5 +## Buy.-5 execute if score @s bw.tmp.ir matches 4.. run clear @s iron_ingot 4 execute unless score @s bw.tmp.ir matches 4.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.ir matches 4.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.ir matches 4.. run tellraw @s ["\u00a7a你购买了\u00a76Ladder * 16"] -execute if score @s bw.tmp.ir matches 4.. run give @s ladder{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 \ No newline at end of file +execute if score @s bw.tmp.ir matches 4.. run give @s ladder[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf6.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf6.mcfunction index eef84287..ad963c48 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf6.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf6.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-6 +## Buy.-6 execute if score @s bw.tmp.gd matches 4.. run clear @s gold_ingot 4 execute unless score @s bw.tmp.gd matches 4.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.gd matches 4.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.gd matches 4.. run tellraw @s ["\u00a7a你购买了\u00a76Planks * 16"] -execute if score @s bw.tmp.gd matches 4.. run give @s dark_oak_planks{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 16 +execute if score @s bw.tmp.gd matches 4.. run give @s dark_oak_planks[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf7.mcfunction b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf7.mcfunction index 90d1655d..4c66677b 100644 --- a/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf7.mcfunction +++ b/datapacks/we_do_not_support_via_1_8/data/minecraft/functions/bedwars/shop/buyf7.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @s at @s store result score @s bw.tmp.ir run clear @s iron_ingot 0 execute as @s at @s store result score @s bw.tmp.gd run clear @s gold_ingot 0 execute as @s at @s store result score @s bw.tmp.dm run clear @s diamond 0 execute as @s at @s store result score @s bw.tmp.em run clear @s emerald 0 -## Buy.-7 +## Buy.-7 execute if score @s bw.tmp.em matches 4.. run clear @s emerald 4 execute unless score @s bw.tmp.em matches 4.. run tellraw @s ["\u00a7c你的资源不够买这个东西!"] execute unless score @s bw.tmp.em matches 4.. run playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute if score @s bw.tmp.em matches 4.. run tellraw @s ["\u00a7a你购买了\u00a76Obsidian * 4"] -execute if score @s bw.tmp.em matches 4.. run give @s obsidian{HideFlags:63,CanPlaceOn:["#minecraft:bwplace"],CanDestroy:["#minecraft:bedblocks"]} 4 +execute if score @s bw.tmp.em matches 4.. run give @s obsidian[can_place_on={predicates:[{blocks:["#minecraft:bwplace"]}],show_in_tooltip:false},can_break={predicates:[{blocks:["#minecraft:bedblocks"]}],show_in_tooltip:false}] + diff --git a/datapacks/zombiepve/data/minecraft/advancements/caidan.json b/datapacks/zombiepve/data/minecraft/advancements/caidan.json index eacf9603..e92d56ce 100644 --- a/datapacks/zombiepve/data/minecraft/advancements/caidan.json +++ b/datapacks/zombiepve/data/minecraft/advancements/caidan.json @@ -26,4 +26,4 @@ ] ], "rewards": {} -} \ No newline at end of file +} diff --git a/datapacks/zombiepve/data/minecraft/advancements/zombieever/caidan.json b/datapacks/zombiepve/data/minecraft/advancements/zombieever/caidan.json index 37435fa3..235231e5 100644 --- a/datapacks/zombiepve/data/minecraft/advancements/zombieever/caidan.json +++ b/datapacks/zombiepve/data/minecraft/advancements/zombieever/caidan.json @@ -26,4 +26,4 @@ ] ], "rewards": {} -} \ No newline at end of file +} diff --git a/datapacks/zombiepve/data/minecraft/advancements/zombieever/wtf.json b/datapacks/zombiepve/data/minecraft/advancements/zombieever/wtf.json index af177d45..00c96f12 100644 --- a/datapacks/zombiepve/data/minecraft/advancements/zombieever/wtf.json +++ b/datapacks/zombiepve/data/minecraft/advancements/zombieever/wtf.json @@ -26,4 +26,4 @@ ] ], "rewards": {} -} \ No newline at end of file +} diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/addcoin.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/addcoin.mcfunction index 34aa9fa2..406efefd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/addcoin.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/addcoin.mcfunction @@ -1,6 +1,10 @@ -execute store result score gun.coin.tmp board as @s at @s run data get entity @s SelectedItem.tag.coin +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score gun.coin.tmp board as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".coin item replace entity @s weapon.mainhand with air tellraw @s ["\u00a76+ ",{"score":{"name": "gun.coin.tmp","objective": "board"},"color": "gold"}," \u00a76Coins (金币袋子)"] scoreboard players operation @s zombie.coin += gun.coin.tmp board # playsound entity.allay.item_given player @s ~ ~ ~ 1 1 1 -playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 0 1 \ No newline at end of file +playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 0 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/damagetocoin.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/damagetocoin.mcfunction index 9fac9b7a..5522f99e 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/damagetocoin.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/damagetocoin.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players operation @s zombie.coin += @s zombie.hurt -tellraw @s ["\u00a76+",{"score":{"name": "@s","objective": "zombie.hurt"},"color":"gold"},"\u00a76 Coins"] \ No newline at end of file +tellraw @s ["\u00a76+",{"score":{"name": "@s","objective": "zombie.hurt"},"color":"gold"},"\u00a76 Coins"] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/died.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/died.mcfunction index e5f3dab0..5e3bf7ee 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/died.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/died.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score zombie.mode board matches 1 run tellraw @s ["\u00a7c很抱歉，你死了。"] execute if score zombie.mode board matches 2 run tellraw @s ["\u00a7c很抱歉，你死了。\n\u00a7e如果还有玩家存活，你将在当前进度完成后复活。"] execute if score zombie.mode board matches 3 run tellraw @s ["\u00a7c很抱歉，你死了。\n\u00a7c由于模式设置，您已无法复活。"] @@ -11,4 +15,4 @@ execute as @a[team=play.zombie,gamemode=adventure] run scoreboard players add tm execute if score zombie.mode board matches 2.. run title @a[team=play.zombie] actionbar [{"selector":"@s"}," \u00a7c死了，剩余玩家数量：",{"score":{"name": "tmp.count","objective": "tick"},"color":"gold"}] tp @s 630 40 -78 90 0 execute if score zombie.mode board matches 1 run function zombieever/fuhuo -execute if score zombie.mode board matches 2.. run gamemode spectator @s \ No newline at end of file +execute if score zombie.mode board matches 2.. run gamemode spectator @s diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/closeall.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/closeall.mcfunction index d0e88df5..1ad2146d 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/closeall.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/closeall.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # ### Door # fill 373 22 -48 371 25 -48 minecraft:barrier @@ -24,9 +28,12 @@ summon marker 630 9 -78 {Tags:["pve.title"],CustomName:'""'} fill 594 3 -58 594 5 -60 minecraft:iron_bars fill 637 13 -46 637 11 -47 minecraft:air fill 637 13 -46 639 11 -46 minecraft:iron_bars + data merge block 597 11 1 {Items:[]} # /give @s minecraft:tripwire_hook{display:{Name:'"\\u00a7a钥匙"',Lore:['"\\u00a7e用于打开大门的钥匙"']},lock:1} + data merge block 597 11 1 {Items:[{id:"minecraft:tripwire_hook",Count:1b,tag:{display:{Name:'"\\u00a7a钥匙"',Lore:['"\\u00a7e用于打开大门的钥匙"']},lock:1},Slot:13}]} + execute as @e[tag=pve.house.chest] at @s run data merge block ~ ~ ~ {Items:[],Lock:"ss114514",CustomName:'"\\u00a7r箱子"'} fill 535 -51 -124 535 -49 -121 minecraft:iron_bars fill 579 -9 -119 578 -10 -119 minecraft:air @@ -37,7 +44,7 @@ setblock 496 -43 -104 air setblock 497 -43 -104 air setblock 513 -43 -112 minecraft:air fill 527 -41 -102 527 -43 -100 minecraft:iron_bars -setblock 513 -43 -112 minecraft:chest{Items:[{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{hp:50,gun:"pao",damage:300,bullet:380,cdtime:10,distance:40,display:{Name:'"\\u00a7e\\u00a7kaaa\\u00a7a 高级魔法棒 \\u00a7e\\u00a7kaaa"',Lore:['"\\u00a7b可使用次数：\\u00a7e380"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e30.0 HP"','"\\u00a7b距离：\\u00a7e40 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e50"']},CustomModelData:9},Slot:13},{id:"minecraft:experience_bottle",Count:64b,Slot:1}]} +setblock 513 -43 -112 minecraft:chest{Items:[{id:"minecraft:carrot_on_a_stick",count:1,components:{"minecraft:custom_data":{hp:50,gun:"pao",damage:300,bullet:380,cdtime:10,distance:40},"minecraft:custom_name":'"\\u00a7e\\u00a7kaaa\\u00a7a 高级魔法棒 \\u00a7e\\u00a7kaaa"',"minecraft:lore":['"\\u00a7b可使用次数：\\u00a7e380"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e30.0 HP"','"\\u00a7b距离：\\u00a7e40 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e50"'],"minecraft:custom_model_data":9},Slot:13},{id:"minecraft:experience_bottle",count:64,Slot:1}]} setblock 496 -43 -104 minecraft:chest[type=left]{Items:[]} setblock 497 -43 -104 minecraft:chest[type=right]{Items:[{id:"minecraft:tnt",Count:1b,Slot:0,tag:{display:{Name:'"\\u00a7c\\u00a7lTNT"',Lore:['"\\u00a7e用于破坏地牢中的某一个墙壁"']},lock:3,flag:1}},{id:"minecraft:tnt",Count:1b,Slot:1,tag:{display:{Name:'"\\u00a7c\\u00a7lTNT"',Lore:['"\\u00a7e用于破坏地牢中的某一个墙壁"']},lock:3,flag:2}}]} kill @e[type=villager,tag=pve.npc] @@ -47,3 +54,4 @@ summon minecraft:villager 630 10 -94 {CustomName:'["\\u00a7e亚奇洛贝 \\u00a7 setblock 681 6 -21 minecraft:barrier forceload remove 595 -41 495 -150 forceload remove 597 -111 714 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open2.mcfunction index 91d3592a..cffd1bf0 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open2.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # ## In # # Left # kill @e[type=item,x=584,y=-6,z=-90,distance=..10] # tellraw @a[team=play.zombie] ["\n \u00a77\u00a7obong.......... 貌似又有什么东西炸开了？\n"] -# playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 \ No newline at end of file +# playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave.mcfunction index 1a1c6d01..3121b1ae 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## In # Left fill 594 3 -58 594 5 -60 minecraft:air destroy @@ -8,6 +12,8 @@ tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇大门被打开了...\n"] # playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 playsound minecraft:block.chest.open player @a[team=play.zombie] ~ ~ ~ 1 0.5 1 + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7b进入地牢"'} bossbar set zombie:zombiecount name ["\u00a7b任务：",{"selector":"@e[tag=pve.title,type=marker,limit=1]","color":"yellow"}] + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_floor.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_floor.mcfunction index b8e49758..ad59ee88 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_floor.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_floor.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 535 -38 -123 535 -40 -125 minecraft:air tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇墙壁被破坏了...\n"] # playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 playsound minecraft:entity.generic.explode player @a[team=play.zombie] ~ ~ ~ 1 1 1 -function zombieever/tasks/boss \ No newline at end of file +function zombieever/tasks/boss diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_in.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_in.mcfunction index d19a6257..de2b2150 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_in.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_in.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## In # Left @@ -10,4 +14,4 @@ tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇大门被打开了... 然 playsound minecraft:block.chest.open player @a[team=play.zombie] ~ ~ ~ 1 0.5 1 fill 579 -9 -119 578 -10 -119 minecraft:iron_bars -function zombieever/rounds/stronghold \ No newline at end of file +function zombieever/rounds/stronghold diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_out.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_out.mcfunction index 29524eaf..36b722bc 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_out.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_loot_out.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## ## In # Left @@ -11,4 +15,4 @@ playsound minecraft:block.chest.open player @a[team=play.zombie] ~ ~ ~ 1 0.5 1 fill 579 -9 -119 578 -10 -119 minecraft:air -schedule function zombieever/rounds/lava 10s \ No newline at end of file +schedule function zombieever/rounds/lava 10s diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall.mcfunction index 084dfe01..16a99564 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 504 -41 -117 503 -43 -117 air tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇墙壁被破坏了...\n"] # playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 playsound minecraft:entity.generic.explode player @a[team=play.zombie] ~ ~ ~ 1 1 1 -function zombieever/talks/stronghold_boss/1 \ No newline at end of file +function zombieever/talks/stronghold_boss/1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall_boss.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall_boss.mcfunction index 6ba03b2e..beb0473d 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall_boss.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_cave_wall_boss.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # fill 504 -41 -117 503 -43 -117 air fill 527 -41 -102 527 -43 -100 minecraft:air tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇门被打开了...\n"] @@ -5,4 +9,4 @@ tellraw @a[team=play.zombie] ["\n \u00a77\u00a7o一扇门被打开了...\n"] # playsound entity.firework_rocket.twinkle player @a[team=play.zombie] ~ ~ ~ 1 1 1 playsound minecraft:entity.generic.explode player @a[team=play.zombie] ~ ~ ~ 1 1 1 -scoreboard players set zombie.round board 27 \ No newline at end of file +scoreboard players set zombie.round board 27 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_house.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_house.mcfunction index 43270cf2..67a96d2b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_house.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/open_house.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## fill 637 13 -46 639 11 -46 minecraft:air replace iron_bars fill 637 13 -46 637 11 -47 minecraft:iron_bars @@ -8,5 +12,7 @@ playsound minecraft:block.chest.open player @a[team=play.zombie] ~ ~ ~ 1 0.5 1 # function zombieever/nextround scoreboard players set zombie.round board 16 tp @e[tag=pve.npc.yaqiluobei,limit=1] 597 4 -61 -57 -8 + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7b前往地牢"'} bossbar set zombie:zombiecount name ["\u00a7b任务：",{"selector":"@e[tag=pve.title,type=marker,limit=1]","color":"yellow"}] + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/stronghold_tpup.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/stronghold_tpup.mcfunction index 3e335b1a..ed037f77 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/stronghold_tpup.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/stronghold_tpup.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tp @a[team=play.zombie,gamemode=adventure] 519 -42 -116 -90 0 effect give @a[team=play.zombie,gamemode=adventure] darkness 10 25 true effect give @a[team=play.zombie,gamemode=adventure] blindness 10 25 true effect give @a[team=play.zombie,gamemode=adventure] slowness 10 2 true tellraw @a[team=play.zombie] ["\u00a7a你：\u00a7f怎么回事？突然眼前一黑... 这好像是迷宫？赶快找到出口出去！这里的空气不太舒服！"] -scoreboard players set zombie.round board 25 \ No newline at end of file +scoreboard players set zombie.round board 25 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_opencave.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_opencave.mcfunction index 2a40117d..5eef73dd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_opencave.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_opencave.mcfunction @@ -1,8 +1,12 @@ -execute as @s[nbt={SelectedItem:{tag:{lock:2}}}] run tag @s add ok +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lock:2}}}}] run tag @s add ok execute if entity @s[tag=ok] run function zombieever/door/open_cave execute if entity @s[tag=ok] run item replace entity @s weapon.mainhand with air execute unless entity @s[tag=ok] if block 594 5 -60 iron_bars run title @s actionbar ["\u00a7c需要地牢钥匙"] execute unless entity @s[tag=ok] unless block 594 5 -60 iron_bars run title @s actionbar ["\u00a7c门已经被打开"] execute unless entity @s[tag=ok] run playsound block.chest.locked player @s ~ ~ ~ 2 1 1 -tag @s remove ok \ No newline at end of file +tag @s remove ok diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openhouse.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openhouse.mcfunction index 11950b81..52180351 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openhouse.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openhouse.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## -execute as @s[nbt={SelectedItem:{tag:{lock:1}}}] run tag @s add ok +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lock:1}}}}] run tag @s add ok execute if entity @e[tag=pve.zombie] run tag @s remove ok execute if entity @s[tag=ok] run function zombieever/door/open_house execute if entity @s[tag=ok] run item replace entity @s weapon.mainhand with air @@ -8,4 +12,4 @@ execute unless entity @s[tag=ok] unless block 639 11 -46 iron_bars run title @s execute unless entity @s[tag=ok] run playsound block.chest.locked player @s ~ ~ ~ 2 1 1 execute if entity @e[tag=pve.zombie] run title @s actionbar ["\u00a7c僵尸没有被消灭完"] -tag @s remove ok \ No newline at end of file +tag @s remove ok diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold.mcfunction index 9f8a61cd..6594291b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## -execute as @s[nbt={SelectedItem:{tag:{lock:3}}}] run tag @s add ok +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lock:3}}}}] run tag @s add ok execute if entity @e[tag=pve.zombie] run tag @s remove ok execute if entity @s[tag=ok] run function zombieever/door/open_cave_floor execute if entity @s[tag=ok] run item replace entity @s weapon.mainhand with air @@ -7,4 +11,4 @@ execute unless entity @s[tag=ok] run title @s actionbar ["\u00a7c需要TNT"] execute unless entity @s[tag=ok] run playsound block.chest.locked player @s ~ ~ ~ 2 1 1 execute if entity @e[tag=pve.zombie] run title @s actionbar ["\u00a7c僵尸没有被消灭完"] -tag @s remove ok \ No newline at end of file +tag @s remove ok diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold_wall.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold_wall.mcfunction index 79400946..10e137c0 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold_wall.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/door/try_openstronghold_wall.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## -execute as @s[nbt={SelectedItem:{tag:{lock:3}}}] run tag @s add ok +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lock:3}}}}] run tag @s add ok execute if block 503 -43 -117 air run tag @s remove ok execute if entity @e[tag=pve.zombie] run tag @s remove ok execute if entity @s[tag=ok] run function zombieever/door/open_cave_wall @@ -9,4 +13,4 @@ execute unless entity @s[tag=ok] if block 503 -43 -117 air run title @s actionba execute unless entity @s[tag=ok] run playsound block.chest.locked player @s ~ ~ ~ 2 1 1 execute if entity @e[tag=pve.zombie] run title @s actionbar ["\u00a7c僵尸没有被消灭完"] -tag @s remove ok \ No newline at end of file +tag @s remove ok diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo.mcfunction index 6150f088..bc8eab07 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @s ["\u00a7a你复活了。"] execute if score zombie.round board matches ..13 run tp @s 630 10 -78 90 0 execute if score zombie.round board matches 14 run tp @s 682 15 -19 90 0 @@ -5,8 +9,8 @@ execute if score zombie.round board matches 15..17 run tp @s 630 10 -78 90 0 execute if score zombie.round board matches 18..24 run tp @s 558 -12 -136 0 0 execute if score zombie.round board matches 25 run tp @s 519 -42 -116 -90 0 execute if score zombie.round board matches 26..27 run tp @s 499 -43 -98 -90 0 -# execute if score zombie.round board matches 27 run +# execute if score zombie.round board matches 27 run execute if score zombie.round board matches 28.. run tp @s 630 10 -78 90 0 gamemode adventure @s xp set @s 0 levels -xp set @s 0 points \ No newline at end of file +xp set @s 0 points diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo_next.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo_next.mcfunction index e966e5e3..ff2d5f86 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo_next.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/fuhuo_next.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score zombie.mode board matches ..2 as @a[team=play.zombie,gamemode=spectator,tag=!GOABLE.SPEC] at @s run function zombieever/fuhuo xp set @s 0 levels -xp set @s 0 points \ No newline at end of file +xp set @s 0 points diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/guninfo.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/guninfo.mcfunction index 9b94c41b..33ec1bb9 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/guninfo.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/guninfo.mcfunction @@ -1,10 +1,14 @@ -execute if data entity @s SelectedItem.tag.gun run tag @s add tmp.usinggun -execute if data entity @s {SelectedItem:{tag:{gun:-10}}} run tag @s remove tmp.usinggun -execute if data entity @s {SelectedItem:{tag:{gun:-10}}} run tag @s add tmp.coindisplay +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if data entity @s SelectedItem.components."minecraft:custom_data".gun run tag @s add tmp.usinggun +execute if data entity @s {SelectedItem:{components:{"minecraft:custom_data":{gun:-10}}}} run tag @s remove tmp.usinggun +execute if data entity @s {SelectedItem:{components:{"minecraft:custom_data":{gun:-10}}}} run tag @s add tmp.coindisplay # xp set @s 0 points -execute as @s[tag=tmp.coindisplay] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.tag.coin +execute as @s[tag=tmp.coindisplay] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".coin execute as @s[tag=tmp.coindisplay] run execute if score gun.tmp board matches 1.. run title @s actionbar [{"translate":"\u00a76☼ \u00a7e[%s\u00a7e] \u00a7e内含金钱: \u00a7a%s\u00a7b Coins \u00a76☼","with":[{"nbt":"SelectedItem.tag.display.Name","interpret":true,"entity":"@s"},{"score":{"name": "gun.tmp","objective": "board"},"color": "green"}]}] -execute as @s[tag=tmp.usinggun] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.tag.bullet +execute as @s[tag=tmp.usinggun] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".bullet execute as @s[tag=tmp.usinggun] if score @s cooldowntime matches 1.. run execute if score gun.tmp board matches 1.. run title @s actionbar [{"translate":"\u00a76☼ \u00a7e[%s\u00a7e] \u00a7e使用次数剩余: \u00a7a%s \u00a7b冷却时间: %s\u00a7ct\u00a76 ☼","with":[{"nbt":"SelectedItem.tag.display.Name","interpret":true,"entity":"@s"},{"score":{"name": "gun.tmp","objective": "board"},"color": "green"},{"score":{"name": "@s","objective": "cooldowntime"},"color": "red"}]}] execute as @s[tag=tmp.usinggun] unless score @s cooldowntime matches 1.. run execute if score gun.tmp board matches 1.. run title @s actionbar [{"translate":"\u00a76☼ \u00a7e[%s\u00a7e] \u00a7e使用次数剩余: \u00a7a%s\u00a7e 消耗能量值: \u00a76%s \u00a7d⚝ %s\u00a76 ☼","with":[{"nbt":"SelectedItem.tag.display.Name","interpret":true,"entity":"@s"},{"score":{"name": "gun.tmp","objective": "board"},"color": "green"},{"nbt":"SelectedItem.tag.hp","interpret":true,"entity":"@s","color":"gold"},{"nbt":"SelectedItem.tag.display.Lore[2]","interpret":true,"entity":"@s"}]}] execute as @s[tag=tmp.usinggun] run execute unless score gun.tmp board matches 1.. run title @s actionbar [{"translate":"\u00a7c☼ \u00a7e[%s\u00a7e] \u00a7c物品已被损坏 \u00a7c ☼","with":[{"nbt":"SelectedItem.tag.display.Name","interpret":true,"entity":"@s"}]}] @@ -14,3 +18,4 @@ execute as @s[tag=tmp.usinggun] run execute unless score gun.tmp board matches 1 # scoreboard players reset @s bw.tmp.em tag @s remove tmp.usinggun tag @s remove tmp.coindisplay + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/guntest.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/guntest.mcfunction index 49cdef90..4c747af3 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/guntest.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/guntest.mcfunction @@ -1,4 +1,8 @@ -execute store result score tmp board run data get entity @s SelectedItem.tag.hp +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score tmp board run data get entity @s SelectedItem.components."minecraft:custom_data".hp execute if score @s level >= tmp board run tag @s add success execute as @s[tag=success] run scoreboard players operation @s bw.tmp.em = tmp board -execute as @s[tag=success] run function zombieever/removelevel/add \ No newline at end of file +execute as @s[tag=success] run function zombieever/removelevel/add diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/join.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/join.mcfunction index 3a379242..736738ac 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/join.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/join.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## title @s title [{"text":"Zombie Day","color":"dark_green","bold": true}] title @s subtitle ["\u00a7bPre-release \u00a7ev0.3"] team join wait.zombie @s tellraw @a[team=!wait.zombie] ["\u00a7a\u00a7l[MESSAGE] ",{"selector":"@s"},"\u00a77 已加入 ",{"text":"Zombie Day","color":"dark_green","bold": true}," \u00a77!"] -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.zombie,gamemode=adventure] run scoreboard players add wait.player tick 1 tellraw @s ["\n\u00a7a Welcome to ",{"text":"Zombie Day","color":"dark_green","bold": true},"\n"] tellraw @s ["\n\u00a7a ",{"text":"Zombie Day","color":"dark_green","bold": true},"\n\n \u00a7b版本：\u00a7ePre-release v0.3\n"] @@ -23,4 +27,4 @@ tellraw @s[tag=GOABLE.SPEC] ["\n\u00a77 你已开启\u00a7b全局旁观者模 execute as @s[tag=GOABLE.SPEC] at @s run gamemode spectator execute as @s[tag=GOABLE.SPEC] at @s run team join play.zombie @s -tellraw @s ["\n\u00a76 您可以在\u00a7b\u00a7l菜单 - 选项 - 声音 - 地图音乐\n \u00a7e（如果未加载材质包显示为“\u00a7b\u00a7l语音\u00a7e”）\n \u00a76调整背景音乐声音大小。\n"] \ No newline at end of file +tellraw @s ["\n\u00a76 您可以在\u00a7b\u00a7l菜单 - 选项 - 声音 - 地图音乐\n \u00a7e（如果未加载材质包显示为“\u00a7b\u00a7l语音\u00a7e”）\n \u00a76调整背景音乐声音大小。\n"] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/modify.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/modify.mcfunction index b0089573..a1230ee2 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/modify.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/modify.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute unless score zombie.state state matches 1.. run scoreboard players add zombie.type board 1 execute if score zombie.state state matches 1.. run tellraw @s ["\u00a7c游戏已经开始，当前无法修改。"] @@ -7,4 +11,4 @@ execute if score zombie.type board matches ..1 run data modify block 347 76 22 f # execute if score chest.type board matches 2 run data modify block 347 76 22 front_text.messages[(2-1)] set value '"\\u00a7b\\u00a7l[逃离神庙]"'} execute if score zombie.type board matches 2 run data modify block 347 76 22 front_text.messages[1] set value '"\\u00a7c[困难难度]"' -# execute if score chest.type board matches 4 run data modify block 347 76 22 front_text.messages[(2-1)] set value '"\\u00a7d\\u00a7l[五子棋]"'} \ No newline at end of file +# execute if score chest.type board matches 4 run data modify block 347 76 22 front_text.messages[(2-1)] set value '"\\u00a7d\\u00a7l[五子棋]"'} diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/modify_mode.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/modify_mode.mcfunction index 9346ad74..e9cf1012 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/modify_mode.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/modify_mode.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s execute unless score zombie.state state matches 1.. run scoreboard players add zombie.mode board 1 execute if score zombie.state state matches 1.. run tellraw @s ["\u00a7c游戏已经开始，当前无法修改。"] @@ -9,4 +13,4 @@ execute if score zombie.mode board matches 2 run data modify block 347 76 21 fro execute if score zombie.mode board matches 2 run data modify block 347 76 21 front_text.messages[2] set value '"\\u00a7e在每一个进度完成后复活"' execute if score zombie.mode board matches 3 run data modify block 347 76 21 front_text.messages[1] set value '"\\u00a7c[高手模式]"' execute if score zombie.mode board matches 3 run data modify block 347 76 21 front_text.messages[2] set value '"\\u00a7e您无法复活"' -# execute if score chest.type board matches 4 run data modify block 347 76 22 front_text.messages[(2-1)] set value '"\\u00a7d\\u00a7l[五子棋]"'} \ No newline at end of file +# execute if score chest.type board matches 4 run data modify block 347 76 22 front_text.messages[(2-1)] set value '"\\u00a7d\\u00a7l[五子棋]"'} diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround.mcfunction index 9aa7fd88..ea15b7c4 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround.mcfunction @@ -1,10 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add zombie.round board 1 scoreboard players reset * zombie.villager.click tellraw @a[team=play.zombie] ["\u00a7e进度推进 \u00a7b[Process ",{"score":{"name": "zombie.round","objective": "board"},"color":"green"},"\u00a7b]"] # Total + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -execute if score zombie.round board matches 12 if entity @e[tag=pve.zombie,tag=pve.root] run function zombieever/rounds/11 -execute if score zombie.round board matches 12 unless entity @e[tag=pve.zombie,tag=pve.root] run function zombieever/talks/crazyrabbit/win +execute if score zombie.round board matches 12 if entity @e[tag=pve.root] run function zombieever/rounds/11 +execute if score zombie.round board matches 12 unless entity @e[tag=pve.root] run function zombieever/talks/crazyrabbit/win ## 下一把开始（开始检测） # scoreboard players set zombie.state state 1 @@ -21,7 +26,7 @@ execute if score zombie.round board matches 18..22 run schedule function zombiee execute if score zombie.round board matches 23 run function zombieever/door/open_cave_loot_out execute if score zombie.round board matches 24 run function zombieever/rounds/lava execute if score zombie.round board matches 25 run function zombieever/door/stronghold_tpup -execute if score zombie.round board matches 27 if entity @e[tag=pve.zombie,tag=pve.root] run function zombieever/rounds/strongholdboss_xb +execute if score zombie.round board matches 27 if entity @e[tag=pve.root] run function zombieever/rounds/strongholdboss_xb # execute if score zombie.round board matches 28 if entity @e[tag=pve.zombie,tag=pve.root] run function zombieever/rounds/strongholdboss_xb execute if score zombie.round board matches 27 run function zombieever/door/open_cave_wall_boss @@ -29,3 +34,4 @@ execute if score zombie.round board matches 27 run function zombieever/door/open # execute if score zombie.round board matches 23.. as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b} # execute if score zombie.round board matches 23.. run function zombieever/over/win execute if score zombie.round board matches 29.. run function zombieever/over/win + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old.mcfunction index a768a995..2bf4de8f 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add zombie.round board 1 tellraw @a[team=play.zombie] ["\n \u00a7a现在是第 ",{"score":{"name": "zombie.round","objective": "board"},"color":"yellow"},"\u00a7e 轮\u00a7a。\n"] @@ -7,13 +11,13 @@ tellraw @a[team=play.zombie] ["\n \u00a7a现在是第 ",{"score":{"name": "zom execute if score zombie.round board matches 2 run tellraw @a[team=play.zombie] ["\n\u00a7a神様：\u00a7f干得不错，再接再厉！\n"] -execute if score zombie.round board matches 1..4 if score zombie.type board matches 2 as @e[tag=zombie.spawn.1,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 1..4 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 1..4 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 1..4 if score zombie.type board matches 2 as @e[tag=zombie.spawn.1,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 1..4 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 1..4 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.round board matches 2..4 as @e[tag=zombie.spawn.1,limit=3,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 2..4 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 2..4 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 2..4 as @e[tag=zombie.spawn.1,limit=3,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 2..4 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 2..4 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} execute if score zombie.round board matches 3..4 as @e[tag=zombie.spawn.1,limit=3,sort=random] at @s run summon spider ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 3..4 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.1,limit=1,sort=random] at @s run summon spider ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} @@ -21,16 +25,16 @@ execute if score zombie.round board matches 3..4 if score zombie.type board matc # 2 Normal - 小白 execute if score zombie.round board matches 6 if score zombie.type board matches 2 run tellraw @a[team=play.zombie] ["\u00a7c骷髅：\u00a7f不要以为只有你们有枪！我们也有！"] -execute if score zombie.round board matches 6 if score zombie.type board matches 2 as @e[tag=zombie.spawn.2,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{CustomModelData:9}}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @e[tag=zombie.spawn.2,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 5..6 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 6 if score zombie.type board matches 2 as @e[tag=zombie.spawn.2,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:carrot_on_a_stick",count:1,components:{"minecraft:custom_model_data":9}}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @e[tag=zombie.spawn.2,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 5..6 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.round board matches 5..6 as @e[tag=zombie.spawn.2,limit=3,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",Count:1b},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",Count:1b},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 5..6 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",Count:1b},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 5..6 as @e[tag=zombie.spawn.2,limit=3,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",count:1},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 5..6 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",count:1},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 5..6 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandItems:[{id:"minecraft:bow",count:1},{}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.round board matches 6 as @e[tag=zombie.spawn.2,limit=3,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 6 as @e[tag=zombie.spawn.2,limit=3,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} execute if score zombie.round board matches 5..6 as @e[tag=zombie.spawn.2,limit=3,sort=random] at @s run summon spider ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 5..6 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.2,limit=1,sort=random] at @s run summon spider ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} @@ -41,30 +45,30 @@ execute if score zombie.round board matches 6 if score zombie.type board matches # 3 Special - 溺尸 execute if score zombie.round board matches 7 run tellraw @a[team=play.zombie] ["\n\u00a7b你：\u00a7f这次他们想玩什么花招？欸... 在\u00a7e\u00a7l村子中心的水里面\u00a7f有什么？！\n"] -execute if score zombie.round board matches 7..8 as @e[tag=zombie.spawn.3,limit=5,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 7..8 as @a[team=play.zombie,gamemode=adventure] at @s as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 7..8 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} -# +execute if score zombie.round board matches 7..8 as @e[tag=zombie.spawn.3,limit=5,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 7..8 as @a[team=play.zombie,gamemode=adventure] at @s as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 7..8 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +# -execute if score zombie.round board matches 9..10 as @e[tag=zombie.spawn.3,limit=5,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 9..10 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 9..10 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 9..10 as @e[tag=zombie.spawn.3,limit=5,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 9..10 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 9..10 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.round board matches 10 as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie","pve.gunfree"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],Health:3,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{CustomModelData:9}}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 10 as @e[tag=zombie.spawn.3,limit=1,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie","pve.gunfree"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],Health:3,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:carrot_on_a_stick",count:1,components:{"minecraft:custom_model_data":9}}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} # 4 Special - 袭击（掠夺者） -execute if score zombie.round board matches 6 as @e[tag=zombie.spawn.4,limit=3,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 6 as @e[tag=zombie.spawn.4,limit=3,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:turtle_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} execute if score zombie.round board matches 11 run tellraw @a[team=play.zombie] ["\n\u00a7d村民：\u00a7f这次又是什么鬼？！袭击者小队？！快逃啊！\n"] execute if score zombie.round board matches 12 run tellraw @a[team=play.zombie] ["\n\u00a7d村民：\u00a7f不是吧？还有一次？！\n"] # execute if score zombie.type board matches 1 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon evoker ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",Count:1b},{}]} -execute if score zombie.type board matches 1 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=4,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute if score zombie.type board matches 1 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=4,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.type board matches 1 if score zombie.round board matches 12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",Count:1b},{}]} +execute if score zombie.type board matches 1 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=4,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute if score zombie.type board matches 1 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=4,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.type board matches 1 if score zombie.round board matches 12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",count:1},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon evoker ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",Count:1b},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon evoker ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 11..12 as @e[tag=zombie.spawn.4,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 12 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:air",count:1},{}]} # 5 Special - 幻翼 execute if score zombie.round board matches 13 run tellraw @a[team=play.zombie] ["\n\u00a7a村民：\u00a7f欸... \u00a7b\u00a7l天上的\u00a7f是啥？！\n"] @@ -79,7 +83,7 @@ execute if score zombie.round board matches 14 if score zombie.type board matche execute if score zombie.round board matches 14 as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon rabbit ~ ~ ~ {RabbitType:99,Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Health:5,Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.max_health"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 14 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.4,limit=1,sort=random] at @s run summon rabbit ~ ~ ~ {RabbitType:99,Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Health:5,Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.max_health"},{Base:1d,Name:"generic.attack_speed"}]} -# 6 Special - Underground - Open: +# 6 Special - Underground - Open: execute if score zombie.round board matches 15 run tellraw @a[team=play.zombie] ["\n\u00a7c敌人：\u00a7f此山是我开，此树是我栽。要想过此路，留下你命来！\n"] execute if score zombie.round board matches 15 if score zombie.type board matches 2 as @e[tag=zombie.spawn.6,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 15 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.6,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} @@ -95,12 +99,12 @@ execute if score zombie.round board matches 15 as @a[team=play.zombie,gamemode=a execute if score zombie.round board matches 15 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.6,limit=1,sort=random] at @s run summon spider ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} # 7 Special - Underground - 僵尸猪人 -execute if score zombie.round board matches 16 as @e[tag=zombie.spawn.7,limit=10,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} -execute if score zombie.round board matches 16 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.7,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{CustomModelData:9}}]} -execute if score zombie.round board matches 16 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.7,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{CustomModelData:9}}]} +execute if score zombie.round board matches 16 as @e[tag=zombie.spawn.7,limit=10,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} +execute if score zombie.round board matches 16 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.7,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{id:"minecraft:carrot_on_a_stick",count:1,components:{"minecraft:custom_model_data":9}}]} +execute if score zombie.round board matches 16 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.7,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{id:"minecraft:carrot_on_a_stick",count:1,components:{"minecraft:custom_model_data":9}}]} -# 8 Special - Underground - 烈焰人 +# 8 Special - Underground - 烈焰人 execute if score zombie.round board matches 17 run tellraw @a[team=play.zombie] ["\n\u00a7c烈焰人：\u00a7f哦不！猪灵桑！我要为你们复仇！\n"] execute if score zombie.round board matches 17..18 as @e[tag=zombie.spawn.8,limit=7,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 17..18 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.8,limit=1,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} @@ -124,17 +128,17 @@ execute if score zombie.round board matches 21..22 if score zombie.type board ma execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 21..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.10,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} -execute if score zombie.round board matches 21..22 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.10,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} -execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} +execute if score zombie.round board matches 21..22 if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=zombie.spawn.10,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} +execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon creeper ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} -execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} +execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} #summon minecraft:marker ~ ~ ~ {Tags:["zombie.spawn","zombie.spawn.10"]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon phantom ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_axe",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon evoker ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_axe",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=6,sort=random] at @s run summon phantom ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_sword",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_axe",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon evoker ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:diamond_axe",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.10,limit=4,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.6d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"}],HandDropChances:[0.0f,0.0f],HandItems:[{id:"minecraft:crossbow",count:1},{}]} # 11 Special - Boss # @e[tag=zombie.spawn.boss] @@ -142,6 +146,7 @@ execute if score zombie.type board matches 1 if score zombie.round board matches execute if score zombie.type board matches 2 if score zombie.round board matches 22 as @e[tag=zombie.spawn.boss] at @s run summon wither ~ ~ ~ {Tags:["pve.zombie","pve.gunzombie"],HandDropChances:[0.0f,0.0f],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],Health:2000,Attributes:[{Base:0.5d,Name:"generic.movement_speed"},{Base:1000d,Name:"generic.max_health"}],DeathLootTable:"minecraft:empty",CustomName:'"\\u00a7a\\u00a7l神様 \\u00a76\\u00a7lKamisama \\u00a76| \\u00a7b\\u00a7lThe God"'} # Total + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} ## 下一把开始（开始检测） @@ -149,4 +154,4 @@ scoreboard players set zombie.state state 1 ## 结束 # execute if score zombie.round board matches 23.. as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b} -execute if score zombie.round board matches 23.. run function zombieever/over/win \ No newline at end of file +execute if score zombie.round board matches 23.. run function zombieever/over/win diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old2.mcfunction index 52cba0ca..3fd6f6fa 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/nextround_old2.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players add zombie.round board 1 tellraw @a[team=play.zombie] ["\n \u00a7a这是第 ",{"score":{"name": "zombie.round","objective": "board"},"color":"yellow"},"\u00a7e 轮\u00a7a进攻。\n\u00a7b 僵尸现在已经生成！\n"] scoreboard players set zombie.state state 1 @@ -64,7 +68,7 @@ execute if score zombie.round board matches 5 run function zombieever/door/open1 execute as @a[team=play.zombie] run execute if score zombie.round board matches 5 as @e[tag=zombie.spawn.now,sort=random,limit=1] at @s run summon pig ~ ~ ~ {Tags:["pve.zombie","pve.coin"],DeathLootTable:"",PersistenceRequired:1b,Health:100f,Attributes:[{Base:300d,Name:"generic.max_health"}]} execute as @a[team=play.zombie] if score zombie.round board matches 5 run scoreboard players add @s zombie.coin 1000 # execute if score zombie.round board matches 5 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon slime ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Size:0} -execute if score zombie.round board matches 6..9 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,HandItems:[{id:"minecraft:bow",Count:1b},{}],Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} +execute if score zombie.round board matches 6..9 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,HandItems:[{id:"minecraft:bow",count:1},{}],Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 7..9 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon llama ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b} execute if score zombie.round board matches 6..9 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:0.33d,Name:"generic.movement_speed"},{Base:3.3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 10..11 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon snow_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:7d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} @@ -80,7 +84,7 @@ execute if score zombie.round board matches 16..17 as @e[tag=zombie.spawn.now,so execute as @a[team=play.zombie] run execute if score zombie.round board matches 18 as @e[tag=zombie.spawn.now,sort=random,limit=5] at @s run summon rabbit ~ ~ ~ {RabbitType:99,Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Health:2,Attributes:[{Base:0.5d,Name:"generic.movement_speed"},{Base:2d,Name:"generic.max_health"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 19..19 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 20 run function zombieever/door/open2 -execute if score zombie.round board matches 20 as @e[tag=zombie.spawn.now,sort=random,limit=9] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,HandItems:[{},{id:"minecraft:bow",Count:1b}],Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} +execute if score zombie.round board matches 20 as @e[tag=zombie.spawn.now,sort=random,limit=9] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,HandItems:[{},{id:"minecraft:bow",count:1}],Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 20 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} # execute if score zombie.round board matches 1..2 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b} @@ -92,29 +96,29 @@ execute store result bossbar zombie:zombiecount max run scoreboard players get z execute if score zombie.round board matches 21..22 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:3.5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} execute if score zombie.round board matches 23..24 as @e[tag=zombie.spawn.now,sort=random,limit=1] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"},{Base:0.5d,Name:"generic.movement_speed"},{Base:4d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}]} -execute if score zombie.round board matches 23..24 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30f,HandItems:[{id:"minecraft:bow",Count:1b},{}]} +execute if score zombie.round board matches 23..24 as @e[tag=zombie.spawn.now,sort=random,limit=3] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30f,HandItems:[{id:"minecraft:bow",count:1},{}]} execute if score zombie.round board matches 23..24 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"},{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],Health:30f} execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"},{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],Health:30f} -execute as @a[team=play.zombie] run execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=1] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:diamond_axe",Count:1b},{}]} -execute as @a[team=play.zombie] run execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=5] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:diamond_axe",Count:1b},{}]} +execute as @a[team=play.zombie] run execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=1] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:diamond_axe",count:1},{}]} +execute as @a[team=play.zombie] run execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=5] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:diamond_axe",count:1},{}]} execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=1] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f} -execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=5] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30f,HandItems:[{id:"minecraft:bow",Count:1b},{}]} +execute if score zombie.round board matches 25 as @e[tag=zombie.spawn.now,sort=random,limit=5] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30f,HandItems:[{id:"minecraft:bow",count:1},{}]} execute if score zombie.round board matches 25 as @e[tag=zombie.boss,sort=random,limit=1] at @s run summon wither ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:90d,Name:"generic.max_health"},{Base:0.5d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],Health:90f} -execute if score zombie.round board matches 25 as @e[type=wither,tag=pve.zombie] at @s run summon firework_rocket ~ ~2 ~ {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +execute if score zombie.round board matches 25 as @e[type=wither,tag=pve.zombie] at @s run summon firework_rocket ~ ~2 ~ {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} execute if score zombie.round board matches 26 run tellraw @a[team=play.zombie] ["\n\u00a7c\u00a7l BOSS 来临\n"] execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=4] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"},{Base:0.5d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],Health:30f} execute if score zombie.round board matches 26 as @e[tag=zombie.boss,sort=random,limit=2] at @s run summon wither ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:50d,Name:"generic.max_health"}],Health:50f} -execute as @a[team=play.zombie] run execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute as @a[team=play.zombie] run execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} +execute as @a[team=play.zombie] run execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute as @a[team=play.zombie] run execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f,HandItems:[{id:"minecraft:crossbow",count:1},{}]} execute if score zombie.round board matches 26 as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon ravager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"}],Health:60f} -execute if score zombie.round board matches 26 as @e[type=wither,tag=pve.zombie] at @s run summon firework_rocket ~ ~2 ~ {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +execute if score zombie.round board matches 26 as @e[type=wither,tag=pve.zombie] at @s run summon firework_rocket ~ ~2 ~ {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} # zombie.boss execute if score zombie.round board matches 25..26 as @e[tag=zombie.spawn.now,sort=random,limit=10] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b,Attributes:[{Base:30d,Name:"generic.max_health"},{Base:0.55d,Name:"generic.movement_speed"},{Base:6d,Name:"generic.attack_damage"},{Base:2d,Name:"generic.attack_speed"}]} ## 结束 # execute if score zombie.round board matches 23.. as @e[tag=zombie.spawn.now,sort=random,limit=2] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"",PersistenceRequired:1b} -execute if score zombie.round board matches 27.. run function zombieever/over/win \ No newline at end of file +execute if score zombie.round board matches 27.. run function zombieever/over/win diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/o_f_tick.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/o_f_tick.mcfunction index cb839787..c1e2ce4d 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/o_f_tick.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/o_f_tick.mcfunction @@ -1,2 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute if score zombie.state state matches 1 if score zombie.round board matches 10.. as @e[tag=pve.zombie,tag=pve.gunzombie] at @s run function gun/zombiegun/shoot execute if score zombie.state state matches 1 as @e[tag=pve.zombie] at @s unless data entity @s {CustomNameVisible:1b} run function zombieever/zombie/displayhealth + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/all.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/all.mcfunction index c4985736..dbce00f3 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/all.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/all.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## schedule function zombieever/over/back 5s tellraw @a ["\u00a72\u00a7lZombie Day >>> \u00a76游戏结束！游戏进度：",{"score":{"objective": "board","name": "zombie.round"},"color":"yellow"}] scoreboard players set zombie.state state 5 @@ -22,4 +26,4 @@ kill @e[type=experience_orb,x=536,y=-24,z=-107,distance=0..80] forceload remove 597 -111 714 1 forceload remove 656 -41 596 -112 -forceload remove 585 -67 495 -154 \ No newline at end of file +forceload remove 585 -67 495 -154 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/back.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/back.mcfunction index 749aa39d..f1751045 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/back.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/back.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode adventure @a[gamemode=spectator,team=play.zombie] execute as @a[team=play.zombie,gamemode=adventure] run function zombieever/join scoreboard players set zombie.state state 0 schedule clear zombieever/nextround schedule clear #minecraft:zom_talks + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_player.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_player.mcfunction index 4ea7f4e9..6cabe802 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_player.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_player.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @a[team=play.zombie,gamemode=adventure] title @a[team=play.zombie] title ["\u00a7cYou lost!"] title @a[team=play.zombie] subtitle ["\u00a7e所有玩家已经阵亡。"] function zombieever/over/all tellraw @a[team=play.zombie] ["\n\u00a72\u00a7l \u00a76游戏结束！持续轮数：",{"score":{"objective": "board","name": "zombie.round"},"color":"yellow"},"\n"] + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_villager.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_villager.mcfunction index e51d472e..a8114733 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_villager.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/lose_villager.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @a[team=play.zombie,gamemode=adventure] title @a[team=play.zombie] title ["\u00a7cYou lost!"] title @a[team=play.zombie] subtitle ["\u00a7b召唤师非正常死亡"] function zombieever/over/all tellraw @a[team=play.zombie] ["\n\u00a72\u00a7l \u00a76游戏结束！持续轮数：",{"score":{"objective": "board","name": "zombie.round"},"color":"yellow"},"\n"] + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/win.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/win.mcfunction index 66f0cefc..24f9905a 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/over/win.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/over/win.mcfunction @@ -1,15 +1,20 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\n\u00a7a 你获胜了！\n"] title @a[team=play.zombie] title ["\u00a76你获胜了！"] title @a[team=play.zombie] subtitle ["\u00a7aGood Game!"] gamemode spectator @a[team=play.zombie,gamemode=adventure] function zombieever/over/all tellraw @a[team=play.zombie] ["\n\u00a72\u00a7l \u00a76游戏结束！\u00a7a冒险者们获胜！\n"] -summon firework_rocket 533 -53 -117 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +summon firework_rocket 533 -53 -117 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} -summon firework_rocket 533 -53 -121 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +summon firework_rocket 533 -53 -121 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} -summon firework_rocket 533 -53 -113 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +summon firework_rocket 533 -53 -113 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} -summon firework_rocket 348 -53 -125 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} +summon firework_rocket 348 -53 -125 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} + +summon firework_rocket 348 -53 -109 {LifeTime:20,FireworksItem:{id:"firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:large_ball,color:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],fade_colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],has_trail:1,has_twinkle:1}],flight_duration:1}}}} -summon firework_rocket 348 -53 -109 {LifeTime:20,FireworksItem:{id:"firework_rocket",Count:1,tag:{Fireworks:{Explosions:[{Type:1,Flicker:1,Trail:1,Colors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320],FadeColors:[I;1973019,11743532,3887386,5320730,2437522,8073150,2651799,11250603,4408131,14188952,4312372,14602026,6719955,12801229,15435844,15790320]}],Flight:1}}}} diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rejoin.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rejoin.mcfunction index 84d49b71..d7ef820b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rejoin.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rejoin.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players reset @s leave execute as @s at @s run tellraw @a[tag=play.zombie] [{"selector":"@s"},"\u00a77 重新加入了游戏。"] tellraw @s ["\n\u00a77 本次游戏仍然有效，您已加入游戏！\n \u00a77您可以使用 \u00a76/trigger hub\u00a77返回大厅\n"] team join play.zombie gamemode spectator @s -tp @s 630 40 -78 90 0 \ No newline at end of file +tp @s 630 40 -78 90 0 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/1.mcfunction index 45ef17f0..7cede8db 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/1.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 1 xp add @s -1 levels # xp set @s 1 points execute if score @s bw.tmp.em matches 1.. run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/10.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/10.mcfunction index f1762555..f62435a6 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/10.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/10.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 10 xp add @s -10 levels # xp set @s 1 points @@ -5,4 +9,4 @@ xp add @s -10 levels execute if score @s bw.tmp.em matches 10.. run function minecraft:zombieever/removelevel/10 execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/100.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/100.mcfunction index e2a16a6f..3dc063c0 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/100.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/100.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 100 xp add @s -100 levels # xp set @s 1 points @@ -9,4 +13,4 @@ execute if score @s bw.tmp.em matches 25..49 run function minecraft:zombieever/r execute if score @s bw.tmp.em matches 10.. run function minecraft:zombieever/removelevel/10 execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/25.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/25.mcfunction index 3f334511..50d20160 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/25.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/25.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 25 xp add @s -25 levels # xp set @s 1 points @@ -6,4 +10,4 @@ execute if score @s bw.tmp.em matches 25.. run function minecraft:zombieever/rem execute if score @s bw.tmp.em matches 10..24 run function minecraft:zombieever/removelevel/10 execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/5.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/5.mcfunction index 1f0cec85..2eba00d9 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/5.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/5.mcfunction @@ -1,7 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 5 xp add @s -5 levels # xp set @s 1 points execute if score @s bw.tmp.em matches 5.. run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/50.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/50.mcfunction index e162c3fe..494e7a23 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/50.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/50.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 50 xp add @s -50 levels # xp set @s 1 points @@ -7,4 +11,4 @@ execute if score @s bw.tmp.em matches 25..49 run function minecraft:zombieever/r execute if score @s bw.tmp.em matches 10.. run function minecraft:zombieever/removelevel/10 execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/75.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/75.mcfunction index 50a7d7e7..2df7dbed 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/75.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/75.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players remove @s bw.tmp.em 75 xp add @s -75 levels # xp set @s 1 points @@ -8,4 +12,4 @@ execute if score @s bw.tmp.em matches 25..49 run function minecraft:zombieever/r execute if score @s bw.tmp.em matches 10.. run function minecraft:zombieever/removelevel/10 execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 -execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em \ No newline at end of file +execute if score @s bw.tmp.em matches ..0 run scoreboard players reset @s bw.tmp.em diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/add.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/add.mcfunction index 35e66004..37bf4b57 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/add.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/removelevel/add.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # xp add @s 1 levels # xp add @s -1 levels -# +# execute if score @s bw.tmp.em matches 100.. run function minecraft:zombieever/removelevel/100 execute if score @s bw.tmp.em matches 75..99 run function minecraft:zombieever/removelevel/75 execute if score @s bw.tmp.em matches 50..74 run function minecraft:zombieever/removelevel/50 @@ -9,4 +13,4 @@ execute if score @s bw.tmp.em matches 10.. run function minecraft:zombieever/rem execute if score @s bw.tmp.em matches 5..9 run function minecraft:zombieever/removelevel/5 execute if score @s bw.tmp.em matches 1..4 run function minecraft:zombieever/removelevel/1 scoreboard players reset @s bw.tmp.em -stopsound @s * minecraft:entity.player.levelup \ No newline at end of file +stopsound @s * minecraft:entity.player.levelup diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/11.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/11.mcfunction index acce75c5..ef4ea593 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/11.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/11.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set zombie.round board 11 -execute as @e[tag=pve.spawn.rabbit,limit=2,sort=random] at @s run summon rabbit ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",RabbitType:99,Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],Health:3} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.rabbit,limit=1,sort=random] at @s run summon rabbit ~ ~ ~ {RabbitType:99,Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],Health:3} +execute as @e[tag=pve.spawn.rabbit,limit=2,sort=random] at @s run summon rabbit ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",RabbitType:99,Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:3d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],Health:3} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.rabbit,limit=1,sort=random] at @s run summon rabbit ~ ~ ~ {RabbitType:99,Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"},{Base:3d,Name:"generic.max_health"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],Health:3} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -scoreboard players set zombie.state state 1 \ No newline at end of file +scoreboard players set zombie.state state 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/13.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/13.mcfunction index b34d4f2e..dbdae307 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/13.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/13.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.findkey"]} -execute as @e[tag=pve.spawn.findkey,limit=10,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:trident",Count:1b},{}]} -execute as @e[tag=pve.spawn.findkey,limit=2,sort=random] at @s run summon guardian ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute as @e[tag=pve.spawn.findkey,limit=10,sort=random] at @s run summon drowned ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:trident",count:1},{}]} +execute as @e[tag=pve.spawn.findkey,limit=2,sort=random] at @s run summon guardian ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -scoreboard players set zombie.state state 2 \ No newline at end of file +scoreboard players set zombie.state state 2 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/14.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/14.mcfunction index b077ad9a..ff7ce2ce 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/14.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/14.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.house"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.house,sort=random,limit=10] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.house,sort=random,limit=10] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.house,sort=random,limit=10] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.house,sort=random,limit=10] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + +execute if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.45d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow"},{}]} +execute if score zombie.type board matches 1 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.type board matches 2 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.45d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow"},{}]} -execute if score zombie.type board matches 1 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.house,limit=1,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -scoreboard players set zombie.state state 1 \ No newline at end of file +scoreboard players set zombie.state state 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/3.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/3.mcfunction index 57c87983..5ed0c81c 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/3.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/3.mcfunction @@ -1,8 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #summon marker ~ ~ ~ {Tags:["pve.spawn.3","pve.spawn","pve"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.3,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.3,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.3,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.3,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.3,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.3,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} # Total + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/5.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/5.mcfunction index 20ccb3d5..cc0207f3 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/5.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/5.mcfunction @@ -1,7 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.village"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=7,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=5,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=7,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=5,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon zombified_piglin ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/6.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/6.mcfunction index 4c4b153c..6c2fc429 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/6.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/6.mcfunction @@ -1,7 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.village"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=8,sort=random] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=8,sort=random] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=8,sort=random] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=8,sort=random] at @s run summon zombie_villager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/7.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/7.mcfunction index ccb51666..a5cda9cb 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/7.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/7.mcfunction @@ -1,10 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.village"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:wooden_axe",count:1},{}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:wooden_axe",Count:1b},{}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/8.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/8.mcfunction index 3ed8812f..b8f1beec 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/8.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/8.mcfunction @@ -1,11 +1,17 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.village"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village,limit=3,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:wooden_axe",count:1},{}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:wooden_axe",Count:1b},{}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/9.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/9.mcfunction index 83404983..b4ac4ea1 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/9.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/9.mcfunction @@ -1,7 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.village.iron"]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village.iron,limit=2,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village.iron,limit=2,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village.iron,limit=1,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.village.iron,limit=2,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1.4d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.village.iron,limit=2,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.village.iron,limit=1,sort=random] at @s run summon iron_golem ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.2d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss.mcfunction index 30d1a583..89a5b9e8 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 544 -20 -128 tellraw @a[team=play.zombie] ["\n\u00a7c 魔王降临...\n"] scoreboard players set zombie.round board 28 @@ -5,3 +9,4 @@ scoreboard players set zombie.round board 28 execute if score zombie.type board matches 1 run summon wither 544 -20 -128 {Tags:["pve.zombie"],Health:1000,Attributes:[{Base:0.5d,Name:"generic.movement_speed"},{Base:1000d,Name:"generic.max_health"}],DeathLootTable:"minecraft:empty",CustomName:'"\\u00a7c\\u00a7l魔王"'} execute if score zombie.type board matches 2 run summon wither 544 -20 -128 {Tags:["pve.zombie"],Health:2000,Attributes:[{Base:0.5d,Name:"generic.movement_speed"},{Base:2000d,Name:"generic.max_health"}],DeathLootTable:"minecraft:empty",CustomName:'"\\u00a7c\\u00a7l魔王"'} function minecraft:zombieever/rounds/boss_xb + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss_xb.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss_xb.mcfunction index 692c0c10..dee5c725 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss_xb.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/boss_xb.mcfunction @@ -1,15 +1,20 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 544 -20 -128 #summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.boss"]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.type board matches 1 as @e[tag=pve.spawn.boss,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_sword",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_sword",Count:1b},{}]} -execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon illusioner ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow",Count:1b},{}]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow",Count:1b},{}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.type board matches 1 as @e[tag=pve.spawn.boss,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_sword",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon wither_skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_sword",count:1},{}]} +execute as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon illusioner ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow",count:1},{}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.boss,limit=2,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow",count:1},{}]} -scoreboard players set zombie.state state 1 \ No newline at end of file +scoreboard players set zombie.state state 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/lava.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/lava.mcfunction index 39ad00ac..f75e6abc 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/lava.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/lava.mcfunction @@ -1,11 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.lava"]} -execute if score zombie.round board matches 23..24 as @e[tag=pve.spawn.lava,limit=5,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.round board matches 23 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.lava,limit=2,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.round board matches 24 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.lava,limit=3,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} +execute if score zombie.round board matches 23..24 as @e[tag=pve.spawn.lava,limit=5,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.round board matches 23 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.lava,limit=2,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.round board matches 24 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.lava,limit=3,sort=random] at @s run summon blaze ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.4d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} # execute if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} # execute if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -scoreboard players set zombie.state state 1 \ No newline at end of file +scoreboard players set zombie.state state 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/stronghold.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/stronghold.mcfunction index 8ec603b2..acb5b9f0 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/stronghold.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/stronghold.mcfunction @@ -1,22 +1,27 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.stronghold"]} -execute if score zombie.round board matches 21..22 as @e[tag=pve.spawn.stronghold,limit=3,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.round board matches 21..22 as @e[tag=pve.spawn.stronghold,limit=3,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 18..22 as @e[tag=pve.spawn.stronghold,limit=8,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 if score zombie.round board matches 18..22 as @e[tag=pve.spawn.stronghold,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 19..22 as @e[tag=pve.spawn.stronghold,limit=5,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow",Count:1b},{}]} -execute if score zombie.round board matches 19..22 as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 21..22 as @e[tag=pve.spawn.stronghold,limit=3,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.round board matches 21..22 as @e[tag=pve.spawn.stronghold,limit=3,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute if score zombie.type board matches 2 if score zombie.round board matches 18..22 as @e[tag=pve.spawn.stronghold,limit=8,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.35d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 if score zombie.round board matches 18..22 as @e[tag=pve.spawn.stronghold,limit=5,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 19..22 as @e[tag=pve.spawn.stronghold,limit=5,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow",count:1},{}]} +execute if score zombie.round board matches 19..22 as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} -execute if score zombie.round board matches 21..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.round board matches 21..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} -execute if score zombie.round board matches 20..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} +execute if score zombie.round board matches 21..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.round board matches 21..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:crossbow",count:1},{}]} +execute if score zombie.round board matches 20..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon witch ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} + +execute if score zombie.type board matches 2 if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.type board matches 1 if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}]} +execute if score zombie.round board matches 19..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:bow",count:1},{}]} -execute if score zombie.type board matches 2 if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.type board matches 1 if score zombie.round board matches 18..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=1,sort=random] at @s run summon zombie ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}]} -execute if score zombie.round board matches 19..22 as @a[team=play.zombie,gamemode=adventure] as @e[tag=pve.spawn.stronghold,limit=2,sort=random] at @s run summon skeleton ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.3d,Name:"generic.movement_speed"},{Base:5d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:bow",Count:1b},{}]} execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} -scoreboard players set zombie.state state 1 \ No newline at end of file +scoreboard players set zombie.state state 1 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss.mcfunction index 10df8884..5ae6956b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.stongholdboss"]} -summon minecraft:illusioner 516 -43 -101 {HandItems:[{id:"minecraft:crossbow",Count:1b},{id:"minecraft:bow",Count:1b}],Tags:["pve.zombie","pve.root"],DeathLootTable:"minecraft:empty",Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30} +summon minecraft:illusioner 516 -43 -101 {HandItems:[{id:"minecraft:crossbow",count:1},{id:"minecraft:bow",count:1}],Tags:["pve.zombie","pve.root"],DeathLootTable:"minecraft:empty",Attributes:[{Base:30d,Name:"generic.max_health"}],Health:30} function minecraft:zombieever/rounds/strongholdboss_xb + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss_xb.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss_xb.mcfunction index eb73757e..ae204c2e 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss_xb.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/rounds/strongholdboss_xb.mcfunction @@ -1,9 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # summon marker ~ ~ ~ {Tags:["pve","pve.spawn","pve.spawn.stongholdboss"]} -execute as @e[tag=pve.spawn.stongholdboss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute as @e[tag=pve.spawn.stongholdboss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:iron_axe",Count:1b},{}]} -execute if score zombie.type board matches 2 as @e[tag=pve.spawn.stongholdboss,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",Count:1b,tag:{Unbreakable:1b}}],HandItems:[{id:"minecraft:crossbow",Count:1b},{}]} +execute as @e[tag=pve.spawn.stongholdboss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute as @e[tag=pve.spawn.stongholdboss,limit=2,sort=random] at @s run summon vindicator ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:iron_axe",count:1},{}]} +execute if score zombie.type board matches 2 as @e[tag=pve.spawn.stongholdboss,limit=1,sort=random] at @s run summon pillager ~ ~ ~ {Tags:["pve.zombie"],DeathLootTable:"minecraft:empty",Attributes:[{Base:0.25d,Name:"generic.movement_speed"},{Base:3d,Name:"generic.attack_damage"},{Base:1d,Name:"generic.attack_speed"}],ArmorItems:[{},{},{},{id:"minecraft:leather_helmet",count:1,components:{"minecraft:unbreakable":{}}}],HandItems:[{id:"minecraft:crossbow",count:1},{}]} + execute as @e[tag=pve.zombie] run data merge entity @s {PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f]} scoreboard players set zombie.state state 1 -scoreboard players set zombie.round board 26 \ No newline at end of file +scoreboard players set zombie.round board 26 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/second.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/second.mcfunction index b591ee8c..abc7d29f 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/second.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/second.mcfunction @@ -1,12 +1,17 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## spawnpoint @a[team=play.zombie] 671 -18 -51 execute as @e[tag=zombie.villagers] at @s run function zombieever/villagers/displayhealth execute as @e[tag=zombie.villager] at @s run kill @e[type=zombie_villager,distance=0..1] -execute as @e[type=item,nbt={Item:{tag:{coin:1b}}}] at @s run data merge entity @s {CustomName:'"\\u00a7e\\u00a7lZombie Coin"',CustomNameVisible:1b} + +execute as @e[type=item,nbt={Item:{components:{"minecraft:custom_data":{coin:1b}}}}] at @s run data merge entity @s {CustomName:'"\\u00a7e\\u00a7lZombie Coin"',CustomNameVisible:1b} tag @e[type=slime] add pve.zombie tag @e[type=magma_cube] add pve.zombie scoreboard players set zombie.count tick 0 -execute as @e[tag=pve.zombie,tag=!pve.root] run scoreboard players add zombie.count tick 1 +execute as @e[tag=!pve.root] run scoreboard players add zombie.count tick 1 execute store result bossbar zombie:zombiecount value run scoreboard players get zombie.count tick execute if score zombie.state state matches 1 run bossbar set zombie:zombiecount name ["\u00a7b任务 \u00a7a[",{"selector":"@e[tag=pve.title,type=marker,limit=1]","color":"yellow"},"\u00a7a] \u00a7e剩余僵尸数量：",{"score":{"name": "zombie.count","objective": "tick"},"color":"red"}] execute if score zombie.state state matches 1 if score zombie.count tick matches ..0 run function zombieever/thisroundover @@ -26,4 +31,4 @@ execute if score zombie.state state matches 1..2 if score tmp.count tick matches # execute if score zombie.type board matches 1 if score zombie.state state matches 1 if score tmp.count tick matches ..0 run function zombieever/over/lose_villager kill @e[type=vex] -execute if score zombie.round board matches 28 run function zombieever/tasks/detect/boss \ No newline at end of file +execute if score zombie.round board matches 28 run function zombieever/tasks/detect/boss diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/arrowgun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/arrowgun.mcfunction index 171b6c06..c7db1b6c 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/arrowgun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/arrowgun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 4000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 4000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{gun:5,bullet:400,cdtime:10,display:{Name:'"\\u00a76箭枪"',Lore:['"\\u00a7b子弹数量：\\u00a7e400"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e4.0 HP"']},CustomModelData:10} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={gun:5,bullet:400,cdtime:10},custom_name='"\\u00a76箭枪"',lore=['"\\u00a7b子弹数量：\\u00a7e400"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e4.0 HP"'],custom_model_data=10] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/bettergun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/bettergun.mcfunction index 1d6f5e70..8b466391 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/bettergun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/bettergun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 14000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 14000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:30,gun:"pao",damage:300,bullet:380,cdtime:10,distance:80,display:{Name:'"\\u00a7b李他娘的意大利魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e380"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e30.0 HP"','"\\u00a7b距离：\\u00a7e80 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e30"']},CustomModelData:9,speed:4} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:30,gun:"pao",damage:300,bullet:380,cdtime:10,distance:80,speed:4},custom_name='"\\u00a7b李他娘的意大利魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e380"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e30.0 HP"','"\\u00a7b距离：\\u00a7e80 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e30"'],custom_model_data=9] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_axe.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_axe.mcfunction index 14803c41..b2377e80 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_axe.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_axe.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 4000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 4000 -execute as @s[tag=buy.pass] run give @s diamond_axe 1 +execute as @s[tag=buy.pass] run give @s diamond_axe execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_sword.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_sword.mcfunction index 091ac316..f76059ed 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_sword.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamond_sword.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 4000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 4000 -execute as @s[tag=buy.pass] run give @s diamond_sword 1 +execute as @s[tag=buy.pass] run give @s diamond_sword execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamondarmor.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamondarmor.mcfunction index 7a51b9c2..132488c3 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamondarmor.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/diamondarmor.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 6000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 6000 -execute as @s[tag=buy.pass] run give @s diamond_helmet{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s diamond_chestplate{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s diamond_leggings{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s diamond_boots{Unbreakable:1b} 1 +execute as @s[tag=buy.pass] run give @s diamond_helmet[unbreakable={}] +execute as @s[tag=buy.pass] run give @s diamond_chestplate[unbreakable={}] +execute as @s[tag=buy.pass] run give @s diamond_leggings[unbreakable={}] +execute as @s[tag=buy.pass] run give @s diamond_boots[unbreakable={}] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/enchan_book.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/enchan_book.mcfunction index b8decdc0..616a3560 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/enchan_book.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/enchan_book.mcfunction @@ -1,9 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 7000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 7000 -execute as @s[tag=buy.pass] run give @s paper{display:{Lore:['{"italic":false,"color":"white","extra":[{"text":""},{"text":"提升玩家能量回复速度"}],"text":""}','{"italic":false,"color":"white","extra":[{"text":""},{"color":"yellow","text":"速度*2"}],"text":""}','"\\u00a7b放在背包即可生效"'],Name:'{"italic":false,"extra":[{"text":""},{"color":"#7CFE9D","text":"增益效果"}],"text":""}'},hpdouble:true,Enchantments:[{id:"efficiency",lvl:1}]} +execute as @s[tag=buy.pass] run give @s paper[custom_name='{"italic":false,"extra":[{"text":""},{"color":"#7CFE9D","text":"增益效果"}],"text":""}',lore=['{"italic":false,"color":"white","extra":[{"text":""},{"text":"提升玩家能量回复速度"}],"text":""}','{"italic":false,"color":"white","extra":[{"text":""},{"color":"yellow","text":"速度*2"}],"text":""}','"\\u00a7b放在背包即可生效"'],custom_data={hpdouble:"true"},enchantments={levels:{"minecraft:efficiency":1}}] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fallgun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fallgun.mcfunction index 4548534e..6f78a0cb 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fallgun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fallgun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 5000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 5000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:3,gun:3,bullet:1000,cdtime:3,display:{Name:'"\\u00a7b反重力魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e1000"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e3"']},CustomModelData:8,speed:2} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:3,gun:3,bullet:1000,cdtime:3,speed:2},custom_name='"\\u00a7b反重力魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e1000"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e3"'],custom_model_data=8] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/faster.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/faster.mcfunction index fcb26a29..27530e2d 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/faster.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/faster.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:1,gun:1,bullet:1000,cdtime:3,display:{Name:'"\\u00a7d莱福魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e1000"','"\\u00a7bCD: \\u00a7e6tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e1"']},CustomModelData:9,speed:3} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:1,gun:1,bullet:1000,cdtime:3,speed:3},custom_name='"\\u00a7d莱福魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e1000"','"\\u00a7bCD: \\u00a7e6tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e1"'],custom_model_data=9] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fireballgun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fireballgun.mcfunction index 97f7edde..967447c7 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fireballgun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/fireballgun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 5000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 5000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:10,gun:4,bullet:100,cdtime:3,display:{Name:'"\\u00a7c火焰弹魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e100"','"\\u00a7bCD: \\u00a7e30tick"','"\\u00a7b伤害：\\u00a77未知"','"\\u00a7b技能: \\u00a7a召唤火球"','"\\u00a7c注意：此枪可能会伤害玩家"','"\\u00a7b消耗能量：\\u00a7e10"']},CustomModelData:11} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:10,gun:4,bullet:100,cdtime:3},custom_name='"\\u00a7c火焰弹魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e100"','"\\u00a7bCD: \\u00a7e30tick"','"\\u00a7b伤害：\\u00a77未知"','"\\u00a7b技能: \\u00a7a召唤火球"','"\\u00a7c注意：此枪可能会伤害玩家"','"\\u00a7b消耗能量：\\u00a7e10"'],custom_model_data=11] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/firegun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/firegun.mcfunction index 2b31f924..6ffc59ed 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/firegun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/firegun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 5000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 5000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:1,gun:2,bullet:800,cdtime:1,display:{Name:'"\\u00a7c火属性魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e800"','"\\u00a7bCD: \\u00a7e3tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e1"']},CustomModelData:7,speed:2} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:1,gun:2,bullet:800,cdtime:1,speed:2},custom_name='"\\u00a7c火属性魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e800"','"\\u00a7bCD: \\u00a7e3tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e1"'],custom_model_data=7] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/goldenapple.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/goldenapple.mcfunction index f94dee58..5429c8df 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/goldenapple.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/goldenapple.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 500.. run tag @s add buy.pass -execute as @s[tag=buy.pass] run give @s golden_apple 1 +execute as @s[tag=buy.pass] run give @s golden_apple execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 500 execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/health.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/health.mcfunction index 038342b1..686d3a62 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/health.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/health.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass -execute as @s[tag=buy.pass] run give @p minecraft:splash_potion{custom_potion_effects:[{id:"instant_health",duration:20,amplifier:1,show_particles:1}],CustomPotionColor:16711680,display:{Name:'"\\u00a7c生命回复药水"'}} +execute as @s[tag=buy.pass] run give @p minecraft:splash_potion[potion_contents={custom_effects:[{id:"instant_health",duration:20,amplifier:1,show_particles:true}],custom_color:16711680},custom_name='"\\u00a7c生命回复药水"'] execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/huishou.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/huishou.mcfunction index 5ea74098..826137ab 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/huishou.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/huishou.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 playsound entity.enderman.teleport player @s ~ ~ ~ 1 1 0.5 execute store result score tmp board run clear @s bucket 1 execute if score tmp board matches 1.. run scoreboard players add @s zombie.coin 250 execute if score tmp board matches 1.. run tellraw @s ["\u00a7a回收牛奶桶 * 1\n\u00a76+250 Coins"] -execute if data entity @s SelectedItem.tag.gun run tag @s add tmp.usinggun +execute if data entity @s SelectedItem.components."minecraft:custom_data".gun run tag @s add tmp.usinggun execute if data entity @s {SelectedItem:{id:"minecraft:enchanted_book"}} run tag @s add gun.getenchanbook # xp set @s 0 points -execute as @s[tag=tmp.usinggun] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.tag.bullet +execute as @s[tag=tmp.usinggun] run execute store result score gun.tmp board as @s at @s run data get entity @s SelectedItem.components."minecraft:custom_data".bullet execute as @s[tag=tmp.usinggun] if score gun.tmp board matches 1.. run tag @s add gun.nohuishou execute as @s[tag=tmp.usinggun] unless score gun.tmp board matches 1.. run tag @s add gun.huishou execute as @s[tag=gun.huishou] run item replace entity @s weapon.mainhand with air @@ -25,4 +29,4 @@ execute as @s[tag=gun.getenchanbook] run playsound entity.experience_orb.pickup tag @s remove gun.nohuishou tag @s remove gun.huishou tag @s remove tmp.usinggun -tag @s remove gun.getenchanbook \ No newline at end of file +tag @s remove gun.getenchanbook diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_axe.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_axe.mcfunction index edbe76aa..46f75b8a 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_axe.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_axe.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 -execute as @s[tag=buy.pass] run give @s iron_axe 1 +execute as @s[tag=buy.pass] run give @s iron_axe execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_sword.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_sword.mcfunction index 243f2ede..3e8e3549 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_sword.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/iron_sword.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 -execute as @s[tag=buy.pass] run give @s iron_sword 1 +execute as @s[tag=buy.pass] run give @s iron_sword execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/ironarmor.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/ironarmor.mcfunction index a71eb2ac..8c296336 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/ironarmor.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/ironarmor.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 3000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 3000 -execute as @s[tag=buy.pass] run give @s iron_helmet{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s iron_chestplate{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s iron_leggings{Unbreakable:1b} 1 -execute as @s[tag=buy.pass] run give @s iron_boots{Unbreakable:1b} 1 +execute as @s[tag=buy.pass] run give @s iron_helmet[unbreakable={}] +execute as @s[tag=buy.pass] run give @s iron_chestplate[unbreakable={}] +execute as @s[tag=buy.pass] run give @s iron_leggings[unbreakable={}] +execute as @s[tag=buy.pass] run give @s iron_boots[unbreakable={}] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/level.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/level.mcfunction index 1db61132..6f356ebd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/level.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/level.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 -execute as @s[tag=buy.pass] run give @s experience_bottle 128 +execute as @s[tag=buy.pass] run give @s experience_bottle execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/milk.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/milk.mcfunction index 557d65cd..36a72077 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/milk.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/milk.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 execute store result score tmp board run clear @s bucket 1 execute if score tmp board matches 1.. run scoreboard players add @s zombie.coin 250 execute if score @s zombie.coin matches 500.. run tag @s add buy.pass -execute as @s[tag=buy.pass] run give @s milk_bucket 1 +execute as @s[tag=buy.pass] run give @s milk_bucket execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 500 execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/netherite_sword.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/netherite_sword.mcfunction index 992eaf4b..97bf8ae1 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/netherite_sword.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/netherite_sword.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 6000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 6000 -execute as @s[tag=buy.pass] run give @s netherite_sword 1 +execute as @s[tag=buy.pass] run give @s netherite_sword execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onepao.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onepao.mcfunction index d54cd551..c2e83401 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onepao.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onepao.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 10000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 10000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:30,gun:"pao",damage:500,bullet:50,cdtime:20,distance:80,display:{Name:'"\\u00a7a\\u00a7l电磁炮"',Lore:['"\\u00a7b可使用次数：\\u00a7e50"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e50.0 HP"','"\\u00a7b距离：\\u00a7e80 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e30"']},CustomModelData:9,speed:6} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:30,gun:"pao",damage:500,bullet:50,cdtime:20,distance:80,speed:6},custom_name='"\\u00a7a\\u00a7l电磁炮"',lore=['"\\u00a7b可使用次数：\\u00a7e50"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e50.0 HP"','"\\u00a7b距离：\\u00a7e80 \\u00a7bblocks"','"\\u00a7b消耗能量：\\u00a7e30"'],custom_model_data=9] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] tag @s remove buy.pass + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onet_coin.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onet_coin.mcfunction index 44e01c57..dce36f30 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onet_coin.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/onet_coin.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1100.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1100 -execute as @s[tag=buy.pass] run give @s carrot_on_a_stick{display:{Name:'"\\u00a7e一小袋金币 \\u00a77- 右键使用"'},coin:1000,CustomModelData:21,gun:-10} 1 +execute as @s[tag=buy.pass] run give @s carrot_on_a_stick[custom_name='"\\u00a7e一小袋金币 \\u00a77- 右键使用"',custom_data={coin:1000,gun:-10},custom_model_data=21] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/sheild.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/sheild.mcfunction index cfb838a8..0974d335 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/sheild.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/sheild.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 1000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 1000 -execute as @s[tag=buy.pass] run give @s shield{Unbreakable:1b} 1 +execute as @s[tag=buy.pass] run give @s shield[unbreakable={}] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/shooter.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/shooter.mcfunction index c7b251de..602d535f 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/shooter.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/shooter.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 800.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 800 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{hp:2,gun:1,bullet:200,cdtime:10,display:{Name:'"\\u00a7a基础魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e200"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"']},CustomModelData:9,speed:1} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={hp:2,gun:1,bullet:200,cdtime:10,speed:1},custom_name='"\\u00a7a基础魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e200"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"'],custom_model_data=9] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/spitgun.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/spitgun.mcfunction index ee68bd47..014d7185 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/spitgun.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/spitgun.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 4000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 4000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{gun:6,bullet:10,cdtime:10,display:{Name:'"\\u00a7dAOE魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e10"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e10\\u00a7b/zombie"','"\\u00a7b技能: \\u00a7aAOE 范围伤害 (10 Blocks)"']},CustomModelData:12} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={gun:6,bullet:10,cdtime:10},custom_name='"\\u00a7dAOE魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e10"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e10\\u00a7b/zombie"','"\\u00a7b技能: \\u00a7aAOE 范围伤害 (10 Blocks)"'],custom_model_data=12] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/xiandan.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/xiandan.mcfunction index d47e005c..d8fe9519 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/xiandan.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/shop/xiandan.mcfunction @@ -1,8 +1,12 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score @s zombie.coin matches 6000.. run tag @s add buy.pass execute as @s[tag=buy.pass] run scoreboard players remove @s zombie.coin 6000 -execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick{gun:7,bullet:400,cdtime:20,distance:30,display:{Name:'"\\u00a7b霰弹枪"',Lore:['"\\u00a7b子弹数量：\\u00a7e400"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b距离：\\u00a7e30 \\u00a7bblocks"']},CustomModelData:8,speed:3} +execute as @s[tag=buy.pass] run give @s minecraft:carrot_on_a_stick[custom_data={gun:7,bullet:400,cdtime:20,distance:30,speed:3},custom_name='"\\u00a7b霰弹枪"',lore=['"\\u00a7b子弹数量：\\u00a7e400"','"\\u00a7bCD: \\u00a7e80tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b距离：\\u00a7e30 \\u00a7bblocks"'],custom_model_data=8] execute as @s[tag=buy.pass] run playsound entity.experience_orb.pickup player @s ~ ~ ~ 1 1 1 execute as @s[tag=!buy.pass] run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute as @s[tag=!buy.pass] run tellraw @s ["\u00a7c购买失败！金币不够。"] execute as @s[tag=buy.pass] run tellraw @s ["\u00a7a购买成功！"] -tag @s remove buy.pass \ No newline at end of file +tag @s remove buy.pass diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/spec.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/spec.mcfunction index 6776f2d0..42d129fa 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/spec.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/spec.mcfunction @@ -1,16 +1,21 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## gamemode spectator @s tellraw @s ["\u00a7c很抱歉，游戏已经开始！您将在下局游戏加入！"] tp @s 630 40 -78 90 0 scoreboard players set @s zombie.coin 100 tellraw @s ["\u00a76+300 Coins (加入游戏)"] team join play.zombie -give @s wooden_sword{Unbreakable:1b} -give @s wooden_axe{Unbreakable:1b} -item replace entity @s armor.head with leather_helmet{Unbreakable:1b} -item replace entity @s armor.chest with leather_chestplate{Unbreakable:1b} -item replace entity @s armor.legs with leather_leggings{Unbreakable:1b} -item replace entity @s armor.feet with leather_boots{Unbreakable:1b} -give @s minecraft:carrot_on_a_stick{hp:2,gun:1,bullet:300,cdtime:10,display:{Name:'"\\u00a7a基础魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e300"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"']},CustomModelData:9} +give @s wooden_sword[unbreakable={}] +give @s wooden_axe[unbreakable={}] +item replace entity @s armor.head with leather_helmet[unbreakable={}] +item replace entity @s armor.chest with leather_chestplate[unbreakable={}] +item replace entity @s armor.legs with leather_leggings[unbreakable={}] +item replace entity @s armor.feet with leather_boots[unbreakable={}] +give @s minecraft:carrot_on_a_stick[custom_data={hp:2,gun:1,bullet:300,cdtime:10},custom_name='"\\u00a7a基础魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e300"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"'],custom_model_data=9] scoreboard players operation @a[team=play.zombie] globle.game = zombie globle.game xp set @s 0 levels xp set @s 0 points + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/start.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/start.mcfunction index 137a4808..e13d4455 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/start.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/start.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # forceload add 393 30 304 -160 forceload add 656 -41 596 -112 forceload add 585 -67 495 -154 @@ -41,4 +45,4 @@ execute as @a[team=play.zombie,tag=GOABLE.SPEC] at @s run gamemode spectator scoreboard players add globle globle.game 1 scoreboard players operation zombie globle.game = globle globle.game -scoreboard players operation @a[team=play.zombie] globle.game = zombie globle.game \ No newline at end of file +scoreboard players operation @a[team=play.zombie] globle.game = zombie globle.game diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/1.mcfunction index 694d66b6..84fe172b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/1.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #pve.event.block.fruit bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与亚奇洛贝"] scoreboard players set zombie.round board 10 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f接下来派发下一个任务。湖边的兔子发疯了，你们能解决这个问题吗？听说是一个长得像鱿鱼的魔术师干的，不解决魔术师问题是解决不了的。"] -schedule function zombieever/tasks/crazy_rabbit 4s append \ No newline at end of file +schedule function zombieever/tasks/crazy_rabbit 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/win.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/win.mcfunction index aee1c8b8..9004e7ec 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/win.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/crazyrabbit/win.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与\u00a7e亚奇洛贝"] scoreboard players set zombie.round board 12 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f恭喜你们完成任务。\n"] tellraw @a[team=play.zombie] ["\u00a76+ 1000 \u00a76Coins (任务完成)"] scoreboard players add @a[team=play.zombie] zombie.coin 1000 -schedule function zombieever/talks/findkey/1 6s \ No newline at end of file +schedule function zombieever/talks/findkey/1 6s diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/1.mcfunction index 9fe4d66e..ff8e76dd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/1.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与亚奇洛贝"] scoreboard players set zombie.round board 12 scoreboard players set zombie.state state 2 tellraw @a[team=play.zombie] ["\u00a7a你：\u00a7f对了，我看到墙上有有关于地牢的任务。你知道怎么进入地牢吗？"] -schedule function minecraft:zombieever/talks/findkey/2 4s append \ No newline at end of file +schedule function minecraft:zombieever/talks/findkey/2 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/2.mcfunction index 1280b710..51d7d615 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/2.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f嗯... 以前，地牢一直都是由\u00a7e村长冈里丝戴布先生\u00a7f在管理。"] -schedule function minecraft:zombieever/talks/findkey/3 2s append \ No newline at end of file +schedule function minecraft:zombieever/talks/findkey/3 2s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/3.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/3.mcfunction index 5ba0daf4..535553f1 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/3.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/3.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f但如今村长已经去世，房屋已经荒废掉了。不过，他应该并没有把钥匙转交给别人，你去他屋子里找找看看吧。"] -schedule function minecraft:zombieever/talks/findkey/4 4s append \ No newline at end of file +schedule function minecraft:zombieever/talks/findkey/4 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/4.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/4.mcfunction index 70ed1740..fe254b25 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/4.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/4.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7a你：\u00a7f但是，他屋子已经被锁上了啊！"] -schedule function minecraft:zombieever/talks/findkey/5 3s append \ No newline at end of file +schedule function minecraft:zombieever/talks/findkey/5 3s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/5.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/5.mcfunction index 4be9f107..6e157120 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/5.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/findkey/5.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f其实还有一条通道。偷偷告诉你们，上次我去看的时候，他家的水井有个洞，一直忘了修。据说，\u00a7e水井里的水和湖里的水是联通的\u00a7f..."] schedule function minecraft:zombieever/tasks/find_keys 3s append scoreboard players set zombie.state state 1 setblock 681 6 -21 minecraft:structure_void + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/1.mcfunction index b6fb5405..0e6c7977 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/1.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## #pve.event.block.fruit bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与亚奇洛贝"] scoreboard players set zombie.round board 2 tellraw @a[team=play.zombie] ["\u00a7a你：\u00a7f您好，我想要注册冒险者。"] -schedule function minecraft:zombieever/talks/getfruit/2 4s append \ No newline at end of file +schedule function minecraft:zombieever/talks/getfruit/2 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/2.mcfunction index 689a7f5b..062f1dc1 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/2.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f好，请您在此处填写您的信息：\n\n名字：_________________\n年龄：______ 职业：______\n"] -schedule function minecraft:zombieever/talks/getfruit/3 4s append \ No newline at end of file +schedule function minecraft:zombieever/talks/getfruit/3 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/3.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/3.mcfunction index 92bb6cc7..baa64285 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/3.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/3.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f好，接下来为您派发第一个任务。\n"] -schedule function minecraft:zombieever/talks/getfruit/done 4s append \ No newline at end of file +schedule function minecraft:zombieever/talks/getfruit/done 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/done.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/done.mcfunction index 00c33765..44fb9f81 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/done.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/getfruit/done.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f最近果园附近有很多怪物出没，导致果实没了收成。请你们去击败它们，并顺便采摘果实。\n"] function zombieever/tasks/getfruit -# scoreboard players set zombie.round board 2 \ No newline at end of file +# scoreboard players set zombie.round board 2 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/1.mcfunction index e100703c..5ced5378 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/1.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## summon minecraft:villager 630 10 -82 {CustomName:'["\\u00a74蜜斯莱哈雅 \\u00a7d[召唤师]"]',Invulnerable:1b,NoAI:1b,Silent:1b,PersistenceRequired:1b,VillagerData:{profession:"minecraft:librarian",type:"minecraft:desert"},Offers:{Recipes:[]},Tags:["pve.npc.pre","pve.zombie"],CustomNameVisible:1b,Attributes:[{Name:"generic.max_health",Base:100}],Health:100} bossbar set zombie:zombiecount name ["\u00a7a前言：\u00a7f背景"] tellraw @a[team=play.zombie] ["\u00a7d群众：\u00a7f欢迎勇者们的到来！"] @@ -7,4 +11,4 @@ effect give @a[team=play.zombie] jump_boost 4 128 true effect give @a[team=play.zombie] invisibility 4 25 true schedule function minecraft:zombieever/talks/pre/2 4s append scoreboard players set zombie.round board 0 -scoreboard players reset * zombie.villager.click \ No newline at end of file +scoreboard players reset * zombie.villager.click diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/2.mcfunction index 93e2e1bb..8b04033b 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/2.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a74蜜斯莱哈雅：\u00a7f勇者大人们，你们被召唤到这个世界了。"] schedule function minecraft:zombieever/talks/pre/3 4s append scoreboard players set zombie.round board 0 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/3.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/3.mcfunction index 880fe1b8..7ba91357 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/3.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/3.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a74蜜斯莱哈雅：\u00a7f时隔100年，魔王又一次降临。我们需要你们的帮助！"] -schedule function minecraft:zombieever/talks/pre/4 2s append \ No newline at end of file +schedule function minecraft:zombieever/talks/pre/4 2s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/4.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/4.mcfunction index 95fe9899..7243def3 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/4.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/4.mcfunction @@ -1,12 +1,16 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a74蜜斯莱哈雅：\u00a7f虽然这么说有点冒昧，请勇者们击败魔王！"] tellraw @a[team=play.zombie] ["\u00a76+100 Coins (来自蜜斯莱哈雅)\n\u00a76+1 木剑 (来自蜜斯莱哈雅)\n\u00a76+1 木斧 (来自蜜斯莱哈雅)\n\u00a76+1 手枪 (来自蜜斯莱哈雅)\n\u00a76+1 皮革装备 (来自蜜斯莱哈雅)"] -give @a[team=play.zombie] wooden_sword{Unbreakable:1b} -give @a[team=play.zombie] wooden_axe{Unbreakable:1b} -give @a[team=play.zombie] minecraft:carrot_on_a_stick{hp:2,gun:1,bullet:300,cdtime:10,display:{Name:'"\\u00a7a基础魔法棒"',Lore:['"\\u00a7b可使用次数：\\u00a7e300"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"']},CustomModelData:9} -item replace entity @a[team=play.zombie] armor.head with leather_helmet{Unbreakable:1b} -item replace entity @a[team=play.zombie] armor.chest with leather_chestplate{Unbreakable:1b} -item replace entity @a[team=play.zombie] armor.legs with leather_leggings{Unbreakable:1b} -item replace entity @a[team=play.zombie] armor.feet with leather_boots{Unbreakable:1b} -schedule function minecraft:zombieever/talks/pre/5 6s append \ No newline at end of file +give @a[team=play.zombie] wooden_sword[unbreakable={}] +give @a[team=play.zombie] wooden_axe[unbreakable={}] +give @a[team=play.zombie] minecraft:carrot_on_a_stick[custom_data={hp:2,gun:1,bullet:300,cdtime:10},custom_name='"\\u00a7a基础魔法棒"',lore=['"\\u00a7b可使用次数：\\u00a7e300"','"\\u00a7bCD: \\u00a7e10tick"','"\\u00a7b伤害：\\u00a7e3.0 HP"','"\\u00a7b消耗能量：\\u00a7e2"'],custom_model_data=9] +item replace entity @a[team=play.zombie] armor.head with leather_helmet[unbreakable={}] +item replace entity @a[team=play.zombie] armor.chest with leather_chestplate[unbreakable={}] +item replace entity @a[team=play.zombie] armor.legs with leather_leggings[unbreakable={}] +item replace entity @a[team=play.zombie] armor.feet with leather_boots[unbreakable={}] +schedule function minecraft:zombieever/talks/pre/5 6s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/5.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/5.mcfunction index 6e9a008a..c1809bdb 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/5.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/5.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless entity @e[tag=pve.npc.pre] run function zombieever/talks/pre/sbdied execute unless entity @e[tag=pve.npc.pre] run return 0 tellraw @a[team=play.zombie] ["\u00a74蜜斯莱哈雅：\u00a7f祝你们顺利。"] schedule function minecraft:zombieever/talks/pre/done 3s append + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/done.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/done.mcfunction index aae6ab7d..4d037382 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/done.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/done.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute unless entity @e[tag=pve.npc.pre] run function zombieever/talks/pre/sbdied execute unless entity @e[tag=pve.npc.pre] run return 0 tellraw @a[team=play.zombie] ["\u00a74蜜斯莱哈雅：\u00a7f在这个世界上，你们队伍里只要有一人活着，你们都可以完好地复活。\u00a7f你们可以去\u00a7d冒险者中心\u00a7f注册冒险者，详情可以找\u00a7e亚奇洛贝\u00a7f问问。\n"] @@ -10,3 +14,4 @@ effect clear @a[team=play.zombie] invisibility bossbar set zombie:zombiecount name ["\u00a7a寻找：\u00a7e亚奇洛贝"] scoreboard players reset * zombie.villager.click scoreboard players set zombie.round board 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/sbdied.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/sbdied.mcfunction index 1af6baad..5d82f51f 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/sbdied.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/pre/sbdied.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7a群众：\u00a7f召唤师死了！快把勇者们杀掉！"] # tellraw @a[team=play.zombie] ["\u00a7a群众：\u00a7f召唤师死了！快把勇者们杀掉！"] -function zombieever/over/lose_villager \ No newline at end of file +function zombieever/over/lose_villager diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/1.mcfunction index 4bae9b6f..4bf5092e 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/1.mcfunction @@ -1,4 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与\u00a7e亚奇洛贝"] scoreboard players set zombie.round board 5 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f新任务来啦！请前往\u00a7bMystery Village\u00a7f将变异的村民们都杀掉。\n"] schedule function minecraft:zombieever/tasks/rescue_village 4s append + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/win.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/win.mcfunction index 163574b3..182e955e 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/win.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/rescue_village/win.mcfunction @@ -1,6 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f与\u00a7e亚奇洛贝"] scoreboard players set zombie.round board 5 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f恭喜你们完成任务。\n"] tellraw @a[team=play.zombie] ["\u00a76+ 3000 \u00a76Coins (任务完成)"] schedule function zombieever/talks/crazyrabbit/1 5s scoreboard players add @a[team=play.zombie] zombie.coin 3000 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/1.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/1.mcfunction index d840f5bf..ffe9f21a 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/1.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/1.mcfunction @@ -1,5 +1,11 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set zombie.round board 26 bossbar set zombie:zombiecount name ["\u00a7a对话：\u00a7f地牢BOSS 幻术师"] tellraw @a[team=play.zombie] ["\u00a7b幻术师：\u00a7f已经好多年没有冒险者到我这里来了。"] schedule function minecraft:zombieever/talks/stronghold_boss/2 4s append + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7c地牢BOSS战"'} + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/2.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/2.mcfunction index a47f688a..66e665e9 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/2.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/stronghold_boss/2.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7b幻术师：\u00a7f来，小伙子们，一起陪他们玩玩！"] scoreboard players set zombie.round board 26 -schedule function minecraft:zombieever/rounds/strongholdboss 4s append \ No newline at end of file +schedule function minecraft:zombieever/rounds/strongholdboss 4s append diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/trigger.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/trigger.mcfunction index b8ceaeba..bef0b695 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/trigger.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/talks/trigger.mcfunction @@ -1,6 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute if score zombie.round board matches 1 as @a[team=play.zombie,gamemode=adventure,scores={zombie.villager.click=1..},x=630,y=10,z=-91,distance=0..10] at @s run function zombieever/talks/getfruit/1 execute if score zombie.round board matches 3 as @a[team=play.zombie,gamemode=adventure,scores={zombie.villager.click=1..},x=630,y=10,z=-91,distance=0..10] at @s run tellraw @s ["\u00a7c还没有将僵尸清理完。"] execute if score zombie.round board matches 4 as @a[team=play.zombie,gamemode=adventure,scores={zombie.villager.click=1..},x=630,y=10,z=-91,distance=0..10] at @s run function zombieever/tasks/detect/fruit -scoreboard players reset @a[team=play.zombie] zombie.villager.click \ No newline at end of file +scoreboard players reset @a[team=play.zombie] zombie.villager.click diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/boss.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/boss.mcfunction index f43b32d2..2be625bd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/boss.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/boss.mcfunction @@ -1,3 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7c魔王战争"'} tellraw @a[team=play.zombie] ["\n\u00a7e 魔王即将降临...\n"] -schedule function zombieever/rounds/boss 60s \ No newline at end of file +schedule function zombieever/rounds/boss 60s diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/crazy_rabbit.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/crazy_rabbit.mcfunction index d93e9e4a..f5f5cbb4 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/crazy_rabbit.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/crazy_rabbit.mcfunction @@ -1,8 +1,14 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\n\u00a7b收到任务 \u00a7a",{"color":"yellow","text":"[发疯的兔子]","hoverEvent": {"action": "show_text","contents": [{"text":"\u00a7f寻找使兔子发疯的魔物，并击败它。\n\n\u00a77温馨提示：如果未找到魔术师，将无法解决此问题。\n当你找不到的时候，看看水里面？"}]}},"\u00a7a\n"] scoreboard players set zombie.round board 11 function zombieever/rounds/11 scoreboard players set zombie.state state 1 # At least 16 summon minecraft:glow_squid 679 0 -83 {Tags:["pve.root","pve.zombie"],PersistenceRequired:1b,ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandDropChances:[0.0f,0.0f],CustomName:'"\\u00a7e兔子发疯罪魁祸首"',CustomNameVisible:1b,DeathLootTable:"minecraft:empty",active_effects:[{id:"glowing",duration:999999}],Attributes:[{Base:1.0d,Name:"generic.movement_speed"},{Base:30d,Name:"generic.max_health"}],Health:30} + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7a发疯的兔子"'} execute if score tmp board matches 18.. run playsound entity.player.levelup player @s ~ ~ ~ 2 0 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/boss.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/boss.mcfunction index 0984601f..875d39cd 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/boss.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/boss.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set zombie.count tick 0 -execute as @e[tag=pve.zombie,tag=!pve.root] run scoreboard players add zombie.count tick 1 +execute as @e[tag=!pve.root] run scoreboard players add zombie.count tick 1 execute store result bossbar zombie:zombiecount value run scoreboard players get zombie.count tick -execute if entity @e[tag=pve.zombie,type=wither] if score zombie.count tick matches ..7 run function zombieever/rounds/boss_xb \ No newline at end of file +execute if entity @e[tag=pve.zombie,type=wither] if score zombie.count tick matches ..7 run function zombieever/rounds/boss_xb diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/findkey.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/findkey.mcfunction index a00dd629..7ce1edd6 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/findkey.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/findkey.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 execute as @a[team=play.zombie,gamemode=adventure] at @s if block ~ ~ ~ minecraft:structure_void run scoreboard players set tmp board 1 execute as @a[team=play.zombie,gamemode=adventure] at @s if block ~ ~-1 ~ minecraft:green_terracotta run scoreboard players set tmp board 1 execute as @a[team=play.zombie,gamemode=adventure] at @s if block ~ ~-2 ~ minecraft:green_terracotta run scoreboard players set tmp board 1 -execute if score tmp board matches 1 run function zombieever/tasks/find_keys_final \ No newline at end of file +execute if score tmp board matches 1 run function zombieever/tasks/find_keys_final diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/fruit.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/fruit.mcfunction index e3389fce..730fdd2e 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/fruit.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/fruit.mcfunction @@ -1,12 +1,17 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 tag @s add sell execute store result score tmp board run clear @a[team=play.zombie] sweet_berries 0 execute if score tmp board matches 18.. run clear @a[team=play.zombie] sweet_berries execute if score tmp board matches 18.. run tellraw @a[team=play.zombie] ["\n\u00a7a任务完成！\n\n\u00a7e亚奇洛贝：\u00a7f这是报酬，每人 \u00a7e1000 C\u00a7f。"] -execute if score tmp board matches 18.. as @a[team=play.zombie,gamemode=adventure] at @s run give @s carrot_on_a_stick{display:{Name:'"\\u00a7e一小袋金币 \\u00a77- 右键使用"'},coin:1000,CustomModelData:21,gun:-10} 1 +execute if score tmp board matches 18.. as @a[team=play.zombie,gamemode=adventure] at @s run give @s carrot_on_a_stick[custom_name='"\\u00a7e一小袋金币 \\u00a77- 右键使用"',custom_data={coin:1000,gun:-10},custom_model_data=21] execute if score tmp board matches 18.. run playsound entity.player.levelup player @s ~ ~ ~ 2 1.5 1 execute if score tmp board matches 18.. run function zombieever/talks/rescue_village/1 # execute if score tmp board matches 18.. run / execute if score tmp board matches ..17 run tellraw @s ["\n\u00a7c无法提交任务：采摘的果实不够。\n"] execute if score tmp board matches ..17 run playsound entity.enderman.teleport player @s ~ ~ ~ 2 0 1 tag @s remove sell + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/npc.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/npc.mcfunction index 86105f3d..d52c2059 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/npc.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/npc.mcfunction @@ -1 +1,5 @@ -execute if entity @a[team=play.zombie,x=597,y=4,z=-59,distance=..10] run function zombieever/tasks/tryenterstronghold \ No newline at end of file +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute if entity @a[team=play.zombie,x=597,y=4,z=-59,distance=..10] run function zombieever/tasks/tryenterstronghold diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/stronghold_open.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/stronghold_open.mcfunction index 943e9abf..54ef6248 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/stronghold_open.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/detect/stronghold_open.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set tmp board 0 execute as @a[team=play.zombie,gamemode=adventure] at @s run scoreboard players add tmp board 1 scoreboard players set tmp2 board 0 execute as @a[x=568,y=-11,z=-121,dx=9,dy=3,dz=1,team=play.zombie,gamemode=adventure] at @s run scoreboard players add tmp2 board 1 -execute if score tmp2 board >= tmp board run function zombieever/tasks/enterstronghold \ No newline at end of file +execute if score tmp2 board >= tmp board run function zombieever/tasks/enterstronghold diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/enterstronghold.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/enterstronghold.mcfunction index c3e47650..60e5c720 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/enterstronghold.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/enterstronghold.mcfunction @@ -1,5 +1,10 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## function zombieever/door/open_cave_loot_in + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7c地牢探险"'} scoreboard players set zombie.round board 18 # tellraw @a[team=play.zombie] ["\u00a7a感谢各位的游玩！目前版本PVE暂时只做到这里，敬请期待更新！"] -# function zombieever/over/win \ No newline at end of file +# function zombieever/over/win diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys.mcfunction index 6cfb78b4..a9f45ca2 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # 冈里丝戴布 # 瑞斯梅基米 # 瑞达布利斯 @@ -18,14 +22,19 @@ forceload add 597 -45 714 1 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f听说，冈里丝戴布先生很喜欢\u00a7e把贵重物品藏在自己的\u00a7d樱花树花园\u00a7e当中\u00a7f。"] tellraw @a[team=play.zombie] ["\n\u00a7b收到任务 \u00a7a",{"color":"green","text":"[寻找钥匙]","hoverEvent": {"action": "show_text","contents": [{"text":"\u00a7f寻找打开要塞的钥匙，并顺便打开冈里丝戴布的宅门。\n\n\u00a77温馨提示：存放东西的箱子并不会上锁。"}]}},"\u00a7a\n"] + execute as @e[tag=pve.house.chest] at @s run data merge block ~ ~ ~ {Items:[],Lock:"娃娃的wer114514",CustomName:'"\\u00a7r箱子"'} + execute as @e[tag=pve.house.chest,limit=1,sort=random] at @s run data merge block ~ ~ ~ {Items:[{id:"minecraft:tripwire_hook",Count:1b,tag:{display:{Name:'"\\u00a7e地牢钥匙"',Lore:['"\\u00a77用于打开地牢的钥匙"']},lock:2},Slot:13}],Lock:"",CustomName:'"\\u00a77貌似另外一个钥匙藏在樱花花园的角落里？"'} + data merge block 597 11 1 {Items:[{id:"minecraft:tripwire_hook",Count:1b,tag:{display:{Name:'"\\u00a7a大门钥匙"',Lore:['"\\u00a77用于打开大门的钥匙"']},lock:1},Slot:13}]} forceload remove 597 -45 714 1 # 召唤僵尸 scoreboard players set zombie.round board 13 function zombieever/rounds/13 + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a76寻找钥匙"'} scoreboard players set zombie.state state 1 execute if score tmp board matches 18.. run playsound entity.player.levelup player @s ~ ~ ~ 2 0 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys_final.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys_final.mcfunction index d35973ba..364441ff 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys_final.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/find_keys_final.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set zombie.round board 14 kill @e[tag=pve.zombie] -function zombieever/rounds/14 \ No newline at end of file +function zombieever/rounds/14 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/getfruit.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/getfruit.mcfunction index 0dc47109..368fd12c 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/getfruit.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/getfruit.mcfunction @@ -1,3 +1,7 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @e[tag=pve.event.block.fruit,limit=8,sort=random] at @s run setblock ~ ~ ~ minecraft:sweet_berry_bush[age=3] execute as @e[tag=pve.event.block.fruit,limit=3,sort=random] at @s run setblock ~ ~ ~ minecraft:sweet_berry_bush[age=2] tellraw @a[team=play.zombie] ["\n\u00a7b收到任务 \u00a7a",{"color":"green","text":"[收获果实]","hoverEvent": {"action": "show_text","contents": [{"text":"\u00a7f寻找魔物，并击败它们。\n然后顺便收获超过18个甜浆果。\n\n\u00a77温馨提示：提交时请让一个玩家提交。"}]}},"\u00a7a\n"] @@ -5,5 +9,7 @@ function zombieever/rounds/3 scoreboard players set zombie.round board 3 scoreboard players set zombie.state state 1 # At least 16 + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7a收集甜浆果"'} execute if score tmp board matches 18.. run playsound entity.player.levelup player @s ~ ~ ~ 2 0 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/rescue_village.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/rescue_village.mcfunction index 34554873..cb543ed9 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/rescue_village.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/rescue_village.mcfunction @@ -1,7 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\n\u00a7b收到任务 \u00a7a",{"color":"green","text":"[拯救村民]","hoverEvent": {"action": "show_text","contents": [{"text":"\u00a7f寻找村庄中魔物，并击败它们。\n\n\u00a77温馨提示：攻击由5波僵尸组成。"}]}},"\u00a7a\n"] scoreboard players set zombie.round board 5 function zombieever/rounds/5 scoreboard players set zombie.state state 1 # At least 16 + data merge entity @e[tag=pve.title,limit=1] {CustomName:'"\\u00a7d拯救村庄"'} execute if score tmp board matches 18.. run playsound entity.player.levelup player @s ~ ~ ~ 2 0 1 + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/tryenterstronghold.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/tryenterstronghold.mcfunction index 9400f512..52ec30ca 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/tryenterstronghold.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tasks/tryenterstronghold.mcfunction @@ -1,2 +1,6 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f各位，注意哦，一旦进入地牢短时间内就没办法出来了，请各位做好准备。"] -scoreboard players set zombie.round board 17 \ No newline at end of file +scoreboard players set zombie.round board 17 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/display.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/display.mcfunction index fa43727b..c5a72c10 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/display.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/display.mcfunction @@ -1,11 +1,16 @@ -execute as @e[tag=zombie.spawn.main] at @s run particle dust 0.118 1 0.192 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.1] at @s run particle dust 0.961 0.749 0.165 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.2] at @s run particle dust 0.373 0.91 0.945 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.3] at @s run particle dust 0.278 0.4 0.408 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.4] at @s run particle dust 0.875 0.106 0.106 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.5] at @s run particle dust 0.545 0.059 0.384 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.6] at @s run particle dust 1 0.933 0 1 ~ ~ ~ 0 0 0 1 30 -execute as @e[tag=zombie.spawn.7] at @s run particle dust 0.655 0.655 0.655 1 ~ ~ ~ 0 0 0 1 30 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute as @e[tag=zombie.spawn.main] at @s run particle dust{color:[0.118, 1, 0.192],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.1] at @s run particle dust{color:[0.961, 0.749, 0.165],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.2] at @s run particle dust{color:[0.373, 0.91, 0.945],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.3] at @s run particle dust{color:[0.278, 0.4, 0.408],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.4] at @s run particle dust{color:[0.875, 0.106, 0.106],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.5] at @s run particle dust{color:[0.545, 0.059, 0.384],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.6] at @s run particle dust{color:[1, 0.933, 0],scale:1} ~ ~ ~ 0 0 0 1 30 +execute as @e[tag=zombie.spawn.7] at @s run particle dust{color:[0.655, 0.655, 0.655],scale:1} ~ ~ ~ 0 0 0 1 30 + +# +execute as @e[tag=zombie.boss] at @s run particle dust{color:[0.945, 0.373, 0.373],scale:1} ~ ~ ~ 0 0 0 1 30 -# -execute as @e[tag=zombie.boss] at @s run particle dust 0.945 0.373 0.373 1 ~ ~ ~ 0 0 0 1 30 diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/hack.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/hack.mcfunction index f81c529a..19fb8f8f 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/hack.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/hack.mcfunction @@ -1,11 +1,15 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## # execute as @e[tag=zombie.villager] at @s run summon villager ~ ~ ~ {Tags:["zombie.villagers"],NoAI:1b,PersistenceRequired:1b,Glowing:1b,VillagerData:{profession:"minecraft:none",type:"minecraft:snow"},Career:1,CareerLevel:26,Offers:{Recipes:[]},Rotation:[0.0f,0.0f],Health:20f,Attributes:[{Base:20d,Name:"generic.max_health"}],CustomNameVisible:1b,Team:"play.zombie"} # /give @s minecraft:carrot_on_a_stick{gun:1,bullet:1000,cdtime:30} # 自定义枪械： # /give @s minecraft:carrot_on_a_stick{gun:"custom",damage:30,bullet:1000,cdtime:30,distance:20} -give @s minecraft:carrot_on_a_stick{gun:2,bullet:1000,cdtime:0} -give @s minecraft:carrot_on_a_stick{gun:3,bullet:1000,cdtime:0} -give @s minecraft:carrot_on_a_stick{gun:"custom",damage:70,bullet:1000,cdtime:4,distance:40,speed:5} -give @s minecraft:carrot_on_a_stick{gun:4,bullet:1000,cdtime:4} -give @s minecraft:carrot_on_a_stick{gun:5,bullet:1000,cdtime:4} -give @s minecraft:carrot_on_a_stick{gun:6,bullet:1000,cdtime:4} \ No newline at end of file +give @s minecraft:carrot_on_a_stick[custom_data={gun:2,bullet:1000,cdtime:0}] +give @s minecraft:carrot_on_a_stick[custom_data={gun:3,bullet:1000,cdtime:0}] +give @s minecraft:carrot_on_a_stick[custom_data={gun:"custom",damage:70,bullet:1000,cdtime:4,distance:40,speed:5}] +give @s minecraft:carrot_on_a_stick[custom_data={gun:4,bullet:1000,cdtime:4}] +give @s minecraft:carrot_on_a_stick[custom_data={gun:5,bullet:1000,cdtime:4}] +give @s minecraft:carrot_on_a_stick[custom_data={gun:6,bullet:1000,cdtime:4}] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/pointer.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/pointer.mcfunction index 9141bc26..5e412bc4 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/test/pointer.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/test/pointer.mcfunction @@ -1,9 +1,13 @@ -give @s minecraft:villager_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["zombie.spawn.main","zombie.spawn"]},display:{Name:'"\\u00a7a出生点"'}} 1 -give @s minecraft:wolf_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["zombie.spawn.1","zombie.spawn"]},display:{Name:'"\\u00a76主楼"'}} 1 -give @s minecraft:cat_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["zombie.spawn.2","zombie.spawn"]},display:{Name:'"\\u00a7b室外"'}} 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +give @s minecraft:villager_spawn_egg[entity_data={id:"minecraft:marker",Tags:["zombie.spawn.main","zombie.spawn"]},custom_name='"\\u00a7a出生点"'] +give @s minecraft:wolf_spawn_egg[entity_data={id:"minecraft:marker",Tags:["zombie.spawn.1","zombie.spawn"]},custom_name='"\\u00a76主楼"'] +give @s minecraft:cat_spawn_egg[entity_data={id:"minecraft:marker",Tags:["zombie.spawn.2","zombie.spawn"]},custom_name='"\\u00a7b室外"'] -give @s minecraft:pig_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["zombie.villager"]},display:{Name:'"\\u00a73村民 Spam"'}} 1 -give @s minecraft:enderman_spawn_egg{EntityTag:{id:"minecraft:marker",Tags:["zombie.boss"]},display:{Name:'"\\u00a7cBoss Spam"'}} 1 +give @s minecraft:pig_spawn_egg[entity_data={id:"minecraft:marker",Tags:["zombie.villager"]},custom_name='"\\u00a73村民 Spam"'] +give @s minecraft:enderman_spawn_egg[entity_data={id:"minecraft:marker",Tags:["zombie.boss"]},custom_name='"\\u00a7cBoss Spam"'] -# kill @e[tag=zombie.spawn] \ No newline at end of file +# kill @e[tag=zombie.spawn] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/thisroundover.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/thisroundover.mcfunction index 82a5e3da..ef05e14a 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/thisroundover.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/thisroundover.mcfunction @@ -1,4 +1,8 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## scoreboard players set zombie.state state 2 function zombieever/fuhuo_next function zombieever/nextround -bossbar set zombie:zombiecount name ["\u00a7b任务：",{"selector":"@e[tag=pve.title,type=marker,limit=1]","color":"yellow"}] \ No newline at end of file +bossbar set zombie:zombiecount name ["\u00a7b任务：",{"selector":"@e[tag=pve.title,type=marker,limit=1]","color":"yellow"}] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/tick.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/tick.mcfunction index 61817f9e..e57d1327 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/tick.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/tick.mcfunction @@ -1,5 +1,9 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## execute as @a[scores={zombie.hurt=1..},team=play.zombie] run function zombieever/damagetocoin -execute as @a[team=play.zombie,x=670,y=-19,z=-52,dx=2,dy=2,dz=2,gamemode=adventure] run function zombieever/died +execute as @a[team=play.zombie,x=670,y=-19,z=-52,dx=2,dy=2,dz=2,gamemode=adventure] run function zombieever/died execute as @e[tag=pve.zombie] at @s as @s[y=40,dy=10] run tp @s ~ ~-1 ~ #zombie.villager.click @@ -9,5 +13,5 @@ execute if score zombie.round board matches 16 run function zombieever/tasks/det execute if score zombie.round board matches 17 run function zombieever/tasks/detect/stronghold_open xp add @a[team=play.zombie,level=..200,gamemode=adventure] 1 points -execute as @a[team=play.zombie,level=..200,gamemode=adventure] run xp add @s[nbt={Inventory:[{id:"minecraft:paper",tag:{hpdouble:true}}]}] 5 points -execute as @a[team=play.zombie,level=30..200,gamemode=adventure] run xp add @s[nbt={Inventory:[{id:"minecraft:paper",tag:{hpdouble:true}}]}] 5 points \ No newline at end of file +execute as @a[team=play.zombie,level=..200,gamemode=adventure] run xp add @s[nbt={Inventory:[{id:"minecraft:paper",components:{"minecraft:custom_data":{hpdouble:"true"}}}]}] 5 points +execute as @a[team=play.zombie,level=30..200,gamemode=adventure] run xp add @s[nbt={Inventory:[{id:"minecraft:paper",components:{"minecraft:custom_data":{hpdouble:"true"}}}]}] 5 points diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/trystart.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/trystart.mcfunction index ae888cfd..3a9b5910 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/trystart.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/trystart.mcfunction @@ -1,8 +1,13 @@ +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## playsound ui.button.click player @s -scoreboard players set wait.player tick 0 +scoreboard players set wait.player tick 0 execute as @a[team=wait.zombie,gamemode=adventure] run scoreboard players add wait.player tick 1 scoreboard players add zombie.state state 0 execute if score zombie.state state matches 1.. run function minecraft:zombieever/spec execute unless score zombie.state state matches 1.. if score wait.player tick matches ..0 run tellraw @s ["\u00a7c人数不够！请等待至少1人！"] execute unless score zombie.state state matches 1.. if score wait.player tick matches ..0 run playsound entity.enderman.teleport player @s ~ ~ ~ 1 0 1 execute unless score zombie.state state matches 1.. if score wait.player tick matches 1.. run function minecraft:zombieever/start + diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/villagers/displayhealth.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/villagers/displayhealth.mcfunction index 488d398a..7214383d 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/villagers/displayhealth.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/villagers/displayhealth.mcfunction @@ -1,4 +1,8 @@ -execute store result score vi.tm.health board run data get entity @s Health 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score vi.tm.health board run data get entity @s Health data modify block 348 23 -157 front_text.messages[0] set value '["\\u00a7a剩余血量： ",{"score":{"objective":"board","name":"vi.tm.health"},"color":"red"},"\\u00a7c♥"]' # ["\\u00a7a剩余血量： ",{"score":{"objective":"board","name":"vi.tm.health"},"color":"red"},"\\u00a7c♥"] -data modify entity @s CustomName set from block 348 23 -157 front_text.messages[0] \ No newline at end of file +data modify entity @s CustomName set from block 348 23 -157 front_text.messages[0] diff --git a/datapacks/zombiepve/data/minecraft/functions/zombieever/zombie/displayhealth.mcfunction b/datapacks/zombiepve/data/minecraft/functions/zombieever/zombie/displayhealth.mcfunction index a1258b22..ae4f75f9 100644 --- a/datapacks/zombiepve/data/minecraft/functions/zombieever/zombie/displayhealth.mcfunction +++ b/datapacks/zombiepve/data/minecraft/functions/zombieever/zombie/displayhealth.mcfunction @@ -1,6 +1,11 @@ -execute store result score vi.tm.health board run data get entity @s Health 1 +## +## Datapack Upgrader v1.0.0 by wifi_left +## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader +## +execute store result score vi.tm.health board run data get entity @s Health execute as @s[tag=!pve.coin] run data modify block 612 10 -89 front_text.messages[0] set value '["\\u00a72\\u00a7lZombies \\u00a77| ",{"score":{"objective":"board","name":"vi.tm.health"},"color":"red"},"\\u00a7c♥"]' execute as @s[tag=pve.coin] run data modify block 612 10 -89 front_text.messages[0] set value '["\\u00a7e\\u00a7l刷金币 \\u00a77| ",{"score":{"objective":"board","name":"vi.tm.health"},"color":"red"},"\\u00a7c♥"]' # ["\\u00a7a剩余血量： ",{"score":{"objective":"board","name":"vi.tm.health"},"color":"red"},"\\u00a7c♥"] data modify entity @s CustomName set from block 612 10 -89 front_text.messages[0] -execute as @s[tag=pve.coin] run data merge entity @s {CustomNameVisible:1b} \ No newline at end of file + +execute as @s[tag=pve.coin] run data merge entity @s {CustomNameVisible:1b} diff --git a/datapacks/zombiepve/data/minecraft/item_modifiers/usegun.json b/datapacks/zombiepve/data/minecraft/item_modifiers/usegun.json index 954db9fa..ddc8f7c3 100644 --- a/datapacks/zombiepve/data/minecraft/item_modifiers/usegun.json +++ b/datapacks/zombiepve/data/minecraft/item_modifiers/usegun.json @@ -13,4 +13,4 @@ } ] } -] \ No newline at end of file +] diff --git a/datapacks/zombiepve/data/minecraft/loot_tables/coin_loot.json b/datapacks/zombiepve/data/minecraft/loot_tables/coin_loot.json index c265fbd5..91ebc6d9 100644 --- a/datapacks/zombiepve/data/minecraft/loot_tables/coin_loot.json +++ b/datapacks/zombiepve/data/minecraft/loot_tables/coin_loot.json @@ -16,8 +16,25 @@ "weight": 5, "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'\"§e§lZombie Coin\"',Lore:['\"§7丧尸之日货币\"']},coin:1b,Unbreakable:1b,HideFlags:63,ench:[{id:114s,lvl:1s}]}" + "function": "set_components", + "components": { + "minecraft:custom_name": "\"§e§lZombie Coin\"", + "minecraft:lore": [ + "\"§7丧尸之日货币\"" + ], + "minecraft:custom_data": { + "coin": 1, + "ench": [ + { + "id": 114, + "lvl": 1 + } + ] + }, + "minecraft:unbreakable": { + "show_in_tooltip": false + } + } }, { "function": "minecraft:set_count", @@ -36,4 +53,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/zombiepve/data/minecraft/loot_tables/random_enchant.json b/datapacks/zombiepve/data/minecraft/loot_tables/random_enchant.json index 06743945..f11e894c 100644 --- a/datapacks/zombiepve/data/minecraft/loot_tables/random_enchant.json +++ b/datapacks/zombiepve/data/minecraft/loot_tables/random_enchant.json @@ -16,4 +16,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/datapacks/zombiepve/data/minecraft/tags/functions/zom_talks.json b/datapacks/zombiepve/data/minecraft/tags/functions/zom_talks.json index e69ce3ce..f0831aab 100644 --- a/datapacks/zombiepve/data/minecraft/tags/functions/zom_talks.json +++ b/datapacks/zombiepve/data/minecraft/tags/functions/zom_talks.json @@ -50,3 +50,4 @@ "minecraft:zombieever/rounds/strongholdboss_xb" ] } + diff --git a/mcversion.txt b/mcversion.txt index 1b9335f1..7ad32779 100644 --- a/mcversion.txt +++ b/mcversion.txt @@ -1 +1 @@ -1.20.4 \ No newline at end of file +1.20.6 \ No newline at end of file