Skip to content

Commit 287aa6b

Browse files
authored
Map Event 1.21 (#1)
* bump pack version to 48 * dac wools * fix fourmilier * fix elytra replace entity * arrow particles * jo fireworks * fix arc give * fix advancement json from icon/item to icon/id * renamed arc advancements * rename arcade adv * gitignore * rename artefact adv * rename boat adv * rename button adv * rename dac adv * rename ecrase adv * rename elytra adv * rename fourmilier adv * rename arc adv part 2 * rename jump adv * rename laby adv * rename music adv * rename pve adv * rename pvp adv * rename secret adv * rename spleef adv * remove excess whitespaces * fix arc * use bools for is_waxed * fix dac * fix fourmilier * fix general * fix jump * fix music * fix spleef * fix secret item frame maps * fix music adv arrow color * fix give sign commands * modernize fourmilier with place * updated pvp thx mcstacker + macros * fix pve THX MCSTACKER again * first pass of mob cleanup * pve mobs fix second pass * pve mobs last pass
1 parent dedb28b commit 287aa6b

File tree

327 files changed

+1172
-1100
lines changed

Some content is hidden

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

327 files changed

+1172
-1100
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.ps1

data/arc/advancement/arc_3.json renamed to data/arc/advancement/arc_interrupteur_1.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
"text": "Vous avez allumé 1 interrupteur"
99
},
1010
"icon": {
11-
"item": "minecraft:lime_stained_glass"
11+
"id": "minecraft:lime_stained_glass"
1212
},
1313
"frame": "goal",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_3": {
19+
"arc_interrupteur_1": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_1"
24-
}
23+
"parent": "arc:arc_start"
24+
}
25+

data/arc/advancement/arc_3_1.json renamed to data/arc/advancement/arc_interrupteur_2.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
"text": "Vous avez allumé 30 interrupteurs"
99
},
1010
"icon": {
11-
"item": "minecraft:green_stained_glass"
11+
"id": "minecraft:green_stained_glass"
1212
},
1313
"frame": "goal",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_3_1": {
19+
"arc_interrupteur_2": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_3"
24-
}
23+
"parent": "arc:arc_interrupteur_1"
24+
}
25+

data/arc/advancement/arc_3_11.json renamed to data/arc/advancement/arc_interrupteur_3.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"text": "Vous avez allumé 50 interrupteurs"
99
},
1010
"icon": {
11-
"item": "minecraft:sea_lantern"
11+
"id": "minecraft:sea_lantern"
1212
},
1313
"frame": "goal",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_3_11": {
19+
"arc_interrupteur_3": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_3_1"
24-
}
23+
"parent": "arc:arc_interrupteur_2"
24+
}

data/arc/advancement/arc_1.json renamed to data/arc/advancement/arc_start.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"text": "Vous êtes entré dans le jeu pour la première fois"
99
},
1010
"icon": {
11-
"item": "minecraft:apple"
11+
"id": "minecraft:apple"
1212
},
1313
"frame": "goal",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_1": {
19+
"arc_start": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
2323
"parent": "arc:root"
24-
}
24+
}

data/arc/advancement/arc_5.json renamed to data/arc/advancement/arc_tnt.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
"text": "Vous avez presque tout fait exploser, heureusement les fleches ne sont pas en feu !"
99
},
1010
"icon": {
11-
"item": "minecraft:tnt"
11+
"id": "minecraft:tnt"
1212
},
1313
"frame": "goal",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_5": {
19+
"arc_tnt": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_1"
24-
}
23+
"parent": "arc:arc_start"
24+
}
25+

data/arc/advancement/arc_6.json renamed to data/arc/advancement/arc_win_1.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
"text": "Vous avez fini le jeu pour la première fois"
99
},
1010
"icon": {
11-
"item": "minecraft:arrow"
11+
"id": "minecraft:arrow"
1212
},
1313
"frame": "task",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_6": {
19+
"arc_win_1": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_1"
24-
}
23+
"parent": "arc:arc_start"
24+
}
25+

data/arc/advancement/arc_6_1.json renamed to data/arc/advancement/arc_win_2.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,23 @@
88
"text": "Vous avez fini le jeu 3 fois"
99
},
1010
"icon": {
11-
"item": "minecraft:tipped_arrow"
11+
"id": "minecraft:tipped_arrow",
12+
"components": {
13+
"minecraft:potion_contents": {
14+
"custom_color": 16237597
15+
}
16+
}
1217
},
1318
"frame": "task",
1419
"show_toast": true,
1520
"announce_to_chat": false,
1621
"hidden": false
1722
},
1823
"criteria": {
19-
"arc_6_1": {
24+
"arc_win_2": {
2025
"trigger": "minecraft:impossible"
2126
}
2227
},
23-
"parent": "arc:arc_6"
24-
}
28+
"parent": "arc:arc_win_1"
29+
}
30+

data/arc/advancement/arc_6_11.json renamed to data/arc/advancement/arc_win_3.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
"text": "Vous avez fini le jeu 5 fois"
99
},
1010
"icon": {
11-
"item": "minecraft:spectral_arrow"
11+
"id": "minecraft:spectral_arrow"
1212
},
1313
"frame": "challenge",
1414
"show_toast": true,
1515
"announce_to_chat": false,
1616
"hidden": false
1717
},
1818
"criteria": {
19-
"arc_6_11": {
19+
"arc_win_3": {
2020
"trigger": "minecraft:impossible"
2121
}
2222
},
23-
"parent": "arc:arc_6_1"
24-
}
23+
"parent": "arc:arc_win_2"
24+
}
25+

data/arc/advancement/root.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"bold": false
1313
},
1414
"icon": {
15-
"item": "minecraft:bow"
15+
"id": "minecraft:bow"
1616
},
1717
"frame": "task",
1818
"show_toast": false,

0 commit comments

Comments
 (0)