fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #4683: Hopefully LazyOptional works as advertised (#4684) (#4695)

Browse Source 
Co-authored-by: yueh <yueh@users.noreply.github.com>
This commit is contained in:
shartte
2020-09-05 18:02:05 +02:00
committed by GitHub
parent 3b61d126a7
commit d6cbfe2e31
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/parts/FluidImportBusPart.java
+9 -11
View File
@@ -96,16 +96,15 @@ public class FluidImportBusPart extends SharedFluidBusPart {
} }
final TileEntity te = this.getConnectedTE(); final TileEntity te = this.getConnectedTE();
LazyOptional<IFluidHandler> fhOpt = LazyOptional.empty();
if (te != null) { if (te != null) {
te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite()); LazyOptional<IFluidHandler> fhOpt = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY,
} this.getSide().getFacing().getOpposite());
if (fhOpt.isPresent()) {
try { if (fhOpt.isPresent()) {
final IFluidHandler fh = fhOpt.orElse(null); try {
final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory(this.getChannel()); final IFluidHandler fh = fhOpt.orElseThrow(() -> new IllegalStateException());
final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory(this.getChannel());
if (fh != null) {
final FluidStack fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE); final FluidStack fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE);
if (this.filterEnabled() && !this.isInFilter(fluidStack)) { if (this.filterEnabled() && !this.isInFilter(fluidStack)) {
@@ -128,12 +127,11 @@ public class FluidImportBusPart extends SharedFluidBusPart {
} }
return TickRateModulation.IDLE; return TickRateModulation.IDLE;
} catch (GridAccessException e) {
// skip
} }
} catch (GridAccessException e) {
e.printStackTrace();
} }
} }
return TickRateModulation.SLEEP; return TickRateModulation.SLEEP;
} }