From a200e8bd2ffea5a93ec5a783ceb5c752d3c32e76 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 29 Oct 2019 16:36:36 +0100 Subject: Revert "small Assembly Line fix" This reverts commit 8de068fbf425162c75793d795c6296d03003d49e. --- .../machines/multi/GT_MetaTileEntity_AssemblyLine.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 2a2cb978b7..20752dfad7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -86,7 +86,7 @@ public class GT_MetaTileEntity_AssemblyLine if(GT_Values.D1) GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found"); - ItemStack[] tStack = new ItemStack[15]; + ItemStack tStack[] = new ItemStack[15]; FluidStack[] tFluids = new FluidStack[4]; boolean findRecipe = false; nextDS:for (ItemStack tDataStick : tDataStickList){ @@ -144,7 +144,7 @@ public class GT_MetaTileEntity_AssemblyLine continue nextDS; } FluidStack fluidInHatch = mInputHatches.get(i).mFluid; - if (!GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) { + if (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) { if(GT_Values.D1) GT_FML_LOGGER.info(i+" not accepted"); continue nextDS; @@ -171,17 +171,11 @@ public class GT_MetaTileEntity_AssemblyLine continue; mEUt = tTag.getInteger("eu"); - if (Math.abs(this.mEUt) > this.getMaxInputVoltage()) { - if(GT_Values.D1) - GT_FML_LOGGER.info("Found avaiable recipe, but Voltage too low!"); - return false; - } if(GT_Values.D1)GT_FML_LOGGER.info("Find avaiable recipe"); findRecipe = true; break; } - if (!findRecipe) - return false; + if (!findRecipe) return false; if(GT_Values.D1)GT_FML_LOGGER.info("All checked start consuming inputs"); for (int i = 0; i < 15; i++) { -- cgit