diff options
| author | Maxim <maxim235@gmx.de> | 2022-08-25 22:48:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 21:48:31 +0100 |
| commit | 07eb934593497b678b07b3e188a3bc525edf34a9 (patch) | |
| tree | 020049b7f13e4855d373cd3823b0d56b3183cd65 /src/main | |
| parent | 7658e6012a25db180ecc1e177331345959e5f459 (diff) | |
| download | GT5-Unofficial-07eb934593497b678b07b3e188a3bc525edf34a9.tar.gz GT5-Unofficial-07eb934593497b678b07b3e188a3bc525edf34a9.tar.bz2 GT5-Unofficial-07eb934593497b678b07b3e188a3bc525edf34a9.zip | |
Matter fab fixes (#304)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index e1ac7c1ca7..70d351a636 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -174,7 +174,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo ItemStack[] tItemInputs = tItems.toArray(new ItemStack[tItems.size()]); FluidStack[] tFluidInputs = tFluids.toArray(new FluidStack[tFluids.size()]); init(); - return checkRecipeGeneric(tItemInputs, tFluidInputs, 4, 80, 00, 100); + return checkRecipeGeneric(tItemInputs, tFluidInputs, 4, 80, 00, 10000); } public static boolean sInit = false; @@ -300,6 +300,10 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo int aMaxParallelRecipes, int aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) { + if (aItemInputs == null || aItemInputs.length <= 0) { + return false; + } + long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); long tEnergy = getMaxInputEnergy(); @@ -462,7 +466,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo log("tRecipeEUt: "+tRecipeEUt); // Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { - if (!tRecipe.isRecipeInputEqual(true, true, aFluidInputs, aItemInputs)) { + if (!tRecipe.isRecipeInputEqual(true, false, aFluidInputs, aItemInputs)) { break; } log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); |