Merge pull request #4486 from AppliedEnergistics/number-entry-dialogs

Number Entry Dialogs

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

@@ -35,6 +35,7 @@ import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.gui.widget.Widget;
 import net.minecraft.client.renderer.BufferBuilder;
@@ -60,6 +61,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
+import appeng.client.gui.widgets.ITickingWidget;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.me.InternalSlotME;
@@ -88,6 +90,9 @@ import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 
 public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerScreen<T> {
+
+    public static final int COLOR_DARK_GRAY = 4210752;
+
     private final List<InternalSlotME> meSlots = new ArrayList<>();
     // drag y
     private final Set<Slot> drag_click = new HashSet<>();
@@ -781,4 +786,14 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
     protected List<InternalSlotME> getMeSlots() {
         return this.meSlots;
     }
+
+    public void tick() {
+        super.tick();
+        for (IGuiEventListener child : children) {
+            if (child instanceof ITickingWidget) {
+                ((ITickingWidget) child).tick();
+            }
+        }
+    }
+
 }

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

@@ -0,0 +1,16 @@
+package appeng.client.gui;
+
+public enum NumberEntryType {
+    CRAFT_ITEM_COUNT(Long.class), PRIORITY(Long.class), LEVEL_ITEM_COUNT(Long.class), LEVEL_FLUID_VOLUME(Long.class);
+
+    private final Class<? extends Number> inputType;
+
+    NumberEntryType(Class<? extends Number> inputType) {
+        this.inputType = inputType;
+    }
+
+    public Class<? extends Number> getInputType() {
+        return inputType;
+    }
+
+}

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

@@ -19,15 +19,13 @@
 package appeng.client.gui.implementations;
 
 import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.client.gui.AEBaseScreen;
-import appeng.client.gui.widgets.NumberBox;
+import appeng.client.gui.NumberEntryType;
 import appeng.container.implementations.CraftAmountContainer;
-import appeng.core.AEConfig;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.CraftRequestPacket;
@@ -35,7 +33,7 @@ import appeng.core.sync.packets.CraftRequestPacket;
 public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
     private final AESubScreen subGui;
 
-    private NumberBox amountToCraft;
+    private NumberEntryWidget amountToCraft;
 
     private Button next;
 
@@ -48,39 +46,22 @@ public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
     public void init() {
         super.init();
 
-        final int a = AEConfig.instance().craftItemsByStackAmounts(0);
+        this.amountToCraft = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.CRAFT_ITEM_COUNT, value -> {
-        final int b = AEConfig.instance().craftItemsByStackAmounts(1);
+        });
-        final int c = AEConfig.instance().craftItemsByStackAmounts(2);
+        this.amountToCraft.setValue(1);
-        final int d = AEConfig.instance().craftItemsByStackAmounts(3);
+        this.amountToCraft.setTextFieldBounds(62, 57, 50);
-
+        this.amountToCraft.setMinValue(1);
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a, btn -> addQty(a)));
+        this.amountToCraft.addButtons(children::add, this::addButton);
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b, btn -> addQty(b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 26, 32, 20, "+" + c, btn -> addQty(c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 26, 38, 20, "+" + d, btn -> addQty(d)));
-
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 75, 22, 20, "-" + a, btn -> addQty(-a)));
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 75, 28, 20, "-" + b, btn -> addQty(-b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 75, 32, 20, "-" + c, btn -> addQty(-c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 75, 38, 20, "-" + d, btn -> addQty(-d)));
 
         this.next = this.addButton(
                 new Button(this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal(), this::confirm));
 
         subGui.addBackButton(this::addButton, 154, 0);
-
-        this.amountToCraft = new NumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT,
-                Integer.class);
-        this.amountToCraft.setEnableBackgroundDrawing(false);
-        this.amountToCraft.setMaxStringLength(16);
-        this.amountToCraft.setTextColor(0xFFFFFF);
-        this.amountToCraft.setVisible(true);
-        this.amountToCraft.setFocused2(true);
-        this.amountToCraft.setText("1");
     }
 
     private void confirm(Button button) {
         NetworkHandler.instance()
-                .sendToServer(new CraftRequestPacket(Integer.parseInt(this.amountToCraft.getText()), hasShiftDown()));
+                .sendToServer(new CraftRequestPacket((int) this.amountToCraft.getValue(), hasShiftDown()));
     }
 
     @Override
@@ -95,99 +76,23 @@ public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
         this.bindTexture("guis/craft_amt.png");
         GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset());
 
-        try {
+        this.next.active = this.amountToCraft.getValue() > 0;
-            Long.parseLong(this.amountToCraft.getText());
-            this.next.active = !this.amountToCraft.getText().isEmpty();
-        } catch (final NumberFormatException e) {
-            this.next.active = false;
-        }
 
         this.amountToCraft.render(offsetX, offsetY, partialTicks);
     }
 
-    @Override
-    public boolean charTyped(char ch, int p_charTyped_2_) {
-        // Forward entered text to the craft amount text-field
-        return this.amountToCraft.charTyped(ch, p_charTyped_2_);
-    }
-
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) {
+        if (keyCode == 28) {
-            if (keyCode == 28) {
+            this.next.onPress();
-                this.next.onPress();
+            return true;
-            }
+        } else {
-            if ((keyCode == 211 || keyCode == 205 || keyCode == 203 || keyCode == 14)
+            return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-                    && this.amountToCraft.keyPressed(keyCode, scanCode, p_keyPressed_3_)) {
-                try {
-                    String out = this.amountToCraft.getText();
-
-                    boolean fixed = false;
-                    while (out.startsWith("0") && out.length() > 1) {
-                        out = out.substring(1);
-                        fixed = true;
-                    }
-
-                    if (fixed) {
-                        this.amountToCraft.setText(out);
-                    }
-
-                    if (out.isEmpty()) {
-                        out = "0";
-                    }
-
-                    final long result = Long.parseLong(out);
-                    if (result < 0) {
-                        this.amountToCraft.setText("1");
-                    }
-                } catch (final NumberFormatException e) {
-                    // :P
-                }
-                return true;
-            }
-        }
-
-        return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-    }
-
-    private void addQty(final int i) {
-        try {
-            String out = this.amountToCraft.getText();
-
-            boolean fixed = false;
-            while (out.startsWith("0") && out.length() > 1) {
-                out = out.substring(1);
-                fixed = true;
-            }
-
-            if (fixed) {
-                this.amountToCraft.setText(out);
-            }
-
-            if (out.isEmpty()) {
-                out = "0";
-            }
-
-            long result = Integer.parseInt(out);
-
-            if (result == 1 && i > 1) {
-                result = 0;
-            }
-
-            result += i;
-            if (result < 1) {
-                result = 1;
-            }
-
-            out = Long.toString(result);
-            Integer.parseInt(out);
-            this.amountToCraft.setText(out);
-        } catch (final NumberFormatException e) {
-            // :P
         }
     }
 
     protected String getBackground() {
         return "guis/craftAmt.png";
     }
+
 }

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

@@ -18,39 +18,27 @@
 
 package appeng.client.gui.implementations;
 
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.LevelType;
+import appeng.api.config.PowerUnits;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
 import appeng.api.config.YesNo;
-import appeng.client.gui.widgets.NumberBox;
+import appeng.client.gui.NumberEntryType;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.container.implementations.LevelEmitterContainer;
-import appeng.core.AEConfig;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 
 public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer> {
 
-    private NumberBox level;
+    private NumberEntryWidget level;
-
-    private Button plus1;
-    private Button plus10;
-    private Button plus100;
-    private Button plus1000;
-    private Button minus1;
-    private Button minus10;
-    private Button minus100;
-    private Button minus1000;
-
     private SettingToggleButton<LevelType> levelMode;
     private SettingToggleButton<YesNo> craftingMode;
 
@@ -62,16 +50,17 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
     public void init() {
         super.init();
 
-        this.level = new NumberBox(this.font, this.guiLeft + 24, this.guiTop + 43, 79, this.font.FONT_HEIGHT,
+        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT,
-                Long.class);
+                this::onLevelChange);
-        this.level.setEnableBackgroundDrawing(false);
+        this.level.setTextFieldBounds(25, 44, 75);
-        this.level.setMaxStringLength(16);
+        this.level.addButtons(children::add, this::addButton);
-        this.level.setTextColor(0xFFFFFF);
-        this.level.setVisible(true);
-        this.level.setFocused2(true);
         container.setTextField(this.level);
     }
 
+    private void onLevelChange(long level) {
+        NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(level)));
+    }
+
     @Override
     protected void addButtons() {
         this.levelMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.LEVEL_TYPE,
@@ -82,29 +71,6 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
                 FuzzyMode.IGNORE_ALL);
         this.craftingMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48,
                 Settings.CRAFT_VIA_REDSTONE, YesNo.NO);
-
-        final int a = AEConfig.instance().levelByStackAmounts(0);
-        final int b = AEConfig.instance().levelByStackAmounts(1);
-        final int c = AEConfig.instance().levelByStackAmounts(2);
-        final int d = AEConfig.instance().levelByStackAmounts(3);
-
-        this.addButton(this.plus1 = new Button(this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a, btn -> addQty(a)));
-        this.addButton(
-                this.plus10 = new Button(this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b, btn -> addQty(b)));
-        this.addButton(
-                this.plus100 = new Button(this.guiLeft + 82, this.guiTop + 17, 32, 20, "+" + c, btn -> addQty(c)));
-        this.addButton(
-                this.plus1000 = new Button(this.guiLeft + 120, this.guiTop + 17, 38, 20, "+" + d, btn -> addQty(d)));
-
-        this.addButton(
-                this.minus1 = new Button(this.guiLeft + 20, this.guiTop + 59, 22, 20, "-" + a, btn -> addQty(-a)));
-        this.addButton(
-                this.minus10 = new Button(this.guiLeft + 48, this.guiTop + 59, 28, 20, "-" + b, btn -> addQty(-b)));
-        this.addButton(
-                this.minus100 = new Button(this.guiLeft + 82, this.guiTop + 59, 32, 20, "-" + c, btn -> addQty(-c)));
-        this.addButton(
-                this.minus1000 = new Button(this.guiLeft + 120, this.guiTop + 59, 38, 20, "-" + d, btn -> addQty(-d)));
-
         this.addButton(this.levelMode);
         this.addButton(this.redstoneMode);
         this.addButton(this.craftingMode);
@@ -115,15 +81,7 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
         final boolean notCraftingMode = this.bc.getInstalledUpgrades(Upgrades.CRAFTING) == 0;
 
         // configure enabled status...
-        this.level.setEnabled(notCraftingMode);
+        this.level.setActive(notCraftingMode);
-        this.plus1.active = notCraftingMode;
-        this.plus10.active = notCraftingMode;
-        this.plus100.active = notCraftingMode;
-        this.plus1000.active = notCraftingMode;
-        this.minus1.active = notCraftingMode;
-        this.minus10.active = notCraftingMode;
-        this.minus100.active = notCraftingMode;
-        this.minus1000.active = notCraftingMode;
         this.levelMode.active = notCraftingMode;
         this.redstoneMode.active = notCraftingMode;
 
@@ -134,7 +92,14 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
         }
 
         if (this.levelMode != null) {
-            this.levelMode.set(((LevelEmitterContainer) this.cvb).getLevelMode());
+            LevelType currentLevelMode = ((LevelEmitterContainer) this.cvb).getLevelMode();
+            this.levelMode.set(currentLevelMode);
+
+            if (notCraftingMode) {
+                if (currentLevelMode == LevelType.ENERGY_LEVEL) {
+                    this.font.drawString(PowerUnits.AE.textComponent().getString(), 110, 44, COLOR_DARK_GRAY);
+                }
+            }
         }
     }
 
@@ -160,70 +125,4 @@ public class LevelEmitterScreen extends UpgradeableScreen<LevelEmitterContainer>
         return GuiText.LevelEmitter;
     }
 
-    private void addQty(final long i) {
-        try {
-            String Out = this.level.getText();
-
-            boolean Fixed = false;
-            while (Out.startsWith("0") && Out.length() > 1) {
-                Out = Out.substring(1);
-                Fixed = true;
-            }
-
-            if (Fixed) {
-                this.level.setText(Out);
-            }
-
-            if (Out.isEmpty()) {
-                Out = "0";
-            }
-
-            long result = Long.parseLong(Out);
-            result += i;
-            if (result < 0) {
-                result = 0;
-            }
-
-            this.level.setText(Out = Long.toString(result));
-
-            NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out));
-        } catch (final NumberFormatException e) {
-            // nope..
-            this.level.setText("0");
-        }
-    }
-
-    @Override
-    public boolean charTyped(char character, int key) {
-        // Forward entered characters to the number-text-field
-        return level.charTyped(character, key);
-    }
-
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) {
-            if (keyCode == 211 || keyCode == 205 || keyCode == 203 || keyCode == 14) {
-                String Out = this.level.getText();
-
-                boolean Fixed = false;
-                while (Out.startsWith("0") && Out.length() > 1) {
-                    Out = Out.substring(1);
-                    Fixed = true;
-                }
-
-                if (Fixed) {
-                    this.level.setText(Out);
-                }
-
-                if (Out.isEmpty()) {
-                    Out = "0";
-                }
-
-                NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out));
-                return true;
-            }
-        }
-
-        return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-    }
 }

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

@@ -0,0 +1,130 @@
+package appeng.client.gui.implementations;
+
+import java.util.function.Consumer;
+import java.util.function.LongConsumer;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.IGuiEventListener;
+import net.minecraft.client.gui.widget.button.Button;
+
+import appeng.client.gui.AEBaseScreen;
+import appeng.client.gui.NumberEntryType;
+import appeng.client.gui.widgets.ITickingWidget;
+import appeng.client.gui.widgets.NumberBox;
+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 {
+
+    private final AEBaseScreen<?> parent;
+
+    private final int x;
+    private final int y;
+
+    private final NumberBox level;
+    private final NumberEntryType type;
+    private Button plus1;
+    private Button plus10;
+    private Button plus100;
+    private Button plus1000;
+    private Button minus1;
+    private Button minus10;
+    private Button minus100;
+    private Button minus1000;
+
+    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type,
+            LongConsumer changeListener) {
+        this.parent = parent;
+        this.x = x;
+        this.y = y;
+        this.type = type;
+
+        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);
+    }
+
+    public void setActive(boolean active) {
+        this.level.setEnabled(active);
+        this.plus1.active = active;
+        this.plus10.active = active;
+        this.plus100.active = active;
+        this.plus1000.active = active;
+        this.minus1.active = active;
+        this.minus10.active = active;
+        this.minus100.active = active;
+        this.minus1000.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);
+    }
+
+    public void setMinValue(long minValue) {
+        this.level.setMinValue(minValue);
+    }
+
+    public void addButtons(Consumer<IGuiEventListener> addChildren, Consumer<Button> addButton) {
+        final int[] steps = AEConfig.instance().getNumberEntrySteps(type);
+        int a = steps[0];
+        int b = steps[1];
+        int c = steps[2];
+        int d = steps[3];
+
+        int left = parent.getGuiLeft() + x;
+        int top = parent.getGuiTop() + y;
+
+        addButton.accept(this.plus1 = new Button(left, top, 22, 20, "+" + a, btn -> addQty(a)));
+        addButton.accept(this.plus10 = new Button(left + 28, top, 28, 20, "+" + b, btn -> addQty(b)));
+        addButton.accept(this.plus100 = new Button(left + 62, top, 32, 20, "+" + c, btn -> addQty(c)));
+        addButton.accept(this.plus1000 = new Button(left + 100, top, 38, 20, "+" + d, btn -> addQty(d)));
+
+        // Placing this here will give a sensible tab order
+        addChildren.accept(this.level);
+
+        addButton.accept(this.minus1 = new Button(left, top + 42, 22, 20, "-" + a, btn -> addQty(-a)));
+        addButton.accept(this.minus10 = new Button(left + 28, top + 42, 28, 20, "-" + b, btn -> addQty(-b)));
+        addButton.accept(this.minus100 = new Button(left + 62, top + 42, 32, 20, "-" + c, btn -> addQty(-c)));
+        addButton.accept(this.minus1000 = new Button(left + 100, top + 42, 38, 20, "-" + d, btn -> addQty(-d)));
+    }
+
+    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)));
+    }
+
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        this.level.render(mouseX, mouseY, partialTicks);
+    }
+
+    public void setValue(long value, boolean skipNotify) {
+        this.level.setValue(value, skipNotify);
+    }
+
+    public void setValue(long value) {
+        setValue(value, false);
+    }
+
+    public long getValue() {
+        return level.getValue();
+    }
+
+    @Override
+    public void tick() {
+        this.level.tick();
+    }
+
+}

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

@@ -18,15 +18,12 @@
 
 package appeng.client.gui.implementations;
 
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.AEBaseScreen;
-import appeng.client.gui.widgets.NumberBox;
+import appeng.client.gui.NumberEntryType;
 import appeng.container.implementations.PriorityContainer;
-import appeng.core.AEConfig;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
@@ -35,7 +32,7 @@ public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
 
     private final AESubScreen subGui;
 
-    private NumberBox priority;
+    private NumberEntryWidget priority;
 
     public PriorityScreen(PriorityContainer container, PlayerInventory playerInventory, ITextComponent title) {
         super(container, playerInventory, title);
@@ -46,31 +43,18 @@ public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
     public void init() {
         super.init();
 
-        final int a = AEConfig.instance().priorityByStacksAmounts(0);
+        this.priority = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.PRIORITY, this::onPriorityChange);
-        final int b = AEConfig.instance().priorityByStacksAmounts(1);
+        this.priority.setTextFieldBounds(62, 57, 50);
-        final int c = AEConfig.instance().priorityByStacksAmounts(2);
+        this.priority.setMinValue(Integer.MIN_VALUE);
-        final int d = AEConfig.instance().priorityByStacksAmounts(3);
+        container.setTextField(this.priority);
-
+        this.priority.addButtons(children::add, this::addButton);
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 32, 22, 20, "+" + a, btn -> addQty(a)));
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 32, 28, 20, "+" + b, btn -> addQty(b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 32, 32, 20, "+" + c, btn -> addQty(c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 32, 38, 20, "+" + d, btn -> addQty(d)));
-
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 69, 22, 20, "-" + a, btn -> addQty(-a)));
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 69, 28, 20, "-" + b, btn -> addQty(-b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 69, 32, 20, "-" + c, btn -> addQty(-c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 69, 38, 20, "-" + d, btn -> addQty(-d)));
 
         this.subGui.addBackButton(this::addButton, 154, 0);
+    }
 
-        this.priority = new NumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT,
+    private void onPriorityChange(long priority) {
-                Long.class);
+        NetworkHandler.instance()
-        this.priority.setEnableBackgroundDrawing(false);
+                .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(priority)));
-        this.priority.setMaxStringLength(16);
-        this.priority.setTextColor(0xFFFFFF);
-        this.priority.setVisible(true);
-        this.priority.setFocused2(true);
-        container.setTextField(this.priority);
     }
 
     @Override
@@ -86,90 +70,6 @@ public class PriorityScreen extends AEBaseScreen<PriorityContainer> {
         this.priority.render(mouseX, mouseY, partialTicks);
     }
 
-    private void addQty(final int i) {
-        try {
-            String out = this.priority.getText();
-
-            boolean fixed = false;
-            while (out.startsWith("0") && out.length() > 1) {
-                out = out.substring(1);
-                fixed = true;
-            }
-
-            if (fixed) {
-                this.priority.setText(out);
-            }
-
-            if (out.isEmpty()) {
-                out = "0";
-            }
-
-            long result = Long.parseLong(out);
-            result += i;
-
-            this.priority.setText(out = Long.toString(result));
-
-            NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out));
-        } catch (final NumberFormatException e) {
-            // nope..
-            this.priority.setText("0");
-        }
-    }
-
-    @Override
-    public boolean charTyped(char character, int key) {
-        if (priority.charTyped(character, key)) {
-            String out = this.priority.getText();
-
-            boolean fixed = false;
-            while (out.startsWith("0") && out.length() > 1) {
-                out = out.substring(1);
-                fixed = true;
-            }
-
-            if (fixed) {
-                this.priority.setText(out);
-            }
-
-            if (out.isEmpty()) {
-                out = "0";
-            }
-
-            NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out));
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) {
-            if ((keyCode == 211 || keyCode == 205 || keyCode == 203 || keyCode == 14)
-                    && this.priority.keyPressed(keyCode, scanCode, p_keyPressed_3_)) {
-                String out = this.priority.getText();
-
-                boolean fixed = false;
-                while (out.startsWith("0") && out.length() > 1) {
-                    out = out.substring(1);
-                    fixed = true;
-                }
-
-                if (fixed) {
-                    this.priority.setText(out);
-                }
-
-                if (out.isEmpty()) {
-                    out = "0";
-                }
-
-                NetworkHandler.instance().sendToServer(new ConfigValuePacket("PriorityHost.Priority", out));
-                return true;
-            }
-        }
-
-        return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-    }
-
     protected String getBackground() {
         return "guis/priority.png";
     }

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

@@ -0,0 +1,13 @@
+package appeng.client.gui.widgets;
+
+import net.minecraft.client.gui.screen.Screen;
+
+/**
+ * Indicates that a widget (anything that is in the {@link Screen#children()}
+ * list) should receive callbacks every tick.
+ */
+public interface ITickingWidget {
+
+    void tick();
+
+}

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

@@ -18,35 +18,131 @@
 
 package appeng.client.gui.widgets;
 
+import java.util.function.LongConsumer;
+
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 
-// FIXME: Fix this piece of crap (i.e. onChange listener)
 public class NumberBox extends TextFieldWidget {
 
-    private final Class type;
+    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) {
+            final Class<?> type, LongConsumer changeListener) {
         super(fontRenderer, x, y, width, height, "0");
-        this.type = type;
+        this.setText("0");
+        setResponder(this::onTextChanged);
+        this.lastValue = 0;
+        this.changeListener = changeListener;
+        if (type == int.class || type == Integer.class) {
+            maxValue = Integer.MAX_VALUE;
+        } else {
+            maxValue = Long.MAX_VALUE;
+        }
+    }
+
+    private void onTextChanged(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 void writeText(final String selectedText) {
+    public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) {
-        final String original = this.getText();
+        if (super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) {
-        super.writeText(selectedText);
+            return true;
-
-        try {
-            if (this.type == int.class || this.type == Integer.class) {
-                Integer.parseInt(this.getText());
-            } else if (this.type == long.class || this.type == Long.class) {
-                Long.parseLong(this.getText());
-            } else if (this.type == double.class || this.type == Double.class) {
-                Double.parseDouble(this.getText());
-            }
-        } catch (final NumberFormatException e) {
-            this.setText(original);
         }
+
+        // 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/container/implementations/LevelEmitterContainer.java

@@ -18,7 +18,6 @@
 
 package appeng.container.implementations;
 
-import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
@@ -33,6 +32,7 @@ import appeng.api.config.RedstoneMode;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Settings;
 import appeng.api.config.YesNo;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.FakeTypeOnlySlot;
@@ -58,7 +58,7 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     private final LevelEmitterPart lvlEmitter;
 
     @OnlyIn(Dist.CLIENT)
-    private TextFieldWidget textField;
+    private NumberEntryWidget textField;
     @GuiSync(2)
     public LevelType lvType;
     @GuiSync(3)
@@ -72,9 +72,9 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     }
 
     @OnlyIn(Dist.CLIENT)
-    public void setTextField(final TextFieldWidget level) {
+    public void setTextField(final NumberEntryWidget level) {
         this.textField = level;
-        this.textField.setText(String.valueOf(this.EmitterValue));
+        this.textField.setValue(this.EmitterValue);
     }
 
     public void setLevel(final long l, final PlayerEntity player) {
@@ -104,7 +104,7 @@ public class LevelEmitterContainer extends UpgradeableContainer {
 
         final IItemHandler inv = this.getUpgradeable().getInventoryByName("config");
         final int y = 40;
-        final int x = 80 + 44;
+        final int x = 80 + 57;
         this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y));
     }
 
@@ -140,7 +140,7 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     public void onUpdate(final String field, final Object oldValue, final Object newValue) {
         if (field.equals("EmitterValue")) {
             if (this.textField != null) {
-                this.textField.setText(String.valueOf(this.EmitterValue));
+                this.textField.setValue(this.EmitterValue);
             }
         }
     }

src/main/java/appeng/container/implementations/PriorityContainer.java

@@ -18,7 +18,6 @@
 
 package appeng.container.implementations;
 
-import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
@@ -29,6 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.parts.IPart;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
@@ -53,7 +53,8 @@ public class PriorityContainer extends AEBaseContainer {
     private final IPriorityHost priHost;
 
     @OnlyIn(Dist.CLIENT)
-    private TextFieldWidget textField;
+    private NumberEntryWidget textField;
+
     @GuiSync(2)
     public long PriorityValue = -1;
 
@@ -64,9 +65,9 @@ public class PriorityContainer extends AEBaseContainer {
     }
 
     @OnlyIn(Dist.CLIENT)
-    public void setTextField(final TextFieldWidget level) {
+    public void setTextField(final NumberEntryWidget level) {
         this.textField = level;
-        this.textField.setText(String.valueOf(this.PriorityValue));
+        this.textField.setValue(this.PriorityValue, true);
     }
 
     public void setPriority(final int newValue, final PlayerEntity player) {
@@ -88,7 +89,7 @@ public class PriorityContainer extends AEBaseContainer {
     public void onUpdate(final String field, final Object oldValue, final Object newValue) {
         if (field.equals("PriorityValue")) {
             if (this.textField != null) {
-                this.textField.setText(String.valueOf(this.PriorityValue));
+                this.textField.setValue(this.PriorityValue, true);
             }
         }
 

src/main/java/appeng/core/AEConfig.java

@@ -53,6 +53,7 @@ import appeng.api.config.Settings;
 import appeng.api.config.TerminalStyle;
 import appeng.api.config.YesNo;
 import appeng.api.features.AEFeature;
+import appeng.client.gui.NumberEntryType;
 import appeng.core.settings.TickRates;
 import appeng.util.EnumCycler;
 
@@ -273,20 +274,23 @@ public final class AEConfig {
         }
     }
 
-    public int craftItemsByStackAmounts(final int i) {
+    /**
-        return this.craftByStacks[i];
+     * Returns an array with the quantity-steps for the +/- buttons in number entry
-    }
+     * dialogs of the given type. Guaranteed to have 4 entries.
-
+     */
-    public int priorityByStacksAmounts(final int i) {
+    public int[] getNumberEntrySteps(NumberEntryType type) {
-        return this.priorityByStacks[i];
+        switch (type) {
-    }
+            case CRAFT_ITEM_COUNT:
-
+                return craftByStacks;
-    public int levelByStackAmounts(final int i) {
+            case PRIORITY:
-        return this.levelByStacks[i];
+                return priorityByStacks;
-    }
+            case LEVEL_ITEM_COUNT:
-
+                return levelByStacks;
-    public int levelByMillyBuckets(final int i) {
+            case LEVEL_FLUID_VOLUME:
-        return this.levelByMillibuckets[i];
+                return levelByMillibuckets;
+            default:
+                throw new IllegalArgumentException("Unknown number entry: " + type);
+        }
     }
 
     public PowerUnits getSelectedPowerUnit() {

src/main/java/appeng/core/localization/GuiText.java

@@ -27,7 +27,7 @@ public enum GuiText {
 
     Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest,
 
-    VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, Terminal,
+    VibrationChamber, SpatialIOPort, LevelEmitter, FluidLevelEmitter, FluidLevelEmitterUnit, Terminal,
 
     Interface, FluidInterface, Config, StoredItems, StoredFluids, Patterns, ImportBus, ImportBusFluids, ExportBus,
     ExportBusFluids,

src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java

@@ -1,17 +1,15 @@
 
 package appeng.fluids.client.gui;
 
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
+import appeng.client.gui.NumberEntryType;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.widgets.NumberBox;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
-import appeng.core.AEConfig;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
@@ -19,7 +17,8 @@ import appeng.fluids.client.gui.widgets.FluidSlotWidget;
 import appeng.fluids.container.FluidLevelEmitterContainer;
 
 public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitterContainer> {
-    private NumberBox level;
+
+    private NumberEntryWidget level;
 
     public FluidLevelEmitterScreen(FluidLevelEmitterContainer container, PlayerInventory playerInventory,
             ITextComponent title) {
@@ -30,17 +29,14 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     public void init() {
         super.init();
 
-        this.level = new NumberBox(this.font, this.guiLeft + 24, this.guiTop + 43, 79, this.font.FONT_HEIGHT,
+        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_FLUID_VOLUME,
-                Long.class);
+                this::onLevelChange);
-        this.level.setEnableBackgroundDrawing(false);
+        this.level.setTextFieldBounds(25, 44, 75);
-        this.level.setMaxStringLength(16);
-        this.level.setTextColor(0xFFFFFF);
-        this.level.setVisible(true);
-        this.level.changeFocus(true);
         container.setTextField(this.level);
+        this.level.addButtons(children::add, this::addButton);
 
         final int y = 40;
-        final int x = 80 + 44;
+        final int x = 80 + 57;
         this.guiSlots.add(new FluidSlotWidget(this.container.getFluidConfigInventory(), 0, 0, x, y));
     }
 
@@ -48,22 +44,6 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     protected void addButtons() {
         this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28,
                 Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL);
-
-        final int a = AEConfig.instance().levelByMillyBuckets(0);
-        final int b = AEConfig.instance().levelByMillyBuckets(1);
-        final int c = AEConfig.instance().levelByMillyBuckets(2);
-        final int d = AEConfig.instance().levelByMillyBuckets(3);
-
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a, btn -> addQty(a)));
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b, btn -> addQty(b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 17, 32, 20, "+" + c, btn -> addQty(c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 17, 38, 20, "+" + d, btn -> addQty(d)));
-
-        this.addButton(new Button(this.guiLeft + 20, this.guiTop + 59, 22, 20, "-" + a, btn -> addQty(-a)));
-        this.addButton(new Button(this.guiLeft + 48, this.guiTop + 59, 28, 20, "-" + b, btn -> addQty(-b)));
-        this.addButton(new Button(this.guiLeft + 82, this.guiTop + 59, 32, 20, "-" + c, btn -> addQty(-c)));
-        this.addButton(new Button(this.guiLeft + 120, this.guiTop + 59, 38, 20, "-" + d, btn -> addQty(-d)));
-
         this.addButton(this.redstoneMode);
     }
 
@@ -73,6 +53,13 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
         this.level.render(mouseX, mouseY, partialTicks);
     }
 
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        super.drawFG(offsetX, offsetY, mouseX, mouseY);
+
+        this.font.drawString(GuiText.FluidLevelEmitterUnit.getLocal(), 110, 44, COLOR_DARK_GRAY);
+    }
+
     @Override
     protected boolean drawUpgrades() {
         return false;
@@ -92,89 +79,8 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     protected void handleButtonVisibility() {
     }
 
-    private void addQty(final long i) {
+    private void onLevelChange(long level) {
-        try {
+        NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(level)));
-            String Out = this.level.getText();
-
-            boolean Fixed = false;
-            while (Out.startsWith("0") && Out.length() > 1) {
-                Out = Out.substring(1);
-                Fixed = true;
-            }
-
-            if (Fixed) {
-                this.level.setText(Out);
-            }
-
-            if (Out.isEmpty()) {
-                Out = "0";
-            }
-
-            long result = Long.parseLong(Out);
-            result += i;
-            if (result < 0) {
-                result = 0;
-            }
-
-            this.level.setText(Out = Long.toString(result));
-
-            NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", Out));
-        } catch (final NumberFormatException e) {
-            // nope..
-            this.level.setText("0");
-        }
     }
 
-    @Override
-    public boolean charTyped(char character, int keyCode) {
-        if (level.charTyped(character, keyCode)) {
-            String Out = this.level.getText();
-
-            boolean Fixed = false;
-            while (Out.startsWith("0") && Out.length() > 1) {
-                Out = Out.substring(1);
-                Fixed = true;
-            }
-
-            if (Fixed) {
-                this.level.setText(Out);
-            }
-
-            if (Out.isEmpty()) {
-                Out = "0";
-            }
-
-            NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", Out));
-            return true;
-        }
-        return super.charTyped(character, keyCode);
-    }
-
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) {
-            if ((keyCode == 211 || keyCode == 205 || keyCode == 203 || keyCode == 14)
-                    && this.level.keyPressed(keyCode, scanCode, p_keyPressed_3_)) {
-                String Out = this.level.getText();
-
-                boolean Fixed = false;
-                while (Out.startsWith("0") && Out.length() > 1) {
-                    Out = Out.substring(1);
-                    Fixed = true;
-                }
-
-                if (Fixed) {
-                    this.level.setText(Out);
-                }
-
-                if (Out.isEmpty()) {
-                    Out = "0";
-                }
-
-                NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", Out));
-                return true;
-            }
-        }
-        return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
-    }
 }

src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java

@@ -1,6 +1,5 @@
 package appeng.fluids.container;
 
-import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
@@ -11,6 +10,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Settings;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.implementations.ContainerHelper;
@@ -35,7 +35,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     private final FluidLevelEmitterPart lvlEmitter;
 
     @OnlyIn(Dist.CLIENT)
-    private TextFieldWidget textField;
+    private NumberEntryWidget textField;
     @GuiSync(3)
     public long EmitterValue = -1;
 
@@ -45,9 +45,9 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     }
 
     @OnlyIn(Dist.CLIENT)
-    public void setTextField(final TextFieldWidget level) {
+    public void setTextField(final NumberEntryWidget level) {
         this.textField = level;
-        this.textField.setText(String.valueOf(this.EmitterValue));
+        this.textField.setValue(this.EmitterValue);
     }
 
     public void setLevel(final long l, final PlayerEntity player) {
@@ -87,7 +87,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public void onUpdate(final String field, final Object oldValue, final Object newValue) {
         if (field.equals("EmitterValue")) {
             if (this.textField != null) {
-                this.textField.setText(String.valueOf(this.EmitterValue));
+                this.textField.setValue(this.EmitterValue);
             }
         }
     }

src/main/resources/assets/appliedenergistics2/lang/en_us.json

@@ -190,6 +190,7 @@
   "gui.appliedenergistics2.FluidFormationPlane": "Fluid Formation Plane",
   "gui.appliedenergistics2.FluidInterface": "ME Fluid Interface",
   "gui.appliedenergistics2.FluidLevelEmitter": "ME Fluid Level Emitter",
+  "gui.appliedenergistics2.FluidLevelEmitterUnit": "mB",
   "gui.appliedenergistics2.Fluix": "Fluix",
   "gui.appliedenergistics2.FormationPlane": "Formation Plane",
   "gui.appliedenergistics2.FromStorage": "Available",