diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java index 1706debe..1b0d98c5 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java @@ -36,6 +36,7 @@ public class GuiFluidTerminal extends GuiFluidMonitor { super(inventoryPlayer, te, new ContainerFluidMonitor(inventoryPlayer, te)); this.container = new ContainerFluidMonitor(inventoryPlayer, te); this.player = inventoryPlayer.player; + this.showViewBtn = false; } @Override diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index 6f1063c8..a7a83f43 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -70,6 +70,7 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui protected int perRow = 9; protected int reservedSpace = 0; protected boolean customSortOrder = true; + protected boolean showViewBtn = true; protected int rows = 0; protected int maxRows = Integer.MAX_VALUE; protected int standardSize; @@ -204,6 +205,49 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting(Settings.SORT_BY))); offset += 20; } + if (this.showViewBtn) { + this.buttonList.add( + this.ViewBox = new GuiImgButton( + this.guiLeft - 18, + offset, + Settings.VIEW_MODE, + this.configSrc.getSetting(Settings.VIEW_MODE))); + offset += 20; + } + + this.buttonList.add( + this.SortDirBox = new GuiImgButton( + this.guiLeft - 18, + offset, + Settings.SORT_DIRECTION, + this.configSrc.getSetting(Settings.SORT_DIRECTION))); + offset += 20; + + this.buttonList.add( + this.searchBoxSettings = new GuiImgButton( + this.guiLeft - 18, + offset, + Settings.SEARCH_MODE, + AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE))); + offset += 20; + + if (ModAndClassUtil.isSaveText) { + this.buttonList.add( + this.searchStringSave = new GuiImgButton( + this.guiLeft - 18, + offset, + Settings.SAVE_SEARCH, + AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO)); + offset += 20; + } + + this.buttonList.add( + this.terminalStyleBox = new GuiImgButton( + this.guiLeft - 18, + offset, + Settings.TERMINAL_STYLE, + AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE))); + offset += 20; this.searchField = new FCGuiTextField( this.fontRendererObj, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90, 12); diff --git a/src/main/java/com/glodblock/github/crossmod/waila/part/FluidMonitorWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/part/FluidMonitorWailaDataProvider.java index 7f53e495..edac637d 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/part/FluidMonitorWailaDataProvider.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/part/FluidMonitorWailaDataProvider.java @@ -3,7 +3,6 @@ package com.glodblock.github.crossmod.waila.part; import appeng.api.parts.IPart; import appeng.api.storage.data.IAEFluidStack; import appeng.integration.modules.waila.part.BasePartWailaDataProvider; -import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.parts.base.FCPartMonitor; import com.glodblock.github.crossmod.waila.Tooltip; import com.glodblock.github.util.Util;