From e54d274b887b1484a601fceb7b4f5ee06bd70334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Dip=C4=8D=C3=A1r?= <492666@mail.muni.cz> Date: Sun, 4 Dec 2022 13:16:26 +0100 Subject: [PATCH] Fix button visible in part interface --- .../github/client/gui/GuiDualInterface.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java index 6a1835ef..07dca5cb 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java @@ -62,8 +62,10 @@ public class GuiDualInterface extends GuiUpgradeable { this.insertionMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 44, Settings.INSERTION_MODE, InsertionMode.DEFAULT ); this.buttonList.add( this.insertionMode ); - this.sidelessMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 62, Settings.SIDELESS_MODE, SidelessMode.SIDELESS); - this.buttonList.add( this.sidelessMode ); + if (isTile()) { + this.sidelessMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 62, Settings.SIDELESS_MODE, SidelessMode.SIDELESS); + this.buttonList.add( this.sidelessMode ); + } } @Override @@ -115,20 +117,20 @@ public class GuiDualInterface extends GuiUpgradeable { if( btn == this.priority ) { - if (host instanceof TileFluidInterface) { + if (isTile()) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_PRIORITY)); } - else if(host instanceof PartFluidInterface) { + else if(isPart()) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_PRIORITY_PART)); } } if( btn == this.switcher ) { - if (host instanceof TileFluidInterface) { + if (isTile()) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_FLUID)); } - else if (host instanceof PartFluidInterface) { + else if (isPart()) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_FLUID_PART)); } } @@ -146,9 +148,17 @@ public class GuiDualInterface extends GuiUpgradeable { { NetworkHandler.instance.sendToServer( new PacketConfigButton( this.insertionMode.getSetting(), backwards ) ); } - if (btn == this.sidelessMode) + if (btn == this.sidelessMode && this.sidelessMode != null) { NetworkHandler.instance.sendToServer( new PacketConfigButton( this.sidelessMode.getSetting(), backwards ) ); } } + + private boolean isPart() { + return this.host instanceof PartFluidInterface; + } + + private boolean isTile() { + return this.host instanceof TileFluidInterface; + } }