Improvements to the usability of the number entry widgets (Priority, Level Emitter, Craft Amount): (#4737)

- Fixed tab order
- Introduced focus state for corner buttons
- Allowed the player to enter any text, but add validation that only persist it if it is a valid number
- Enter will now confirm these dialogs and return to the previous dialog
- The text field is automatically focused and its contents are selected

src/main/java/appeng/client/gui/AEBaseScreen.java

@@ -628,15 +628,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
     }
 
     protected ITextComponent getGuiDisplayName(final ITextComponent in) {
-        return this.hasCustomInventoryName() ? new StringTextComponent(this.getInventoryName()) : in;
-    }
-
-    private boolean hasCustomInventoryName() {
-        return this.container.getCustomName() != null;
-    }
-
-    private String getInventoryName() {
-        return this.container.getCustomName();
+        return title.getString().isEmpty() ? in : title;
     }
 
     /**

src/main/java/appeng/client/gui/implementations/AESubScreen.java

@@ -55,35 +55,23 @@ final class AESubScreen {
             IPriorityHost priorityHost = (IPriorityHost) containerTarget;
             this.previousContainerIcon = priorityHost.getItemStackRepresentation();
             this.previousContainerType = ChestContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof IPriorityHost) {
+        } else if (containerTarget instanceof IPriorityHost) {
             IPriorityHost priorityHost = (IPriorityHost) containerTarget;
             this.previousContainerIcon = priorityHost.getItemStackRepresentation();
             this.previousContainerType = priorityHost.getContainerType();
-        }
-
-        else if (containerTarget instanceof WirelessTerminalGuiObject) {
+        } else if (containerTarget instanceof WirelessTerminalGuiObject) {
             this.previousContainerIcon = definitions.items().wirelessTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = WirelessTermContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof TerminalPart) {
+        } else if (containerTarget instanceof TerminalPart) {
             this.previousContainerIcon = parts.terminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = MEMonitorableContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof CraftingTerminalPart) {
+        } else if (containerTarget instanceof CraftingTerminalPart) {
             this.previousContainerIcon = parts.craftingTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = CraftingTermContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof PatternTerminalPart) {
+        } else if (containerTarget instanceof PatternTerminalPart) {
             this.previousContainerIcon = parts.patternTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = PatternTermContainer.TYPE;
-        }
-
-        else {
+        } else {
             this.previousContainerIcon = null;
             this.previousContainerType = null;
         }

src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java

@@ -48,22 +48,28 @@ public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
     public void init() {
         super.init();
 
-        this.amountToCraft = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.CRAFT_ITEM_COUNT, value -> {
-        });
+        this.amountToCraft = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.CRAFT_ITEM_COUNT);
         this.amountToCraft.setValue(1);
         this.amountToCraft.setTextFieldBounds(62, 57, 50);
         this.amountToCraft.setMinValue(1);
+        this.amountToCraft.setHideValidationIcon(true);
         this.amountToCraft.addButtons(children::add, this::addButton);
 
         this.next = this.addButton(
                 new Button(this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.text(), this::confirm));
+        this.amountToCraft.setOnConfirm(() -> this.confirm(this.next));
 
         subGui.addBackButton(this::addButton, 154, 0);
+
+        changeFocus(true);
     }
 
     private void confirm(Button button) {
-        NetworkHandler.instance()
-                .sendToServer(new CraftRequestPacket((int) this.amountToCraft.getValue(), hasShiftDown()));
+        int amount = this.amountToCraft.getIntValue().orElse(0);
+        if (amount <= 0) {
+            return;
+        }
+        NetworkHandler.instance().sendToServer(new CraftRequestPacket(amount, hasShiftDown()));
     }
 
     @Override
@@ -80,23 +86,9 @@ public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
         this.bindTexture("guis/craft_amt.png");
         GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset());
 
-        this.next.active = this.amountToCraft.getValue() > 0;
+        this.next.active = this.amountToCraft.getIntValue().orElse(0) > 0;
 
         this.amountToCraft.render(matrixStack, offsetX, offsetY, partialTicks);
     }
 
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if (keyCode == 28) {
-            this.next.onPress();
-            return true;
-        } else {
-            return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-        }
-    }
-
-    protected String getBackground() {
-        return "guis/craftAmt.png";
-    }
-
 }

src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java

@@ -57,7 +57,7 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
 
         subGui.addBackButton(btn -> {
             addButton(btn);
-            btn.setHideEdge(13);
+            btn.setHideEdge(true);
         }, 213, -4);
     }
 

src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java

@@ -35,8 +35,6 @@ import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
 
 public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer> {
 
@@ -52,15 +50,18 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
     public void init() {
         super.init();
 
-        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT,
-                this::onLevelChange);
+        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT);
         this.level.setTextFieldBounds(25, 44, 75);
         this.level.addButtons(children::add, this::addButton);
-        container.setTextField(this.level);
+        this.level.setValue(container.getReportingValue());
+        this.level.setOnChange(this::saveReportingValue);
+        this.level.setOnConfirm(this::closeScreen);
+
+        this.changeFocus(true);
     }
 
-    private void onLevelChange(long level) {
-        NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(level)));
+    private void saveReportingValue() {
+        this.level.getLongValue().ifPresent(container::setReportingValue);
     }
 
     @Override

src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java

@@ -237,7 +237,7 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
         if (this.viewCell || this instanceof WirelessTermScreen) {
             this.craftingStatusBtn = this.addButton(new TabButton(this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16,
                     GuiText.CraftingStatus.text(), this.itemRenderer, btn -> showCraftingStatus()));
-            this.craftingStatusBtn.setHideEdge(13);
+            this.craftingStatusBtn.setHideEdge(true);
         }
 
         this.isAutoFocus = SearchBoxMode.AUTOSEARCH == searchMode || SearchBoxMode.JEI_AUTOSEARCH == searchMode

src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java

@@ -2,43 +2,60 @@ package appeng.client.gui.implementations;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.function.Consumer;
-import java.util.function.LongConsumer;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
+import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
 
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.NumberEntryType;
-import appeng.client.gui.widgets.ITickingWidget;
-import appeng.client.gui.widgets.NumberBox;
+import appeng.client.gui.widgets.ConfirmableTextField;
+import appeng.client.gui.widgets.ValidationIcon;
 import appeng.core.AEConfig;
 
 /**
  * A utility widget that consists of a text-field to enter a number with
  * attached buttons to increment/decrement the number in fixed intervals.
  */
-public class NumberEntryWidget implements ITickingWidget {
+public class NumberEntryWidget extends AbstractGui {
 
+    private static final ITextComponent INVALID_NUMBER = new TranslationTextComponent(
+            "gui.appliedenergistics2.validation.InvalidNumber");
+    private static final String NUMBER_LESS_THAN_MIN_VALUE = "gui.appliedenergistics2.validation.NumberLessThanMinValue";
     private static final ITextComponent PLUS = new StringTextComponent("+");
     private static final ITextComponent MINUS = new StringTextComponent("-");
+    private static final int TEXT_COLOR_ERROR = 0xFF1900;
+    private static final int TEXT_COLOR_NORMAL = 0xFFFFFF;
 
     private final AEBaseScreen<?> parent;
 
     private final int x;
     private final int y;
 
-    private final NumberBox level;
+    private final ConfirmableTextField textField;
     private final NumberEntryType type;
     private List<Button> buttons;
+    private long minValue;
+    private ValidationIcon validationIcon;
 
-    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type,
-            LongConsumer changeListener) {
+    // Called when the value changes
+    private Runnable onChange;
+
+    // Called when the user presses enter while there's a valid number in the field
+    private Runnable onConfirm;
+
+    private boolean hideValidationIcon;
+
+    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type) {
         this.parent = parent;
         this.x = x;
         this.y = y;
@@ -47,28 +64,51 @@ public class NumberEntryWidget implements ITickingWidget {
         FontRenderer font = parent.getMinecraft().fontRenderer;
         int inputX = parent.getGuiLeft() + x;
         int inputY = parent.getGuiTop() + y;
-        this.level = new NumberBox(font, inputX, inputY, width, font.FONT_HEIGHT, type.getInputType(), changeListener);
-        this.level.setEnableBackgroundDrawing(false);
-        this.level.setMaxStringLength(16);
-        this.level.setTextColor(0xFFFFFF);
-        this.level.setVisible(true);
-        this.level.setFocused2(true);
-        parent.setFocusedDefault(this.level);
+        this.textField = new ConfirmableTextField(font, inputX, inputY, width, font.FONT_HEIGHT,
+                StringTextComponent.EMPTY);
+        this.textField.setEnableBackgroundDrawing(false);
+        this.textField.setMaxStringLength(16);
+        this.textField.setTextColor(TEXT_COLOR_NORMAL);
+        this.textField.setVisible(true);
+        this.textField.setFocused2(true);
+        parent.setFocusedDefault(this.textField);
+        this.textField.setResponder(text -> {
+            validate();
+            if (onChange != null) {
+                this.onChange.run();
+            }
+        });
+        this.textField.setOnConfirm(() -> {
+            // Only confirm if it's actually valid
+            if (this.onConfirm != null && getLongValue().isPresent()) {
+                this.onConfirm.run();
+            }
+        });
+        validate();
+    }
+
+    public void setOnConfirm(Runnable callback) {
+        this.onConfirm = callback;
+    }
+
+    public void setOnChange(Runnable callback) {
+        this.onChange = callback;
     }
 
     public void setActive(boolean active) {
-        this.level.setEnabled(active);
+        this.textField.setEnabled(active);
         this.buttons.forEach(b -> b.active = active);
     }
 
     public void setTextFieldBounds(int x, int y, int width) {
-        this.level.x = parent.getGuiLeft() + x;
-        this.level.y = parent.getGuiTop() + y;
-        this.level.setWidth(width);
+        this.textField.x = parent.getGuiLeft() + x;
+        this.textField.y = parent.getGuiTop() + y;
+        this.textField.setWidth(width);
     }
 
     public void setMinValue(long minValue) {
-        this.level.setMinValue(minValue);
+        this.minValue = minValue;
+        validate();
     }
 
     public void addButtons(Consumer<IGuiEventListener> addChildren, Consumer<Button> addButton) {
@@ -81,54 +121,116 @@ public class NumberEntryWidget implements ITickingWidget {
         int left = parent.getGuiLeft() + x;
         int top = parent.getGuiTop() + y;
 
-        List<Button> buttons = new ArrayList<>(8);
+        List<Button> buttons = new ArrayList<>(9);
 
         buttons.add(new Button(left, top, 22, 20, makeLabel(PLUS, a), btn -> addQty(a)));
         buttons.add(new Button(left + 28, top, 28, 20, makeLabel(PLUS, b), btn -> addQty(b)));
         buttons.add(new Button(left + 62, top, 32, 20, makeLabel(PLUS, c), btn -> addQty(c)));
         buttons.add(new Button(left + 100, top, 38, 20, makeLabel(PLUS, d), btn -> addQty(d)));
 
+        // Need to add these now for sensible tab-order
+        buttons.forEach(addButton);
+
         // Placing this here will give a sensible tab order
-        addChildren.accept(this.level);
+        addChildren.accept(this.textField);
 
         buttons.add(new Button(left, top + 42, 22, 20, makeLabel(MINUS, a), btn -> addQty(-a)));
         buttons.add(new Button(left + 28, top + 42, 28, 20, makeLabel(MINUS, b), btn -> addQty(-b)));
         buttons.add(new Button(left + 62, top + 42, 32, 20, makeLabel(MINUS, c), btn -> addQty(-c)));
         buttons.add(new Button(left + 100, top + 42, 38, 20, makeLabel(MINUS, d), btn -> addQty(-d)));
 
+        // This element is not focusable
+        if (!hideValidationIcon) {
+            this.validationIcon = new ValidationIcon(left + 104, top + 27);
+            buttons.add(this.validationIcon);
+        }
+
+        // Add the rest to the tab order
+        buttons.subList(4, buttons.size()).forEach(addButton);
+
         this.buttons = buttons;
-        this.buttons.forEach(addButton);
+
+        // we need to re-validate because the icon may now be present and needs it's
+        // initial state
+        this.validate();
     }
 
-    private void addQty(final long i) {
-        long currentValue = this.level.getValue();
-        long minValue = this.level.getMinValue();
-        this.level.setText(String.valueOf(Math.max(minValue, currentValue + i)));
+    /**
+     * Returns the integer value currently in the text-field, if it is a valid
+     * number and is within the allowed min/max value.
+     */
+    public OptionalInt getIntValue() {
+        String text = textField.getText().trim();
+        try {
+            int value = Integer.parseInt(text, 10);
+            if (value < minValue) {
+                return OptionalInt.empty();
+            }
+            return OptionalInt.of(value);
+        } catch (NumberFormatException ignored) {
+            return OptionalInt.empty();
+        }
     }
 
-    public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
-        this.level.render(matrixStack, mouseX, mouseY, partialTicks);
-    }
-
-    public void setValue(long value, boolean skipNotify) {
-        this.level.setValue(value, skipNotify);
+    /**
+     * Returns the long value currently in the text-field, if it is a valid number
+     * and is within the allowed min/max value.
+     */
+    public OptionalLong getLongValue() {
+        String text = textField.getText().trim();
+        try {
+            long value = Long.parseLong(text, 10);
+            if (value < minValue) {
+                return OptionalLong.empty();
+            }
+            return OptionalLong.of(value);
+        } catch (NumberFormatException ignored) {
+            return OptionalLong.empty();
+        }
     }
 
     public void setValue(long value) {
-        setValue(value, false);
+        this.textField.setText(String.valueOf(Math.max(minValue, value)));
+        this.textField.setCursorPositionEnd();
+        this.textField.setSelectionPos(0);
+        validate();
     }
 
-    public long getValue() {
-        return level.getValue();
+    private void addQty(final long i) {
+        getLongValue().ifPresent(currentValue -> setValue(currentValue + i));
     }
 
-    @Override
-    public void tick() {
-        this.level.tick();
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
+        this.textField.render(matrices, mouseX, mouseY, partialTicks);
+    }
+
+    private void validate() {
+        List<ITextComponent> validationErrors = new ArrayList<>();
+
+        String text = textField.getText().trim();
+        try {
+            long value = Long.parseLong(text, 10);
+            if (value < minValue) {
+                validationErrors.add(new TranslationTextComponent(NUMBER_LESS_THAN_MIN_VALUE, minValue));
+            }
+        } catch (NumberFormatException ignored) {
+            validationErrors.add(INVALID_NUMBER);
+        }
+
+        boolean valid = validationErrors.isEmpty();
+        this.textField.setTextColor(valid ? TEXT_COLOR_NORMAL : TEXT_COLOR_ERROR);
+        if (this.validationIcon != null) {
+            this.validationIcon.setValid(valid);
+            this.validationIcon.setTooltip(validationErrors);
+        }
     }
 
     private ITextComponent makeLabel(ITextComponent prefix, int amount) {
         return prefix.copyRaw().appendString(String.valueOf(amount));
     }
 
+    public void setHideValidationIcon(boolean hideValidationIcon) {
+        this.hideValidationIcon = hideValidationIcon;
+    }
+
 }

src/main/java/appeng/client/gui/implementations/PriorityScreen.java

@@ -18,6 +18,8 @@
 
 package appeng.client.gui.implementations;
 
+import java.util.OptionalInt;
+
 import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.entity.player.PlayerInventory;
@@ -27,8 +29,6 @@ import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.NumberEntryType;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
 
 public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
 
@@ -39,24 +39,38 @@ public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
     public PriorityScreen(PriorityContainer container, PlayerInventory playerInventory, ITextComponent title) {
         super(container, playerInventory, title);
         this.subGui = new AESubScreen(this, container.getPriorityHost());
+
+        // This is the effective size of the background image
+        xSize = 175;
+        ySize = 128;
     }
 
     @Override
     public void init() {
         super.init();
 
-        this.priority = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.PRIORITY, this::onPriorityChange);
+        this.priority = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.PRIORITY);
         this.priority.setTextFieldBounds(62, 57, 50);
         this.priority.setMinValue(Integer.MIN_VALUE);
-        container.setTextField(this.priority);
+        this.priority.setValue(this.container.getPriorityValue());
         this.priority.addButtons(children::add, this::addButton);
 
         this.subGui.addBackButton(this::addButton, 154, 0);
+
+        this.priority.setOnChange(this::savePriority);
+        this.priority.setOnConfirm(() -> {
+            savePriority();
+            this.subGui.goBack();
+        });
+
+        changeFocus(true);
     }
 
-    private void onPriorityChange(long priority) {
-        NetworkHandler.instance()
-                .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(priority)));
+    private void savePriority() {
+        OptionalInt priority = this.priority.getIntValue();
+        if (priority.isPresent()) {
+            container.setPriority(priority.getAsInt());
+        }
     }
 
     @Override
@@ -68,13 +82,10 @@ public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
     @Override
     public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX,
             final int mouseY, float partialTicks) {
-        this.bindTexture(getBackground());
+        this.bindTexture("guis/priority.png");
         blit(matrixStack, offsetX, offsetY, 0, 0, this.xSize, this.ySize);
 
         this.priority.render(matrixStack, mouseX, mouseY, partialTicks);
     }
 
-    protected String getBackground() {
-        return "guis/priority.png";
-    }
 }

src/main/java/appeng/client/gui/widgets/ConfirmableTextField.java

@@ -0,0 +1,51 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.client.gui.widgets;
+
+import org.lwjgl.glfw.GLFW;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.util.text.ITextComponent;
+
+public class ConfirmableTextField extends TextFieldWidget {
+
+    private Runnable onConfirm;
+
+    public ConfirmableTextField(FontRenderer fontRenderer, int x, int y, int width, int height, ITextComponent text) {
+        super(fontRenderer, x, y, width, height, text);
+    }
+
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (canWrite() && (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER)) {
+            if (this.onConfirm != null) {
+                this.onConfirm.run();
+            }
+            return true;
+        }
+
+        return super.keyPressed(keyCode, scanCode, modifiers);
+    }
+
+    public void setOnConfirm(Runnable onConfirm) {
+        this.onConfirm = onConfirm;
+    }
+
+}

src/main/java/appeng/client/gui/widgets/IconButton.java

@@ -22,6 +22,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
@@ -35,6 +36,10 @@ public abstract class IconButton extends Button implements ITooltip {
 
     private boolean halfSize = false;
 
+    private boolean disableClickSound = false;
+
+    private boolean disableBackground = false;
+
     public IconButton(final int x, final int y, IPressable onPress) {
         super(x, y, 16, 16, StringTextComponent.EMPTY, onPress);
     }
@@ -44,6 +49,13 @@ public abstract class IconButton extends Button implements ITooltip {
         this.active = vis;
     }
 
+    @Override
+    public void playDownSound(SoundHandler soundHandler) {
+        if (!disableClickSound) {
+            super.playDownSound(soundHandler);
+        }
+    }
+
     @Override
     public void renderButton(MatrixStack matrixStack, final int mouseX, final int mouseY, float partial) {
 
@@ -74,7 +86,9 @@ public abstract class IconButton extends Button implements ITooltip {
                 final int uv_y = iconIndex / 16;
                 final int uv_x = iconIndex - uv_y * 16;
 
-                GuiUtils.drawTexturedModalRect(0, 0, 256 - 16, 256 - 16, 16, 16, 0);
+                if (!disableBackground) {
+                    GuiUtils.drawTexturedModalRect(0, 0, 256 - 16, 256 - 16, 16, 16, 0);
+                }
                 GuiUtils.drawTexturedModalRect(0, 0, uv_x * 16, uv_y * 16, 16, 16, 0);
                 RenderSystem.popMatrix();
             } else {
@@ -87,12 +101,18 @@ public abstract class IconButton extends Button implements ITooltip {
                 final int uv_y = iconIndex / 16;
                 final int uv_x = iconIndex - uv_y * 16;
 
-                GuiUtils.drawTexturedModalRect(this.x, this.y, 256 - 16, 256 - 16, 16, 16, 0);
+                if (!disableBackground) {
+                    GuiUtils.drawTexturedModalRect(this.x, this.y, 256 - 16, 256 - 16, 16, 16, 0);
+                }
                 GuiUtils.drawTexturedModalRect(this.x, this.y, uv_x * 16, uv_y * 16, 16, 16, 0);
             }
             RenderSystem.enableDepthTest();
+            RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+            if (isHovered()) {
+                renderToolTip(matrixStack, mouseX, mouseY);
+            }
         }
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 
     protected abstract int getIconIndex();
@@ -135,4 +155,20 @@ public abstract class IconButton extends Button implements ITooltip {
         this.halfSize = halfSize;
     }
 
+    public boolean isDisableClickSound() {
+        return disableClickSound;
+    }
+
+    public void setDisableClickSound(boolean disableClickSound) {
+        this.disableClickSound = disableClickSound;
+    }
+
+    public boolean isDisableBackground() {
+        return disableBackground;
+    }
+
+    public void setDisableBackground(boolean disableBackground) {
+        this.disableBackground = disableBackground;
+    }
+
 }

src/main/java/appeng/client/gui/widgets/NumberBox.java

@@ -1,153 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.client.gui.widgets;
-
-import java.util.function.LongConsumer;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.util.text.StringTextComponent;
-
-public class NumberBox extends TextFieldWidget {
-
-    private final LongConsumer changeListener;
-
-    private long lastValue;
-
-    private long minValue = 0;
-
-    private long maxValue;
-
-    public NumberBox(final FontRenderer fontRenderer, final int x, final int y, final int width, final int height,
-            final Class<?> type, LongConsumer changeListener) {
-        super(fontRenderer, x, y, width, height, new StringTextComponent("0"));
-        this.setText("0");
-        setResponder(this::handleTextChanged);
-        this.lastValue = 0;
-        this.changeListener = changeListener;
-        if (type == int.class || type == Integer.class) {
-            maxValue = Integer.MAX_VALUE;
-        } else {
-            maxValue = Long.MAX_VALUE;
-        }
-    }
-
-    // NOTE: This method MUST NOT BE NAMED like a method in the superclass because
-    // of a ForgeGradle remapping bug
-    // since it'll not remap this method's name, but it will remap the name of the
-    // method reference above.
-    private void handleTextChanged(String text) {
-        if (text.isEmpty()) {
-            setText("0"); // Will call onTextChanged recursively
-            return;
-        }
-
-        boolean canBeNegative = canBeNegative();
-        if (canBeNegative && text.equals("-")) {
-            // Allow this as a special case to make typing in a negative number easier
-            return;
-        }
-
-        StringBuilder sanitized = new StringBuilder(text);
-        boolean encounteredNonZero = false;
-        for (int i = 0; i < sanitized.length(); i++) {
-            char ch = sanitized.charAt(i);
-            if (canBeNegative && i == 0 && ch == '-') {
-                continue; // Allow leading minus sign
-            }
-            if (ch >= '1' && ch <= '9') {
-                encounteredNonZero = true;
-                continue;
-            }
-            if (ch != '0' || !encounteredNonZero) {
-                sanitized.deleteCharAt(i--);
-            }
-        }
-        if (sanitized.length() == 0) {
-            sanitized.append('0');
-        }
-        String sanitizedStr = sanitized.toString();
-        if (!sanitizedStr.equals(text)) {
-            setText(sanitizedStr); // Will call onTextChanged recursively
-            return;
-        }
-        if (getValue() < minValue) {
-            setText(String.valueOf(minValue)); // Will call onTextChanged recursively
-            return;
-        }
-        if (getValue() > maxValue) {
-            setText(String.valueOf(maxValue)); // Will call onTextChanged recursively
-            return;
-        }
-
-        reportChange();
-    }
-
-    private void reportChange() {
-        long value = getValue();
-        if (value != lastValue) {
-            lastValue = value;
-            changeListener.accept(value);
-        }
-    }
-
-    public void setValue(long value, boolean skipNotify) {
-        // This check avoid changing the cursor position needlessly
-        if (value == this.getValue()) {
-            return;
-        }
-
-        if (skipNotify) {
-            lastValue = value;
-        }
-        setText(String.valueOf(value));
-    }
-
-    public long getValue() {
-        if (getText().equals("-") && canBeNegative()) {
-            return lastValue; // Allow this as a special case to type in a negative number more easily
-        }
-
-        return Long.parseLong(getText());
-    }
-
-    @Override
-    public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) {
-        if (super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) {
-            return true;
-        }
-
-        // Swallow key presses for numbers because they would otherwise trigger the
-        // hotbar swapping unintentionally
-        return isFocused() && p_keyPressed_1_ >= '0' && p_keyPressed_1_ <= '9';
-    }
-
-    public void setMinValue(long minValue) {
-        this.minValue = minValue;
-    }
-
-    public long getMinValue() {
-        return minValue;
-    }
-
-    private boolean canBeNegative() {
-        return minValue < 0;
-    }
-
-}

src/main/java/appeng/client/gui/widgets/TabButton.java

@@ -33,7 +33,7 @@ public class TabButton extends Button implements ITooltip {
     public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2",
             "textures/guis/states.png");
     private final ItemRenderer itemRenderer;
-    private int hideEdge = 0;
+    private boolean hideEdge;
     private int myIcon = -1;
     private ItemStack myItem;
 
@@ -71,14 +71,17 @@ public class TabButton extends Button implements ITooltip {
 
             RenderSystem.enableAlphaTest();
 
-            int uv_x = (this.hideEdge > 0 ? 11 : 13);
+            // Selects the button border from the sprite-sheet, where each type occupies a
+            // 2x2 slot
+            int uv_x = 8 + (this.hideEdge ? 0 : 2);
+            int uv_y = 12 + (this.isFocused() ? 2 : 0);
 
-            final int offsetX = this.hideEdge > 0 ? 1 : 0;
+            final int offsetX = this.hideEdge ? 1 : 0;
 
-            blit(matrixStack, this.x, this.y, uv_x * 16, 0, 25, 22);
+            blit(matrixStack, this.x, this.y, uv_x * 16, uv_y * 16, 25, 22);
 
             if (this.myIcon >= 0) {
-                final int uv_y = this.myIcon / 16;
+                uv_y = this.myIcon / 16;
                 uv_x = this.myIcon - uv_y * 16;
 
                 blit(matrixStack, offsetX + this.x + 3, this.y + 3, uv_x * 16, uv_y * 16, 16, 16);
@@ -128,11 +131,11 @@ public class TabButton extends Button implements ITooltip {
         return this.visible;
     }
 
-    public int getHideEdge() {
+    public boolean getHideEdge() {
         return this.hideEdge;
     }
 
-    public void setHideEdge(final int hideEdge) {
+    public void setHideEdge(final boolean hideEdge) {
         this.hideEdge = hideEdge;
     }
 }

src/main/java/appeng/client/gui/widgets/ValidationIcon.java

@@ -0,0 +1,65 @@
+package appeng.client.gui.widgets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.mojang.blaze3d.matrix.MatrixStack;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.util.text.ITextComponent;
+
+/**
+ * Displays a small icon that shows validation errors for some input control.
+ */
+public class ValidationIcon extends IconButton {
+
+    private final List<ITextComponent> tooltip = new ArrayList<>();
+
+    private boolean valid;
+
+    public ValidationIcon(int x, int y) {
+        super(x, y, btn -> {
+        });
+        setDisableBackground(true);
+        setDisableClickSound(true);
+        setHalfSize(true);
+    }
+
+    public void setValid(boolean valid) {
+        setVisibility(!valid);
+        if (valid) {
+            this.tooltip.clear();
+        }
+    }
+
+    public void setTooltip(List<ITextComponent> lines) {
+        this.tooltip.clear();
+        this.tooltip.addAll(lines);
+    }
+
+    @Override
+    protected int getIconIndex() {
+        return 16 * 8;
+    }
+
+    @Override
+    public boolean changeFocus(boolean flag) {
+        return false; // Cannot focus this element
+    }
+
+    @Override
+    public void renderToolTip(MatrixStack matrices, int mouseX, int mouseY) {
+        if (this.tooltip.isEmpty()) {
+            return;
+        }
+
+        Minecraft client = Minecraft.getInstance();
+        Screen screen = client.currentScreen;
+        if (screen == null) {
+            return;
+        }
+
+        screen.renderToolTip(matrices, this.tooltip, x, y, client.fontRenderer);
+    }
+}