From f1d50eca1a2c2254fbf5b2cc23bec20278b5ee7a Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers Date: Fri, 26 Mar 2021 22:10:24 -0700 Subject: [PATCH] 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"