diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json b/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json index e376ac9be..9f4f051e2 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json index af9dea492..09a0fc7bc 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json index f3796f1d7..841c1bf09 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json index 2f7edebb4..3214ad8e1 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json @@ -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" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json index 74224d71f..d46ae42f3 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json index 180367311..aa37aec9e 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json index 74ccdb823..903a20599 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json index 9f4c11cd2..33ce7b04a 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json @@ -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" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json b/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json index 2a96a4aac..bc3df95f9 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json index cdf0d1054..a1990b9b8 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json @@ -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" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json index 0399b494c..b18667504 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json @@ -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", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json index 9dcafdf10..7cfa73085 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json @@ -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", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json index 32c33c2d6..c8d30376e 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json @@ -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", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json index 9d038dc0d..721af3c2e 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json index e2ca64e06..b4d84f53c 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json b/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json index db1820cc7..ce9aea793 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json b/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json index 71443d1ee..8d458caad 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json @@ -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" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json index 1c7b7e1f8..f1703e762 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json index e7858f7f1..a669112c0 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json @@ -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" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json index 0b0c4634b..e6abbb3d8 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json @@ -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" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json index a3ab735dc..dddc48e0c 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json @@ -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": { diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json index a325c8915..2d4e71db3 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json @@ -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": {