From 3d73604315500235f065e48840a975db894ea50e Mon Sep 17 00:00:00 2001 From: pupnewfster Date: Sun, 17 Mar 2019 14:34:53 -0400 Subject: [PATCH] Cleanup some code in case something gives null fluid stacks --- .../common/base/IFluidHandlerWrapper.java | 9 +++---- .../common/tile/TileEntityBoilerValve.java | 11 +++++---- .../common/tile/TileEntityChemicalWasher.java | 9 +++---- .../common/tile/TileEntityDynamicValve.java | 11 +++++---- .../common/tile/TileEntityElectricPump.java | 13 +++++----- .../tile/TileEntityElectrolyticSeparator.java | 17 ++++++------- .../common/tile/TileEntityFluidTank.java | 14 +++++++---- .../tile/TileEntityFluidicPlenisher.java | 24 ++++++++++--------- .../mekanism/common/tile/TileEntityPRC.java | 9 +++---- .../tile/TileEntityQuantumEntangloporter.java | 11 +++++---- .../tile/TileEntityRotaryCondensentrator.java | 16 +++++++------ .../TileEntityThermalEvaporationValve.java | 13 +++++----- .../transmitter/TileEntityMechanicalPipe.java | 9 +++---- .../common/tile/TileEntityBioGenerator.java | 19 ++++++++------- .../common/tile/TileEntityHeatGenerator.java | 20 +++++++++------- .../tile/reactor/TileEntityReactorPort.java | 17 ++++++------- .../tile/turbine/TileEntityTurbineValve.java | 11 +++++---- .../tile/turbine/TileEntityTurbineVent.java | 9 +++---- 18 files changed, 134 insertions(+), 108 deletions(-) diff --git a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java index 0b007ce4d..be126e2c3 100644 --- a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java @@ -1,20 +1,21 @@ package mekanism.common.base; +import javax.annotation.Nullable; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; public interface IFluidHandlerWrapper { - int fill(EnumFacing from, FluidStack resource, boolean doFill); + int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill); - FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain); + FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain); FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain); - boolean canFill(EnumFacing from, FluidStack fluid); + boolean canFill(EnumFacing from, @Nullable FluidStack fluid); - boolean canDrain(EnumFacing from, FluidStack fluid); + boolean canDrain(EnumFacing from, @Nullable FluidStack fluid); FluidTankInfo[] getTankInfo(EnumFacing from); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index 148d22c64..96d61446c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; @@ -84,7 +85,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.y - 1) { return waterTank.fill(resource, doFill); @@ -94,11 +95,11 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { if (structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y - 1) { if (structure.steamStored != null) { - if (resource.getFluid() == structure.steamStored.getFluid()) { + if (resource != null && resource.getFluid() == structure.steamStored.getFluid()) { return steamTank.drain(resource.amount, doDrain); } } @@ -118,7 +119,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { if ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.y - 1; } @@ -127,7 +128,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { if ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y - 1; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index cfa5a73b1..b46609742 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -303,7 +304,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (canFill(from, resource)) { return fluidTank.fill(resource, doFill); } @@ -312,7 +313,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @@ -322,12 +323,12 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { return from == EnumFacing.UP && fluid.getFluid().equals(FluidRegistry.WATER); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index ebbedf690..8e7a649c0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.content.tank.DynamicFluidTank; @@ -33,14 +34,14 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { return fluidTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { if (structure != null && structure.fluidStored != null) { - if (resource.getFluid() == structure.fluidStored.getFluid()) { + if (resource != null && resource.getFluid() == structure.fluidStored.getFluid()) { return fluidTank.drain(resource.amount, doDrain); } } @@ -58,12 +59,12 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 991eef44c..e722e1a20 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -406,9 +407,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing - .byIndex(1)) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { + if (resource != null && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() + && from == EnumFacing.byIndex(1)) { return drain(from, resource.amount, doDrain); } @@ -416,7 +417,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { return 0; } @@ -430,12 +431,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { return false; } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return from == EnumFacing.byIndex(1); } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 7d08aaa18..99840a9d7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,9 +1,10 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -156,7 +157,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement if (tank.getGas() != null) { if (mode != GasMode.DUMPING) { GasStack toSend = new GasStack(tank.getGas().getGas(), Math.min(tank.getStored(), output)); - tank.draw(GasUtils.emit(toSend, this, Arrays.asList(side)), true); + tank.draw(GasUtils.emit(toSend, this, Collections.singletonList(side)), true); } else { tank.draw(dumpAmount, true); } @@ -404,23 +405,23 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - return Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(fluid.getFluid()); + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + return fluid != null && Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(fluid.getFluid()); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(resource.getFluid())) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { + if (resource != null && Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(resource.getFluid())) { return fluidTank.fill(resource, doFill); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 7f9bd0d6d..4d9d8c306 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.Range4D; @@ -206,7 +207,10 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc fluidTank.setFluid(PipeUtils.copy(ret, Math.min(fluidTank.getCapacity(), ret.amount))); if (tier == FluidTankTier.CREATIVE) { - fluidTank.getFluid().amount = Integer.MAX_VALUE; + FluidStack fluid = fluidTank.getFluid(); + if (fluid != null) { + fluid.amount = Integer.MAX_VALUE; + } } else { int rejects = Math.max(0, ret.amount - fluidTank.getCapacity()); @@ -437,7 +441,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (tier == FluidTankTier.CREATIVE) { return resource != null ? resource.amount : 0; } @@ -465,7 +469,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { if (resource != null && canDrain(from, resource)) { return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE && doDrain); } @@ -483,7 +487,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { TileEntity tile = world.getTileEntity(getPos().offset(EnumFacing.DOWN)); if (from == EnumFacing.DOWN && world != null) { if (isActive && !(tile instanceof TileEntityFluidTank)) { @@ -505,7 +509,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { if (fluidTank != null) { if (fluid == null || fluidTank.getFluid() != null && fluidTank.getFluid().isFluidEqual(fluid)) { return !(isActive && from == EnumFacing.DOWN); diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index b4699b219..a5a1ada1a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -155,9 +156,10 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen for (Coord4D coord : activeNodes) { if (coord.exists(world)) { - if (canReplace(coord, true, false)) { + FluidStack fluid = fluidTank.getFluid(); + if (canReplace(coord, true, false) && fluid != null) { world.setBlockState(coord.getPos(), - MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()).getDefaultState(), 3); + MekanismUtils.getFlowingBlock(fluid.getFluid()).getDefaultState(), 3); fluidTank.drain(Fluid.BUCKET_VOLUME, true); } @@ -293,8 +295,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen if (slotID == 1) { return false; } else if (slotID == 0) { - return FluidUtil.getFluidContained(itemstack) != null && FluidUtil.getFluidContained(itemstack).getFluid() - .canBePlacedInWorld(); + FluidStack fluidContained = FluidUtil.getFluidContained(itemstack); + return fluidContained != null && fluidContained.getFluid().canBePlacedInWorld(); } else if (slotID == 2) { return ChargeUtils.canBeDischarged(itemstack); } @@ -364,8 +366,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { + if (resource != null && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing.UP) { return drain(from, resource.amount, doDrain); } @@ -374,8 +376,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (from == EnumFacing.UP && resource.getFluid().canBePlacedInWorld()) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { + if (from == EnumFacing.UP && resource != null && resource.getFluid().canBePlacedInWorld()) { return fluidTank.fill(resource, true); } @@ -388,12 +390,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - return from == EnumFacing.UP && fluid.getFluid().canBePlacedInWorld(); + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + return from == EnumFacing.UP && fluid != null && fluid.getFluid().canBePlacedInWorld(); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 188885f8f..045307249 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.Map; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -275,7 +276,7 @@ public class TileEntityPRC extends } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (canFill(from, resource)) { return inputFluidTank.fill(resource, doFill); } @@ -284,7 +285,7 @@ public class TileEntityPRC extends } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @@ -294,7 +295,7 @@ public class TileEntityPRC extends } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { SideData data = configComponent.getOutput(TransmissionType.FLUID, from, facing); if (data.hasSlot(0)) { @@ -305,7 +306,7 @@ public class TileEntityPRC extends } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 39b09f399..684e4fd3f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; @@ -404,13 +405,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { return !hasFrequency() ? 0 : frequency.storedFluid.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (hasFrequency() && resource.isFluidEqual(frequency.storedFluid.getFluid())) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { + if (hasFrequency() && resource != null && resource.isFluidEqual(frequency.storedFluid.getFluid())) { return frequency.storedFluid.drain(resource.amount, doDrain); } @@ -427,7 +428,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { if (hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.INPUT) { return frequency.storedFluid.getFluid() == null || frequency.storedFluid.getFluid().isFluidEqual(fluid); @@ -437,7 +438,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { if (hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.OUTPUT) { return frequency.storedFluid.getFluid() == null || frequency.storedFluid.getFluid().isFluidEqual(fluid); diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index afff5b2ac..eddeb6f22 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -293,7 +294,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (canFill(from, resource)) { return fluidTank.fill(resource, doFill); } @@ -302,8 +303,9 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid()) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { + if (resource != null && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource + .getFluid()) { return drain(from, resource.amount, doDrain); } @@ -311,13 +313,13 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - return mode == 1 && from == MekanismUtils.getRight(facing) && (fluidTank.getFluid() == null ? isValidFluid( - new FluidStack(fluid, 1)) : fluidTank.getFluid().isFluidEqual(fluid)); + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + return fluid != null && mode == 1 && from == MekanismUtils.getRight(facing) && (fluidTank.getFluid() == null + ? isValidFluid(new FluidStack(fluid, 1)) : fluidTank.getFluid().isFluidEqual(fluid)); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return mode == 0 && from == MekanismUtils.getRight(facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 24120a99d..c9c0a184e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.common.base.FluidHandlerWrapper; @@ -40,16 +41,16 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { TileEntityThermalEvaporationController controller = getController(); return controller == null ? 0 : controller.inputTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { TileEntityThermalEvaporationController controller = getController(); - if (controller != null && (resource == null || resource.isFluidEqual(controller.outputTank.getFluid()))) { + if (controller != null && resource != null && resource.isFluidEqual(controller.outputTank.getFluid())) { return controller.outputTank.drain(resource.amount, doDrain); } @@ -68,13 +69,13 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { TileEntityThermalEvaporationController controller = getController(); - return controller != null && controller.hasRecipe(fluid.getFluid()); + return controller != null && fluid != null && controller.hasRecipe(fluid.getFluid()); } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { TileEntityThermalEvaporationController controller = getController(); return controller != null && controller.outputTank.getFluidAmount() > 0; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index f43f480a1..aee64c55a 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -3,6 +3,7 @@ package mekanism.common.tile.transmitter; import io.netty.buffer.ByteBuf; import java.util.Collection; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; @@ -197,7 +198,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter 0 || (FluidUtil.getFluidContained(itemstack) != null - && FluidUtil.getFluidContained(itemstack).getFluid() == FluidRegistry.LAVA); + if (getFuel(itemstack) > 0) { + return true; + } + FluidStack fluidContained = FluidUtil.getFluidContained(itemstack); + return fluidContained != null && fluidContained.getFluid() == FluidRegistry.LAVA; } else if (slotID == 1) { return ChargeUtils.canBeCharged(itemstack); } @@ -260,8 +264,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (resource.getFluid() == FluidRegistry.LAVA && from != facing) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { + if (resource != null && resource.getFluid() == FluidRegistry.LAVA && from != facing) { return lavaTank.fill(resource, doFill); } @@ -274,17 +278,17 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - return fluid.getFluid().equals(FluidRegistry.LAVA) && from != facing; + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + return fluid != null && fluid.getFluid().equals(FluidRegistry.LAVA) && from != facing; } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 3545aad2d..1e2202547 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -2,6 +2,7 @@ package mekanism.generators.common.tile.reactor; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -109,8 +110,8 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (resource.getFluid() == FluidRegistry.WATER && getReactor() != null && !fluidEject) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { + if (resource != null && resource.getFluid() == FluidRegistry.WATER && getReactor() != null && !fluidEject) { return getReactor().getWaterTank().fill(resource, doFill); } @@ -118,8 +119,8 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (resource.getFluid() == FluidRegistry.getFluid("steam") && getReactor() != null) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { + if (resource != null && resource.getFluid() == FluidRegistry.getFluid("steam") && getReactor() != null) { getReactor().getSteamTank().drain(resource.amount, doDrain); } @@ -136,13 +137,13 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - return getReactor() != null && fluid.getFluid().equals(FluidRegistry.WATER) && !fluidEject; + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + return getReactor() != null && fluid != null && fluid.getFluid().equals(FluidRegistry.WATER) && !fluidEject; } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { - return getReactor() != null && fluid.getFluid().equals(FluidRegistry.getFluid("steam")); + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { + return getReactor() != null && fluid != null && fluid.getFluid().equals(FluidRegistry.getFluid("steam")); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 25e2c1570..9982e9b4a 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -8,6 +8,7 @@ import ic2.api.energy.tile.IEnergyConductor; import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyTile; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IEnergyWrapper; @@ -317,7 +318,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { if (resource == null || !canFill(from, resource)) { return 0; } @@ -336,7 +337,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @@ -346,8 +347,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { - if (fluid.getFluid().equals(FluidRegistry.getFluid("steam"))) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { + if (fluid != null && fluid.getFluid().equals(FluidRegistry.getFluid("steam"))) { return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)); } @@ -355,7 +356,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java index 7855edbc6..df0c99550 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java @@ -1,6 +1,7 @@ package mekanism.generators.common.tile.turbine; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; @@ -58,12 +59,12 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, @Nullable FluidStack resource, boolean doFill) { return 0; } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, @Nullable FluidStack resource, boolean doDrain) { return null; } @@ -73,12 +74,12 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF } @Override - public boolean canFill(EnumFacing from, FluidStack fluid) { + public boolean canFill(EnumFacing from, @Nullable FluidStack fluid) { return false; } @Override - public boolean canDrain(EnumFacing from, FluidStack fluid) { + public boolean canDrain(EnumFacing from, @Nullable FluidStack fluid) { return fluid != null && fluid.getFluid().equals(FluidRegistry.WATER); }