From 1ea32404b2ff85fe6eaf590e439ced3aa27754e1 Mon Sep 17 00:00:00 2001 From: DreamYao520 <123301307+DreamYao520@users.noreply.github.com> Date: Mon, 28 Sep 2026 16:20:03 +0800 Subject: [PATCH] Add direct flow input to Flux Gate GUI --- .../client/gui/GUIFlowGate.java | 120 ++++++++++++++---- .../assets/draconicevolution/lang/en_US.lang | 1 + .../assets/draconicevolution/lang/zh_CN.lang | 1 + 3 files changed, 97 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java index 0356bdcf..f9c27f08 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -14,7 +15,9 @@ import org.lwjgl.input.Mouse; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.utils.GuiHelper; +import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.gates.TileGate; +import com.brandon3055.draconicevolution.common.tileentities.gates.TileFluxGate; /** * Created by Brandon on 30/6/2015. @@ -22,6 +25,7 @@ import com.brandon3055.draconicevolution.common.tileentities.gates.TileGate; public class GUIFlowGate extends GuiScreen { public TileGate tile; + private GuiTextField[] flowInputs; public GUIFlowGate(TileGate gate) { this.tile = gate; @@ -33,11 +37,20 @@ public class GUIFlowGate extends GuiScreen { int guiTop = (height / 2) - (88 / 2); buttonList.clear(); if (tile.flowOverridden) return; - buttonList.add(new GuiTextureButton(0, guiLeft + 20, guiTop + 20, 0, 108, 18, 18, "")); - buttonList.add(new GuiTextureButton(1, guiLeft + 159, guiTop + 20, 0, 54, 18, 18, "")); + int buttonY = tile instanceof TileFluxGate ? 24 : 20; + buttonList.add(new GuiTextureButton(0, guiLeft + 20, guiTop + buttonY, 0, 108, 18, 18, "")); + buttonList.add(new GuiTextureButton(1, guiLeft + 159, guiTop + buttonY, 0, 54, 18, 18, "")); - buttonList.add(new GuiTextureButton(2, guiLeft + 20, guiTop + 50, 0, 108, 18, 18, "")); - buttonList.add(new GuiTextureButton(3, guiLeft + 159, guiTop + 50, 0, 54, 18, 18, "")); + buttonList.add(new GuiTextureButton(2, guiLeft + 20, guiTop + buttonY + 30, 0, 108, 18, 18, "")); + buttonList.add(new GuiTextureButton(3, guiLeft + 159, guiTop + buttonY + 30, 0, 54, 18, 18, "")); + + if (tile instanceof TileFluxGate) { + flowInputs = new GuiTextField[2]; + for (int i = 0; i < flowInputs.length; i++) { + flowInputs[i] = new GuiTextField(fontRendererObj, guiLeft + 49, guiTop + (i == 0 ? 57 : 27), 70, 12); + flowInputs[i].setMaxStringLength(10); + } + } } @Override @@ -45,6 +58,8 @@ public class GUIFlowGate extends GuiScreen { int guiLeft = (width / 2) - (197 / 2); int guiCrt = (width / 2); int guiTop = (height / 2) - (88 / 2); + int labelY = flowInputs == null ? 20 : 17; + int buttonY = flowInputs == null ? 20 : 24; drawDefaultBackground(); ResourceHandler.bindResource("textures/gui/ToolConfig.png"); @@ -62,23 +77,23 @@ public class GUIFlowGate extends GuiScreen { StatCollector.translateToLocal("gui.de.flowGateRSHigh.name"), guiCrt - (fontRendererObj .getStringWidth(StatCollector.translateToLocal("gui.de.flowGateRSHigh.name")) / 2), - guiTop + 20, + guiTop + labelY, 0xff0000); - fontRendererObj.drawString( + if (flowInputs == null) fontRendererObj.drawString( flowRSHeigh, guiCrt - (fontRendererObj.getStringWidth(flowRSHeigh) / 2), - guiTop + 31, + guiTop + labelY + 11, 0x2c2c2c); fontRendererObj.drawString( StatCollector.translateToLocal("gui.de.flowGateRSLow.name"), guiCrt - (fontRendererObj .getStringWidth(StatCollector.translateToLocal("gui.de.flowGateRSLow.name")) / 2), - guiTop + 50, + guiTop + labelY + 30, 0x660000); - fontRendererObj.drawString( + if (flowInputs == null) fontRendererObj.drawString( flowRSLow, guiCrt - (fontRendererObj.getStringWidth(flowRSLow) / 2), - guiTop + 61, + guiTop + labelY + 41, 0x2c2c2c); } else drawCenteredString( fontRendererObj, @@ -98,37 +113,55 @@ public class GUIFlowGate extends GuiScreen { guiTop + 90, 197, 0xFFFFFF); - fontRendererObj.drawSplitString( - StatCollector.translateToLocal("gui.de.ctrlAndShift.name"), + String modifierHint = StatCollector.translateToLocal("gui.de.ctrlAndShift.name"); + fontRendererObj.drawSplitString(modifierHint, guiLeft + 200, guiTop + 5, 100, 0xFFFFFF); + if (flowInputs != null) fontRendererObj.drawSplitString( + StatCollector.translateToLocal("gui.de.flowGateInputHint.name"), guiLeft + 200, - guiTop + 5, + guiTop + Math.max( + 34, + 9 + fontRendererObj.listFormattedStringToWidth(modifierHint, 100).size() + * fontRendererObj.FONT_HEIGHT), 100, 0xFFFFFF); ResourceHandler.bindResource("textures/gui/Widgets.png"); super.drawScreen(x, y, pt); + if (flowInputs != null) { + for (int i = 0; i < flowInputs.length; i++) { + GuiTextField input = flowInputs[i]; + String value = Integer.toString(i == 0 ? tile.flowRSLow : tile.flowRSHigh); + if (!input.isFocused()) { + if (!input.getText().equals(value)) input.setText(value); + input.setTextColor(0xFFFFFF); + } + input.drawTextBox(); + fontRendererObj.drawString("RF/t", guiLeft + 123, guiTop + (i == 0 ? 59 : 29), 0x2c2c2c); + } + } + List hoverText = new ArrayList(); boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); boolean ctrl = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); - if (GuiHelper.isInRect(guiLeft + 20, guiTop + 20, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY, 18, 18, x, y)) { hoverText.add( StatCollector.translateToLocal("gui.de.decrement.name") + " " + tile.getToolTip(1, shift, ctrl)); } - if (GuiHelper.isInRect(guiLeft + 159, guiTop + 20, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY, 18, 18, x, y)) { hoverText.add( StatCollector.translateToLocal("gui.de.increment.name") + " " + tile.getToolTip(1, shift, ctrl)); } - if (GuiHelper.isInRect(guiLeft + 20, guiTop + 50, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY + 30, 18, 18, x, y)) { hoverText.add( StatCollector.translateToLocal("gui.de.decrement.name") + " " + tile.getToolTip(0, shift, ctrl)); } - if (GuiHelper.isInRect(guiLeft + 159, guiTop + 50, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY + 30, 18, 18, x, y)) { hoverText.add( StatCollector.translateToLocal("gui.de.increment.name") + " " + tile.getToolTip(0, shift, ctrl)); @@ -152,20 +185,32 @@ public class GUIFlowGate extends GuiScreen { protected void mouseClicked(int x, int y, int button) { int guiLeft = (width / 2) - (197 / 2); int guiTop = (height / 2) - (88 / 2); + int buttonY = flowInputs == null ? 20 : 24; boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); boolean ctrl = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); - if (GuiHelper.isInRect(guiLeft + 20, guiTop + 20, 18, 18, x, y)) { + if (flowInputs != null && !tile.flowOverridden) { + for (GuiTextField input : flowInputs) { + boolean wasFocused = input.isFocused(); + input.mouseClicked(x, y, button); + if (!wasFocused && input.isFocused()) { + input.setCursorPositionEnd(); + input.setSelectionPos(0); + } + } + } + + if (GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY, 18, 18, x, y)) { tile.incrementFlow(1, ctrl, shift, false, button); } - if (GuiHelper.isInRect(guiLeft + 159, guiTop + 20, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY, 18, 18, x, y)) { tile.incrementFlow(1, ctrl, shift, true, button); } - if (GuiHelper.isInRect(guiLeft + 20, guiTop + 50, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY + 30, 18, 18, x, y)) { tile.incrementFlow(0, ctrl, shift, false, button); } - if (GuiHelper.isInRect(guiLeft + 159, guiTop + 50, 18, 18, x, y)) { + if (GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY + 30, 18, 18, x, y)) { tile.incrementFlow(0, ctrl, shift, true, button); } @@ -176,23 +221,24 @@ public class GUIFlowGate extends GuiScreen { public void handleMouseInput() { int guiLeft = (width / 2) - (197 / 2); int guiTop = (height / 2) - (88 / 2); + int buttonY = flowInputs == null ? 20 : 24; int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); boolean ctrl = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); int i = org.lwjgl.input.Mouse.getEventDWheel(); - if (i != 0 && GuiHelper.isInRect(guiLeft + 20, guiTop + 20, 18, 18, x, y)) { + if (i != 0 && GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY, 18, 18, x, y)) { tile.incrementFlow(1, ctrl, shift, i < 0, 0); } - if (i != 0 && GuiHelper.isInRect(guiLeft + 159, guiTop + 20, 18, 18, x, y)) { + if (i != 0 && GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY, 18, 18, x, y)) { tile.incrementFlow(1, ctrl, shift, i > 0, 0); } - if (i != 0 && GuiHelper.isInRect(guiLeft + 20, guiTop + 50, 18, 18, x, y)) { + if (i != 0 && GuiHelper.isInRect(guiLeft + 20, guiTop + buttonY + 30, 18, 18, x, y)) { tile.incrementFlow(0, ctrl, shift, i < 0, 0); } - if (i != 0 && GuiHelper.isInRect(guiLeft + 159, guiTop + 50, 18, 18, x, y)) { + if (i != 0 && GuiHelper.isInRect(guiLeft + 159, guiTop + buttonY + 30, 18, 18, x, y)) { tile.incrementFlow(0, ctrl, shift, i > 0, 0); } @@ -208,6 +254,30 @@ public class GUIFlowGate extends GuiScreen { if (key == 1 || key == this.mc.gameSettings.keyBindInventory.getKeyCode()) { this.mc.displayGuiScreen(null); this.mc.setIngameFocus(); + return; + } + + if (flowInputs != null && !tile.flowOverridden) { + for (int i = 0; i < flowInputs.length; i++) { + GuiTextField input = flowInputs[i]; + if (!input.isFocused()) continue; + if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { + try { + int value = Integer.parseInt(input.getText()); + if (value < 0) throw new NumberFormatException(); + if (i == 0) tile.flowRSLow = value; + else tile.flowRSHigh = value; + tile.sendObjectToServer(References.INT_ID, i, value); + input.setFocused(false); + } catch (NumberFormatException ignored) { + input.setTextColor(0xFF5555); + } + } else { + input.textboxKeyTyped(p_73869_1_, key); + input.setTextColor(0xFFFFFF); + } + return; + } } } } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index acba4635..9be7d9bd 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -586,6 +586,7 @@ gui.de.flowGateOverridden.txt=Computer Override Enabled gui.de.increment.name=Increment value by gui.de.decrement.name=Decrement value by gui.de.ctrlAndShift.name=You can use Ctrl and Shift to change the increment amount. +gui.de.flowGateInputHint.name=Click a value to edit. Press Enter to apply. gui.de.pressOrScroll.name=Press Or Scroll gui.de.tempLoad.name=Temperature Load Factor gui.de.mass.name=Core Mass diff --git a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang index 42e39040..3ff31203 100644 --- a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang +++ b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang @@ -556,6 +556,7 @@ gui.de.flowGateOverridden.txt=电脑覆盖启用 gui.de.increment.name=增加值 gui.de.decrement.name=衰减值 gui.de.ctrlAndShift.name=您可以使用Ctrl和Shift调整增加的数量 +gui.de.flowGateInputHint.name=点击数值输入,按 Enter 生效。 gui.de.pressOrScroll.name=按下或滚动 gui.de.tempLoad.name=温度负载系数 gui.de.mass.name=核心质量