fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix advancements not triggering

Browse Source
This commit is contained in:
Salomão
2021-04-02 08:29:32 -03:00
parent c3b1dea7c5
commit 44c7a46315
26 changed files with 338 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json
+4 -2
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json
+2 -1
View File
@@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:1" "item": "appliedenergistics2:material",
"data": 1
} }
], ],
"display": { "display": {
src/main/resources/assets/appliedenergistics2/advancements/main/charger.json
+2 -1
View File
@@ -9,7 +9,8 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:1" "item": "appliedenergistics2:material",
"data": 1
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/controller.json
+8 -4
View File
@@ -5,19 +5,23 @@
"values": [ "values": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json
+12 -6
View File
@@ -21,19 +21,23 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
@@ -41,11 +45,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360" "item": "appliedenergistics2:part",
"data": 360
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340" "item": "appliedenergistics2:part",
"data": 340
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json
+10 -5
View File
@@ -5,19 +5,23 @@
"values": [ "values": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
@@ -25,7 +29,8 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360" "item": "appliedenergistics2:part",
"data": 360
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/facade.json
+6 -3
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
@@ -24,7 +26,8 @@
], ],
"display": { "display": {
"icon": { "icon": {
"item": "appliedenergistics2:facade" "item": "appliedenergistics2:facade",
"nbt": "{item:\"minecraft:stone\"}"
}, },
"title": { "title": {
"translate": "achievement.ae2.Facade" "translate": "achievement.ae2.Facade"
src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json
+2 -1
View File
@@ -9,7 +9,8 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json
+2 -1
View File
@@ -9,7 +9,8 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/interface.json
+4 -2
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json
+8 -4
View File
@@ -18,19 +18,23 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/network1.json
+4 -2
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/network2.json
+4 -2
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/network3.json
+4 -2
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json
+8 -4
View File
@@ -5,19 +5,23 @@
"values": [ "values": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json
+8 -5
View File
@@ -9,15 +9,18 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460" "item": "appliedenergistics2:part",
"data": 460
} }
] ]
} }
@@ -41,8 +44,8 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:part",
"part": "P2P_TUNNEL_ME" "data": 460
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json
+12 -6
View File
@@ -5,19 +5,23 @@
"values": [ "values": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
@@ -25,11 +29,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360" "item": "appliedenergistics2:part",
"data": 360
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340" "item": "appliedenergistics2:part",
"data": 340
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json
+47 -38
View File
@@ -1,44 +1,53 @@
{ {
"conditions": [ "conditions": [
{ {
"type": "minecraft:item_exists", "type": "forge:and",
"item": "appliedenergistics2:storage_cell_1k" "values": [
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_1k"
"item": "appliedenergistics2:storage_cell_4k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_4k"
"item": "appliedenergistics2:storage_cell_16k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_16k"
"item": "appliedenergistics2:storage_cell_64k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_64k"
"item": "appliedenergistics2:material:13" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:material",
"item": "appliedenergistics2:material:14" "data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
}, "data": 14
{ },
"type": "minecraft:item_exists", {
"item": "appliedenergistics2:material:19" "type": "minecraft:item_exists",
}, "item": "appliedenergistics2:material",
{ "data": 15
"type": "minecraft:item_exists", },
"item": "appliedenergistics2:controller" {
}, "type": "minecraft:item_exists",
{ "item": "appliedenergistics2:material",
"type": "minecraft:item_exists", "data": 19
"item": "appliedenergistics2:portable_cell" },
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:portable_cell"
}
]
} }
], ],
"display": { "display": {
src/main/resources/assets/appliedenergistics2/advancements/main/presses.json
+8 -4
View File
@@ -5,19 +5,23 @@
"values": [ "values": [
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13" "item": "appliedenergistics2:material",
"data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14" "item": "appliedenergistics2:material",
"data": 14
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
"data": 15
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19" "item": "appliedenergistics2:material",
"data": 19
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json
+6 -3
View File
@@ -9,15 +9,18 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460" "item": "appliedenergistics2:part",
"data": 460
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json
+51 -42
View File
@@ -1,48 +1,57 @@
{ {
"conditions": [ "conditions": [
{ {
"type": "minecraft:item_exists", "type": "forge:and",
"item": "appliedenergistics2:storage_cell_1k" "values": [
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_1k"
"item": "appliedenergistics2:storage_cell_4k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_4k"
"item": "appliedenergistics2:storage_cell_16k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_16k"
"item": "appliedenergistics2:storage_cell_64k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_64k"
"item": "appliedenergistics2:material:13" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:material",
"item": "appliedenergistics2:material:14" "data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
}, "data": 14
{ },
"type": "minecraft:item_exists", {
"item": "appliedenergistics2:material:19" "type": "minecraft:item_exists",
}, "item": "appliedenergistics2:material",
{ "data": 15
"type": "minecraft:item_exists", },
"item": "appliedenergistics2:controller" {
}, "type": "minecraft:item_exists",
{ "item": "appliedenergistics2:material",
"type": "minecraft:item_exists", "data": 19
"item": "appliedenergistics2:io_port" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:controller"
"item": "appliedenergistics2:spatial_io_port" },
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
}
]
} }
], ],
"display": { "display": {
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json
+51 -42
View File
@@ -1,48 +1,57 @@
{ {
"conditions": [ "conditions": [
{ {
"type": "minecraft:item_exists", "type": "forge:and",
"item": "appliedenergistics2:storage_cell_1k" "values": [
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_1k"
"item": "appliedenergistics2:storage_cell_4k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_4k"
"item": "appliedenergistics2:storage_cell_16k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_16k"
"item": "appliedenergistics2:storage_cell_64k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_64k"
"item": "appliedenergistics2:material:13" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:material",
"item": "appliedenergistics2:material:14" "data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
}, "data": 14
{ },
"type": "minecraft:item_exists", {
"item": "appliedenergistics2:material:19" "type": "minecraft:item_exists",
}, "item": "appliedenergistics2:material",
{ "data": 15
"type": "minecraft:item_exists", },
"item": "appliedenergistics2:controller" {
}, "type": "minecraft:item_exists",
{ "item": "appliedenergistics2:material",
"type": "minecraft:item_exists", "data": 19
"item": "appliedenergistics2:io_port" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:controller"
"item": "appliedenergistics2:spatial_io_port" },
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
}
]
} }
], ],
"display": { "display": {
src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json
+6 -3
View File
@@ -9,11 +9,13 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7" "item": "appliedenergistics2:material",
"data": 7
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16" "item": "appliedenergistics2:part",
"data": 16
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
@@ -21,7 +23,8 @@
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:part:220" "item": "appliedenergistics2:part",
"data": 220
} }
] ]
} }
src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json
+43 -34
View File
@@ -1,40 +1,49 @@
{ {
"conditions": [ "conditions": [
{ {
"type": "minecraft:item_exists", "type": "forge:and",
"item": "appliedenergistics2:storage_cell_1k" "values": [
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_1k"
"item": "appliedenergistics2:storage_cell_4k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_4k"
"item": "appliedenergistics2:storage_cell_16k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_16k"
"item": "appliedenergistics2:storage_cell_64k" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:storage_cell_64k"
"item": "appliedenergistics2:material:13" },
}, {
{ "type": "minecraft:item_exists",
"type": "minecraft:item_exists", "item": "appliedenergistics2:material",
"item": "appliedenergistics2:material:14" "data": 13
}, },
{ {
"type": "minecraft:item_exists", "type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15" "item": "appliedenergistics2:material",
}, "data": 14
{ },
"type": "minecraft:item_exists", {
"item": "appliedenergistics2:material:19" "type": "minecraft:item_exists",
}, "item": "appliedenergistics2:material",
{ "data": 15
"type": "minecraft:item_exists", },
"item": "appliedenergistics2:controller" {
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
}
]
} }
], ],
"display": { "display": {