From 66e589324a3a0b381acaae46c4e7fbf1f1ce2b2a Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Fri, 26 Mar 2021 19:12:49 -0700 Subject: [PATCH 1/5] Make recipes and advancements conditional Fix crash when fluix was disabled --- .../core/api/definitions/ApiBlocks.java | 11 +++++++- .../advancements/main/cable_glass.json | 6 +++++ .../advancements/main/charged_quartz.json | 6 +++++ .../advancements/main/charger.json | 6 +++++ .../advancements/main/compass.json | 6 +++++ .../advancements/main/controller.json | 6 +++++ .../advancements/main/crafting_cpu.json | 23 ++++++++++++++++ .../advancements/main/crafting_terminal.json | 6 +++++ .../advancements/main/facade.json | 6 +++++ .../advancements/main/fluix.json | 6 +++++ .../advancements/main/growth_accelerator.json | 4 +++ .../advancements/main/interface.json | 6 +++++ .../advancements/main/ioport.json | 6 +++++ .../advancements/main/network_tool.json | 6 +++++ .../advancements/main/p2p.json | 6 +++++ .../advancements/main/pattern_terminal.json | 6 +++++ .../advancements/main/portable_cell.json | 6 +++++ .../advancements/main/presses.json | 23 ++++++++++++++++ .../advancements/main/qnb.json | 6 +++++ .../advancements/main/spatial_explorer.json | 6 +++++ .../advancements/main/spatial_ioport.json | 6 +++++ .../advancements/main/storage_bus.json | 6 +++++ .../advancements/main/storage_cell.json | 18 +++++++++++++ .../aerecipes/grinder/fluix_dust.json | 6 +++++ .../aerecipes/grinder/sky_dust.json | 6 +++++ .../inscriber/calculation_processor.json | 19 +++++++++++++ .../calculation_processor_press.json | 6 +++++ .../calculation_processor_print.json | 19 +++++++++++++ .../inscriber/engineering_processor.json | 19 +++++++++++++ .../engineering_processor_press.json | 6 +++++ .../engineering_processor_print.json | 15 +++++++++++ .../aerecipes/inscriber/logic_processor.json | 19 +++++++++++++ .../inscriber/logic_processor_press.json | 11 ++++++++ .../inscriber/logic_processor_print.json | 15 +++++++++++ .../aerecipes/inscriber/silicon_press.json | 6 +++++ .../aerecipes/inscriber/silicon_print.json | 15 +++++++++++ .../aerecipes/smelting/bread.json | 6 +++++ .../aerecipes/smelting/silicon.json | 6 +++++ .../smelting/smooth_sky_stone_block.json | 15 +++++++++++ .../decorative/certus_quartz_block.json | 6 +++++ .../decorative/certus_quartz_block_pure.json | 10 +++++++ .../decorative/certus_quartz_pillar.json | 15 +++++++++++ .../decorative/chiseled_quartz_block.json | 15 +++++++++++ .../recipes/decorative/fluix_block.json | 6 +++++ .../recipes/decorative/fluix_block_pure.json | 15 +++++++++++ .../recipes/decorative/light_detector.json | 15 +++++++++++ .../recipes/decorative/quartz_block_pure.json | 6 +++++ .../recipes/decorative/quartz_fixture.json | 10 +++++++ .../recipes/decorative/quartz_glass.json | 6 +++++ .../decorative/quartz_vibrant_glass.json | 15 +++++++++++ .../recipes/decorative/sky_stone_brick.json | 15 +++++++++++ .../decorative/sky_stone_small_brick.json | 15 +++++++++++ .../recipes/decorative/sky_stone_smooth.json | 15 +++++++++++ .../decorative/slabs_chiseled_quartz.json | 15 +++++++++++ .../recipes/decorative/slabs_fluix.json | 15 +++++++++++ .../recipes/decorative/slabs_quartz.json | 15 +++++++++++ .../decorative/slabs_quartz_pillar.json | 15 +++++++++++ .../recipes/decorative/slabs_sky_stone.json | 15 +++++++++++ .../decorative/slabs_sky_stone_brick.json | 15 +++++++++++ .../slabs_sky_stone_small_brick.json | 15 +++++++++++ .../decorative/slabs_smooth_sky_stone.json | 15 +++++++++++ .../decorative/stairs_chiseled_quartz.json | 15 +++++++++++ .../recipes/decorative/stairs_fluix.json | 15 +++++++++++ .../recipes/decorative/stairs_quartz.json | 15 +++++++++++ .../decorative/stairs_quartz_pillar.json | 15 +++++++++++ .../recipes/decorative/stairs_sky_stone.json | 15 +++++++++++ .../decorative/stairs_sky_stone_brick.json | 15 +++++++++++ .../stairs_sky_stone_small_brick.json | 15 +++++++++++ .../decorative/stairs_smooth_sky_stone.json | 15 +++++++++++ .../recipes/materials/advancedcard.json | 13 +++++++-- .../recipes/materials/annihilationcore.json | 13 +++++++-- .../recipes/materials/basiccard.json | 13 +++++++-- .../recipes/materials/cardcapacity.json | 13 +++++++-- .../recipes/materials/cardcrafting.json | 13 +++++++-- .../recipes/materials/cardfuzzy.json | 13 +++++++-- .../recipes/materials/cardinverter.json | 13 +++++++-- .../recipes/materials/cardredstone.json | 13 +++++++-- .../recipes/materials/cardspeed.json | 13 +++++++-- .../recipes/materials/formationcore.json | 17 ++++++++++-- .../recipes/misc/chests_sky_stone.json | 15 +++++++++++ .../recipes/misc/chests_smooth_sky_stone.json | 15 +++++++++++ ...deconstruction_certus_chiseled_quartz.json | 4 +++ .../deconstruction_certus_quartz_block.json | 4 +++ .../deconstruction_certus_quartz_pillar.json | 4 +++ .../misc/deconstruction_fluix_block.json | 4 +++ .../recipes/misc/fluixpearl.json | 13 +++++++-- .../recipes/misc/grindstone.json | 15 +++++++++++ .../recipes/misc/meteors_sky_compass.json | 15 +++++++++++ .../recipes/misc/seeds_certus.json | 6 +++++ .../recipes/misc/seeds_fluix.json | 6 +++++ .../recipes/misc/seeds_nether.json | 6 +++++ .../recipes/misc/tiny_tnt.json | 15 +++++++++++ .../recipes/misc/vanilla_comparator.json | 6 +++++ .../misc/vanilla_daylight_detector.json | 6 +++++ .../network/blocks/cell_workbench.json | 10 +++++++ .../recipes/network/blocks/controller.json | 23 ++++++++++++++++ .../blocks/crystal_processing_charger.json | 15 +++++++++++ ..._processing_quartz_growth_accelerator.json | 23 ++++++++++++++++ .../blocks/energy_dense_energy_cell.json | 19 +++++++++++++ .../blocks/energy_energy_acceptor.json | 19 +++++++++++++ .../network/blocks/energy_energy_cell.json | 19 +++++++++++++ .../blocks/energy_vibration_chamber.json | 8 ++++++ .../blocks/fluid_interfaces_interface.json | 19 +++++++++++++ .../fluid_interfaces_interface_alt.json | 6 +++++ .../fluid_interfaces_interface_part.json | 6 +++++ .../recipes/network/blocks/inscribers.json | 15 +++++++++++ .../network/blocks/interfaces_interface.json | 23 ++++++++++++++++ .../blocks/interfaces_interface_alt.json | 6 +++++ .../blocks/interfaces_interface_part.json | 6 +++++ .../recipes/network/blocks/io_condenser.json | 15 +++++++++++ .../recipes/network/blocks/io_port.json | 23 ++++++++++++++++ .../recipes/network/blocks/quantum_link.json | 19 +++++++++++++ .../recipes/network/blocks/quantum_ring.json | 27 +++++++++++++++++++ .../network/blocks/security_station.json | 27 +++++++++++++++++++ .../network/blocks/spatial_io_port.json | 23 ++++++++++++++++ .../network/blocks/spatial_io_pylon.json | 23 ++++++++++++++++ .../recipes/network/blocks/storage_chest.json | 19 +++++++++++++ .../recipes/network/blocks/storage_drive.json | 19 +++++++++++++ .../recipes/network/cables/covered_black.json | 15 +++++++++++ .../recipes/network/cables/covered_blue.json | 15 +++++++++++ .../recipes/network/cables/covered_brown.json | 15 +++++++++++ .../recipes/network/cables/covered_cyan.json | 15 +++++++++++ .../recipes/network/cables/covered_fluix.json | 15 +++++++++++ .../network/cables/covered_fluix_clean.json | 15 +++++++++++ .../recipes/network/cables/covered_gray.json | 15 +++++++++++ .../recipes/network/cables/covered_green.json | 15 +++++++++++ .../network/cables/covered_light_blue.json | 15 +++++++++++ .../network/cables/covered_light_gray.json | 15 +++++++++++ .../recipes/network/cables/covered_lime.json | 15 +++++++++++ .../network/cables/covered_magenta.json | 15 +++++++++++ .../network/cables/covered_orange.json | 15 +++++++++++ .../recipes/network/cables/covered_pink.json | 15 +++++++++++ .../network/cables/covered_purple.json | 15 +++++++++++ .../recipes/network/cables/covered_red.json | 15 +++++++++++ .../recipes/network/cables/covered_white.json | 15 +++++++++++ .../network/cables/covered_yellow.json | 15 +++++++++++ .../network/cables/dense_covered_black.json | 15 +++++++++++ .../network/cables/dense_covered_blue.json | 15 +++++++++++ .../network/cables/dense_covered_brown.json | 15 +++++++++++ .../network/cables/dense_covered_cyan.json | 15 +++++++++++ .../network/cables/dense_covered_fluix.json | 15 +++++++++++ .../cables/dense_covered_fluix_clean.json | 15 +++++++++++ .../network/cables/dense_covered_gray.json | 15 +++++++++++ .../network/cables/dense_covered_green.json | 15 +++++++++++ .../cables/dense_covered_light_blue.json | 15 +++++++++++ .../cables/dense_covered_light_gray.json | 15 +++++++++++ .../network/cables/dense_covered_lime.json | 15 +++++++++++ .../network/cables/dense_covered_magenta.json | 15 +++++++++++ .../network/cables/dense_covered_orange.json | 15 +++++++++++ .../network/cables/dense_covered_pink.json | 15 +++++++++++ .../network/cables/dense_covered_purple.json | 15 +++++++++++ .../network/cables/dense_covered_red.json | 15 +++++++++++ .../network/cables/dense_covered_white.json | 15 +++++++++++ .../network/cables/dense_covered_yellow.json | 15 +++++++++++ .../network/cables/dense_smart_black.json | 15 +++++++++++ .../network/cables/dense_smart_blue.json | 15 +++++++++++ .../network/cables/dense_smart_brown.json | 15 +++++++++++ .../network/cables/dense_smart_cyan.json | 15 +++++++++++ .../network/cables/dense_smart_fluix.json | 15 +++++++++++ .../cables/dense_smart_fluix_clean.json | 15 +++++++++++ .../network/cables/dense_smart_gray.json | 15 +++++++++++ .../network/cables/dense_smart_green.json | 15 +++++++++++ .../cables/dense_smart_light_blue.json | 15 +++++++++++ .../cables/dense_smart_light_gray.json | 15 +++++++++++ .../network/cables/dense_smart_lime.json | 15 +++++++++++ .../network/cables/dense_smart_magenta.json | 15 +++++++++++ .../network/cables/dense_smart_orange.json | 15 +++++++++++ .../network/cables/dense_smart_pink.json | 15 +++++++++++ .../network/cables/dense_smart_purple.json | 15 +++++++++++ .../network/cables/dense_smart_red.json | 15 +++++++++++ .../network/cables/dense_smart_white.json | 15 +++++++++++ .../network/cables/dense_smart_yellow.json | 15 +++++++++++ .../recipes/network/cables/glass_black.json | 15 +++++++++++ .../recipes/network/cables/glass_blue.json | 15 +++++++++++ .../recipes/network/cables/glass_brown.json | 15 +++++++++++ .../recipes/network/cables/glass_cyan.json | 15 +++++++++++ .../recipes/network/cables/glass_fluix.json | 15 +++++++++++ .../network/cables/glass_fluix_clean.json | 15 +++++++++++ .../recipes/network/cables/glass_gray.json | 15 +++++++++++ .../recipes/network/cables/glass_green.json | 15 +++++++++++ .../network/cables/glass_light_blue.json | 15 +++++++++++ .../network/cables/glass_light_gray.json | 15 +++++++++++ .../recipes/network/cables/glass_lime.json | 15 +++++++++++ .../recipes/network/cables/glass_magenta.json | 15 +++++++++++ .../recipes/network/cables/glass_orange.json | 15 +++++++++++ .../recipes/network/cables/glass_pink.json | 15 +++++++++++ .../recipes/network/cables/glass_purple.json | 15 +++++++++++ .../recipes/network/cables/glass_red.json | 15 +++++++++++ .../recipes/network/cables/glass_white.json | 15 +++++++++++ .../recipes/network/cables/glass_yellow.json | 15 +++++++++++ .../recipes/network/cables/smart_black.json | 15 +++++++++++ .../recipes/network/cables/smart_blue.json | 15 +++++++++++ .../recipes/network/cables/smart_brown.json | 15 +++++++++++ .../recipes/network/cables/smart_cyan.json | 15 +++++++++++ .../recipes/network/cables/smart_fluix.json | 15 +++++++++++ .../network/cables/smart_fluix_clean.json | 15 +++++++++++ .../recipes/network/cables/smart_gray.json | 15 +++++++++++ .../recipes/network/cables/smart_green.json | 15 +++++++++++ .../network/cables/smart_light_blue.json | 15 +++++++++++ .../network/cables/smart_light_gray.json | 15 +++++++++++ .../recipes/network/cables/smart_lime.json | 15 +++++++++++ .../recipes/network/cables/smart_magenta.json | 15 +++++++++++ .../recipes/network/cables/smart_orange.json | 15 +++++++++++ .../recipes/network/cables/smart_pink.json | 15 +++++++++++ .../recipes/network/cables/smart_purple.json | 15 +++++++++++ .../recipes/network/cables/smart_red.json | 15 +++++++++++ .../recipes/network/cables/smart_white.json | 15 +++++++++++ .../recipes/network/cables/smart_yellow.json | 15 +++++++++++ .../network/cells/empty_storage_cell.json | 15 +++++++++++ .../network/cells/fluid_storage_cell_16k.json | 19 +++++++++++++ .../cells/fluid_storage_cell_16k_storage.json | 19 +++++++++++++ .../network/cells/fluid_storage_cell_1k.json | 19 +++++++++++++ .../cells/fluid_storage_cell_1k_storage.json | 19 +++++++++++++ .../network/cells/fluid_storage_cell_4k.json | 19 +++++++++++++ .../cells/fluid_storage_cell_4k_storage.json | 19 +++++++++++++ .../network/cells/fluid_storage_cell_64k.json | 19 +++++++++++++ .../cells/fluid_storage_cell_64k_storage.json | 19 +++++++++++++ ...luid_storage_components_cell_16k_part.json | 23 ++++++++++++++++ ...fluid_storage_components_cell_1k_part.json | 15 +++++++++++ ...fluid_storage_components_cell_4k_part.json | 23 ++++++++++++++++ ...luid_storage_components_cell_64k_part.json | 23 ++++++++++++++++ .../network/cells/spatial_components.json | 19 +++++++++++++ .../network/cells/spatial_components_0.json | 19 +++++++++++++ .../network/cells/spatial_components_1.json | 19 +++++++++++++ .../cells/spatial_storage_cell_128_cubed.json | 19 +++++++++++++ ...patial_storage_cell_128_cubed_storage.json | 19 +++++++++++++ .../cells/spatial_storage_cell_16_cubed.json | 19 +++++++++++++ ...spatial_storage_cell_16_cubed_storage.json | 19 +++++++++++++ .../cells/spatial_storage_cell_2_cubed.json | 19 +++++++++++++ .../spatial_storage_cell_2_cubed_storage.json | 19 +++++++++++++ .../network/cells/storage_cell_16k.json | 19 +++++++++++++ .../cells/storage_cell_16k_storage.json | 19 +++++++++++++ .../network/cells/storage_cell_1k.json | 19 +++++++++++++ .../cells/storage_cell_1k_storage.json | 19 +++++++++++++ .../network/cells/storage_cell_4k.json | 19 +++++++++++++ .../cells/storage_cell_4k_storage.json | 19 +++++++++++++ .../network/cells/storage_cell_64k.json | 19 +++++++++++++ .../cells/storage_cell_64k_storage.json | 19 +++++++++++++ .../storage_components_cell_16k_part.json | 23 ++++++++++++++++ .../storage_components_cell_1k_part.json | 15 +++++++++++ .../storage_components_cell_4k_part.json | 23 ++++++++++++++++ .../storage_components_cell_64k_part.json | 23 ++++++++++++++++ .../recipes/network/cells/view_cell.json | 15 +++++++++++ .../network/cells/view_cell_storage.json | 15 +++++++++++ .../crafting/cpu_crafting_accelerator.json | 19 +++++++++++++ .../crafting/cpu_crafting_monitor.json | 19 +++++++++++++ .../crafting/cpu_crafting_storage_16k.json | 19 +++++++++++++ .../crafting/cpu_crafting_storage_1k.json | 19 +++++++++++++ .../crafting/cpu_crafting_storage_4k.json | 19 +++++++++++++ .../crafting/cpu_crafting_storage_64k.json | 19 +++++++++++++ .../network/crafting/cpu_crafting_unit.json | 23 ++++++++++++++++ .../network/crafting/molecular_assembler.json | 23 ++++++++++++++++ .../network/crafting/patterns_blank.json | 19 +++++++++++++ .../recipes/network/parts/cable_anchor.json | 6 +++++ .../recipes/network/parts/export_bus.json | 15 +++++++++++ .../network/parts/export_bus_fluid.json | 15 +++++++++++ .../network/parts/fluid_level_emitter.json | 15 +++++++++++ .../recipes/network/parts/import_bus.json | 15 +++++++++++ .../network/parts/import_bus_fluid.json | 15 +++++++++++ .../recipes/network/parts/level_emitter.json | 15 +++++++++++ .../network/parts/monitors_conversion.json | 23 ++++++++++++++++ .../network/parts/monitors_storage.json | 15 +++++++++++ .../network/parts/panels_dark_monitor.json | 15 +++++++++++ .../recipes/network/parts/panels_monitor.json | 15 +++++++++++ .../parts/panels_semi_dark_monitor.json | 10 +++++++ .../parts/panels_semi_dark_monitor_alt.json | 15 +++++++++++ .../parts/planes_annihilation_alt.json | 15 +++++++++++ .../parts/planes_annihilation_alt2.json | 15 +++++++++++ .../parts/planes_annihilation_fluid.json | 15 +++++++++++ .../parts/planes_annihilation_fluid_alt.json | 15 +++++++++++ .../parts/planes_annihilatition_identity.json | 19 +++++++++++++ .../network/parts/planes_formation.json | 15 +++++++++++ .../network/parts/planes_formation_alt.json | 15 +++++++++++ .../network/parts/planes_formation_fluid.json | 15 +++++++++++ .../parts/planes_formation_fluid_alt.json | 15 +++++++++++ .../network/parts/quartz_fiber_part.json | 6 +++++ .../recipes/network/parts/storage_bus.json | 15 +++++++++++ .../network/parts/storage_bus_fluid.json | 15 +++++++++++ .../recipes/network/parts/terminals.json | 23 ++++++++++++++++ .../network/parts/terminals_crafting.json | 19 +++++++++++++ .../network/parts/terminals_fluid.json | 19 +++++++++++++ .../network/parts/terminals_interface.json | 15 +++++++++++ .../network/parts/terminals_pattern.json | 19 +++++++++++++ .../recipes/network/parts/toggle_bus.json | 15 +++++++++++ .../recipes/network/parts/toggle_bus_alt.json | 10 +++++++ .../parts/toggle_bus_inverted_alt.json | 10 +++++++ .../recipes/network/parts/tunnels_me.json | 19 +++++++++++++ .../network/wireless_access_point.json | 23 ++++++++++++++++ .../recipes/network/wireless_booster.json | 19 +++++++++++++ .../recipes/network/wireless_part.json | 19 +++++++++++++ .../recipes/network/wireless_terminal.json | 23 ++++++++++++++++ .../recipes/tools/certus_quartz_axe.json | 6 +++++ .../tools/certus_quartz_cutting_knife.json | 6 +++++ .../recipes/tools/certus_quartz_hoe.json | 6 +++++ .../recipes/tools/certus_quartz_pickaxe.json | 6 +++++ .../recipes/tools/certus_quartz_spade.json | 6 +++++ .../recipes/tools/certus_quartz_sword.json | 6 +++++ .../recipes/tools/certus_quartz_wrench.json | 6 +++++ .../recipes/tools/matter_cannon.json | 25 ++++++++++++++++- .../tools/misctools_charged_staff.json | 10 +++++++ .../tools/misctools_entropy_manipulator.json | 23 ++++++++++++++++ .../recipes/tools/nether_quartz_axe.json | 4 +++ .../tools/nether_quartz_cutting_knife.json | 4 +++ .../recipes/tools/nether_quartz_hoe.json | 4 +++ .../recipes/tools/nether_quartz_pickaxe.json | 4 +++ .../recipes/tools/nether_quartz_spade.json | 4 +++ .../recipes/tools/nether_quartz_sword.json | 4 +++ .../recipes/tools/nether_quartz_wrench.json | 4 +++ .../recipes/tools/network_biometric_card.json | 10 +++++++ .../tools/network_color_applicator.json | 23 ++++++++++++++++ .../recipes/tools/network_memory_card.json | 10 +++++++ .../recipes/tools/network_portable_cell.json | 19 +++++++++++++ .../recipes/tools/network_tool.json | 10 +++++++ .../recipes/tools/paintballs_black.json | 15 +++++++++++ .../recipes/tools/paintballs_blue.json | 15 +++++++++++ .../recipes/tools/paintballs_brown.json | 15 +++++++++++ .../recipes/tools/paintballs_cyan.json | 15 +++++++++++ .../recipes/tools/paintballs_gray.json | 15 +++++++++++ .../recipes/tools/paintballs_green.json | 15 +++++++++++ .../recipes/tools/paintballs_light_blue.json | 15 +++++++++++ .../recipes/tools/paintballs_light_gray.json | 15 +++++++++++ .../recipes/tools/paintballs_lime.json | 15 +++++++++++ .../recipes/tools/paintballs_lumen_black.json | 8 +++++- .../recipes/tools/paintballs_lumen_blue.json | 6 +++++ .../recipes/tools/paintballs_lumen_brown.json | 6 +++++ .../recipes/tools/paintballs_lumen_cyan.json | 6 +++++ .../recipes/tools/paintballs_lumen_gray.json | 6 +++++ .../recipes/tools/paintballs_lumen_green.json | 6 +++++ .../tools/paintballs_lumen_light_blue.json | 6 +++++ .../tools/paintballs_lumen_light_gray.json | 6 +++++ .../recipes/tools/paintballs_lumen_lime.json | 6 +++++ .../tools/paintballs_lumen_magenta.json | 6 +++++ .../tools/paintballs_lumen_orange.json | 6 +++++ .../recipes/tools/paintballs_lumen_pink.json | 6 +++++ .../tools/paintballs_lumen_purple.json | 6 +++++ .../recipes/tools/paintballs_lumen_red.json | 6 +++++ .../recipes/tools/paintballs_lumen_white.json | 6 +++++ .../tools/paintballs_lumen_yellow.json | 6 +++++ .../recipes/tools/paintballs_magenta.json | 15 +++++++++++ .../recipes/tools/paintballs_orange.json | 15 +++++++++++ .../recipes/tools/paintballs_pink.json | 15 +++++++++++ .../recipes/tools/paintballs_purple.json | 15 +++++++++++ .../recipes/tools/paintballs_red.json | 15 +++++++++++ .../recipes/tools/paintballs_white.json | 15 +++++++++++ .../recipes/tools/paintballs_yellow.json | 15 +++++++++++ 345 files changed, 4787 insertions(+), 25 deletions(-) diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index b5eefa65b..053e922d7 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -616,7 +616,12 @@ public final class ApiBlocks implements IBlocks private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block ) { - return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) ) + if( !block.maybeBlock().isPresent() ) + { + return new BlockDefinition( registryName, null, null ); + } + + IBlockDefinition stairs = registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) ) .features( AEFeature.DECORATIVE_BLOCKS ) .rendering( new BlockRenderingCustomizer() { @@ -629,6 +634,10 @@ public final class ApiBlocks implements IBlocks } } ) .build(); + + Verify.verify(stairs.maybeBlock().isPresent()); + + return stairs; } @Override 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 0b731f3bf..e376ac9be 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:CABLE_GLASS" + } + ], "display": { "icon": { "item": "appliedenergistics2:part", 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 35681b0ff..e74c81d7c 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:material:1" + } + ], "display": { "icon": { "item": "appliedenergistics2:material", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json index f710dfaec..af9dea492 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/charger.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:charger" + } + ], "display": { "icon": { "item": "appliedenergistics2:charger" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json b/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json index eb8b08538..ff5f6b696 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/compass.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_compass" + } + ], "display": { "icon": { "item": "appliedenergistics2:sky_compass" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json index b354609c4..f3796f1d7 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/controller.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:controller" + } + ], "display": { "icon": { "item": "appliedenergistics2:controller" 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 0088de722..2f7edebb4 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_1k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_4k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_16k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_64k" + } + ] + } + ], "display": { "icon": { "item": "appliedenergistics2:crafting_storage_64k" 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 54003cca3..74224d71f 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:CRAFTING_TERMINAL" + } + ], "display": { "icon": { "item": "appliedenergistics2:part", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json index 9f9de8b1f..180367311 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/facade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:facade" + } + ], "display": { "icon": { "item": "appliedenergistics2:facade" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json index 4faa334d9..74ccdb823 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:material:7" + } + ], "display": { "icon": { "item": "appliedenergistics2:material", 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 567c6a681..9f4c11cd2 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "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 9497394c6..2a96a4aac 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/interface.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:interface" + } + ], "display": { "icon": { "item": "appliedenergistics2:interface" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json index 22feab917..cdf0d1054 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:io_port" + } + ], "display": { "icon": { "item": "appliedenergistics2:io_port" 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 38d205592..9d038dc0d 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:network_tool" + } + ], "display": { "icon": { "item": "appliedenergistics2:network_tool" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json index c08fd895b..e2ca64e06 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:P2P_TUNNEL_ME" + } + ], "display": { "icon": { "item": "appliedenergistics2:part", 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 2e752caaa..db1820cc7 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:PATTERN_TERMINAL" + } + ], "display": { "icon": { "item": "appliedenergistics2:part", 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 845907bb1..71443d1ee 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/portable_cell.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:portable_cell" + } + ], "display": { "icon": { "item": "appliedenergistics2:portable_cell" diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json b/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json index 91be97d1a..9b751bbc1 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/presses.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "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" + } + ] + } + ], "display": { "icon": { "item": "appliedenergistics2:material", diff --git a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json index 20ab8a787..1c7b7e1f8 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/qnb.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quantum_link" + } + ], "display": { "icon": { "item": "appliedenergistics2:quantum_link" 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 eb8ffa78a..e7858f7f1 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_explorer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_io_port" + } + ], "display": { "icon": { "item": "appliedenergistics2:spatial_storage_cell_128_cubed" 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 af440b95d..0b0c4634b 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/spatial_ioport.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_io_port" + } + ], "display": { "icon": { "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 cac69329a..a3ab735dc 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_bus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:STORAGE_BUS" + } + ], "display": { "icon": { "item": "appliedenergistics2:part", 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 8cc4e35b1..a325c8915 100644 --- a/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json +++ b/src/main/resources/assets/appliedenergistics2/advancements/main/storage_cell.json @@ -1,4 +1,22 @@ { + "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" + } + ], "display": { "icon": { "item": "appliedenergistics2:storage_cell_64k" diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/fluix_dust.json b/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/fluix_dust.json index b916a8728..90d2015c9 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/fluix_dust.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/fluix_dust.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_dust" + } + ], "type": "appliedenergistics2:grinder", "input": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/sky_dust.json b/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/sky_dust.json index 96496c44d..142644fe3 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/sky_dust.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/grinder/sky_dust.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_block" + } + ], "type": "appliedenergistics2:grinder", "input": { "item": "appliedenergistics2:sky_stone_block" diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor.json index 13d75c514..e1f94b8d2 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_print" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "press", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_press.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_press.json index 32f8f1eed..d056d1ce4 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_press.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_press.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor_press" + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_print.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_print.json index 1f83a08b0..4d264e03e 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_print.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_print.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor_press" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_certus_quartz_crystal" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor.json index 6e21c3799..98f6044e2 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_print" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "press", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_press.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_press.json index 47797029f..168f298f0 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_press.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_press.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor_press" + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_print.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_print.json index 12649ae21..83bd06aa0 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_print.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_print.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor_press" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor.json index 47ab83c98..06f5db69d 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_print" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "press", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json index aa85757bf..7b2898cab 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json @@ -1,4 +1,15 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor_press" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_print.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_print.json index 7eb63773c..eca197f1b 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_print.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_print.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor_press" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_press.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_press.json index d6e43e32a..9f50ed1ec 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_press.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_press.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_press" + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_print.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_print.json index e79d39b6c..7b6107c6b 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_print.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_print.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_print" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon_press" + } + ] + } + ], "type": "appliedenergistics2:inscriber", "mode": "inscribe", "result": { diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/bread.json b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/bread.json index fd055c556..000702701 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/bread.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/bread.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.flour" + } + ], "type": "appliedenergistics2:smelt", "result": { "item": "minecraft:bread" diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/silicon.json b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/silicon.json index b9da64a44..12fb3a88c 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/silicon.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/silicon.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.silicon" + } + ], "type": "appliedenergistics2:smelt", "result": { "part": "material.silicon" diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smooth_sky_stone_block.json index f063b9547..a3d1ae4fe 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smooth_sky_stone_block.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smooth_sky_stone_block.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_block" + } + ] + } + ], "type": "appliedenergistics2:smelt", "result": { "item": "appliedenergistics2:smooth_sky_stone_block" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block.json index 051440ea8..1a261d5ff 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ], "result": { "item": "appliedenergistics2:quartz_block" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json index 8a9023627..33479dd0c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_certus_quartz_crystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ], "result": { "item": "appliedenergistics2:quartz_block" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json index 934c86278..81fb70f01 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_pillar", "count": 2 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json index 2a73193d0..5da02ca4f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_block" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:chiseled_quartz_block", "count": 2 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block.json index b486e5a7f..c6323122d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + } + ], "result": { "item": "appliedenergistics2:fluix_block" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json index 6cde2145f..e06fb79cc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_fluix_crystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluix_block" }, 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 e0514bf0e..ce46a56a6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:light_detector" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:netherCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:light_detector" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json index e0d03852b..34ed955a0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_nether_quartz_crystal" + } + ], "result": { "item": "minecraft:quartz_block", "data": 0 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json index daa3b2cfb..a30dc13c3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal_charged" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_fixture" + } + ], "result": { "item": "appliedenergistics2:quartz_fixture", "count": 2 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_glass.json index 988c353e5..29723214d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_glass.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_glass.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + } + ], "result": { "item": "appliedenergistics2:quartz_glass", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json index 042d5b763..7380c91b1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_vibrant_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_vibrant_glass" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_brick.json index 8088a81f8..a05b956f5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_brick" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json index f79f4e0ee..d2f6be819 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_small_brick" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_smooth.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_smooth.json index 60284e71f..8c2b9a7d0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_smooth.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_smooth.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:smooth_sky_stone_block" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json index a5724a1b4..42571efed 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:chiseled_quartz_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_fluix.json index acdabed92..a48f7d8cf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluix_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz.json index 79956c104..f12b78de2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json index ed418864b..52f19781a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_pillar_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone.json index a3f07d820..754333258 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json index e45e02770..d298eebb2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_brick_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json index 5509c7dba..dff65e36b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_small_brick_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json index 36810bea1..2c913c4dc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_slab" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:smooth_sky_stone_slab", "data": 0, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json index 6669f7cd2..dd80e1dcd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:chiseled_quartz_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_fluix.json index 556985cf7..997f54012 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluix_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz.json index ce988ae65..444307a1d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json index 2f7e49a78..2a5a2d8c5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_pillar_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone.json index e497d29e3..63bc90957 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json index ee6b6a84c..b36cda2dc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_brick_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json index 5b2fe6d23..f1ed4884c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_small_brick" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_small_brick_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json index f2bfce744..390ae9ef2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_stairs" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:smooth_sky_stone_stairs", "count": 4 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json index 39703ea92..d2aa428ff 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.advanced_card" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.advanced_card" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json index 72bc743a4..2264a8985 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.annihilation_core" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json index 3aa357409..44205a84d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.basic_card" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.basic_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json index 66f2aff7f..4a8c37b45 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_capacity" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_capacity" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.basic_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json index a892f9b45..1689c7146 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_crafting" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_crafting" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.basic_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json index 5dbd0ba0b..0961dafb1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_fuzzy" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_fuzzy" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.advanced_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json index 8a70d537e..d7477a728 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_inverter" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_inverter" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.advanced_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json index 82365d8ce..af2e140b7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_redstone" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_redstone" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.basic_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json index 939dbdaad..d1b5fa882 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.card_speed" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_speed" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.advanced_card" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json index 39d42885e..f314f83fe 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json @@ -1,8 +1,21 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.formation_core" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certusCrystal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_sky_stone.json index 80a8cca68..06b1f4743 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_chest" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_stone_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_stone_chest" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json index 92f090757..7fe7ed0c7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_chest" + } + ] + } + ], "result": { "item": "appliedenergistics2:smooth_sky_stone_chest" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json index f0ac1394d..bb3cc2c24 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json @@ -3,6 +3,10 @@ { "type": "appliedenergistics2:material_exists", "material": "material.certus_quartz_crystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_block" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json index feaec1648..0b232308b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json @@ -3,6 +3,10 @@ { "type": "appliedenergistics2:material_exists", "material": "material.certus_quartz_crystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json index 445d7498c..7b935b3c9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json @@ -3,6 +3,10 @@ { "type": "appliedenergistics2:material_exists", "material": "material.certus_quartz_crystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_crystal" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json index 8c03f97f1..8efbe1848 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json @@ -3,6 +3,10 @@ { "type": "appliedenergistics2:material_exists", "material": "material.fluix_crystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json index 365c217f0..d4101a824 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json @@ -1,8 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.fluix_pearl" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + }, + { + "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 b5de160a2..7a7b2e0f1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:grindstone" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crystalQuartz" + } + ] + } + ], "result": { "item": "appliedenergistics2:grindstone" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json index a38c1b34c..262e1c427 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:sky_compass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal_charged" + } + ] + } + ], "result": { "item": "appliedenergistics2:sky_compass" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json index db1b04d0f..f40b9cf75 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:crystal_seed.certus" + } + ], "result": { "type": "appliedenergistics2:part", "part": "crystal_seed.certus", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json index 7c5a27ed0..bb79a4649 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:crystal_seed.fluix" + } + ], "result": { "type": "appliedenergistics2:part", "part": "crystal_seed.fluix", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json index 9b68c77d0..8b2426445 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:crystal_seed.nether" + } + ], "result": { "type": "appliedenergistics2:part", "part": "crystal_seed.nether", 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 805175f75..7a8afd9ae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/tiny_tnt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:tiny_tnt" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:dustQuartz" + } + ] + } + ], "result": { "item": "appliedenergistics2:tiny_tnt" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json index 11dfb7627..87a58de3c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:netherCrystal" + } + ], "result": { "item": "minecraft:comparator" }, 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 abdd397d3..46a6e0ebc 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,4 +1,10 @@ { + "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 6f1c66dc5..33ea1d9d3 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,4 +1,14 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:cell_workbench" + } + ], "result": { "item": "appliedenergistics2:cell_workbench" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json index f7b358ba5..043c07696 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:controller" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_fluix_crystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:controller" }, 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 44a6df978..06d257cb4 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 @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:charger" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:charger" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json index 476622001..5bf35bbd7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_growth_accelerator" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + } + ] + } + ], "result": { "item": "appliedenergistics2:quartz_growth_accelerator" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json index 28f0e8afd..dc0692199 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:dense_energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:dense_energy_cell" }, 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 b71d45516..ed4dabfb0 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 @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_acceptor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:energy_acceptor" }, 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 487364256..25fce09dc 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 @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certusCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:energy_cell" }, 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 712cae96e..21fefabdd 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,4 +1,12 @@ { + "conditions": [{ + "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/fluid_interfaces_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json index 816170e68..6116179d2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_interface" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_interface" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json index d634987f9..15be406a7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_interface" + } + ], "result": { "item": "appliedenergistics2:fluid_interface" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json index 6cce7e4d4..8f6ba1a4b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_interface" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_interface" 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 f9906f2d1..36f2835e8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:inscriber" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:inscriber" }, 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 50dca96df..fa708ee40 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 @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:interface" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:glass" + } + ] + } + ], "result": { "item": "appliedenergistics2:interface" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json index 580d6ea76..bbb48ff5c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:interface" + } + ], "result": { "item": "appliedenergistics2:interface" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json index 62543387d..dddce2992 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:interface" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.interface" 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 a58c91c06..70169d79e 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,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:condenser" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:glass" + } + ] + } + ], "result": { "item": "appliedenergistics2:condenser" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json index 2b08f20fd..8fe2cd341 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:io_port" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:drive" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "item": "appliedenergistics2:io_port" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json index 14eed4e90..9a4e7cf7d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quantum_link" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" + } + ] + } + ], "result": { "item": "appliedenergistics2:quantum_link" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json index 4b15a682f..efb4e1a83 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json @@ -1,4 +1,31 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quantum_ring" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:quantum_ring" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json index 83b333f3c..448cafa11 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json @@ -1,4 +1,31 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:security_station" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chest" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "item": "appliedenergistics2:security_station" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json index 5e1862e00..631cad345 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_io_port" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:io_port" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_io_port" }, 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 ebcdac7f4..f148dd5cb 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 @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_pylon" + }, + { + "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" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_pylon" }, 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 a8f5f60c9..31063828c 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 @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chest" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + } + ] + } + ], "result": { "item": "appliedenergistics2:chest" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json index 8bb8b5b71..3f6ff5433 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:drive" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:drive" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json index 504b8a07f..300309796 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json index 7b022cdfd..c3bbea9e7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json index 0c60befed..5520e2a3e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json index 1f322182d..0cf3a1aab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json index 52a30d178..7979c0bae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json index a374d9b6a..4664c3cc0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json index 920b0210c..022727313 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json index c75bf6a05..ea263bf17 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json index 44ae617dd..5217e8a5b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json index bb782b7e8..440357436 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json index ce0e797f7..ed5fee21d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json index 853cbc3cc..10bf4dc76 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json index a5200ffb4..17ba8d0e7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json index 09a93a9c4..18792b705 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json index 477eaf8c8..ab7c84d45 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json index 210181ac7..5e6f4719a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json index 5985130cf..74d2974be 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json index 724412be5..99fd47526 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_covered.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json index 09df187fd..e19d620d9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json index 4204d03fb..24208a2f1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json index af87bb968..a4aecc092 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json index a8113072c..2518a4c7f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json index 5bc62ef28..0f4f1d976 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json index fdf707b7b..f48b09845 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json index dd12b985b..f268111ed 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json index 28a27633b..c59a8127b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json index a0dda5b32..173ea3689 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json index 1b33b1116..d6c4f4404 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json index 9512b98fc..18c0be7b9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json index c8bd6fa55..aa420428d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json index ce8b17068..e8c34647d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json index cd7fd0926..138bba3ab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json index 1bea08ac6..cd0239f38 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json index 585342c77..45c983f26 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json index b7b813bbe..3eb6a79ba 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json index bbd0c2d4d..2e986c97a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_covered.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json index 20091a048..80c817b40 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json index 984e8baeb..96f1bb138 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json index b7c2983d5..f1169158f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json index 7849926b1..e94e94597 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json index 61ab926cf..863fa641f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_covered.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json index 25e9d4e01..c7a12dfe9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json index 4da4fdd40..96f0903f4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json index d886a5438..9d565cd56 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json index 222238fe3..9552cd9ae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json index b260f66f6..384e33c9f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json index 55b926499..59fa7b053 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json index 5587b5b87..bcbec860e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json index 72edc3846..af0c61ac2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json index 1e465de59..135d09470 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json index 7c61b289f..9024625eb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json index 01aff0bb2..a48306679 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json index f314ea2de..b089ff26b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json index 4923b06a7..e452243de 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_dense_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_dense_smart.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json index 2271b4ec1..729fec98f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json index 846305020..e188e1635 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json index 291153b93..d34de2200 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json index 315f914ab..622dd4622 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json index e484a0407..b86431bf2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.quartz_fiber" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.fluix", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json index af5c7ca74..6af6a6aed 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json index c6dc3a203..975e7cad3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json index b3a246070..8778d4dcf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json index dcbe56c8b..c48e97fdf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json index bc4bde2c5..2cc5582dd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json index 558ce0e8f..cef38f556 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json index d28da3e0a..63d42ec54 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json index e3260609c..8b5bb28c3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json index b64a638e7..d8257587f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json index 6bafa676b..9e604132a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json index d784bb371..64ad744f8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json index 143943f29..9355f1920 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json index 899d0b64c..2b7826910 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_glass.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json index 6f06204b5..27ddd4f16 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json index 75ba88022..7a33f5eda 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json index 7ae90ee82..b09ae895e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json index 437366678..220a70fd1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json index caa460cf2..0be6c850c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_covered.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json index c32f3bace..4a4cc88e0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.fluix" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json index 6e09c52e4..01fb032ac 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json index 42e68b56d..e520f2559 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json index e56b10fb4..1901f6a95 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json index d053f901d..32fcfc61b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json index 115a5165e..2fcf30573 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json index 32f5deec3..7ed0db392 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json index 2428c3650..1e9bbfbba 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json index 97c02fe60..bb1291e7c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json index 313c09fcc..86909b8b0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json index bafc795d9..2fddeb604 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json index f4785fd53..18ed2bfb7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json index 40aa80201..8699a2799 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_smart.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "cable_smart.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json index 0882b5520..8cfe6380f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.empty_storage_cell" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json index d99ee13ac..48f5c6df0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_16k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell16k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_16k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json index bd6d51602..60a83727a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_16k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell16k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_16k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json index 537923a61..287949388 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_1k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_1k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json index f69e8ec07..b094a0d72 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_1k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_1k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json index 11de55ede..2d16df426 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_4k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_4k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json index b6d5b2967..516873ea4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_4k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_4k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json index cd2fa2a26..790d47dd6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_64k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell64k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_64k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json index b25ff52c5..28ba22199 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_storage_cell_64k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell64k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:fluid_storage_cell_64k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json index 03083f302..d5d711bc6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell16k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell4k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.fluid_cell16k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json index 2bfd62acc..9c76d2d61 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell1k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.fluid_cell1k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json index e636726dc..ccbd3e370 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell4k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell1k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.fluid_cell4k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json index ba9211c5f..854155f26 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell64k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluid_cell16k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.fluid_cell64k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json index 4f2c859e3..8352bc8fa 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell2_spatial_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell2_spatial_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json index abefec632..dcd330e66 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16_spatial_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell2_spatial_part" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell16_spatial_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json index 3a59d525c..ae2772987 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell128_spatial_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16_spatial_part" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell128_spatial_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json index 71a84c6b5..1e1c08801 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell128_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_128_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json index 54a9b00df..6b987b7d6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell128_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_128_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json index 45d6feeca..ac2ad3b89 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_16_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json index ee29c74da..f4b9f999d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_16_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json index ab98d1efe..aa76a6d9a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell2_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_2_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json index c5fa547d1..2927c027e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell2_spatial_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:spatial_storage_cell_2_cubed" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json index e4263bbe1..1a64c968a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_16k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_16k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json index db1de7ad0..d2c449e88 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_16k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_16k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json index 6fed11c9a..81b154ba4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_1k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_1k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json index 3fa6d507f..583ec2aaa 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_1k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_1k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json index 08322c9ac..51661c732 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_4k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_4k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json index 8bb5f344f..0fe3d4d96 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_4k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_4k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json index f7cdc6960..16e9d51d5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_64k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell64k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_64k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json index 64a158e15..4d77177d1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:storage_cell_64k" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell64k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:storage_cell_64k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json index e57700510..4f22bc72c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell16k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json index 7810fb634..0cf5622a2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell1k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json index c32a151f7..fc5a93d6e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell4k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json index 4a6480430..fd735c0c6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell64k_part" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.cell64k_part" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json index 456ea2337..6a858f19c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:view_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + } + ] + } + ], "result": { "item": "appliedenergistics2:view_cell" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json index 30095a3f2..9977a4c4c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:view_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.empty_storage_cell" + } + ] + } + ], "result": { "item": "appliedenergistics2:view_cell" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json index 86607e2d0..9d1b94751 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_accelerator" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_accelerator" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json index 5c3db0652..57bea8bac 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.storage_monitor" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_monitor" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json index 8aedc0be6..e7563b901 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_16k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell16k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_storage_16k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json index 7de424146..07f28ec1b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_1k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_storage_1k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json index a2d0429d4..3bd837e39 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_4k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_storage_4k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json index e9e56f039..1c96e9fd6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_storage_64k" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell64k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_storage_64k" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json index 1799326bd..7d4378964 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:crafting_unit" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "item": "appliedenergistics2:crafting_unit" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json index 97247f7b1..e0e06be33 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:molecular_assembler" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "item": "appliedenergistics2:molecular_assembler" }, 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 f9b47951d..eb5aadbec 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 @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certusCrystal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.blank_pattern" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.blank_pattern" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json index f1b45ab16..141bda9b8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.cable_anchor" + } + ], "type": "appliedenergistics2:part_shapeless", "result": { "part": "part.cable_anchor", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json index 6f782185c..7cb9d563a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.export_bus" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.export_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json index 25e0252aa..4c7b11fba 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_export_bus" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_export_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json index 193dce5ab..3d29df8b9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_level_emitter" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_level_emitter" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json index e0445bf30..ec3e61626 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.import_bus" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.import_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json index b6c0c2ff8..096273f32 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_import_bus" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_import_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json index 6db170d45..9485bd94b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.level_emitter" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.level_emitter" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json index eb388ada6..007ceea55 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.conversion_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.storage_monitor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.conversion_monitor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json index 6696df07a..bd284c000 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.storage_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.level_emitter" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.storage_monitor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json index be640b3a6..d16046206 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.dark_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.monitor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.dark_monitor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json index 7b45e1eda..3c92094c6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.semi_dark_monitor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.monitor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json index 4a14d254f..ad0e7dd90 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.semi_dark_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_glass" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.semi_dark_monitor", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json index 19eda0c34..4d3496e77 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.semi_dark_monitor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.dark_monitor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.semi_dark_monitor" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json index b7063599f..68c849581 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.annihilation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.annihilation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json index c800223a5..a666208c3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.annihilation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.annihilation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json index 6409acc3a..358ca8157 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_annihilation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_annihilation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json index 97f09cf80..241025600 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_annihilation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_annihilation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json index 0bbdcf882..74858a640 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.identity_annihilation_plane" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.annihilation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.identity_annihilation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json index d647a2108..3e9545277 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.formation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.formation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json index 93b6111f3..c0eeb6bb5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.formation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.formation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json index 7cee4d655..05d5ef41c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_formation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_formation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json index ea7d97e15..42a87596a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_formation_plane" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_formation_plane" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json index f91968f93..e0d4a102c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.quartz_fiber" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.quartz_fiber", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json index 9d0191e8f..ceed5303b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.storage_bus" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:interface" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.storage_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json index 9440a3b33..09bff774e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_storage_bus" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluid_interface" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_storage_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json index 14a1ea713..7fd9d4a06 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.terminal" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json index 1c6519584..546114368 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.crafting_terminal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.crafting_terminal" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json index 38fb67c29..0263de5bc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.fluid_terminal" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.fluid_terminal" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json index cb664ef43..7ad92f474 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.interface_terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.interface_terminal" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json index 47ed814e4..4d874c3bc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.pattern_terminal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.crafting_terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.pattern_terminal" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json index ccd763acf..f49029848 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.toggle_bus" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.toggle_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json index d49f5d5f6..ce52ae5a5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.toggle_bus" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.inverted_toggle_bus" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.toggle_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json index c30760b2a..ac8164c73 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.toggle_bus" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.inverted_toggle_bus" + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.inverted_toggle_bus" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json index c186f522f..9772868b9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.p2p_tunnel_me" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "part.p2p_tunnel_me" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json index a5618659f..adf1f7b70 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:wireless_access_point" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.wireless" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:cable_glass.fluix" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:wireless_access_point" }, 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 fe16941bc..dd0c02a6b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json @@ -1,4 +1,23 @@ { + "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" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.wireless_booster", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json index 091d35692..3d36dc000 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.wireless" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.quartz_fiber" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.wireless" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json index 2fc545f74..2fda0c949 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:wireless_terminal" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:dense_energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:part.terminal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.wireless" + } + ] + } + ], "result": { "item": "appliedenergistics2:wireless_terminal" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_axe.json index 5c0c795dc..c4b83bfdc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_axe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_axe" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_axe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json index 30ece2544..cc409dfbb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_cutting_knife" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_cutting_knife" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_hoe.json index b8cf144a1..46227e6f7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_hoe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_hoe" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_hoe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json index 882c53dd8..787ff87b7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_pickaxe" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_pickaxe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_spade.json index 8adb32c0f..bf5415924 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_spade.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_spade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_spade" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_spade" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_sword.json index 8174351a1..a9f792d39 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_sword.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_sword" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_sword" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_wrench.json index 72683ec71..0393e3ddb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_wrench.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz_wrench.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:certus_quartz_wrench" + } + ], "result": { "item": "appliedenergistics2:certus_quartz_wrench" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json index fb6936303..7ebb5bc62 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:matter_cannon" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:matter_cannon" }, @@ -25,4 +48,4 @@ "item": "appliedenergistics2:energy_cell" } } -} +} \ No newline at end of file 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 1922db084..7cfe1f9f0 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,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:charged_staff" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal_charged" + } + ], "result": { "item": "appliedenergistics2:charged_staff" }, 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 ce0f61312..9417e69f4 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 @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:entropy_manipulator" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluixCrystal" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ] + } + ], "result": { "item": "appliedenergistics2:entropy_manipulator" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_axe.json index 123919328..8fe2bcadd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_axe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_axe.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_axe" + }], "result": { "item": "appliedenergistics2:nether_quartz_axe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json index 4205b95e9..611c96617 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_cutting_knife" + }], "result": { "item": "appliedenergistics2:nether_quartz_cutting_knife" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_hoe.json index 44cfbdec4..37bb23f60 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_hoe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_hoe.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_hoe" + }], "result": { "item": "appliedenergistics2:nether_quartz_hoe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json index 11c136770..894ef0267 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_pickaxe" + }], "result": { "item": "appliedenergistics2:nether_quartz_pickaxe" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_spade.json index 6f0e8de7b..c745c4062 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_spade.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_spade.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_spade" + }], "result": { "item": "appliedenergistics2:nether_quartz_spade" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_sword.json index 548d64f9e..5e5b168cb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_sword.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_sword.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_sword" + }], "result": { "item": "appliedenergistics2:nether_quartz_sword" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_wrench.json index 483e3c2e7..c793c67ab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_wrench.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz_wrench.json @@ -1,4 +1,8 @@ { + "conditions": [{ + "type": "minecraft:item_exists", + "item": "appliedenergistics2:nether_quartz_wrench" + }], "result": { "item": "appliedenergistics2:nether_quartz_wrench" }, 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 ce1727c83..20fbcb4ee 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,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:biometric_card" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.engineering_processor" + } + ], "result": { "item": "appliedenergistics2:biometric_card" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json index d0edebcb7..8c7d986a1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json @@ -1,4 +1,27 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:color_applicator" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell4k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:color_applicator" }, 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 30dee8d8e..183ff38c8 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,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:memory_card" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ], "result": { "item": "appliedenergistics2:memory_card" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json index 1b984e1e7..90960252b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json @@ -1,4 +1,23 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:energy_cell" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:portable_cell" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.cell1k_part" + } + ] + } + ], "result": { "item": "appliedenergistics2:portable_cell" }, 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 89524f190..c9102b70c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:network_tool" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.calculation_processor" + } + ], "result": { "item": "appliedenergistics2:network_tool" }, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json index e7894d367..8622f51f0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.black" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.black", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json index 7a761e60d..2bfa3c5e7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json index 5c8f18842..2c9e4b9b5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.brown" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json index 94130c8c4..3b107151b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.cyan" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json index 981a99d6f..18aa67a37 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json index 9011a6952..7a1414613 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.green" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json index cd4e10d37..307223e6a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.light_blue" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json index d9ad4b5cd..426a3f1ab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.light_gray" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json index 63cbd3912..1a1988054 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.lime" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json index d11b7abe7..0fa1867f1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.black" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.black", @@ -20,4 +26,4 @@ "ore": "dustGlowstone" } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json index 36ffcf1e3..86a5f4650 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.blue" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json index 680b4d6f8..5373cc486 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.brown" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.brown", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json index 1a30e1b06..63f7f2bdf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.cyan" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.cyan", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json index 0787865f7..55a134b04 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.gray" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json index f73862cc4..6c4d63723 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.green" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.green", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json index 3682a6763..637f2232f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.light_blue" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.light_blue", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json index 2bf98e672..4e9e3b677 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.light_gray" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.light_gray", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json index ac3eb7dfc..aabeb4011 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.lime" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.lime", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json index 54ecc2c90..b968ab8e2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.magenta" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json index 679b17d4d..d841bf8f7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.orange" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json index db7657315..56faba009 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.pink" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json index ede3b448d..5de209e79 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.purple" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json index cd55dcba4..5c894e7ef 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.red" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json index faf716d7b..b46dcb08d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.white" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json index ab0d241c1..985e4bd04 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:lumen_paint_ball.yellow" + } + ], "result": { "type": "appliedenergistics2:part", "part": "lumen_paint_ball.yellow", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json index 0a0f8b7ab..46371fde3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.magenta" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.magenta", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json index 81b3e16f8..1d70fc6b1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.orange" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.orange", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json index 35a757881..126f55db4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.pink" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.pink", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json index dccdf672d..c1be8dbfa 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.purple" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.purple", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json index b275750e5..e0f2ea414 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.red" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.red", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json index 34673fcd0..810546611 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.white" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.white", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json index a90d2ec40..80164c6e8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json @@ -1,4 +1,19 @@ { + "conditions": [ + { + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:paint_ball.yellow" + }, + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:part:material.matter_ball" + } + ] + } + ], "result": { "type": "appliedenergistics2:part", "part": "paint_ball.yellow", From 4ee32dd0b09ea54eea3ddc42f180a7629bd4f856 Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Fri, 26 Mar 2021 21:48:03 -0700 Subject: [PATCH 2/5] Fix some recipes not showing up due to bad conditions --- .../recipes/decorative/light_detector.json | 13 ++--------- .../recipes/materials/formationcore.json | 4 ---- .../recipes/misc/fluixpearl.json | 13 ++--------- .../recipes/misc/grindstone.json | 13 ++--------- .../recipes/misc/tiny_tnt.json | 13 ++--------- .../misc/vanilla_daylight_detector.json | 6 ----- .../network/blocks/cell_workbench.json | 17 +++++++++----- .../blocks/crystal_processing_charger.json | 4 ---- .../blocks/energy_energy_acceptor.json | 4 ---- .../network/blocks/energy_energy_cell.json | 4 ---- .../blocks/energy_vibration_chamber.json | 23 ++++++++++++------- .../recipes/network/blocks/inscribers.json | 13 ++--------- .../network/blocks/interfaces_interface.json | 4 ---- .../recipes/network/blocks/io_condenser.json | 13 ++--------- .../network/blocks/spatial_io_pylon.json | 4 ---- .../recipes/network/blocks/storage_chest.json | 4 ---- .../network/crafting/patterns_blank.json | 4 ---- .../recipes/network/wireless_booster.json | 17 ++------------ .../tools/misctools_charged_staff.json | 17 +++++++++----- .../tools/misctools_entropy_manipulator.json | 4 ---- .../recipes/tools/network_biometric_card.json | 17 +++++++++----- .../recipes/tools/network_memory_card.json | 17 +++++++++----- .../recipes/tools/network_tool.json | 17 +++++++++----- 23 files changed, 84 insertions(+), 161 deletions(-) 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": { From f1d50eca1a2c2254fbf5b2cc23bec20278b5ee7a Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Fri, 26 Mar 2021 22:10:24 -0700 Subject: [PATCH 3/5] More minor fixes --- .../inscriber/logic_processor_press.json | 9 ++------- .../decorative/certus_quartz_block_pure.json | 17 +++++++++++------ .../recipes/decorative/quartz_fixture.json | 18 ++++++++++++------ .../deconstruction_certus_chiseled_quartz.json | 17 +++++++++++------ .../deconstruction_certus_quartz_block.json | 17 +++++++++++------ .../deconstruction_certus_quartz_pillar.json | 17 +++++++++++------ .../misc/deconstruction_fluix_block.json | 17 +++++++++++------ .../recipes/misc/vanilla_comparator.json | 6 ------ .../blocks/crystal_processing_charger.json | 9 ++------- .../recipes/network/parts/tunnels_me.json | 4 ---- 10 files changed, 71 insertions(+), 60 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json index 7b2898cab..68024d1af 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json @@ -1,13 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.logic_processor_press" - } - ] + "type": "appliedenergistics2:material_exists", + "material": "material.logic_processor_press" } ], "type": "appliedenergistics2:inscriber", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json index 33479dd0c..e7819b69f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.purified_certus_quartz_crystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:quartz_block" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.purified_certus_quartz_crystal" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json index a30dc13c3..f6e7804f6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json @@ -1,12 +1,18 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal_charged" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:quartz_fixture" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_fixture" + }, + + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal_charged" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json index bb3cc2c24..270c8ef1b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:chiseled_quartz_block" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:chiseled_quartz_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json index 0b232308b..f350b30c4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:quartz_block" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json index 7b935b3c9..2e90e308e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:certus_quartz_crystal" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:quartz_pillar" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json index 8efbe1848..252897a7d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "appliedenergistics2:material_exists", - "material": "material.fluix_crystal" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluix_block" + "type": "forge:and", + "values": [ + { + "type": "minecraft:item_exists", + "item": "appliedenergistics2:fluix_block" + }, + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_crystal" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json index 87a58de3c..11dfb7627 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:netherCrystal" - } - ], "result": { "item": "minecraft:comparator" }, 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 dbebec998..b4866f05e 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 @@ -1,13 +1,8 @@ { "conditions": [ { - "type": "forge:and", - "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:charger" - } - ] + "type": "minecraft:item_exists", + "item": "appliedenergistics2:charger" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json index 9772868b9..7b9b35221 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -3,10 +3,6 @@ { "type": "forge:and", "values": [ - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:fluixCrystal" - }, { "type": "minecraft:item_exists", "item": "appliedenergistics2:part:part.p2p_tunnel_me" From 6878bfa4b04aab89a4bf7a6f544445e3f9dce6eb Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Sat, 27 Mar 2021 01:26:29 -0700 Subject: [PATCH 4/5] Fix parts --- .../factories/conditions/PartExists.java | 36 +++++++++++++++++++ .../recipes/_factories.json | 3 +- .../recipes/misc/seeds_certus.json | 4 +-- .../recipes/misc/seeds_fluix.json | 4 +-- .../recipes/misc/seeds_nether.json | 4 +-- ..._processing_quartz_growth_accelerator.json | 4 +-- .../recipes/network/blocks/io_port.json | 4 +-- .../recipes/network/blocks/quantum_ring.json | 4 +-- .../network/blocks/security_station.json | 4 +-- .../network/blocks/spatial_io_port.json | 4 +-- .../network/blocks/spatial_io_pylon.json | 4 +-- .../recipes/network/blocks/storage_chest.json | 4 +-- .../recipes/network/blocks/storage_drive.json | 4 +-- .../recipes/network/cables/covered_black.json | 8 ++--- .../recipes/network/cables/covered_blue.json | 8 ++--- .../recipes/network/cables/covered_brown.json | 8 ++--- .../recipes/network/cables/covered_cyan.json | 8 ++--- .../recipes/network/cables/covered_fluix.json | 8 ++--- .../network/cables/covered_fluix_clean.json | 8 ++--- .../recipes/network/cables/covered_gray.json | 8 ++--- .../recipes/network/cables/covered_green.json | 8 ++--- .../network/cables/covered_light_blue.json | 8 ++--- .../network/cables/covered_light_gray.json | 8 ++--- .../recipes/network/cables/covered_lime.json | 8 ++--- .../network/cables/covered_magenta.json | 8 ++--- .../network/cables/covered_orange.json | 8 ++--- .../recipes/network/cables/covered_pink.json | 8 ++--- .../network/cables/covered_purple.json | 8 ++--- .../recipes/network/cables/covered_red.json | 8 ++--- .../recipes/network/cables/covered_white.json | 8 ++--- .../network/cables/covered_yellow.json | 8 ++--- .../network/cables/dense_covered_black.json | 8 ++--- .../network/cables/dense_covered_blue.json | 8 ++--- .../network/cables/dense_covered_brown.json | 8 ++--- .../network/cables/dense_covered_cyan.json | 8 ++--- .../network/cables/dense_covered_fluix.json | 8 ++--- .../cables/dense_covered_fluix_clean.json | 8 ++--- .../network/cables/dense_covered_gray.json | 8 ++--- .../network/cables/dense_covered_green.json | 8 ++--- .../cables/dense_covered_light_blue.json | 8 ++--- .../cables/dense_covered_light_gray.json | 8 ++--- .../network/cables/dense_covered_lime.json | 8 ++--- .../network/cables/dense_covered_magenta.json | 8 ++--- .../network/cables/dense_covered_orange.json | 8 ++--- .../network/cables/dense_covered_pink.json | 8 ++--- .../network/cables/dense_covered_purple.json | 8 ++--- .../network/cables/dense_covered_red.json | 8 ++--- .../network/cables/dense_covered_white.json | 8 ++--- .../network/cables/dense_covered_yellow.json | 8 ++--- .../network/cables/dense_smart_black.json | 8 ++--- .../network/cables/dense_smart_blue.json | 8 ++--- .../network/cables/dense_smart_brown.json | 8 ++--- .../network/cables/dense_smart_cyan.json | 8 ++--- .../network/cables/dense_smart_fluix.json | 8 ++--- .../cables/dense_smart_fluix_clean.json | 8 ++--- .../network/cables/dense_smart_gray.json | 8 ++--- .../network/cables/dense_smart_green.json | 8 ++--- .../cables/dense_smart_light_blue.json | 8 ++--- .../cables/dense_smart_light_gray.json | 8 ++--- .../network/cables/dense_smart_lime.json | 8 ++--- .../network/cables/dense_smart_magenta.json | 8 ++--- .../network/cables/dense_smart_orange.json | 8 ++--- .../network/cables/dense_smart_pink.json | 8 ++--- .../network/cables/dense_smart_purple.json | 8 ++--- .../network/cables/dense_smart_red.json | 8 ++--- .../network/cables/dense_smart_white.json | 8 ++--- .../network/cables/dense_smart_yellow.json | 8 ++--- .../recipes/network/cables/glass_black.json | 8 ++--- .../recipes/network/cables/glass_blue.json | 8 ++--- .../recipes/network/cables/glass_brown.json | 8 ++--- .../recipes/network/cables/glass_cyan.json | 8 ++--- .../recipes/network/cables/glass_fluix.json | 8 ++--- .../network/cables/glass_fluix_clean.json | 8 ++--- .../recipes/network/cables/glass_gray.json | 8 ++--- .../recipes/network/cables/glass_green.json | 8 ++--- .../network/cables/glass_light_blue.json | 8 ++--- .../network/cables/glass_light_gray.json | 8 ++--- .../recipes/network/cables/glass_lime.json | 8 ++--- .../recipes/network/cables/glass_magenta.json | 8 ++--- .../recipes/network/cables/glass_orange.json | 8 ++--- .../recipes/network/cables/glass_pink.json | 8 ++--- .../recipes/network/cables/glass_purple.json | 8 ++--- .../recipes/network/cables/glass_red.json | 8 ++--- .../recipes/network/cables/glass_white.json | 8 ++--- .../recipes/network/cables/glass_yellow.json | 8 ++--- .../recipes/network/cables/smart_black.json | 8 ++--- .../recipes/network/cables/smart_blue.json | 8 ++--- .../recipes/network/cables/smart_brown.json | 8 ++--- .../recipes/network/cables/smart_cyan.json | 8 ++--- .../recipes/network/cables/smart_fluix.json | 8 ++--- .../network/cables/smart_fluix_clean.json | 8 ++--- .../recipes/network/cables/smart_gray.json | 8 ++--- .../recipes/network/cables/smart_green.json | 8 ++--- .../network/cables/smart_light_blue.json | 8 ++--- .../network/cables/smart_light_gray.json | 8 ++--- .../recipes/network/cables/smart_lime.json | 8 ++--- .../recipes/network/cables/smart_magenta.json | 8 ++--- .../recipes/network/cables/smart_orange.json | 8 ++--- .../recipes/network/cables/smart_pink.json | 8 ++--- .../recipes/network/cables/smart_purple.json | 8 ++--- .../recipes/network/cables/smart_red.json | 8 ++--- .../recipes/network/cables/smart_white.json | 8 ++--- .../recipes/network/cables/smart_yellow.json | 8 ++--- .../crafting/cpu_crafting_monitor.json | 4 +-- .../network/crafting/cpu_crafting_unit.json | 4 +-- .../recipes/network/parts/cable_anchor.json | 4 +-- .../recipes/network/parts/export_bus.json | 4 +-- .../network/parts/export_bus_fluid.json | 4 +-- .../network/parts/fluid_level_emitter.json | 4 +-- .../recipes/network/parts/import_bus.json | 4 +-- .../network/parts/import_bus_fluid.json | 4 +-- .../recipes/network/parts/level_emitter.json | 4 +-- .../network/parts/monitors_conversion.json | 8 ++--- .../network/parts/monitors_storage.json | 8 ++--- .../network/parts/panels_dark_monitor.json | 8 ++--- .../recipes/network/parts/panels_monitor.json | 8 ++--- .../parts/panels_semi_dark_monitor.json | 4 +-- .../parts/panels_semi_dark_monitor_alt.json | 8 ++--- .../parts/planes_annihilation_alt.json | 4 +-- .../parts/planes_annihilation_alt2.json | 4 +-- .../parts/planes_annihilation_fluid.json | 4 +-- .../parts/planes_annihilation_fluid_alt.json | 4 +-- .../parts/planes_annihilatition_identity.json | 8 ++--- .../network/parts/planes_formation.json | 4 +-- .../network/parts/planes_formation_alt.json | 4 +-- .../network/parts/planes_formation_fluid.json | 4 +-- .../parts/planes_formation_fluid_alt.json | 4 +-- .../network/parts/quartz_fiber_part.json | 4 +-- .../recipes/network/parts/storage_bus.json | 4 +-- .../network/parts/storage_bus_fluid.json | 4 +-- .../recipes/network/parts/terminals.json | 4 +-- .../network/parts/terminals_crafting.json | 8 ++--- .../network/parts/terminals_fluid.json | 4 +-- .../network/parts/terminals_interface.json | 4 +-- .../network/parts/terminals_pattern.json | 8 ++--- .../recipes/network/parts/toggle_bus.json | 8 ++--- .../recipes/network/parts/toggle_bus_alt.json | 17 +++++---- .../parts/toggle_bus_inverted_alt.json | 17 +++++---- .../recipes/network/parts/tunnels_me.json | 4 +-- .../network/wireless_access_point.json | 4 +-- .../recipes/network/wireless_part.json | 4 +-- .../recipes/network/wireless_terminal.json | 4 +-- .../recipes/tools/paintballs_black.json | 8 ++--- .../recipes/tools/paintballs_blue.json | 8 ++--- .../recipes/tools/paintballs_brown.json | 8 ++--- .../recipes/tools/paintballs_cyan.json | 8 ++--- .../recipes/tools/paintballs_gray.json | 8 ++--- .../recipes/tools/paintballs_green.json | 8 ++--- .../recipes/tools/paintballs_light_blue.json | 8 ++--- .../recipes/tools/paintballs_light_gray.json | 8 ++--- .../recipes/tools/paintballs_lime.json | 8 ++--- .../recipes/tools/paintballs_lumen_black.json | 4 +-- .../recipes/tools/paintballs_lumen_blue.json | 4 +-- .../recipes/tools/paintballs_lumen_brown.json | 4 +-- .../recipes/tools/paintballs_lumen_cyan.json | 4 +-- .../recipes/tools/paintballs_lumen_gray.json | 4 +-- .../recipes/tools/paintballs_lumen_green.json | 4 +-- .../tools/paintballs_lumen_light_blue.json | 4 +-- .../tools/paintballs_lumen_light_gray.json | 4 +-- .../recipes/tools/paintballs_lumen_lime.json | 4 +-- .../tools/paintballs_lumen_magenta.json | 4 +-- .../tools/paintballs_lumen_orange.json | 4 +-- .../recipes/tools/paintballs_lumen_pink.json | 4 +-- .../tools/paintballs_lumen_purple.json | 4 +-- .../recipes/tools/paintballs_lumen_red.json | 4 +-- .../recipes/tools/paintballs_lumen_white.json | 4 +-- .../tools/paintballs_lumen_yellow.json | 4 +-- .../recipes/tools/paintballs_magenta.json | 8 ++--- .../recipes/tools/paintballs_orange.json | 8 ++--- .../recipes/tools/paintballs_pink.json | 8 ++--- .../recipes/tools/paintballs_purple.json | 8 ++--- .../recipes/tools/paintballs_red.json | 8 ++--- .../recipes/tools/paintballs_white.json | 8 ++--- .../recipes/tools/paintballs_yellow.json | 8 ++--- 174 files changed, 630 insertions(+), 583 deletions(-) create mode 100644 src/main/java/appeng/recipes/factories/conditions/PartExists.java diff --git a/src/main/java/appeng/recipes/factories/conditions/PartExists.java b/src/main/java/appeng/recipes/factories/conditions/PartExists.java new file mode 100644 index 000000000..4edc52f11 --- /dev/null +++ b/src/main/java/appeng/recipes/factories/conditions/PartExists.java @@ -0,0 +1,36 @@ +package appeng.recipes.factories.conditions; + +import appeng.core.Api; +import appeng.core.AppEng; +import com.google.gson.JsonObject; +import net.minecraft.util.JsonUtils; +import net.minecraftforge.common.crafting.IConditionFactory; +import net.minecraftforge.common.crafting.JsonContext; + +import java.util.function.BooleanSupplier; + +public class PartExists implements IConditionFactory { + + private static final String JSON_MATERIAL_KEY = "part"; + + @Override + public BooleanSupplier parse(JsonContext jsonContext, JsonObject jsonObject ) + { + final boolean result; + + if( JsonUtils.isString( jsonObject, JSON_MATERIAL_KEY ) ) + { + final String part = JsonUtils.getString( jsonObject, JSON_MATERIAL_KEY ); + final Object item = Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, part ); + + result = item != null; + } + else + { + result = false; + } + + return () -> result; + + } +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/_factories.json b/src/main/resources/assets/appliedenergistics2/recipes/_factories.json index 5f8190ca8..3d00ab798 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/_factories.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/_factories.json @@ -1,7 +1,8 @@ { "conditions": { "material_exists": "appeng.recipes.factories.conditions.MaterialExists", - "features": "appeng.recipes.factories.conditions.Features" + "features": "appeng.recipes.factories.conditions.Features", + "part_exists": "appeng.recipes.factories.conditions.PartExists" }, "ingredients": { "part": "appeng.recipes.factories.ingredients.PartIngredientFactory" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json index f40b9cf75..2eab4fa0a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_certus.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:crystal_seed.certus" + "type": "appliedenergistics2:part_exists", + "part": "crystal_seed.certus" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json index bb79a4649..db5e92759 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_fluix.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:crystal_seed.fluix" + "type": "appliedenergistics2:part_exists", + "part": "crystal_seed.fluix" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json index 8b2426445..f01264f0d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds_nether.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:crystal_seed.nether" + "type": "appliedenergistics2:part_exists", + "part": "crystal_seed.nether" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json index 5bf35bbd7..bb88da9b4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json @@ -12,8 +12,8 @@ "item": "appliedenergistics2:quartz_glass" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" }, { "type": "minecraft:item_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json index 8fe2cd341..2c450da47 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json @@ -16,8 +16,8 @@ "material": "material.logic_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json index efb4e1a83..e37c7ebf9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json @@ -16,8 +16,8 @@ "material": "material.engineering_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json index 448cafa11..438186b11 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json @@ -20,8 +20,8 @@ "material": "material.engineering_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json index 631cad345..5e4ede3d4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json @@ -16,8 +16,8 @@ "material": "material.engineering_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } 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 a30fee9ae..874446516 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 @@ -12,8 +12,8 @@ "item": "appliedenergistics2:quartz_glass" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "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 37fa36b49..6e37580f7 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 @@ -8,8 +8,8 @@ "item": "appliedenergistics2:chest" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json index 3f6ff5433..2af5d3a31 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json @@ -8,8 +8,8 @@ "item": "appliedenergistics2:drive" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json index 300309796..dd8ab4f20 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json index c3bbea9e7..86ebcffbd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json index 5520e2a3e..df2585325 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.brown" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json index 0cf3a1aab..da6b51977 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.cyan" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json index 7979c0bae..4b7269147 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json index 4664c3cc0..8cc89f8f4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json index 022727313..797e17930 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json index ea263bf17..3245a74c4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.green" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json index 5217e8a5b..6407e19db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json index 440357436..7327bcdea 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json index ed5fee21d..1c3b19e10 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.lime" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json index 10bf4dc76..733d404db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.magenta" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json index 17ba8d0e7..73fe5d57b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.orange" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json index 18792b705..7635faef9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.pink" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json index ab7c84d45..e8128b498 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.purple" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json index 5e6f4719a..eb5c26e90 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.red" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json index 74d2974be..199c3bcf2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.white" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json index 99fd47526..8822f74f0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.yellow" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json index e19d620d9..0b7b6676c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json index 24208a2f1..9db5b3ec8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json index a4aecc092..98c2497cf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.brown" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json index 2518a4c7f..24a490301 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.cyan" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json index 0f4f1d976..ff419f419 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json index f48b09845..1d5a518b9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json index f268111ed..4ef902cf0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json index c59a8127b..dc4745ad5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.green" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json index 173ea3689..46c2539ee 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json index d6c4f4404..7bbcde370 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json index 18c0be7b9..8ca3cc7b8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.lime" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json index aa420428d..f26b0d484 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.magenta" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json index e8c34647d..09450a828 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.orange" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json index 138bba3ab..2a3394a36 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.pink" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json index cd0239f38..db9e0cfae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.purple" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json index 45c983f26..91bc13796 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.red" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json index 3eb6a79ba..a641000cc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.white" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json index 2e986c97a..fe2c5f539 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.yellow" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json index 80c817b40..59e5b74c0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json index 96f1bb138..31a3bc4cf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json index f1169158f..86198413c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.brown" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json index e94e94597..480c5c686 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.cyan" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json index 863fa641f..ea0bb6aa7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_covered.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_covered.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json index c7a12dfe9..4e0403fda 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json index 96f0903f4..ab008143b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json index 9d565cd56..4dc4402bf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.green" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json index 9552cd9ae..ba9ced08c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json index 384e33c9f..21cd07a1a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json index 59fa7b053..3ef126a5f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.lime" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json index bcbec860e..e000109ec 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.magenta" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json index af0c61ac2..5128dcef4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.orange" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json index 135d09470..6897c12e0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.pink" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json index 9024625eb..84fc64460 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.purple" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json index a48306679..ce816c297 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.red" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json index b089ff26b..36b396127 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.white" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json index e452243de..8c9ced68e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.yellow" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_dense_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_dense_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json index 729fec98f..be3675118 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json index e188e1635..747e695c7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json index d34de2200..82d5de06f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.brown" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json index 622dd4622..61a5e6c13 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.cyan" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json index b86431bf2..5f783a96f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.quartz_fiber" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "part.quartz_fiber" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json index 6af6a6aed..aa28e3201 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json index 975e7cad3..f918c4a78 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json index 8778d4dcf..74ffde185 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.green" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json index c48e97fdf..ebe28334d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json index 2cc5582dd..c7c76740d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json index cef38f556..a8e38e7c5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.lime" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json index 63d42ec54..423377689 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.magenta" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json index 8b5bb28c3..0fa9e1000 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.orange" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json index d8257587f..0e86075c5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.pink" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json index 9e604132a..739ad638f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.purple" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json index 64ad744f8..eb3337164 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.red" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json index 9355f1920..285016fbf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.white" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json index 2b7826910..aa94adc0a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.yellow" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json index 27ddd4f16..1d52d985d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json index 7a33f5eda..2d2be64f4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json index b09ae895e..5d201052a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.brown" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json index 220a70fd1..9240090f5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.cyan" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json index 0be6c850c..c0ba7abef 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_covered.black" + "type": "appliedenergistics2:part_exists", + "part": "cable_covered.fluix" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json index 4a4cc88e0..b41361ff8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json index 01fb032ac..2558dcb56 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json index e520f2559..b09447b1d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.green" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json index 1901f6a95..5fccca076 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json index 32fcfc61b..281d94680 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json index 2fcf30573..0d89bbce0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.lime" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json index 7ed0db392..3c4a729ed 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.magenta" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json index 1e9bbfbba..bb17da643 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.orange" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json index bb1291e7c..245dc6343 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.pink" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json index 86909b8b0..0640ded1c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.purple" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json index 2fddeb604..eab628eeb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.red" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json index 18ed2bfb7..8d1291385 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.white" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json index 8699a2799..626872217 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.yellow" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_smart.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_smart.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json index 57bea8bac..0776be65c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json @@ -12,8 +12,8 @@ "item": "appliedenergistics2:crafting_unit" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.storage_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.storage_monitor" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json index 7d4378964..2aef9580d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json @@ -16,8 +16,8 @@ "material": "material.calculation_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json index 141bda9b8..339f4577c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.cable_anchor" + "type": "appliedenergistics2:part_exists", + "part": "part.cable_anchor" } ], "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json index 7cb9d563a..45718a791 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.export_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.export_bus" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json index 4c7b11fba..4f659d2e2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_export_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_export_bus" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json index 3d29df8b9..c6f1c3aa5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_level_emitter" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_level_emitter" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json index ec3e61626..9271c9cf6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.import_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.import_bus" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json index 096273f32..69f6917c8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_import_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_import_bus" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json index 9485bd94b..fbbed3440 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.level_emitter" + "type": "appliedenergistics2:part_exists", + "part": "part.level_emitter" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json index 007ceea55..faa73b7a8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.conversion_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.conversion_monitor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.storage_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.storage_monitor" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json index bd284c000..dfde31777 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.storage_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.storage_monitor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.level_emitter" + "type": "appliedenergistics2:part_exists", + "part": "part.level_emitter" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json index d16046206..61022bb61 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.dark_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.dark_monitor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.monitor" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json index 3c92094c6..ae1996a78 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.monitor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.semi_dark_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.semi_dark_monitor" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json index ad0e7dd90..49252bb8d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.semi_dark_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.semi_dark_monitor" }, { "type": "minecraft:item_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json index 4d3496e77..dac859fd7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.semi_dark_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.semi_dark_monitor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.dark_monitor" + "type": "appliedenergistics2:part_exists", + "part": "part.dark_monitor" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json index 68c849581..58c801799 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.annihilation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json index a666208c3..72d3b8494 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.annihilation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json index 358ca8157..f5e3dd602 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_annihilation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json index 241025600..044e16a77 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_annihilation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json index 74858a640..3353edf08 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.identity_annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.identity_annihilation_plane" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.annihilation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.annihilation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json index 3e9545277..a7aca333f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.formation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.formation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json index c0eeb6bb5..31e30d299 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.formation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.formation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json index 05d5ef41c..57040b85c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_formation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_formation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json index 42a87596a..3c82cd9b3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_formation_plane" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_formation_plane" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json index e0d4a102c..9be24984a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.quartz_fiber" + "type": "appliedenergistics2:part_exists", + "part": "part.quartz_fiber" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json index ceed5303b..b06d8183b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.storage_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.storage_bus" }, { "type": "minecraft:item_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json index 09bff774e..8715f5885 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_storage_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_storage_bus" }, { "type": "minecraft:item_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json index 7fd9d4a06..93a44c8b1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.terminal" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json index 546114368..a60612870 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.crafting_terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.crafting_terminal" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.terminal" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json index 0263de5bc..f3ee520cc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json @@ -12,8 +12,8 @@ "material": "material.logic_processor" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.fluid_terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.fluid_terminal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json index 7ad92f474..59b696e92 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.interface_terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.interface_terminal" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json index 4d874c3bc..7b2ced0ae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.pattern_terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.pattern_terminal" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.crafting_terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.crafting_terminal" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json index f49029848..717f64351 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.toggle_bus" + "type": "appliedenergistics2:part_exists", + "part": "part.toggle_bus" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json index ce52ae5a5..1be18b8eb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.toggle_bus" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.inverted_toggle_bus" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:part_exists", + "part": "part.toggle_bus" + }, + { + "type": "appliedenergistics2:part_exists", + "part": "part.inverted_toggle_bus" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json index ac8164c73..f551c028c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json @@ -1,12 +1,17 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.toggle_bus" - }, - { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.inverted_toggle_bus" + "type": "forge:and", + "values": [ + { + "type": "appliedenergistics2:part_exists", + "part": "part.inverted_toggle_bus" + }, + { + "type": "appliedenergistics2:part_exists", + "part": "part.toggle_bus" + } + ] } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json index 7b9b35221..bcecc025e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -4,8 +4,8 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.p2p_tunnel_me" + "type": "appliedenergistics2:part_exists", + "part": "part.p2p_tunnel_me" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json index adf1f7b70..00024e0cd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json @@ -12,8 +12,8 @@ "material": "material.wireless" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:cable_glass.fluix" + "type": "appliedenergistics2:part_exists", + "part": "cable_glass.fluix" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json index 3d36dc000..14b6e4c81 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json @@ -12,8 +12,8 @@ "material": "material.fluix_pearl" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.quartz_fiber" + "type": "appliedenergistics2:part_exists", + "part": "part.quartz_fiber" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json index 2fda0c949..ac661118d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json @@ -12,8 +12,8 @@ "item": "appliedenergistics2:dense_energy_cell" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:part.terminal" + "type": "appliedenergistics2:part_exists", + "part": "part.terminal" }, { "type": "appliedenergistics2:material_exists", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json index 8622f51f0..dc2190333 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.black" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.black" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json index 2bfa3c5e7..e55a0d70f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.blue" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json index 2c9e4b9b5..15b7aa807 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.brown" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.brown" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json index 3b107151b..c9055fe87 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.cyan" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.cyan" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json index 18aa67a37..e610e8f63 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.gray" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json index 7a1414613..502f4e594 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.green" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.green" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json index 307223e6a..bc23af68e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.light_blue" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json index 426a3f1ab..6ed0606f0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.light_gray" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json index 1a1988054..aee8e8def 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.lime" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.lime" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json index 0fa1867f1..d0578312e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_black.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.black" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.black" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json index 86a5f4650..ca47688af 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.blue" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.blue" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json index 5373cc486..fc2f49977 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.brown" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.brown" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json index 63f7f2bdf..10ffb12db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.cyan" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.cyan" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json index 55a134b04..0b44e635e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.gray" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.gray" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json index 6c4d63723..668d568f7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_green.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.green" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.green" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json index 637f2232f..353c9c6cc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.light_blue" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.light_blue" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json index 4e9e3b677..701e24e4a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.light_gray" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.light_gray" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json index aabeb4011..c33bfa21b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.lime" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.lime" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json index b968ab8e2..1a6e91131 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.magenta" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.magenta" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json index d841bf8f7..15d0f6b91 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.orange" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.orange" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json index 56faba009..fe3f13e14 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.pink" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.pink" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json index 5de209e79..2648a6a2e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.purple" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.purple" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json index 5c894e7ef..edbd6aff9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_red.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.red" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.red" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json index b46dcb08d..fd0891e06 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_white.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.white" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.white" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json index 985e4bd04..2fcf49588 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:lumen_paint_ball.yellow" + "type": "appliedenergistics2:part_exists", + "part": "lumen_paint_ball.yellow" } ], "result": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json index 46371fde3..fc8e55b68 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.magenta" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.magenta" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json index 1d70fc6b1..50fda88f1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.orange" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.orange" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json index 126f55db4..30f95001f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.pink" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.pink" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json index c1be8dbfa..1251eee22 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.purple" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.purple" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json index e0f2ea414..da69bb71d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.red" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.red" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json index 810546611..2e434aad9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.white" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.white" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json index 80164c6e8..e19cecaad 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json @@ -4,12 +4,12 @@ "type": "forge:and", "values": [ { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:paint_ball.yellow" + "type": "appliedenergistics2:part_exists", + "part": "paint_ball.yellow" }, { - "type": "minecraft:item_exists", - "item": "appliedenergistics2:part:material.matter_ball" + "type": "appliedenergistics2:material_exists", + "material": "material.matter_ball" } ] } From e910af7734b19bd26652f241fce86135946e49ab Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Tue, 30 Mar 2021 15:36:25 -0700 Subject: [PATCH 5/5] Fix advancements to check if their parent item is enabled to prevent more logging --- .../advancements/main/cable_glass.json | 17 +++++++- .../advancements/main/charger.json | 13 +++++- .../advancements/main/controller.json | 25 +++++++++++- .../advancements/main/crafting_cpu.json | 28 +++++++++++++ .../advancements/main/crafting_terminal.json | 29 +++++++++++++- .../advancements/main/facade.json | 21 +++++++++- .../advancements/main/fluix.json | 13 +++++- .../advancements/main/growth_accelerator.json | 23 +++++++++-- .../advancements/main/interface.json | 21 +++++++++- .../advancements/main/ioport.json | 36 +++++++++++++++++ .../advancements/main/network1.json | 19 +++++++++ .../advancements/main/network2.json | 19 +++++++++ .../advancements/main/network3.json | 19 +++++++++ .../advancements/main/network_tool.json | 29 +++++++++++++- .../advancements/main/p2p.json | 21 +++++++++- .../advancements/main/pattern_terminal.json | 33 ++++++++++++++- .../advancements/main/portable_cell.json | 36 +++++++++++++++++ .../advancements/main/qnb.json | 25 +++++++++++- .../advancements/main/spatial_explorer.json | 40 +++++++++++++++++++ .../advancements/main/spatial_ioport.json | 40 +++++++++++++++++++ .../advancements/main/storage_bus.json | 25 +++++++++++- .../advancements/main/storage_cell.json | 20 ++++++++++ 22 files changed, 524 insertions(+), 28 deletions(-) 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": {