From 76fd3c11663898c77d539dc0d76e01bab2cf0684 Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Thu, 13 Jul 2017 09:30:39 +0200 Subject: [PATCH] Fix potential crash in the recipes when the material was replaced. --- .../appliedenergistics2/recipes/materials/advcard.json | 6 ++++++ .../recipes/materials/annihilationcore.json | 6 ++++++ .../appliedenergistics2/recipes/materials/basiccard.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardcapacity.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardcrafting.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardfuzzy.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardinverter.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardredstone.json | 6 ++++++ .../appliedenergistics2/recipes/materials/cardspeed.json | 6 ++++++ .../recipes/materials/formationcore.json | 6 ++++++ .../recipes/misc/deconstruction_certus_chiseled_quartz.json | 6 ++++++ .../recipes/misc/deconstruction_certus_quartz_block.json | 6 ++++++ .../recipes/misc/deconstruction_certus_quartz_pillar.json | 6 ++++++ .../recipes/misc/deconstruction_fluix_block.json | 6 ++++++ .../assets/appliedenergistics2/recipes/misc/fluixpearl.json | 6 ++++++ 15 files changed, 90 insertions(+) diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json index 7bbad599..8be21e77 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.AdvCard" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.AdvCard", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json index a5d673b8..125bf3ae 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.AnnihilationCore" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.AnnihilationCore", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json index be306ba6..126e84d8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.BasicCard" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.BasicCard", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json index 59f1163d..8305791e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardCapacity" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardCapacity" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json index fcf3c3be..6cf96454 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardCrafting" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardCrafting" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json index d9e80b13..05e203b0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardFuzzy" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardFuzzy" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json index 2763952d..e990abd6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardInverter" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardInverter" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json index 23357680..f258dd66 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardRedstone" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardRedstone" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json index 3986b255..cd65bb66 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CardSpeed" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CardSpeed" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json index a8f03ee7..3ea2670c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.FormationCore" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.FormationCore", 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 d1e789c2..18a0cc93 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,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CertusQuartzCrystal" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CertusQuartzCrystal", 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 2a96a47c..aa036c62 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,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CertusQuartzCrystal" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CertusQuartzCrystal", 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 fa9737ec..1fe0678e 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,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.CertusQuartzCrystal" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.CertusQuartzCrystal", 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 06465421..06d10676 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,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.FluixCrystal" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.FluixCrystal", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json index 64c8f09c..6447aa1e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.FluixPearl" + } + ], "result": { "type": "appliedenergistics2:part", "part": "material.FluixPearl"