Skip to content

Commit 5340fad

Browse files
wifi-leftwifi-left
committed
Update the Map.
1 parent f974c8b commit 5340fad

File tree

59 files changed

+391
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+391
-41
lines changed

‎data/command_storage_minecraft.dat‎

16 Bytes
Binary file not shown.

‎data/raids.dat‎

0 Bytes
Binary file not shown.

‎data/scoreboard.dat‎

-21 Bytes
Binary file not shown.

‎datapacks/advancements/data/minecraft/advancement/get_all.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
"minecraft:others/haekara": true,
3333
"minecraft:intro/author": true,
3434
"minecraft:intro/other": true,
35+
"minecraft:lobby/good_view_ontop_building": true,
36+
"minecraft:lobby/how_to_open_chest": true,
37+
"minecraft:lobby/wtf_command_block": true,
3538
"minecraft:lobby/cue_feet": true,
3639
"minecraft:lobby/curious_boy_1": true,
3740
"minecraft:lobby/curious_boy_2": true,
@@ -51,7 +54,6 @@
5154
"minecraft:games/parkour": true,
5255
"minecraft:games/pool_cold_underwater": true,
5356
"minecraft:games/potato_boom": true,
54-
"minecraft:games/remaking_game": true,
5557
"minecraft:games/twolfstart": true,
5658
"minecraft:games/wind_charge_bw": true,
5759
"minecraft:games/endless_wolf_sign": true

‎datapacks/advancements/data/minecraft/advancement/lobby/good_view_ontop_building.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"display": {
3+
"title": [
4+
"公寓屋顶的风景真不辍"
5+
],
6+
"description": [
7+
"昔者庄周梦为胡蝶，栩栩然胡蝶也，自喻适志与！不知周也。\n俄然觉，则蘧蘧然周也。\n不知周之梦为胡蝶与，胡蝶之梦为周与？\n周与胡蝶，则必有分矣。此之谓物化。\n",
8+
{
9+
"text": "提示：到达公寓顶楼",
10+
"color": "gray"
11+
}
12+
],
13+
"icon": {
14+
"id": "minecraft:gray_concrete"
15+
},
16+
"frame": "goal",
17+
"show_toast": true,
18+
"announce_to_chat": true,
19+
"hidden": true
20+
},
21+
"parent": "minecraft:lobby/good_view_ontop",
22+
"criteria": {
23+
"a": {
24+
"trigger": "minecraft:impossible"
25+
}
26+
},
27+
"requirements": [
28+
[
29+
"a"
30+
]
31+
],
32+
"rewards": {}
33+
}

‎datapacks/advancements/data/minecraft/advancement/lobby/how_to_open_chest.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"display": {
3+
"title": [
4+
"真聪明"
5+
],
6+
"description": [
7+
"你是怎么知道怎么打开箱子的？"
8+
],
9+
"icon": {
10+
"id": "minecraft:chest"
11+
},
12+
"frame": "goal",
13+
"show_toast": true,
14+
"announce_to_chat": true,
15+
"hidden": true
16+
},
17+
"parent": "minecraft:lobby/wtf_command_block",
18+
"criteria": {
19+
"a": {
20+
"trigger": "minecraft:impossible"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"a"
26+
]
27+
],
28+
"rewards": {}
29+
}

‎datapacks/advancements/data/minecraft/advancement/lobby/wtf_command_block.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"display": {
3+
"title": [
4+
{
5+
"text": "从天上拿过来的命令方块[别踢我]awa",
6+
"color": "light_purple",
7+
"italic": true
8+
}
9+
],
10+
"description": [
11+
{
12+
"text": "(+NBT)\n\n",
13+
"color": "dark_purple",
14+
"italic": true
15+
},{
16+
"text": "这是...生存建筑的痕迹？\n",
17+
"color": "aqua",
18+
"italic": false
19+
},
20+
{
21+
"text": "\u00a78\u00a7o\u00a7m\u00a7n放心，不会踢你的",
22+
"color": "red",
23+
"italic": false
24+
}
25+
],
26+
"icon": {
27+
"id": "minecraft:chain_command_block"
28+
},
29+
"frame": "goal",
30+
"show_toast": true,
31+
"announce_to_chat": true,
32+
"hidden": true
33+
},
34+
"parent": "minecraft:lobby/good_view_ontop_building",
35+
"criteria": {
36+
"a": {
37+
"trigger": "minecraft:impossible"
38+
}
39+
},
40+
"requirements": [
41+
[
42+
"a"
43+
]
44+
],
45+
"rewards": {}
46+
}

‎datapacks/bedwars/data/minecraft/advancement/bedwars/player_killed.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"criteria": {
3+
"bw": {
4+
"trigger": "minecraft:player_killed_entity",
5+
"conditions": {
6+
"entity": {
7+
"type": "player",
8+
"nbt":"{Tags:[\"bw.player\"]}"
9+
},
10+
"player": {
11+
"type": "player",
12+
"nbt":"{Tags:[\"bw.player\"]}"
13+
}
14+
}
15+
}
16+
},
17+
"requirements": [
18+
[
19+
"bw"
20+
]
21+
],
22+
"rewards": {
23+
"function": "bedwars/during/player/killed_player"
24+
}
25+
}

‎datapacks/bedwars/data/minecraft/advancement/bedwars/player_was_killed.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"criteria": {
3+
"red": {
4+
"trigger": "minecraft:entity_killed_player",
5+
"conditions": {
6+
"entity": {
7+
"type": "player",
8+
"nbt":"{Tags:[\"bw.player\"]}"
9+
},
10+
"player": {
11+
"type": "player",
12+
"nbt":"{Tags:[\"bw.player\"]}"
13+
}
14+
}
15+
},
16+
"yellow": {
17+
"trigger": "minecraft:entity_killed_player",
18+
"conditions": {
19+
"player": {
20+
"team": "bw.yellow"
21+
}
22+
}
23+
},
24+
"blue": {
25+
"trigger": "minecraft:entity_killed_player",
26+
"conditions": {
27+
"player": {
28+
"team": "bw.blue"
29+
}
30+
}
31+
},
32+
"green": {
33+
"trigger": "minecraft:entity_killed_player",
34+
"conditions": {
35+
"player": {
36+
"team": "bw.green"
37+
}
38+
}
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"red",
44+
"green",
45+
"blue",
46+
"yellow"
47+
]
48+
],
49+
"rewards": {
50+
"function": "bedwars/during/player/was_killed"
51+
}
52+
}

‎datapacks/bedwars/data/minecraft/function/bedwars/during/player/died.mcfunction‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
## Datapack Upgrader v1.0.2 by wifi_left
33
## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
44
##
5-
5+
tag @s remove bw.was_killed
6+
tag @s remove bw.died_because_out_of_world
67
tp @s -302 68 210
78
gamemode spectator @s
89
clear @s
@@ -22,9 +23,9 @@ execute if score bw.mode state matches 7 as @s[tag=bw.fhing] at @s run function
2223
scoreboard players set @s[tag=bw.fhing] player.board 6
2324

2425
execute as @s[tag=!bw.fhing] at @s run tag @s remove bw.play
25-
execute as @s[tag=!bw.play] run tellraw @a[tag=bw.player] ["§b§l最终击杀！"]
26+
# execute as @s[tag=!bw.play] run tellraw @a[tag=bw.player] ["§b§l最终击杀！"]
2627
execute as @s[tag=!bw.fhing] at @s run tellraw @s ["§c你已被淘汰！"]
27-
28+
execute as @s[tag=!bw.fhing] at @s run function minecraft:bedwars/during/player/out
2829
execute as @s[tag=!bw.play] run function minecraft:bedwars/during/updateinfo/update
2930

3031
# execute as @s[]

0 commit comments

Comments
 (0)