From d712c01657f5ed631d6faa3cfc98be1a1588352f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Dip=C4=8D=C3=A1r?= <492666@mail.muni.cz> Date: Sat, 3 Dec 2022 23:28:20 +0100 Subject: [PATCH] Make DualInterface behaviour correspond to sideless setting --- .../glodblock/github/client/gui/GuiFluidInterface.java | 3 +++ .../github/common/tile/TileFluidInterface.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java index b8a50d3a..b08677c0 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java @@ -84,6 +84,9 @@ public class GuiFluidInterface extends AEBaseGui { mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); for (int i = 0; i < 6; i++) { + if (!isPart()) { + fontRendererObj.drawString(dirName(i), TANK_X + i * TANK_X_OFF + 5, 22, 0x404040); + } renderFluidIntoGui(TANK_X + i * TANK_X_OFF, TANK_Y, TANK_WIDTH, TANK_HEIGHT, fluidInv.getFluidInSlot(i), fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity); } diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java index d04240a9..7e8fbe3c 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java @@ -10,6 +10,7 @@ import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.util.IConfigManager; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; import appeng.tile.inventory.AppEngInternalAEInventory; @@ -43,9 +44,16 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler, } private final DualityFluidInterface fluidDuality = new DualityFluidInterface(this.getProxy(), this) { + private final IConfigManager dualityConfigManager = getInterfaceDuality().getConfigManager(); + @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return this.getTanks().drain(from, maxDrain, doDrain); + SidelessMode mode = (SidelessMode) dualityConfigManager.getSetting(Settings.SIDELESS_MODE); + if (mode == SidelessMode.SIDELESS) { + return this.getTanks().drain(from, maxDrain, doDrain); + } + + return this.getTanks().drain(from.ordinal(), maxDrain, doDrain); } }; private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);