From 38d4792fdd4163a18c4d0ba5a208e9a00710fc91 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 8 Apr 2023 12:52:57 +0100 Subject: null checks for ingots (#1852) --- .../postload/recipes/AlloySmelterRecipes.java | 55 ++++++++++++---------- 1 file changed, 30 insertions(+), 25 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index ebe68fe1c6..5310e87eb7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -74,32 +74,37 @@ public class AlloySmelterRecipes implements Runnable { materials[2].mMaterial, materials[2].mAmount); if (outputIngot != GT_Values.NI) { - GT_Values.RA.stdBuilder() - .itemInputs(ingot1, dust2) - .itemOutputs(outputIngot) - .noFluidInputs() - .noFluidOutputs() - .duration((int) materials[2].mAmount * 50) - .eut(16) - .addTo(sAlloySmelterRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ingot1, ingot2) - .itemOutputs(outputIngot) - .noFluidInputs() - .noFluidOutputs() - .duration((int) materials[2].mAmount * 50) - .eut(16) - .addTo(sAlloySmelterRecipes); + if (ingot1 != null) { + GT_Values.RA.stdBuilder() + .itemInputs(ingot1, dust2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); + if (ingot2 != null) { + GT_Values.RA.stdBuilder() + .itemInputs(ingot1, ingot2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); + } + } - GT_Values.RA.stdBuilder() - .itemInputs(dust1, ingot2) - .itemOutputs(outputIngot) - .noFluidInputs() - .noFluidOutputs() - .duration((int) materials[2].mAmount * 50) - .eut(16) - .addTo(sAlloySmelterRecipes); + if (ingot2 != null) { + GT_Values.RA.stdBuilder() + .itemInputs(dust1, ingot2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); + } GT_Values.RA.stdBuilder() .itemInputs(dust1, dust2) -- cgit