From a28bbe6e34328501f3d44b4ea114f2021841de7f Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Sun, 12 Feb 2023 11:55:43 +0800 Subject: [PATCH] wireless interface terminal add switch crafting status button --- ...GuiFluidPatternTerminalCraftingStatus.java | 5 ++++ .../gui/GuiInterfaceTerminalWireless.java | 24 ++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java index e872d882..d6b7e4e7 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java @@ -16,6 +16,7 @@ import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; +import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.util.Ae2ReflectClient; @@ -44,6 +45,8 @@ public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_FLUID_TERM, 1)); } else if (host instanceof WirelessPatternTerminalInventory) { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_PATTERN_TERM, 1)); + } else if (host instanceof WirelessInterfaceTerminalInventory) { + Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_INTERFACE_TERM, 1)); } super.initGui(); originalGuiBtn = Ae2ReflectClient.getOriginalGuiButton(this); @@ -62,6 +65,8 @@ public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus { InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_TERMINAL); else if (host instanceof WirelessPatternTerminalInventory) InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); + else if (host instanceof WirelessInterfaceTerminalInventory) + InventoryHandler.switchGui(GuiType.WIRELESS_INTERFACE_TERMINAL); } else { super.actionPerformed(btn); } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java index 247331c8..01ad3ed8 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java @@ -15,16 +15,10 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import appeng.api.AEApi; -import appeng.api.config.ActionItems; -import appeng.api.config.Settings; -import appeng.api.config.TerminalStyle; -import appeng.api.config.YesNo; +import appeng.api.config.*; import appeng.api.util.DimensionalCoord; import appeng.api.util.WorldCoord; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.client.gui.widgets.IDropToFillTextField; -import appeng.client.gui.widgets.MEGuiTextField; +import appeng.client.gui.widgets.*; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; import appeng.client.render.BlockPosHighlighter; @@ -43,6 +37,8 @@ import appeng.util.Platform; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.base.FCBaseMEGui; import com.glodblock.github.client.gui.container.ContainerInterfaceWireless; +import com.glodblock.github.inventory.InventoryHandler; +import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.network.CPacketRenamer; import com.glodblock.github.util.ModAndClassUtil; @@ -78,6 +74,7 @@ public class GuiInterfaceTerminalWireless extends FCBaseMEGui implements IDropTo private boolean refreshList = false; protected static boolean onlyMolecularAssemblers = false; protected static boolean onlyBrokenRecipes = false; + protected GuiTabButton craftingStatusBtn; // private final IConfigManager configSrc; private int rows = 3; @@ -179,6 +176,14 @@ public class GuiInterfaceTerminalWireless extends FCBaseMEGui implements IDropTo terminalStyleBox.xPosition = guiLeft - 18; terminalStyleBox.yPosition = guiTop + 8; + this.buttonList.add( + this.craftingStatusBtn = new GuiTabButton( + this.guiLeft + this.xSize - 24, + this.guiTop - 4, + 2 + 11 * 16, + GuiText.CraftingStatus.getLocal(), + itemRender)); + this.craftingStatusBtn.setHideEdge(13); // GuiTabButton implementation // if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui())) { setSearchString(); @@ -296,6 +301,7 @@ public class GuiInterfaceTerminalWireless extends FCBaseMEGui implements IDropTo buttonList.add(terminalStyleBox); buttonList.add(searchStringSave); + buttonList.add(craftingStatusBtn); addSwitchGuiBtns(); int offset = 51; @@ -391,6 +397,8 @@ public class GuiInterfaceTerminalWireless extends FCBaseMEGui implements IDropTo AEConfig.instance.settings.putSetting(Settings.SAVE_SEARCH, next); this.searchStringSave.set(next); + } else if (btn == craftingStatusBtn) { + InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); } else if (btn instanceof GuiImgButton) { final GuiImgButton iBtn = (GuiImgButton) btn; if (iBtn.getSetting() != Settings.ACTIONS) {