diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json index ce46a56a6..26c5987d2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:light_detector" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:netherCrystal" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:light_detector" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json index f314f83fe..47bd9a215 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json @@ -7,10 +7,6 @@ "type": "appliedenergistics2:material_exists", "material": "material.formation_core" }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:certusCrystal" - }, { "type": "appliedenergistics2:material_exists", "material": "material.logic_processor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json index d4101a824..365c217f0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" - }, - { - "type": "appliedenergistics2:material_exists", - "material": "material.fluix_pearl" - } - ] + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json index 7a7b2e0f1..9ba154b7b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:grindstone" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:crystalQuartz" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:grindstone" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json index 7a8afd9ae..0522bc860 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:tiny_tnt" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:dustQuartz" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:tiny_tnt" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json index 46a6e0ebc..abdd397d3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:netherCrystal" - } - ], "result": { "item": "minecraft:daylight_detector" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json index 33ea1d9d3..b12190de0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.calculation_processor" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:cell_workbench" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:cell_workbench" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json index 06d257cb4..dbebec998 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json @@ -6,10 +6,6 @@ { "type": "minecraft:item_exists", "item": "appliedenergistics2:charger" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json index ed4dabfb0..56acc48a3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json @@ -10,10 +10,6 @@ { "type": "minecraft:item_exists", "item": "appliedenergistics2:quartz_glass" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json index 25fce09dc..8c12b5b76 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json @@ -10,10 +10,6 @@ { "type": "minecraft:item_exists", "item": "appliedenergistics2:quartz_glass" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:certusCrystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json index 21fefabdd..37b1c11fc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json @@ -1,12 +1,19 @@ { - "conditions": [{ - "type": "minecraft:item_exists", - "item": "appliedenergistics2:vibration_chamber" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:energy_acceptor" - }], + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:vibration_chamber" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_acceptor" + } + ] + } + ], "result": { "item": "appliedenergistics2:vibration_chamber" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json index 36f2835e8..362c66acd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:inscriber" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:inscriber" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json index fa708ee40..0473df19c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json @@ -14,10 +14,6 @@ { "type": "appliedenergistics2:material_exists", "material": "material.annihilation_core" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:glass" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_condenser.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_condenser.json index 70169d79e..bfae38853 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_condenser.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_condenser.json @@ -1,17 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:condenser" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:glass" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:condenser" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json index f148dd5cb..a30fee9ae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json @@ -11,10 +11,6 @@ "type": "minecraft:item_exists", "item": "appliedenergistics2:quartz_glass" }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" - }, { "type": "minecraft:item_exists", "item": "appliedenergistics2:part:cable_glass.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json index 31063828c..37fa36b49 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json @@ -10,10 +10,6 @@ { "type": "minecraft:item_exists", "item": "appliedenergistics2:part:cable_glass.fluix" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json index eb5aadbec..5de1b80a1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json @@ -7,10 +7,6 @@ "type": "minecraft:item_exists", "item": "appliedenergistics2:quartz_glass" }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:certusCrystal" - }, { "type": "appliedenergistics2:material_exists", "material": "material.blank_pattern" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json index dd0c02a6b..cf44bd929 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json @@ -1,21 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.wireless_booster" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:certusCrystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:dustEnder" - } - ] + "type": "appliedenergistics2:material_exists", + "material": "material.wireless_booster" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json index 7cfe1f9f0..0bc375ab0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:charged_staff" - }, - { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal_charged" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:charged_staff" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal_charged" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json index 9417e69f4..1cf24de88 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json @@ -11,10 +11,6 @@ "type": "minecraft:item_exists", "item": "appliedenergistics2:entropy_manipulator" }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" - }, { "type": "appliedenergistics2:material_exists", "material": "material.engineering_processor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json index 20fbcb4ee..afc4eccab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:biometric_card" - }, - { - "type": "appliedenergistics2:material_exists", - "material": "material.engineering_processor" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:biometric_card" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json index 183ff38c8..2d9c399db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:memory_card" - }, - { - "type": "appliedenergistics2:material_exists", - "material": "material.calculation_processor" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:memory_card" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json index c9102b70c..2fe7ad95c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:network_tool" - }, - { - "type": "appliedenergistics2:material_exists", - "material": "material.calculation_processor" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:network_tool" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] } ], "result": {