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 9f4f051e2..55f34cb10 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json b/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json index e74c81d7c..063389b39 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "minecraft:item_exists", - "item": "appliedenergistics2:material:1" + "item": "appliedenergistics2:material", + "data": 1 } ], "display": { @@ -31,4 +32,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json index 09a0fc7bc..f5d5c0aea 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json @@ -9,7 +9,8 @@ }, { "type": "minecraft:item_exists", - "item": "appliedenergistics2:material:1" + "item": "appliedenergistics2:material", + "data": 1 } ] } @@ -38,4 +39,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json b/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json index ff5f6b696..52151496f 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json @@ -29,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json index 841c1bf09..3c7f96861 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json @@ -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 @@ } } } -} +} \ No newline at end of file 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 3214ad8e1..1014512b3 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json @@ -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" ] ] -} +} \ No newline at end of file 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 d46ae42f3..0a527060e 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json index aa37aec9e..91f52eb09 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json index 903a20599..5e5d400b0 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json @@ -9,7 +9,8 @@ }, { "type": "minecraft:item_exists", - "item": "appliedenergistics2:material:7" + "item": "appliedenergistics2:material", + "data": 7 } ] } @@ -40,4 +41,4 @@ } } } -} +} \ No newline at end of file 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 33ce7b04a..15351d87c 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json b/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json index bc3df95f9..5aac6adb6 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json index a1990b9b8..1884151c8 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json index b18667504..b17438f2c 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network1.json @@ -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" } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json index 7cfa73085..83ab25984 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network2.json @@ -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" } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json b/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json index c8d30376e..a6e1b11fd 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network3.json @@ -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" } } -} +} \ No newline at end of file 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 721af3c2e..e71567ae6 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json index b4d84f53c..915137dc0 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json @@ -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 } ] } } } -} +} \ No newline at end of file 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 ce9aea793..ab9e5dfa6 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json @@ -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 @@ } } } -} +} \ No newline at end of file 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 8d458caad..aa3cff442 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json b/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json index 9b751bbc1..5aabbbc5a 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json @@ -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" ] ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json index f1703e762..0183facb4 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json @@ -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 @@ } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/root.json b/src/main/resources/assets/appliedenergistics2/advancements/main/root.json index 72e2317b6..425a38e40 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/root.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/root.json @@ -27,4 +27,4 @@ } } } -} +} \ No newline at end of file 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 a669112c0..6e84740e9 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json @@ -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" } } -} +} \ No newline at end of file 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 e6abbb3d8..a4109273a 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json @@ -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 @@ } } } -} +} \ No newline at end of file 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 dddc48e0c..d56ef5ef5 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json @@ -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 @@ } } } -} +} \ No newline at end of file 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 2d4e71db3..32d47ffde 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json @@ -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" ] ] -} +} \ No newline at end of file