From 23379df0b0a53b0b070bc0ac9fce3c8e07a102c3 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Sun, 18 Dec 2022 15:57:32 +0800 Subject: [PATCH] sa --- .../github/common/block/BlockFluidBuffer.java | 2 +- .../github/common/tile/TileFluidBuffer.java | 20 ++++++++----------- .../waila/tile/FluidInvWailaDataProvider.java | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidBuffer.java b/src/main/java/com/glodblock/github/common/block/BlockFluidBuffer.java index 93a258f4..e3f60cdd 100644 --- a/src/main/java/com/glodblock/github/common/block/BlockFluidBuffer.java +++ b/src/main/java/com/glodblock/github/common/block/BlockFluidBuffer.java @@ -37,7 +37,7 @@ public class BlockFluidBuffer extends FCBaseBlock { if (Platform.isServer()) { TileFluidBuffer tile = getTileEntity(world, x, y, z); if (tile == null) return false; - if(player.isSneaking() && itemStack == null) return !tile.setFluid(null); + if (player.isSneaking() && itemStack == null) return !tile.setFluid(null); IAEFluidStack ias = tile.getAEStoreFluidStack(); if (fs == null && ias != null) { player.addChatMessage(new ChatComponentText( diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidBuffer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidBuffer.java index 02ac6d13..e10b77b4 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidBuffer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidBuffer.java @@ -4,15 +4,11 @@ import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; -import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.MachineSource; -import appeng.api.networking.ticking.IGridTickable; -import appeng.api.networking.ticking.TickRateModulation; -import appeng.api.networking.ticking.TickingRequest; import appeng.api.storage.data.IAEFluidStack; import appeng.me.GridAccessException; import appeng.tile.TileEvent; @@ -30,8 +26,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileFluidBuffer extends AENetworkTile - implements IAEFluidInventory, IFluidHandler, IPowerChannelState { +public class TileFluidBuffer extends AENetworkTile implements IAEFluidInventory, IFluidHandler, IPowerChannelState { private final AEFluidInventory invFluids = new AEFluidInventory(this, 1, Integer.MAX_VALUE); private final BaseActionSource source; @@ -86,9 +81,9 @@ public class TileFluidBuffer extends AENetworkTile @Override public FluidStack drain(ForgeDirection forgeDirection, FluidStack fluidStack, boolean b) { FluidStack fs = this.getFluidStack(); - if(fs != null && fs.getFluid() == fluidStack.getFluid()){ + if (fs != null && fs.getFluid() == fluidStack.getFluid()) { return this.drainFluid(fluidStack, b ? Actionable.MODULATE : Actionable.SIMULATE); - }else { + } else { return null; } } @@ -228,10 +223,11 @@ public class TileFluidBuffer extends AENetworkTile public AEFluidInventory getInternalFluid() { return this.invFluids; } - public void updateFluidStore(){ - IAEFluidStack iaf = this.getAEStoreFluidStack(); - if(iaf != null){ - this.invFluids.setFluidInSlot(0,iaf); + + public void updateFluidStore() { + IAEFluidStack iaf = this.getAEStoreFluidStack(); + if (iaf != null) { + this.invFluids.setFluidInSlot(0, iaf); } } } diff --git a/src/main/java/com/glodblock/github/crossmod/waila/tile/FluidInvWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/tile/FluidInvWailaDataProvider.java index 26befc36..33c41741 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/tile/FluidInvWailaDataProvider.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/tile/FluidInvWailaDataProvider.java @@ -74,7 +74,7 @@ public class FluidInvWailaDataProvider extends BaseWailaDataProvider { final int x, final int y, final int z) { - if(te instanceof TileFluidBuffer){ + if (te instanceof TileFluidBuffer) { ((TileFluidBuffer) te).updateFluidStore(); } if (te instanceof IAEFluidInventory) {