From d635a87f013f13fd9b2df4c4ca47c4b8031c7856 Mon Sep 17 00:00:00 2001 From: Florian Scandella Date: Fri, 22 Jun 2018 21:34:33 +0200 Subject: [PATCH] Fluid import/export bus fixes. * use correct side for capability. * don't to to sleep if there is nothing to extract. --- src/main/java/appeng/fluids/parts/PartFluidExportBus.java | 4 ++-- src/main/java/appeng/fluids/parts/PartFluidImportBus.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java b/src/main/java/appeng/fluids/parts/PartFluidExportBus.java index a9253299a..ca469f094 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidExportBus.java @@ -109,11 +109,11 @@ public class PartFluidExportBus extends PartSharedFluidBus final TileEntity te = this.getConnectedTE(); - if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ) ) + if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ) ) { try { - final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ); + final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ); final IMEMonitor inv = this.getProxy().getStorage().getInventory( this.getChannel() ); if( fh != null ) diff --git a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java b/src/main/java/appeng/fluids/parts/PartFluidImportBus.java index 4b0c8f3a6..f643a902b 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidImportBus.java @@ -103,11 +103,11 @@ public class PartFluidImportBus extends PartSharedFluidBus final TileEntity te = this.getConnectedTE(); - if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ) ) + if( te != null && te.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ) ) { try { - final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing() ); + final IFluidHandler fh = te.getCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite() ); final IMEMonitor inv = this.getProxy().getStorage().getInventory( this.getChannel() ); if( fh != null ) @@ -134,6 +134,8 @@ public class PartFluidImportBus extends PartSharedFluidBus return TickRateModulation.FASTER; } + + return TickRateModulation.IDLE; } } catch( GridAccessException e )