From 020c182014db57fb2abfa92493524f1c26ec0dd6 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 30 Nov 2016 18:13:36 +1000 Subject: + Added a Blast Smelter Recipe check, so that things with invalid sub-components won't ever get a multi-dust recipe at all. (Should fix #43) - Removed an old function for obtaining items excluding certain mods. Not really needed any more at all. --- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java index 3285e6294d..c66563fb36 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java @@ -9,11 +9,11 @@ import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; public class RecipeGen_BlastSmelterGT implements Runnable{ - + public RecipeGen_BlastSmelterGT(){ - + } - + @Override public void run() { generateRecipes(); @@ -23,15 +23,21 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ Materials[] GregMaterials = Materials.values(); - for (Materials M : GregMaterials){ + GT: for (Materials M : GregMaterials){ - if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium) - || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) - || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) - || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) - || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) + if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium) + || !M.equals(Materials._NULL) || !M.equals(Materials.Knightmetal) || !M.equals(Materials.Osmiridium) ){ + for (MaterialStack xMaterial : M.mMaterialList){ + if (xMaterial.mMaterial == Materials.Magic || xMaterial.mMaterial == Materials.Metal){ + continue GT; + } + if (null == GT_OreDictUnificator.get(OrePrefixes.dust, xMaterial, 1L)){ + continue GT; + } + } + //Add a Blast Smelting Recipe, Let's go! ItemStack tStack; -- cgit