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

fix advancements

Browse Source
This commit is contained in:
Salomão
2021-04-01 02:13:11 -03:00
parent 4c4214754a
commit d58a5f0307
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
+5 -3
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
}
]
}
@@ -44,4 +46,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json
+3 -2
View File
@@ -2,7 +2,8 @@
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:1"
"item": "appliedenergistics2:material",
"data": 1
}
],
"display": {
@@ -31,4 +32,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/charger.json
+3 -2
View File
@@ -9,7 +9,8 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:1"
"item": "appliedenergistics2:material",
"data": 1
}
]
}
@@ -38,4 +39,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/compass.json
+1 -1
View File
@@ -29,4 +29,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/controller.json
+9 -5
View File
@@ -5,19 +5,23 @@
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -50,4 +54,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json
+13 -7
View File
@@ -21,19 +21,23 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -41,11 +45,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360"
"item": "appliedenergistics2:part",
"data": 360
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340"
"item": "appliedenergistics2:part",
"data": 340
}
]
}
@@ -112,4 +118,4 @@
"c64k"
]
]
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json
+11 -6
View File
@@ -5,19 +5,23 @@
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -25,7 +29,8 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360"
"item": "appliedenergistics2:part",
"data": 360
}
]
}
@@ -56,4 +61,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/facade.json
+7 -4
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
},
{
"type": "minecraft:item_exists",
@@ -24,7 +26,8 @@
],
"display": {
"icon": {
"item": "appliedenergistics2:facade"
"item": "appliedenergistics2:facade",
"nbt": "{item:\"minecraft:stone\"}"
},
"title": {
"translate": "achievement.ae2.Facade"
@@ -46,4 +49,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json
+3 -2
View File
@@ -9,7 +9,8 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
}
]
}
@@ -40,4 +41,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json
+3 -2
View File
@@ -9,7 +9,8 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
@@ -42,4 +43,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/interface.json
+5 -3
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
},
{
"type": "minecraft:item_exists",
@@ -46,4 +48,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json
+9 -5
View File
@@ -18,19 +18,23 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -65,4 +69,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/network1.json
+5 -3
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
}
]
}
@@ -36,4 +38,4 @@
"trigger": "appliedenergistics2:network_apprentice"
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/network2.json
+5 -3
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
}
]
}
@@ -36,4 +38,4 @@
"trigger": "appliedenergistics2:network_engineer"
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/network3.json
+5 -3
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
}
]
}
@@ -36,4 +38,4 @@
"trigger": "appliedenergistics2:network_admin"
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json
+9 -5
View File
@@ -5,19 +5,23 @@
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -54,4 +58,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json
+9 -6
View File
@@ -9,15 +9,18 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460"
"item": "appliedenergistics2:part",
"data": 460
}
]
}
@@ -41,11 +44,11 @@
"conditions": {
"items": [
{
"type": "appliedenergistics2:part",
"part": "P2P_TUNNEL_ME"
"item": "appliedenergistics2:part",
"data": 460
}
]
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json
+13 -7
View File
@@ -5,19 +5,23 @@
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
@@ -25,11 +29,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:360"
"item": "appliedenergistics2:part",
"data": 360
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340"
"item": "appliedenergistics2:part",
"data": 340
}
]
}
@@ -60,4 +66,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json
+48 -39
View File
@@ -1,44 +1,53 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:portable_cell"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:portable_cell"
}
]
}
],
"display": {
@@ -65,4 +74,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/presses.json
+9 -5
View File
@@ -5,19 +5,23 @@
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
"item": "appliedenergistics2:material",
"data": 19
}
]
}
@@ -89,4 +93,4 @@
"silicon"
]
]
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json
+7 -4
View File
@@ -9,15 +9,18 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460"
"item": "appliedenergistics2:part",
"data": 460
},
{
"type": "minecraft:item_exists",
@@ -50,4 +53,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/root.json
+1 -1
View File
@@ -27,4 +27,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json
+52 -43
View File
@@ -1,48 +1,57 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
}
]
}
],
"display": {
@@ -62,4 +71,4 @@
"trigger": "appliedenergistics2:spatial_explorer"
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json
+52 -43
View File
@@ -1,48 +1,57 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:io_port"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:spatial_io_port"
}
]
}
],
"display": {
@@ -69,4 +78,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json
+7 -4
View File
@@ -9,11 +9,13 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"item": "appliedenergistics2:material",
"data": 7
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
"item": "appliedenergistics2:part",
"data": 16
},
{
"type": "minecraft:item_exists",
@@ -21,7 +23,8 @@
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:220"
"item": "appliedenergistics2:part",
"data": 220
}
]
}
@@ -52,4 +55,4 @@
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json
+44 -35
View File
@@ -1,40 +1,49 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:13"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:14"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:15"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:19"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_1k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_4k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_16k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:storage_cell_64k"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 13
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 14
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 15
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material",
"data": 19
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
}
]
}
],
"display": {
@@ -99,4 +108,4 @@
"c64k"
]
]
}
}