diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-10-15 17:08:54 +0200 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-10-15 17:08:54 +0200 |
commit | 8de068fbf425162c75793d795c6296d03003d49e (patch) | |
tree | 707f6065cd7736229fed78dce0651e2516189b2a /src | |
parent | a1b69080ff7bc4b00b0a4a1dea960b69453d0a0b (diff) | |
download | GT5-Unofficial-8de068fbf425162c75793d795c6296d03003d49e.tar.gz GT5-Unofficial-8de068fbf425162c75793d795c6296d03003d49e.tar.bz2 GT5-Unofficial-8de068fbf425162c75793d795c6296d03003d49e.zip |
small Assembly Line fix
+ made the Assembly Line not start when the recipe voltage > possible incoming voltage
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java | 12 |
1 files changed, 9 insertions, 3 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 20752dfad7..2a2cb978b7 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 (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
+ if (!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,11 +171,17 @@ 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++) {
|