diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java | 10 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java | 17 |
2 files changed, 20 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index 2e1e259b4e..fe1e6d6f2d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -4,6 +4,8 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; @@ -31,11 +33,11 @@ public class RecipeGen_BlastSmelter implements Runnable{ if (null != (tStack = M.getDust(1))) { Material[] badMaterials = { - ALLOY.THORIUM_HEXAFLUORIDE, - ALLOY.THORIUM_TETRAFLUORIDE, + FLUORIDES.THORIUM_HEXAFLUORIDE, + FLUORIDES.THORIUM_TETRAFLUORIDE, ALLOY.BLOODSTEEL, - ALLOY.LiFBeF2ThF4UF4, - ALLOY.LiFBeF2ZrF4U235 + NUCLIDE.LiFBeF2ThF4UF4, + NUCLIDE.LiFBeF2ZrF4U235 }; for (Material R : badMaterials){ if (M == R){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 857ce8013d..fd9c1b722e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -21,8 +21,12 @@ public class RecipeGen_DustGeneration implements Runnable{ public void run() { generateRecipes(toGenerate); } - + public static void generateRecipes(final Material material){ + generateRecipes(material, false); + } + + public static void generateRecipes(final Material material, boolean disableOptional){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16; Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO @@ -218,10 +222,17 @@ public class RecipeGen_DustGeneration implements Runnable{ } //Macerate blocks back to dusts. - GT_ModHandler.addPulverisationRecipe(material.getBlock(1), material.getDust(9)); + ItemStack materialBlock = material.getBlock(1); + ItemStack materialFrameBox = material.getFrameBox(1); + + if (materialBlock != null) + GT_ModHandler.addPulverisationRecipe(materialBlock, material.getDust(9)); + + if (materialFrameBox != null) + GT_ModHandler.addPulverisationRecipe(materialFrameBox, material.getDust(2)); //Is this a composite? - if (inputStacks != null){ + if (inputStacks != null && !disableOptional){ //Is this a composite? Utils.LOG_INFO("mixer length: "+inputStacks.length); if (inputStacks.length != 0 && inputStacks.length <= 4){ |