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

Fix advancements to check if their parent item is enabled to prevent more logging

Browse Source
This commit is contained in:
ALongStringOfNumbers
2021-03-30 15:36:25 -07:00
parent 6878bfa4b0
commit e910af7734
22 changed files with 524 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json
+15 -2
View File
@@ -1,8 +1,21 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:CABLE_GLASS"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/charger.json
+11 -2
View File
@@ -1,8 +1,17 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:1"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/controller.json
+23 -2
View File
@@ -1,8 +1,29 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:controller"
"type": "forge:and",
"values": [
{
"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"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json
+28
View File
@@ -18,6 +18,34 @@
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:crafting_storage_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:part:360"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340"
}
]
}
src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json
+27 -2
View File
@@ -1,8 +1,33 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:CRAFTING_TERMINAL"
"type": "forge:and",
"values": [
{
"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:part:360"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/facade.json
+19 -2
View File
@@ -1,8 +1,25 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:facade"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:facade"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json
+11 -2
View File
@@ -1,8 +1,17 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json
+19 -4
View File
@@ -1,8 +1,23 @@
{
"conditions": [{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:quartz_growth_accelerator"
}],
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:quartz_growth_accelerator"
}
]
}
],
"display": {
"icon": {
"item": "appliedenergistics2:quartz_growth_accelerator"
src/main/resources/assets/appliedenergistics2/advancements/main/interface.json
+19 -2
View File
@@ -1,8 +1,25 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:interface"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:interface"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json
+36
View File
@@ -1,5 +1,41 @@
{
"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"
src/main/resources/assets/appliedenergistics2/advancements/main/network1.json
+19
View File
@@ -1,4 +1,23 @@
{
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
}
]
}
],
"display": {
"icon": {
"item": "appliedenergistics2:part",
src/main/resources/assets/appliedenergistics2/advancements/main/network2.json
+19
View File
@@ -1,4 +1,23 @@
{
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
}
]
}
],
"display": {
"icon": {
"item": "appliedenergistics2:part",
src/main/resources/assets/appliedenergistics2/advancements/main/network3.json
+19
View File
@@ -1,4 +1,23 @@
{
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
}
]
}
],
"display": {
"icon": {
"item": "appliedenergistics2:part",
src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json
+27 -2
View File
@@ -1,8 +1,33 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:network_tool"
"type": "forge:and",
"values": [
{
"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:network_tool"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json
+19 -2
View File
@@ -1,8 +1,25 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:P2P_TUNNEL_ME"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json
+31 -2
View File
@@ -1,8 +1,37 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:PATTERN_TERMINAL"
"type": "forge:and",
"values": [
{
"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:part:360"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:340"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json
+36
View File
@@ -1,5 +1,41 @@
{
"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"
src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json
+23 -2
View File
@@ -1,8 +1,29 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:quantum_link"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:460"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:quantum_link"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json
+40
View File
@@ -1,5 +1,45 @@
{
"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"
src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json
+40
View File
@@ -1,5 +1,45 @@
{
"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"
src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json
+23 -2
View File
@@ -1,8 +1,29 @@
{
"conditions": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:STORAGE_BUS"
"type": "forge:and",
"values": [
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:charger"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:material:7"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:16"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:interface"
},
{
"type": "minecraft:item_exists",
"item": "appliedenergistics2:part:220"
}
]
}
],
"display": {
src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json
+20
View File
@@ -15,6 +15,26 @@
{
"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"
}
],
"display": {