Skip to content

Commit 30f813f

Browse files
imreallybadatnamesimreallybadatnames
committed
fix last errors + consistent formatting
1 parent 1954b69 commit 30f813f

File tree

2,051 files changed

+15904
-15040
lines changed

Some content is hidden

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

2,051 files changed

+15904
-15040
lines changed

‎src/main/resources/data/spectrum/advancement/hidden/break_black_materia.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
}
1010
},
1111
"gotten_previous": {
12-
"trigger":"revelationary:advancement_gotten",
13-
"conditions": { "advancement_identifier": "spectrum:midgame/create_midnight_aberration" }
12+
"trigger": "revelationary:advancement_gotten",
13+
"conditions": {
14+
"advancement_identifier": "spectrum:midgame/create_midnight_aberration"
15+
}
1416
}
1517
}
1618
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_all_jade_vine_products.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"criteria": {
33
"harvested_moonstruck_nectar": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:midgame/harvest_moonstruck_nectar" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:midgame/harvest_moonstruck_nectar"
7+
}
68
},
79
"collected_jade_vine_petals": {
8-
"trigger":"revelationary:advancement_gotten",
9-
"conditions": { "advancement_identifier": "spectrum:midgame/collect_jade_vine_petals" }
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:midgame/collect_jade_vine_petals"
13+
}
1014
},
1115
"collected_jade_jelly": {
12-
"trigger":"revelationary:advancement_gotten",
13-
"conditions": { "advancement_identifier": "spectrum:midgame/collect_jade_jelly" }
16+
"trigger": "revelationary:advancement_gotten",
17+
"conditions": {
18+
"advancement_identifier": "spectrum:midgame/collect_jade_jelly"
19+
}
1420
}
1521
}
1622
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_any_crystallized_block.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
22
"criteria": {
33
"collected_blazing_crystal": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:hidden/collect_blazing_crystal" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:hidden/collect_blazing_crystal"
7+
}
68
},
79
"collected_frostbite_crystal": {
8-
"trigger":"revelationary:advancement_gotten",
9-
"conditions": { "advancement_identifier": "spectrum:hidden/collect_frostbite_crystal" }
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:hidden/collect_frostbite_crystal"
13+
}
1014
}
1115
},
1216
"requirements": [

‎src/main/resources/data/spectrum/advancement/hidden/collect_ash.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
}
14-
}
14+
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_ash_and_slush.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
22
"criteria": {
33
"collect_ash": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:hidden/collect_ash" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:hidden/collect_ash"
7+
}
68
},
79
"collect_slush": {
8-
"trigger":"revelationary:advancement_gotten",
9-
"conditions": { "advancement_identifier": "spectrum:hidden/collect_slush" }
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:hidden/collect_slush"
13+
}
1014
}
1115
}
1216
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_blazing_crystal.json

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
{
22
"criteria": {
33
"reached_midgame": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:midgame/spectrum_midgame" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:midgame/spectrum_midgame"
7+
}
68
},
79
"has_blazing_crystal": {
810
"trigger": "minecraft:inventory_changed",
9-
"conditions": { "items": [{ "items": ["spectrum:blazing_crystal"] }] }
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"spectrum:blazing_crystal"
16+
]
17+
}
18+
]
19+
}
1020
}
1121
}
1222
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_crawfish.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
}
14-
}
14+
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_gilded_book.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
}
14-
}
14+
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_koi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
}
14-
}
14+
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_paltaeria_gem.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"criteria": {
33
"collected_paltaeria": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:lategame/collect_paltaeria" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
7+
}
68
},
79
"has_paltaeria_gem": {
810
"trigger": "minecraft:inventory_changed",

‎src/main/resources/data/spectrum/advancement/hidden/collect_slush.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
}
14-
}
14+
}

‎src/main/resources/data/spectrum/advancement/hidden/collect_stratine_gem.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"criteria": {
33
"collected_stratine": {
4-
"trigger":"revelationary:advancement_gotten",
5-
"conditions": { "advancement_identifier": "spectrum:midgame/collect_stratine" }
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:midgame/collect_stratine"
7+
}
68
},
79
"has_stratine_gem": {
810
"trigger": "minecraft:inventory_changed",

‎src/main/resources/data/spectrum/advancement/hidden/collect_weeping_gala.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
}
1717
}
1818
}
19-
}
19+
}

‎src/main/resources/data/spectrum/advancement/hidden/entity_interact/eraser.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
"player_hurt_entity"
4747
]
4848
]
49-
}
49+
}

‎src/main/resources/data/spectrum/advancement/hidden/entity_interact/killed_by_monstrosity.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
}
2323
}
2424
}
25-
}
25+
}

‎src/main/resources/data/spectrum/advancement/hidden/entity_interact/kindling.json

+41-42
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
11
{
2-
"criteria": {
3-
"entity_interact": {
4-
"trigger": "minecraft:player_interacted_with_entity",
5-
"conditions": {
6-
"player": [
7-
{
8-
"condition": "minecraft:entity_properties",
9-
"entity": "this",
10-
"predicate": {
11-
"type": "spectrum:kindling"
12-
}
13-
}
14-
]
15-
}
16-
},
17-
"entity_hurt_player": {
18-
"trigger": "minecraft:entity_hurt_player",
19-
"conditions": {
20-
"damage": {
21-
"source_entity": {
2+
"criteria": {
3+
"entity_interact": {
4+
"trigger": "minecraft:player_interacted_with_entity",
5+
"conditions": {
6+
"player": [
7+
{
8+
"condition": "minecraft:entity_properties",
9+
"entity": "this",
10+
"predicate": {
2211
"type": "spectrum:kindling"
2312
}
2413
}
25-
}
26-
},
27-
"player_hurt_entity": {
28-
"trigger": "minecraft:player_hurt_entity",
29-
"conditions": {
30-
"entity": [
31-
{
32-
"condition": "minecraft:entity_properties",
33-
"entity": "this",
34-
"predicate": {
35-
"type": "spectrum:kindling"
36-
}
37-
}
38-
]
14+
]
15+
}
16+
},
17+
"entity_hurt_player": {
18+
"trigger": "minecraft:entity_hurt_player",
19+
"conditions": {
20+
"damage": {
21+
"source_entity": {
22+
"type": "spectrum:kindling"
23+
}
3924
}
4025
}
4126
},
42-
"requirements": [
43-
[
44-
"entity_interact",
45-
"entity_hurt_player",
46-
"player_hurt_entity"
47-
]
27+
"player_hurt_entity": {
28+
"trigger": "minecraft:player_hurt_entity",
29+
"conditions": {
30+
"entity": [
31+
{
32+
"condition": "minecraft:entity_properties",
33+
"entity": "this",
34+
"predicate": {
35+
"type": "spectrum:kindling"
36+
}
37+
}
38+
]
39+
}
40+
}
41+
},
42+
"requirements": [
43+
[
44+
"entity_interact",
45+
"entity_hurt_player",
46+
"player_hurt_entity"
4847
]
49-
}
50-
48+
]
49+
}

‎src/main/resources/data/spectrum/advancement/hidden/entity_interact/lizard.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
"player_hurt_entity"
4747
]
4848
]
49-
}
49+
}

‎src/main/resources/data/spectrum/advancement/hidden/entity_interact/preservation_turret.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
"player_hurt_entity"
4747
]
4848
]
49-
}
49+
}

‎src/main/resources/data/spectrum/advancement/hidden/get_substantial_azure_dike_charge.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
}
88
},
99
"gotten_previous": {
10-
"trigger":"revelationary:advancement_gotten",
11-
"conditions": { "advancement_identifier": "spectrum:midgame/get_azure_dike_charge" }
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:midgame/get_azure_dike_charge"
13+
}
1214
}
1315
}
1416
}

‎src/main/resources/data/spectrum/advancement/hidden/instilled_germinated_jade_vine_bulb.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
}
2424
}
2525
}
26-
}
26+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/ascension.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/calming.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/density.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/divinity.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/eternal_slumber.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/fatal_slumber.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/lightweight.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/somnolence.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/stiffness.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

‎src/main/resources/data/spectrum/advancement/hidden/status_effects/swiftness.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
}
1010
}
1111
}
12-
}
12+
}

0 commit comments

Comments
 (0)