diff --git a/dependencies.gradle b/dependencies.gradle index e937915ba..fffbb7ba2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.6.41-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-465-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-469-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.1:dev') 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 337c0838a..487bb4d7f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java @@ -42,6 +42,7 @@ public class GuiDualInterface extends GuiUpgradeable { private GuiTabButton priority; private GuiTabButton switcher; private GuiImgButton BlockMode; + private GuiImgButton SmartBlockMode; private GuiToggleButton interfaceMode; private GuiImgButton insertionMode; private GuiImgButton sidelessMode; @@ -82,6 +83,9 @@ protected void addButtons() { this.BlockMode = new GuiImgButton(this.guiLeft - 18, this.guiTop + offset, Settings.BLOCK, YesNo.NO); this.buttonList.add(this.BlockMode); + this.SmartBlockMode = new GuiImgButton(this.guiLeft - 36, this.guiTop + offset, Settings.SMART_BLOCK, YesNo.NO); + this.buttonList.add(this.SmartBlockMode); + offset += 18; this.interfaceMode = new GuiToggleButton( @@ -156,7 +160,9 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final if (this.BlockMode != null) { this.BlockMode.set(((ContainerInterface) this.cvb).getBlockingMode()); } - + if (this.SmartBlockMode != null) { + this.SmartBlockMode.set(((ContainerInterface) this.cvb).getSmartBlockingMode()); + } if (this.interfaceMode != null) { this.interfaceMode.setState(((ContainerInterface) this.cvb).getInterfaceTerminalMode() == YesNo.YES); } @@ -213,6 +219,8 @@ protected void actionPerformed(final GuiButton btn) { NetworkHandler.instance.sendToServer(new PacketConfigButton(Settings.INTERFACE_TERMINAL, backwards)); } else if (btn == this.BlockMode) { NetworkHandler.instance.sendToServer(new PacketConfigButton(this.BlockMode.getSetting(), backwards)); + } else if (btn == this.SmartBlockMode) { + NetworkHandler.instance.sendToServer(new PacketConfigButton(this.SmartBlockMode.getSetting(), backwards)); } else if (btn == this.insertionMode) { NetworkHandler.instance.sendToServer(new PacketConfigButton(this.insertionMode.getSetting(), backwards)); } else if (btn == this.doublePatterns) {