diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-02-28 19:51:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 12:51:24 +0100 |
| commit | 63a65e8d98ede6b76d455288ce27d3f8a621223d (patch) | |
| tree | 29dde52e9bc8630f6d358f6f6b08c76679229e53 /src/main/java/gtPlusPlus/xmod/gregtech/recipes | |
| parent | 5497075f54732ccf3c7580fe311a2327ebb05cb2 (diff) | |
| download | GT5-Unofficial-63a65e8d98ede6b76d455288ce27d3f8a621223d.tar.gz GT5-Unofficial-63a65e8d98ede6b76d455288ce27d3f8a621223d.tar.bz2 GT5-Unofficial-63a65e8d98ede6b76d455288ce27d3f8a621223d.zip | |
Fix several recipes (#842)
* chemiplant frontend
* fix missing coke oven recipe
* new cell-less recipes
* fix conflict hydrogen freezing recipe
* fix missing ethylbenzene-to-fuel recipes
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/recipes')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 4fafaf25e3..fa3d2f36cc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -34,15 +34,17 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { @Override public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) { - if (aInput1 == null || (aOutput == null || aFluidOutput == null)) { + if (aInput1 == null || (aOutput == null && aFluidOutput == null)) { Logger.WARNING("Something was null, returning false"); return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0) { + if (aOutput != null && (aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0) { Logger.WARNING("Something was null, returning false"); return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0) { + if (aFluidOutput != null + && (aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) + <= 0) { Logger.WARNING("Something was null, returning false"); return false; } @@ -857,7 +859,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { @Override public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs, FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier) { - if (aInputs.length > 4 || aInputFluids.length > 4 || aOutputs.length > 4 || aFluidOutputs.length > 2) { + if (aInputs.length > 4 || aInputFluids.length > 4 || aOutputs.length > 6 || aFluidOutputs.length > 3) { Logger.INFO("Inputs: " + ItemUtils.getArrayStackNames(aInputs)); Logger.INFO("Fluid Inputs: " + ItemUtils.getArrayStackNames(aInputFluids)); Logger.INFO("Outputs: " + ItemUtils.getArrayStackNames(aOutputs)); |
