From 5a1d5356d1e69b6551105710fef97c8cef50e60a Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Wed, 16 Sep 2020 22:56:23 +0200
Subject: [PATCH 1/5] Fixes #4733: Fix a crash bug when an external machine
 tries draining fluids from a fluid interface without a filter. (#4738)

---
 .../appeng/fluids/util/AEFluidInventory.java  | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/main/java/appeng/fluids/util/AEFluidInventory.java
index 4566d62f8..b0d53bd4e 100644
--- a/src/main/java/appeng/fluids/util/AEFluidInventory.java
+++ b/src/main/java/appeng/fluids/util/AEFluidInventory.java
@@ -13,6 +13,14 @@ import appeng.core.AELog;
 import appeng.util.Platform;
 
 public class AEFluidInventory implements IAEFluidTank {
+
+    /**
+     * While this may seem redundant, it helps since this class heavily mixes AE
+     * fluids stacks, which use null to represent "nothing", and Minecraft's
+     * FluidStack, which uses #isEmpty() to represent nothing.
+     */
+    private static final IAEFluidStack EMPTY_AE_FLUIDSTACK = null;
+
     private final IAEFluidStack[] fluids;
     private final IAEFluidInventory handler;
     private final int capacity;
@@ -31,13 +39,13 @@ public class AEFluidInventory implements IAEFluidTank {
     public void setFluidInSlot(final int slot, final IAEFluidStack fluid) {
         if (slot >= 0 && slot < this.getSlots()) {
             if (Objects.equals(this.fluids[slot], fluid)) {
-                if (fluid != null && fluid.getStackSize() != this.fluids[slot].getStackSize()) {
+                if (fluid != EMPTY_AE_FLUIDSTACK && fluid.getStackSize() != this.fluids[slot].getStackSize()) {
                     this.fluids[slot].setStackSize(Math.min(fluid.getStackSize(), this.capacity));
                     this.onContentChanged(slot);
                 }
             } else {
-                if (fluid == null) {
-                    this.fluids[slot] = null;
+                if (fluid == EMPTY_AE_FLUIDSTACK) {
+                    this.fluids[slot] = EMPTY_AE_FLUIDSTACK;
                 } else {
                     this.fluids[slot] = fluid.copy();
                     this.fluids[slot].setStackSize(Math.min(fluid.getStackSize(), this.capacity));
@@ -59,7 +67,7 @@ public class AEFluidInventory implements IAEFluidTank {
         if (slot >= 0 && slot < this.getSlots()) {
             return this.fluids[slot];
         }
-        return null;
+        return EMPTY_AE_FLUIDSTACK;
     }
 
     @Override
@@ -78,12 +86,12 @@ public class AEFluidInventory implements IAEFluidTank {
         if (tank < 0 || tank >= fluids.length) {
             return FluidStack.EMPTY;
         }
-        return fluids[tank] == null ? FluidStack.EMPTY : fluids[tank].getFluidStack();
+        return fluids[tank] == EMPTY_AE_FLUIDSTACK ? FluidStack.EMPTY : fluids[tank].getFluidStack();
     }
 
     @Override
     public int getTankCapacity(int tank) {
-        return Math.min(this.capacity, Integer.MAX_VALUE);
+        return this.capacity;
     }
 
     @Override
@@ -98,20 +106,20 @@ public class AEFluidInventory implements IAEFluidTank {
 
         final IAEFluidStack fluid = this.fluids[slot];
 
-        if (fluid != null && !fluid.getFluidStack().equals(resource)) {
+        if (fluid != EMPTY_AE_FLUIDSTACK && !fluid.getFluidStack().equals(resource)) {
             return 0;
         }
 
         int amountToStore = this.capacity;
 
-        if (fluid != null) {
+        if (fluid != EMPTY_AE_FLUIDSTACK) {
             amountToStore -= fluid.getStackSize();
         }
 
         amountToStore = Math.min(amountToStore, resource.getAmount());
 
         if (doFill) {
-            if (fluid == null) {
+            if (fluid == EMPTY_AE_FLUIDSTACK) {
                 this.setFluidInSlot(slot, AEFluidStack.fromFluidStack(resource));
             } else {
                 fluid.setStackSize(fluid.getStackSize() + amountToStore);
@@ -141,14 +149,14 @@ public class AEFluidInventory implements IAEFluidTank {
 
         int amountToStore = this.capacity;
 
-        if (fluid != null) {
+        if (fluid != EMPTY_AE_FLUIDSTACK) {
             amountToStore -= fluid.getStackSize();
         }
 
         amountToStore = Math.min(amountToStore, resource.getAmount());
 
         if (action == FluidAction.EXECUTE) {
-            if (fluid == null) {
+            if (fluid == EMPTY_AE_FLUIDSTACK) {
                 this.setFluidInSlot(slot, AEFluidStack.fromFluidStack(resource));
             } else {
                 fluid.setStackSize(fluid.getStackSize() + amountToStore);
@@ -170,7 +178,7 @@ public class AEFluidInventory implements IAEFluidTank {
         FluidStack totalDrained = FluidStack.EMPTY;
         for (int slot = 0; slot < this.getSlots(); ++slot) {
             FluidStack drain = this.drain(slot, resource, action == FluidAction.EXECUTE);
-            if (drain != null) {
+            if (!drain.isEmpty()) {
                 if (totalDrained.isEmpty()) {
                     totalDrained = drain;
                 } else {
@@ -205,7 +213,7 @@ public class AEFluidInventory implements IAEFluidTank {
                 FluidStack copy = totalDrained.copy();
                 copy.setAmount(toDrain);
                 FluidStack drain = this.drain(slot, copy, action == FluidAction.EXECUTE);
-                if (drain != null) {
+                if (!drain.isEmpty()) {
                     totalDrained.setAmount(totalDrained.getAmount() + drain.getAmount());
                     toDrain -= drain.getAmount();
                 }
@@ -220,7 +228,7 @@ public class AEFluidInventory implements IAEFluidTank {
 
     private int indexOfFluid(FluidStack resource) {
         for (int slot = 0; slot < fluids.length; slot++) {
-            if (fluids[slot] != null && fluids[slot].getFluidStack().isFluidEqual(resource)) {
+            if (fluids[slot] != EMPTY_AE_FLUIDSTACK && fluids[slot].getFluidStack().isFluidEqual(resource)) {
                 return slot;
             }
         }
@@ -229,7 +237,7 @@ public class AEFluidInventory implements IAEFluidTank {
 
     private int indexOfEmptySlot() {
         for (int slot = 0; slot < fluids.length; slot++) {
-            if (fluids[slot] == null) {
+            if (fluids[slot] == EMPTY_AE_FLUIDSTACK) {
                 return slot;
             }
         }
@@ -238,16 +246,16 @@ public class AEFluidInventory implements IAEFluidTank {
 
     public FluidStack drain(final int slot, final FluidStack resource, final boolean doDrain) {
         final IAEFluidStack fluid = this.fluids[slot];
-        if (resource.isEmpty() || fluid == null || !fluid.getFluidStack().equals(resource)) {
-            return null;
+        if (resource.isEmpty() || fluid == EMPTY_AE_FLUIDSTACK || !fluid.getFluidStack().equals(resource)) {
+            return FluidStack.EMPTY;
         }
         return this.drain(slot, resource.getAmount(), doDrain);
     }
 
     public FluidStack drain(final int slot, final int maxDrain, boolean doDrain) {
         final IAEFluidStack fluid = this.fluids[slot];
-        if (fluid == null || maxDrain <= 0) {
-            return null;
+        if (fluid == EMPTY_AE_FLUIDSTACK || maxDrain <= 0) {
+            return FluidStack.EMPTY;
         }
 
         int drained = maxDrain;
@@ -259,7 +267,7 @@ public class AEFluidInventory implements IAEFluidTank {
         if (doDrain) {
             fluid.setStackSize(fluid.getStackSize() - drained);
             if (fluid.getStackSize() <= 0) {
-                this.fluids[slot] = null;
+                this.fluids[slot] = EMPTY_AE_FLUIDSTACK;
             }
             this.onContentChanged(slot);
         }
@@ -277,7 +285,7 @@ public class AEFluidInventory implements IAEFluidTank {
             try {
                 final CompoundNBT c = new CompoundNBT();
 
-                if (this.fluids[x] != null) {
+                if (this.fluids[x] != EMPTY_AE_FLUIDSTACK) {
                     this.fluids[x].writeToNBT(c);
                 }
 

From e5b45d51cc874674f4804b9e358797385e6b0915 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Thu, 17 Sep 2020 11:43:29 +0200
Subject: [PATCH 2/5] Minor style fixes.

---
 .../appeng/client/render/crafting/CraftingCubeBakedModel.java   | 2 +-
 .../java/appeng/tile/crafting/CraftingStorageTileEntity.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
index 227a8d263..c299897c6 100644
--- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
+++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
@@ -113,7 +113,7 @@ abstract class CraftingCubeBakedModel implements IDynamicBakedModel {
         return quads;
     }
 
-    private void addRing(CubeBuilder builder, @Nullable Direction side, EnumSet<Direction> connections) {
+    private void addRing(CubeBuilder builder, Direction side, EnumSet<Direction> connections) {
         // Fill in the corners
         builder.setTexture(this.ringCorner);
         this.addCornerCap(builder, connections, side, Direction.UP, Direction.EAST, Direction.NORTH);
diff --git a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
index 92d20b2d5..866c0afd4 100644
--- a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
+++ b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
@@ -78,7 +78,7 @@ public class CraftingStorageTileEntity extends CraftingTileEntity {
             return 0;
         }
 
-        final AbstractCraftingUnitBlock unit = (AbstractCraftingUnitBlock) this.world.getBlockState(this.pos)
+        final AbstractCraftingUnitBlock<?> unit = (AbstractCraftingUnitBlock<?>) this.world.getBlockState(this.pos)
                 .getBlock();
         switch (unit.type) {
             default:

From f368f9dac2b849b151df1d567902cafa15ba0e8d Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Thu, 17 Sep 2020 14:33:43 +0200
Subject: [PATCH 3/5] Fixes #4697: Show number of required items in condenser
 tooltips.

---
 .../java/appeng/client/gui/widgets/SettingToggleButton.java | 6 ++++--
 .../container/implementations/CondenserContainer.java       | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
index b80b38f35..f5bee7e9c 100644
--- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
+++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
@@ -89,9 +89,11 @@ public class SettingToggleButton<T extends Enum<T>> extends IconButton {
             registerApp(16 * 7, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput,
                     ButtonToolTips.Trash);
             registerApp(16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS,
-                    ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls);
+                    ButtonToolTips.CondenserOutput,
+                    ButtonToolTips.MatterBalls.text(CondenserOutput.MATTER_BALLS.requiredPower));
             registerApp(16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY,
-                    ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity);
+                    ButtonToolTips.CondenserOutput,
+                    ButtonToolTips.Singularity.text(CondenserOutput.SINGULARITY.requiredPower));
 
             registerApp(16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode,
                     ButtonToolTips.Read);
diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/main/java/appeng/container/implementations/CondenserContainer.java
index b2e71c6a8..636027319 100644
--- a/src/main/java/appeng/container/implementations/CondenserContainer.java
+++ b/src/main/java/appeng/container/implementations/CondenserContainer.java
@@ -81,7 +81,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
 
             this.requiredEnergy = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min(requiredEnergy, maxStorage);
             this.storedPower = (int) this.condenser.getStoredPower();
-            this.setOutput((CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT));
+            this.output = (CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT);
         }
 
         super.detectAndSendChanges();
@@ -101,7 +101,4 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
         return this.output;
     }
 
-    private void setOutput(final CondenserOutput output) {
-        this.output = output;
-    }
 }

From 971a9d22e81bf9ca2130683f43196ed57e1097c7 Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Sat, 19 Sep 2020 16:27:29 +0200
Subject: [PATCH 4/5] 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
---
 .../java/appeng/client/gui/AEBaseScreen.java  |  10 +-
 .../gui/implementations/AESubScreen.java      |  24 +--
 .../implementations/CraftAmountScreen.java    |  30 ++-
 .../implementations/CraftingStatusScreen.java |   2 +-
 .../implementations/LevelEmitterScreen.java   |  15 +-
 .../implementations/MEMonitorableScreen.java  |   2 +-
 .../implementations/NumberEntryWidget.java    | 178 ++++++++++++++----
 .../gui/implementations/PriorityScreen.java   |  33 ++--
 .../gui/widgets/ConfirmableTextField.java     |  51 +++++
 .../appeng/client/gui/widgets/IconButton.java |  42 ++++-
 .../appeng/client/gui/widgets/NumberBox.java  | 153 ---------------
 .../appeng/client/gui/widgets/TabButton.java  |  17 +-
 .../client/gui/widgets/ValidationIcon.java    |  65 +++++++
 .../appeng/container/AEBaseContainer.java     |  67 ++-----
 .../CellWorkbenchContainer.java               |   3 +-
 .../implementations/CondenserContainer.java   |   3 +-
 .../implementations/ContainerHelper.java      |  95 +++++++---
 .../CraftConfirmContainer.java                |   3 +-
 .../implementations/CraftingCPUContainer.java |  34 ++--
 .../CraftingStatusContainer.java              |   3 +-
 .../FormationPlaneContainer.java              |   3 +-
 .../implementations/IOPortContainer.java      |   3 +-
 .../implementations/InscriberContainer.java   |   3 +-
 .../InterfaceTerminalContainer.java           |   5 +-
 .../LevelEmitterContainer.java                |  54 +++---
 .../MEMonitorableContainer.java               |   9 +-
 .../MolecularAssemblerContainer.java          |   3 +-
 .../NetworkStatusContainer.java               |   5 +-
 .../implementations/PatternTermContainer.java |  10 +-
 .../implementations/PriorityContainer.java    |  58 +++---
 .../implementations/QuartzKnifeContainer.java |   3 +-
 .../SpatialIOPortContainer.java               |   5 +-
 .../implementations/StorageBusContainer.java  |   3 +-
 .../implementations/UpgradeableContainer.java |   3 +-
 .../VibrationChamberContainer.java            |   3 +-
 .../WirelessTermContainer.java                |   3 +-
 .../core/sync/packets/ConfigValuePacket.java  |  10 +-
 .../client/gui/FluidLevelEmitterScreen.java   |  19 +-
 .../container/FluidConfigurableContainer.java |   2 +-
 .../container/FluidInterfaceContainer.java    |   2 +-
 .../container/FluidLevelEmitterContainer.java |  51 +++--
 .../container/FluidStorageBusContainer.java   |   2 +-
 .../container/FluidTerminalContainer.java     |  10 +-
 .../appliedenergistics2/lang/en_us.json       |   2 +
 .../textures/guis/states.png                  | Bin 12506 -> 13141 bytes
 45 files changed, 574 insertions(+), 527 deletions(-)
 create mode 100644 src/main/java/appeng/client/gui/widgets/ConfirmableTextField.java
 delete mode 100644 src/main/java/appeng/client/gui/widgets/NumberBox.java
 create mode 100644 src/main/java/appeng/client/gui/widgets/ValidationIcon.java

diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
index 74e2e2668..5773c0f11 100644
--- a/src/main/java/appeng/client/gui/AEBaseScreen.java
+++ b/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;
     }
 
     /**
diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java
index 8f540759e..a663de325 100644
--- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java
+++ b/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;
         }
diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
index c967aefca..421c1bb2e 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
+++ b/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";
-    }
-
 }
diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
index 777dd4e15..a3b4fe4ce 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
+++ b/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);
     }
 
diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
index 181b10ec7..216c9f563 100644
--- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
+++ b/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
diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
index ceedf3e1f..f8575fef9 100644
--- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
+++ b/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
diff --git a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
index b31dfd6b9..7b7fbc275 100644
--- a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
+++ b/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;
+    }
+
 }
diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java
index 9c32c886d..2146da545 100644
--- a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java
+++ b/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";
-    }
 }
diff --git a/src/main/java/appeng/client/gui/widgets/ConfirmableTextField.java b/src/main/java/appeng/client/gui/widgets/ConfirmableTextField.java
new file mode 100644
index 000000000..d8c202bba
--- /dev/null
+++ b/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;
+    }
+
+}
diff --git a/src/main/java/appeng/client/gui/widgets/IconButton.java b/src/main/java/appeng/client/gui/widgets/IconButton.java
index fcf88e4bb..7cfaf3ef9 100644
--- a/src/main/java/appeng/client/gui/widgets/IconButton.java
+++ b/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;
+    }
+
 }
diff --git a/src/main/java/appeng/client/gui/widgets/NumberBox.java b/src/main/java/appeng/client/gui/widgets/NumberBox.java
deleted file mode 100644
index 20c7267bf..000000000
--- a/src/main/java/appeng/client/gui/widgets/NumberBox.java
+++ /dev/null
@@ -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;
-    }
-
-}
diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java
index bd1154065..b135d07eb 100644
--- a/src/main/java/appeng/client/gui/widgets/TabButton.java
+++ b/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;
     }
 }
diff --git a/src/main/java/appeng/client/gui/widgets/ValidationIcon.java b/src/main/java/appeng/client/gui/widgets/ValidationIcon.java
new file mode 100644
index 000000000..4a6344e86
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index 1f71dab58..d0cdf46f8 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -65,10 +65,8 @@ import appeng.container.slot.PlayerInvSlot;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.InventoryActionPacket;
 import appeng.core.sync.packets.TargetItemStackPacket;
-import appeng.helpers.ICustomNameObject;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.PlayerSource;
 import appeng.util.InventoryAdaptor;
@@ -86,11 +84,9 @@ public abstract class AEBaseContainer extends Container {
     private final IGuiItemObject obj;
     private final HashMap<Integer, SyncData> syncData = new HashMap<>();
     private boolean isContainerValid = true;
-    private String customName;
     private ContainerLocator locator;
     private IMEInventoryHandler<IAEItemStack> cellInv;
     private IEnergySource powerSrc;
-    private boolean sentCustomName;
     private int ticksSinceCheck = 900;
     private IAEItemStack clientRequestedTargetItem = null;
 
@@ -297,9 +293,7 @@ public abstract class AEBaseContainer extends Container {
 
     @Override
     public void detectAndSendChanges() {
-        this.sendCustomName();
-
-        if (Platform.isServer()) {
+        if (isServer()) {
             if (this.tileEntity != null
                     && this.tileEntity.getWorld().getTileEntity(this.tileEntity.getPos()) != this.tileEntity) {
                 this.setValidContainer(false);
@@ -866,43 +860,6 @@ public abstract class AEBaseContainer extends Container {
         this.detectAndSendChanges();
     }
 
-    private void sendCustomName() {
-        // FIXME: Trash this, this is handled by NamedContainerProvider now
-        if (!this.sentCustomName) {
-            this.sentCustomName = true;
-            if (Platform.isServer()) {
-                ICustomNameObject name = null;
-
-                if (this.part instanceof ICustomNameObject) {
-                    name = (ICustomNameObject) this.part;
-                }
-
-                if (this.tileEntity instanceof ICustomNameObject) {
-                    name = (ICustomNameObject) this.tileEntity;
-                }
-
-                if (this.obj instanceof ICustomNameObject) {
-                    name = (ICustomNameObject) this.obj;
-                }
-
-                if (this instanceof ICustomNameObject) {
-                    name = (ICustomNameObject) this;
-                }
-
-                if (name != null) {
-                    if (name.hasCustomInventoryName()) {
-                        this.setCustomName(name.getCustomInventoryName().getString());
-                    }
-
-                    if (this.getCustomName() != null) {
-                        NetworkHandler.instance().sendTo(new ConfigValuePacket("CustomName", this.getCustomName()),
-                                (ServerPlayerEntity) this.getPlayerInventory().player);
-                    }
-                }
-            }
-        }
-    }
-
     public void swapSlotContents(final int slotA, final int slotB) {
         final Slot a = this.getSlot(slotA);
         final Slot b = this.getSlot(slotB);
@@ -992,14 +949,6 @@ public abstract class AEBaseContainer extends Container {
         this.cellInv = cellInv;
     }
 
-    public String getCustomName() {
-        return this.customName;
-    }
-
-    public void setCustomName(final String customName) {
-        this.customName = customName;
-    }
-
     public PlayerInventory getPlayerInventory() {
         return this.invPlayer;
     }
@@ -1028,4 +977,18 @@ public abstract class AEBaseContainer extends Container {
         this.powerSrc = powerSrc;
     }
 
+    /**
+     * Returns whether this container instance lives on the client.
+     */
+    protected boolean isClient() {
+        return invPlayer.player.getEntityWorld().isRemote();
+    }
+
+    /**
+     * Returns whether this container instance lives on the server.
+     */
+    protected boolean isServer() {
+        return !isClient();
+    }
+
 }
diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
index ce14510db..9fc52e079 100644
--- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
+++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
@@ -49,7 +49,6 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.tile.misc.CellWorkbenchTileEntity;
 import appeng.util.EnumCycler;
-import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.WrapperSupplierItemHandler;
 import appeng.util.iterators.NullIterator;
@@ -143,7 +142,7 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
     @Override
     public void detectAndSendChanges() {
         final ItemStack is = this.workBench.getInventoryByName("cell").getStackInSlot(0);
-        if (Platform.isServer()) {
+        if (isServer()) {
             for (final IContainerListener listener : this.listeners) {
                 if (this.prevStack != is) {
                     // if the bars changed an item was probably made, so just send shit!
diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/main/java/appeng/container/implementations/CondenserContainer.java
index 636027319..1c37f5459 100644
--- a/src/main/java/appeng/container/implementations/CondenserContainer.java
+++ b/src/main/java/appeng/container/implementations/CondenserContainer.java
@@ -33,7 +33,6 @@ import appeng.container.interfaces.IProgressProvider;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.misc.CondenserTileEntity;
-import appeng.util.Platform;
 
 public class CondenserContainer extends AEBaseContainer implements IProgressProvider {
 
@@ -75,7 +74,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             final double maxStorage = this.condenser.getStorage();
             final double requiredEnergy = this.condenser.getRequiredPower();
 
diff --git a/src/main/java/appeng/container/implementations/ContainerHelper.java b/src/main/java/appeng/container/implementations/ContainerHelper.java
index 3afd4ec38..236efc184 100644
--- a/src/main/java/appeng/container/implementations/ContainerHelper.java
+++ b/src/main/java/appeng/container/implementations/ContainerHelper.java
@@ -1,5 +1,7 @@
 package appeng.container.implementations;
 
+import java.util.function.Function;
+
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -11,8 +13,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraft.world.World;
 import net.minecraftforge.fml.network.NetworkHooks;
 
 import appeng.api.config.SecurityPermissions;
@@ -43,6 +43,8 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
 
     private final SecurityPermissions requiredPermission;
 
+    private Function<I, ITextComponent> containerTitleStrategy = this::getDefaultContainerTitle;
+
     public ContainerHelper(ContainerFactory<C, I> factory, Class<I> interfaceClass) {
         this(factory, interfaceClass, null);
     }
@@ -54,19 +56,47 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
         this.factory = factory;
     }
 
+    /**
+     * Specifies a custom strategy for obtaining a custom container name.
+     *
+     * The stratgy should return {@link StringTextComponent#EMPTY} if there's no
+     * custom name.
+     */
+    public ContainerHelper<C, I> withContainerTitle(Function<I, ITextComponent> containerTitleStrategy) {
+        this.containerTitleStrategy = containerTitleStrategy;
+        return this;
+    }
+
     /**
      * Opens a container that is based around a single tile entity. The tile
      * entity's position is encoded in the packet buffer.
      */
     public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) {
+        return fromNetwork(windowId, inv, packetBuf, (accessObj, container, buffer) -> {
+        });
+    }
+
+    /**
+     * Same as {@link #open}, but allows or additional data to be read from the
+     * packet, and passed onto the container.
+     */
+    public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf,
+            InitialDataDeserializer<C, I> initialDataDeserializer) {
         I host = getHostFromLocator(inv.player, ContainerLocator.read(packetBuf));
         if (host != null) {
-            return factory.create(windowId, inv, host);
+            C container = factory.create(windowId, inv, host);
+            initialDataDeserializer.deserializeInitialData(host, container, packetBuf);
+            return container;
         }
         return null;
     }
 
     public boolean open(PlayerEntity player, ContainerLocator locator) {
+        return open(player, locator, (accessObj, buffer) -> {
+        });
+    }
+
+    public boolean open(PlayerEntity player, ContainerLocator locator, InitialDataSerializer<I> initialDataSerializer) {
         if (!(player instanceof ServerPlayerEntity)) {
             // Cannot open containers on the client or for non-players
             // FIXME logging?
@@ -83,7 +113,7 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
             return false;
         }
 
-        ITextComponent title = findContainerTitle(player.world, locator, accessInterface);
+        ITextComponent title = containerTitleStrategy.apply(accessInterface);
 
         INamedContainerProvider container = new SimpleNamedContainerProvider((wnd, p, pl) -> {
             C c = factory.create(wnd, p, accessInterface);
@@ -92,34 +122,14 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
             c.setLocator(locator);
             return c;
         }, title);
-        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator::write);
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, buffer -> {
+            locator.write(buffer);
+            initialDataSerializer.serializeInitialData(accessInterface, buffer);
+        });
 
         return true;
     }
 
-    private ITextComponent findContainerTitle(World world, ContainerLocator locator, I accessInterface) {
-
-        if (accessInterface instanceof ICustomNameObject) {
-            ICustomNameObject customNameObject = (ICustomNameObject) accessInterface;
-            if (customNameObject.hasCustomInventoryName()) {
-                return customNameObject.getCustomInventoryName();
-            }
-        }
-
-        // Use block name at position
-        // FIXME: this is not right, we'd need to check the part's item stack, or custom
-        // naming interface impl
-        // FIXME: Should move this up, because at this point, it's hard to know where
-        // the terminal host came from (part or tile)
-        if (locator.hasBlockPos()) {
-            return new TranslationTextComponent(
-                    world.getBlockState(locator.getBlockPos()).getBlock().getTranslationKey());
-        }
-
-        return new StringTextComponent("Unknown");
-
-    }
-
     private I getHostFromLocator(PlayerEntity player, ContainerLocator locator) {
         if (locator.hasItemIndex()) {
             return getHostFromPlayerInventory(player, locator);
@@ -196,6 +206,24 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
         C create(int windowId, PlayerInventory playerInv, I accessObj);
     }
 
+    /**
+     * Strategy used to serialize initial data for opening the container on the
+     * client-side into the packet that is sent to the client.
+     */
+    @FunctionalInterface
+    public interface InitialDataSerializer<I> {
+        void serializeInitialData(I host, PacketBuffer buffer);
+    }
+
+    /**
+     * Strategy used to deserialize initial data for opening the container on the
+     * client-side from the packet received by the server.
+     */
+    @FunctionalInterface
+    public interface InitialDataDeserializer<C, I> {
+        void deserializeInitialData(I host, C container, PacketBuffer buffer);
+    }
+
     private boolean checkPermission(PlayerEntity player, Object accessInterface) {
 
         if (requiredPermission != null) {
@@ -206,4 +234,15 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
 
     }
 
+    private ITextComponent getDefaultContainerTitle(I accessInterface) {
+        if (accessInterface instanceof ICustomNameObject) {
+            ICustomNameObject customNameObject = (ICustomNameObject) accessInterface;
+            if (customNameObject.hasCustomInventoryName()) {
+                return customNameObject.getCustomInventoryName();
+            }
+        }
+
+        return StringTextComponent.EMPTY;
+    }
+
 }
diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
index c4d548386..47e0e2dbd 100644
--- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
@@ -66,7 +66,6 @@ import appeng.me.helpers.PlayerSource;
 import appeng.parts.reporting.CraftingTerminalPart;
 import appeng.parts.reporting.PatternTerminalPart;
 import appeng.parts.reporting.TerminalPart;
-import appeng.util.Platform;
 
 public class CraftConfirmContainer extends AEBaseContainer {
 
@@ -134,7 +133,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isClient()) {
+        if (isClient()) {
             return;
         }
 
diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
index fabc5939a..fcccf1b5a 100644
--- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
@@ -26,7 +26,7 @@ import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
@@ -46,24 +46,28 @@ import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
-import appeng.helpers.ICustomNameObject;
 import appeng.me.cluster.implementations.CraftingCPUCluster;
 import appeng.tile.crafting.CraftingTileEntity;
-import appeng.util.Platform;
 
-public class CraftingCPUContainer extends AEBaseContainer
-        implements IMEMonitorHandlerReceiver<IAEItemStack>, ICustomNameObject {
+public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorHandlerReceiver<IAEItemStack> {
 
     public static ContainerType<CraftingCPUContainer> TYPE;
 
     private static final ContainerHelper<CraftingCPUContainer, CraftingTileEntity> helper = new ContainerHelper<>(
-            CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT);
+            CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT)
+                    .withContainerTitle(craftingTileEntity -> {
+                        // Use the cluster's custom name instead of the right-clicked block entities one
+                        CraftingCPUCluster cluster = craftingTileEntity.getCluster();
+                        if (cluster != null && cluster.getName() != null) {
+                            return cluster.getName();
+                        }
+                        return StringTextComponent.EMPTY;
+                    });
 
     private final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
     private IGrid network;
     private CraftingCPUCluster monitor = null;
-    private ITextComponent cpuName = null;
 
     @GuiSync(0)
     public long eta = -1;
@@ -84,7 +88,7 @@ public class CraftingCPUContainer extends AEBaseContainer
             this.setCPU(((CraftingTileEntity) te).getCluster());
         }
 
-        if (this.getNetwork() == null && Platform.isServer()) {
+        if (this.getNetwork() == null && isServer()) {
             this.setValidContainer(false);
         }
     }
@@ -114,7 +118,6 @@ public class CraftingCPUContainer extends AEBaseContainer
         }
 
         if (c instanceof CraftingCPUCluster) {
-            this.cpuName = c.getName();
             this.setMonitor((CraftingCPUCluster) c);
             this.list.resetStatus();
             this.getMonitor().getListOfItem(this.list, CraftingItemList.ALL);
@@ -122,7 +125,6 @@ public class CraftingCPUContainer extends AEBaseContainer
             this.setEstimatedTime(0);
         } else {
             this.setMonitor(null);
-            this.cpuName = null;
             this.setEstimatedTime(-1);
         }
     }
@@ -153,7 +155,7 @@ public class CraftingCPUContainer extends AEBaseContainer
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty()) {
+        if (isServer() && this.getMonitor() != null && !this.list.isEmpty()) {
             try {
                 if (this.getEstimatedTime() >= 0) {
                     final long elapsedTime = this.getMonitor().getElapsedTime();
@@ -218,16 +220,6 @@ public class CraftingCPUContainer extends AEBaseContainer
 
     }
 
-    @Override
-    public ITextComponent getCustomInventoryName() {
-        return this.cpuName;
-    }
-
-    @Override
-    public boolean hasCustomInventoryName() {
-        return this.cpuName != null;
-    }
-
     public long getEstimatedTime() {
         return this.eta;
     }
diff --git a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
index 2b5d61912..dcd1f8406 100644
--- a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
@@ -36,7 +36,6 @@ import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.storage.ITerminalHost;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.util.Platform;
 
 public class CraftingStatusContainer extends CraftingCPUContainer {
 
@@ -67,7 +66,7 @@ public class CraftingStatusContainer extends CraftingCPUContainer {
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer() && this.getNetwork() != null) {
+        if (isServer() && this.getNetwork() != null) {
             final ICraftingGrid cc = this.getNetwork().getCache(ICraftingGrid.class);
             final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
 
diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
index 3ec08634c..e78fa1de4 100644
--- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
+++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
@@ -35,7 +35,6 @@ import appeng.container.slot.FakeTypeOnlySlot;
 import appeng.container.slot.OptionalTypeOnlyFakeSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.parts.automation.FormationPlanePart;
-import appeng.util.Platform;
 
 public class FormationPlaneContainer extends UpgradeableContainer {
 
@@ -107,7 +106,7 @@ public class FormationPlaneContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.setFuzzyMode((FuzzyMode) this.getUpgradeable().getConfigManager().getSetting(Settings.FUZZY_MODE));
             this.setPlaceMode((YesNo) this.getUpgradeable().getConfigManager().getSetting(Settings.PLACE_BLOCK));
         }
diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/main/java/appeng/container/implementations/IOPortContainer.java
index e06699f45..f44cfbd16 100644
--- a/src/main/java/appeng/container/implementations/IOPortContainer.java
+++ b/src/main/java/appeng/container/implementations/IOPortContainer.java
@@ -34,7 +34,6 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.storage.IOPortTileEntity;
-import appeng.util.Platform;
 
 public class IOPortContainer extends UpgradeableContainer {
 
@@ -111,7 +110,7 @@ public class IOPortContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.setOperationMode(
                     (OperationMode) this.getUpgradeable().getConfigManager().getSetting(Settings.OPERATION_MODE));
             this.setFullMode(
diff --git a/src/main/java/appeng/container/implementations/InscriberContainer.java b/src/main/java/appeng/container/implementations/InscriberContainer.java
index a768ebca3..4fc78965d 100644
--- a/src/main/java/appeng/container/implementations/InscriberContainer.java
+++ b/src/main/java/appeng/container/implementations/InscriberContainer.java
@@ -35,7 +35,6 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.tile.misc.InscriberRecipes;
 import appeng.tile.misc.InscriberTileEntity;
-import appeng.util.Platform;
 
 /**
  * @author AlgorithmX2
@@ -119,7 +118,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
     public void detectAndSendChanges() {
         this.standardDetectAndSendChanges();
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.maxProcessingTime = this.ti.getMaxProcessingTime();
             this.processingTime = this.ti.getProcessingTime();
         }
diff --git a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
index 648262f0b..04eb51fad 100644
--- a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
+++ b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
@@ -52,7 +52,6 @@ import appeng.parts.reporting.InterfaceTerminalPart;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.tile.misc.InterfaceTileEntity;
 import appeng.util.InventoryAdaptor;
-import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.AdaptorItemHandler;
 import appeng.util.inv.WrapperCursorItemHandler;
@@ -88,7 +87,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
     public InterfaceTerminalContainer(int id, final PlayerInventory ip, final InterfaceTerminalPart anchor) {
         super(TYPE, id, ip, anchor);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.grid = anchor.getActionableNode().getGrid();
         }
 
@@ -97,7 +96,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isClient()) {
+        if (isClient()) {
             return;
         }
 
diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
index 5493fdac7..cb993160c 100644
--- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
+++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
@@ -22,8 +22,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.FuzzyMode;
@@ -32,13 +30,13 @@ 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;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.parts.automation.LevelEmitterPart;
-import appeng.util.Platform;
 
 public class LevelEmitterContainer extends UpgradeableContainer {
 
@@ -48,38 +46,46 @@ public class LevelEmitterContainer extends UpgradeableContainer {
             LevelEmitterContainer::new, LevelEmitterPart.class, SecurityPermissions.BUILD);
 
     public static LevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
-        return helper.fromNetwork(windowId, inv, buf);
+        return helper.fromNetwork(windowId, inv, buf, (host, container, buffer) -> {
+            container.reportingValue = buffer.readVarLong();
+        });
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator);
+        return helper.open(player, locator, (host, buffer) -> {
+            buffer.writeVarLong(host.getReportingValue());
+        });
     }
 
     private final LevelEmitterPart lvlEmitter;
 
-    @OnlyIn(Dist.CLIENT)
-    private NumberEntryWidget textField;
     @GuiSync(2)
     public LevelType lvType;
     @GuiSync(3)
-    public long EmitterValue = -1;
-    @GuiSync(4)
     public YesNo cmType;
 
+    // Only synced once on container-open, and only used on client
+    private long reportingValue;
+
     public LevelEmitterContainer(int id, final PlayerInventory ip, final LevelEmitterPart te) {
         super(TYPE, id, ip, te);
         this.lvlEmitter = te;
     }
 
-    @OnlyIn(Dist.CLIENT)
-    public void setTextField(final NumberEntryWidget level) {
-        this.textField = level;
-        this.textField.setValue(this.EmitterValue);
+    public long getReportingValue() {
+        return reportingValue;
     }
 
-    public void setLevel(final long l, final PlayerEntity player) {
-        this.lvlEmitter.setReportingValue(l);
-        this.EmitterValue = l;
+    public void setReportingValue(long reportingValue) {
+        if (isClient()) {
+            if (reportingValue != this.reportingValue) {
+                this.reportingValue = reportingValue;
+                NetworkHandler.instance()
+                        .sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(reportingValue)));
+            }
+        } else {
+            this.lvlEmitter.setReportingValue(reportingValue);
+        }
     }
 
     @Override
@@ -115,7 +121,6 @@ public class LevelEmitterContainer extends UpgradeableContainer {
 
     @Override
     public int availableUpgrades() {
-
         return 1;
     }
 
@@ -123,8 +128,7 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
-            this.EmitterValue = this.lvlEmitter.getReportingValue();
+        if (isServer()) {
             this.setCraftingMode(
                     (YesNo) this.getUpgradeable().getConfigManager().getSetting(Settings.CRAFT_VIA_REDSTONE));
             this.setLevelMode((LevelType) this.getUpgradeable().getConfigManager().getSetting(Settings.LEVEL_TYPE));
@@ -136,15 +140,6 @@ public class LevelEmitterContainer extends UpgradeableContainer {
         this.standardDetectAndSendChanges();
     }
 
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("EmitterValue")) {
-            if (this.textField != null) {
-                this.textField.setValue(this.EmitterValue);
-            }
-        }
-    }
-
     @Override
     public YesNo getCraftingMode() {
         return this.cmType;
@@ -162,4 +157,5 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     private void setLevelMode(final LevelType lvType) {
         this.lvType = lvType;
     }
+
 }
diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
index d9316db9b..79e38303f 100644
--- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
+++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
@@ -73,7 +73,6 @@ import appeng.core.sync.packets.MEInventoryUpdatePacket;
 import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
 
 public class MEMonitorableContainer extends AEBaseContainer
         implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEItemStack> {
@@ -122,7 +121,7 @@ public class MEMonitorableContainer extends AEBaseContainer
         this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
         this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.serverCM = monitorable.getConfigManager();
 
             this.monitor = monitorable
@@ -183,7 +182,7 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             if (this.monitor != this.host
                     .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))) {
                 this.setValidContainer(false);
@@ -287,7 +286,7 @@ public class MEMonitorableContainer extends AEBaseContainer
     }
 
     private void queueInventory(final IContainerListener c) {
-        if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) {
+        if (isServer() && c instanceof PlayerEntity && this.monitor != null) {
             try {
                 MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket();
                 final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
@@ -356,7 +355,7 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     @Override
     public IConfigManager getConfigManager() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             return this.serverCM;
         }
         return this.clientCM;
diff --git a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
index 542a32cfd..f8e012c65 100644
--- a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
+++ b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
@@ -41,7 +41,6 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.tile.crafting.MolecularAssemblerTileEntity;
-import appeng.util.Platform;
 
 public class MolecularAssemblerContainer extends UpgradeableContainer implements IProgressProvider {
 
@@ -147,7 +146,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.setRedStoneMode(
                     (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting(Settings.REDSTONE_CONTROLLED));
         }
diff --git a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java
index b34b169ff..4bf622cbe 100644
--- a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java
+++ b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java
@@ -43,7 +43,6 @@ import appeng.container.guisync.GuiSync;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
-import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 
 public class NetworkStatusContainer extends AEBaseContainer {
@@ -83,7 +82,7 @@ public class NetworkStatusContainer extends AEBaseContainer {
             }
         }
 
-        if (this.network == null && Platform.isServer()) {
+        if (this.network == null && isServer()) {
             this.setValidContainer(false);
         }
     }
@@ -100,7 +99,7 @@ public class NetworkStatusContainer extends AEBaseContainer {
     @Override
     public void detectAndSendChanges() {
         this.delay++;
-        if (Platform.isServer() && this.delay > 15 && this.network != null) {
+        if (isServer() && this.delay > 15 && this.network != null) {
             this.delay = 0;
 
             final IEnergyGrid eg = this.network.getCache(IEnergyGrid.class);
diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java
index 0898e52bc..3be1014ec 100644
--- a/src/main/java/appeng/container/implementations/PatternTermContainer.java
+++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java
@@ -291,9 +291,9 @@ public class PatternTermContainer extends MEMonitorableContainer
     @Override
     public boolean isSlotEnabled(final int idx) {
         if (idx == 1) {
-            return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode();
+            return isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode();
         } else if (idx == 2) {
-            return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode();
+            return isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode();
         } else {
             return false;
         }
@@ -395,7 +395,7 @@ public class PatternTermContainer extends MEMonitorableContainer
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
-        if (Platform.isServer()) {
+        if (isServer()) {
             if (this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe()) {
                 this.setCraftingMode(this.getPatternTerminal().isCraftingRecipe());
                 this.updateOrderOfOutputSlots();
@@ -417,7 +417,7 @@ public class PatternTermContainer extends MEMonitorableContainer
 
     @Override
     public void onSlotChange(final Slot s) {
-        if (s == this.patternSlotOUT && Platform.isServer()) {
+        if (s == this.patternSlotOUT && isServer()) {
             for (final IContainerListener listener : this.listeners) {
                 for (final Slot slot : this.inventorySlots) {
                     if (slot instanceof OptionalFakeSlot || slot instanceof FakeCraftingMatrixSlot) {
@@ -431,7 +431,7 @@ public class PatternTermContainer extends MEMonitorableContainer
             this.detectAndSendChanges();
         }
 
-        if (s == this.craftSlot && Platform.isClient()) {
+        if (s == this.craftSlot && isClient()) {
             this.getAndUpdateOutput();
         }
     }
diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java
index 57a03023e..fc2ccad47 100644
--- a/src/main/java/appeng/container/implementations/PriorityContainer.java
+++ b/src/main/java/appeng/container/implementations/PriorityContainer.java
@@ -23,17 +23,14 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.api.distmarker.Dist;
-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;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.helpers.IPriorityHost;
-import appeng.util.Platform;
 
 public class PriorityContainer extends AEBaseContainer {
 
@@ -43,60 +40,53 @@ public class PriorityContainer extends AEBaseContainer {
             PriorityContainer::new, IPriorityHost.class, SecurityPermissions.BUILD);
 
     public static PriorityContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
-        return helper.fromNetwork(windowId, inv, buf);
+        return helper.fromNetwork(windowId, inv, buf, (host, container, buffer) -> {
+            container.priorityValue = buffer.readVarInt();
+        });
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator);
+        return helper.open(player, locator, (host, buffer) -> buffer.writeVarInt(host.getPriority()));
     }
 
     private final IPriorityHost priHost;
 
-    @OnlyIn(Dist.CLIENT)
-    private NumberEntryWidget textField;
-
-    @GuiSync(2)
-    public long PriorityValue = -1;
+    private int priorityValue;
 
     public PriorityContainer(int id, final PlayerInventory ip, final IPriorityHost te) {
         super(TYPE, id, ip, (TileEntity) (te instanceof TileEntity ? te : null),
                 (IPart) (te instanceof IPart ? te : null));
         this.priHost = te;
+        this.priorityValue = te.getPriority();
     }
 
-    @OnlyIn(Dist.CLIENT)
-    public void setTextField(final NumberEntryWidget level) {
-        this.textField = level;
-        this.textField.setValue(this.PriorityValue, true);
-    }
-
-    public void setPriority(final int newValue, final PlayerEntity player) {
-        this.priHost.setPriority(newValue);
-        this.PriorityValue = newValue;
+    public void setPriority(final int newValue) {
+        if (newValue != priorityValue) {
+            if (isClient()) {
+                // If for whatever reason the client enters the value first, do not update based
+                // on incoming server data
+                this.priorityValue = newValue;
+                NetworkHandler.instance()
+                        .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(newValue)));
+            } else {
+                this.priHost.setPriority(newValue);
+                this.priorityValue = newValue;
+            }
+        }
     }
 
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
         this.verifyPermissions(SecurityPermissions.BUILD, false);
-
-        if (Platform.isServer()) {
-            this.PriorityValue = this.priHost.getPriority();
-        }
     }
 
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("PriorityValue")) {
-            if (this.textField != null) {
-                this.textField.setValue(this.PriorityValue, true);
-            }
-        }
-
-        super.onUpdate(field, oldValue, newValue);
+    public int getPriorityValue() {
+        return priorityValue;
     }
 
     public IPriorityHost getPriorityHost() {
         return this.priHost;
     }
+
 }
diff --git a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
index f5c5aea95..0d2136bfc 100644
--- a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
+++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
@@ -38,7 +38,6 @@ import appeng.core.Api;
 import appeng.items.contents.QuartzKnifeObj;
 import appeng.items.materials.MaterialItem;
 import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.util.Platform;
 
 public class QuartzKnifeContainer extends AEBaseContainer {
 
@@ -148,7 +147,7 @@ public class QuartzKnifeContainer extends AEBaseContainer {
         }
 
         private void makePlate() {
-            if (Platform.isServer()) {
+            if (isServer()) {
                 if (!this.getItemHandler().extractItem(0, 1, false).isEmpty()) {
                     final ItemStack item = QuartzKnifeContainer.this.toolInv.getItemStack();
                     final ItemStack before = item.copy();
diff --git a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
index e6fe36bea..b14283722 100644
--- a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
+++ b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
@@ -35,7 +35,6 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.spatial.SpatialIOPortTileEntity;
-import appeng.util.Platform;
 
 public class SpatialIOPortContainer extends AEBaseContainer {
 
@@ -65,7 +64,7 @@ public class SpatialIOPortContainer extends AEBaseContainer {
     public SpatialIOPortContainer(int id, final PlayerInventory ip, final SpatialIOPortTileEntity spatialIOPort) {
         super(TYPE, id, ip, spatialIOPort, null);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.network = spatialIOPort.getGridNode(AEPartLocation.INTERNAL).getGrid();
         }
 
@@ -89,7 +88,7 @@ public class SpatialIOPortContainer extends AEBaseContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.delay++;
             if (this.delay > 15 && this.network != null) {
                 this.delay = 0;
diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java
index 2d5dd3ecc..e595504a3 100644
--- a/src/main/java/appeng/container/implementations/StorageBusContainer.java
+++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java
@@ -44,7 +44,6 @@ import appeng.container.slot.OptionalTypeOnlyFakeSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.parts.misc.StorageBusPart;
-import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.iterators.NullIterator;
 
@@ -124,7 +123,7 @@ public class StorageBusContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.setFuzzyMode((FuzzyMode) this.getUpgradeable().getConfigManager().getSetting(Settings.FUZZY_MODE));
             this.setReadWriteMode(
                     (AccessRestriction) this.getUpgradeable().getConfigManager().getSetting(Settings.ACCESS));
diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java
index f6abbd227..f2c167ec5 100644
--- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java
+++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java
@@ -51,7 +51,6 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.items.contents.NetworkToolViewer;
 import appeng.items.tools.NetworkToolItem;
 import appeng.parts.automation.ExportBusPart;
-import appeng.util.Platform;
 
 public class UpgradeableContainer extends AEBaseContainer implements IOptionalSlotHost {
 
@@ -199,7 +198,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             final IConfigManager cm = this.getUpgradeable().getConfigManager();
             this.loadSettingsFromHost(cm);
         }
diff --git a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java
index 8676798a0..242992549 100644
--- a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java
+++ b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java
@@ -29,7 +29,6 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.interfaces.IProgressProvider;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.misc.VibrationChamberTileEntity;
-import appeng.util.Platform;
 
 public class VibrationChamberContainer extends AEBaseContainer implements IProgressProvider {
 
@@ -65,7 +64,7 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.remainingBurnTime = this.vibrationChamber.getMaxBurnTime() <= 0 ? 0
                     : (int) (100.0 * this.vibrationChamber.getBurnTime() / this.vibrationChamber.getMaxBurnTime());
             this.burnSpeed = this.remainingBurnTime <= 0 ? 0 : this.vibrationChamber.getBurnSpeed();
diff --git a/src/main/java/appeng/container/implementations/WirelessTermContainer.java b/src/main/java/appeng/container/implementations/WirelessTermContainer.java
index eb3fe9bfd..643e28025 100644
--- a/src/main/java/appeng/container/implementations/WirelessTermContainer.java
+++ b/src/main/java/appeng/container/implementations/WirelessTermContainer.java
@@ -28,7 +28,6 @@ import appeng.container.ContainerLocator;
 import appeng.core.AEConfig;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.WirelessTerminalGuiObject;
-import appeng.util.Platform;
 
 public class WirelessTermContainer extends MEPortableCellContainer {
 
@@ -57,7 +56,7 @@ public class WirelessTermContainer extends MEPortableCellContainer {
         super.detectAndSendChanges();
 
         if (!this.wirelessTerminalGUIObject.rangeCheck()) {
-            if (Platform.isServer() && this.isValidContainer()) {
+            if (isServer() && this.isValidContainer()) {
                 this.getPlayerInv().player.sendMessage(PlayerMessages.OutOfRange.get(), Util.DUMMY_UUID);
             }
 
diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
index 5a3bbca36..5a222403b 100644
--- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
+++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
@@ -118,13 +118,13 @@ public class ConfigValuePacket extends BasePacket {
             sc.toggleSetting(this.Value, player);
         } else if (this.Name.equals("PriorityHost.Priority") && c instanceof PriorityContainer) {
             final PriorityContainer pc = (PriorityContainer) c;
-            pc.setPriority(Integer.parseInt(this.Value), player);
+            pc.setPriority(Integer.parseInt(this.Value));
         } else if (this.Name.equals("LevelEmitter.Value") && c instanceof LevelEmitterContainer) {
             final LevelEmitterContainer lvc = (LevelEmitterContainer) c;
-            lvc.setLevel(Long.parseLong(this.Value), player);
+            lvc.setReportingValue(Long.parseLong(this.Value));
         } else if (this.Name.equals("FluidLevelEmitter.Value") && c instanceof FluidLevelEmitterContainer) {
             final FluidLevelEmitterContainer lvc = (FluidLevelEmitterContainer) c;
-            lvc.setLevel(Long.parseLong(this.Value), player);
+            lvc.setReportingValue(Long.parseLong(this.Value));
         } else if (this.Name.startsWith("PatternTerminal.") && c instanceof PatternTermContainer) {
             final PatternTermContainer cpt = (PatternTermContainer) c;
             if (this.Name.equals("PatternTerminal.CraftMode")) {
@@ -192,9 +192,7 @@ public class ConfigValuePacket extends BasePacket {
     public void clientPacketData(final INetworkInfo network, final PlayerEntity player) {
         final Container c = player.openContainer;
 
-        if (this.Name.equals("CustomName") && c instanceof AEBaseContainer) {
-            ((AEBaseContainer) c).setCustomName(this.Value);
-        } else if (this.Name.startsWith("SyncDat.")) {
+        if (this.Name.startsWith("SyncDat.")) {
             ((AEBaseContainer) c).stringSync(Integer.parseInt(this.Name.substring(8)), this.Value);
         } else if (this.Name.equals("CraftingStatus") && this.Value.equals("Clear")) {
             final Screen gs = Minecraft.getInstance().currentScreen;
diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
index 33b09ea85..d301df07c 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
+++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
@@ -13,8 +13,6 @@ import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.fluids.client.gui.widgets.FluidSlotWidget;
 import appeng.fluids.container.FluidLevelEmitterContainer;
 
@@ -31,17 +29,24 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     public void init() {
         super.init();
 
-        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_FLUID_VOLUME,
-                this::onLevelChange);
+        this.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_FLUID_VOLUME);
         this.level.setTextFieldBounds(25, 44, 75);
-        container.setTextField(this.level);
         this.level.addButtons(children::add, this::addButton);
+        this.level.setValue(container.getReportingValue());
+        this.level.setOnChange(this::saveReportingValue);
+        this.level.setOnConfirm(this::closeScreen);
+
+        this.changeFocus(true);
 
         final int y = 40;
         final int x = 80 + 57;
         this.guiSlots.add(new FluidSlotWidget(this.container.getFluidConfigInventory(), 0, 0, x, y));
     }
 
+    private void saveReportingValue() {
+        this.level.getLongValue().ifPresent(container::setReportingValue);
+    }
+
     @Override
     protected void addButtons() {
         this.redstoneMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 28,
@@ -82,8 +87,4 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     protected void handleButtonVisibility() {
     }
 
-    private void onLevelChange(long level) {
-        NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(level)));
-    }
-
 }
diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
index 0204b1267..bf3497587 100644
--- a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
@@ -71,7 +71,7 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im
 
     @Override
     protected void standardDetectAndSendChanges() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.getSyncHelper().sendDiff(this.listeners);
 
             // clear out config items that are no longer valid (eg capacity upgrade removed)
diff --git a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
index 19fa46dd2..e90c85382 100644
--- a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
@@ -81,7 +81,7 @@ public class FluidInterfaceContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.tankSync.sendDiff(this.listeners);
         }
 
diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
index bbe2b5063..c8f4b955f 100644
--- a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
@@ -4,16 +4,14 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.api.distmarker.Dist;
-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;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.fluids.parts.FluidLevelEmitterPart;
 import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
@@ -25,34 +23,41 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
             FluidLevelEmitterContainer::new, FluidLevelEmitterPart.class, SecurityPermissions.BUILD);
 
     public static FluidLevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
-        return helper.fromNetwork(windowId, inv, buf);
+        return helper.fromNetwork(windowId, inv, buf, (host, container, buffer) -> {
+            container.reportingValue = buffer.readVarLong();
+        });
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator);
+        return helper.open(player, locator, (host, buffer) -> {
+            buffer.writeVarLong(host.getReportingValue());
+        });
     }
 
     private final FluidLevelEmitterPart lvlEmitter;
 
-    @OnlyIn(Dist.CLIENT)
-    private NumberEntryWidget textField;
-    @GuiSync(3)
-    public long EmitterValue = -1;
+    // Only synced once on container-open, and only used on client
+    private long reportingValue;
 
     public FluidLevelEmitterContainer(int id, final PlayerInventory ip, final FluidLevelEmitterPart te) {
         super(TYPE, id, ip, te);
         this.lvlEmitter = te;
     }
 
-    @OnlyIn(Dist.CLIENT)
-    public void setTextField(final NumberEntryWidget level) {
-        this.textField = level;
-        this.textField.setValue(this.EmitterValue);
+    public long getReportingValue() {
+        return reportingValue;
     }
 
-    public void setLevel(final long l, final PlayerEntity player) {
-        this.lvlEmitter.setReportingValue(l);
-        this.EmitterValue = l;
+    public void setReportingValue(long reportingValue) {
+        if (isClient()) {
+            if (reportingValue != this.reportingValue) {
+                this.reportingValue = reportingValue;
+                NetworkHandler.instance()
+                        .sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(reportingValue)));
+            }
+        } else {
+            this.lvlEmitter.setReportingValue(reportingValue);
+        }
     }
 
     @Override
@@ -74,8 +79,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
-            this.EmitterValue = this.lvlEmitter.getReportingValue();
+        if (isServer()) {
             this.setRedStoneMode(
                     (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting(Settings.REDSTONE_EMITTER));
         }
@@ -83,15 +87,6 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
         this.standardDetectAndSendChanges();
     }
 
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("EmitterValue")) {
-            if (this.textField != null) {
-                this.textField.setValue(this.EmitterValue);
-            }
-        }
-    }
-
     @Override
     public IAEFluidTank getFluidConfigInventory() {
         return this.lvlEmitter.getConfig();
diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
index 655d13633..823b59c43 100644
--- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
@@ -128,7 +128,7 @@ public class FluidStorageBusContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.setFuzzyMode((FuzzyMode) this.getUpgradeable().getConfigManager().getSetting(Settings.FUZZY_MODE));
             this.setReadWriteMode(
                     (AccessRestriction) this.getUpgradeable().getConfigManager().getSetting(Settings.ACCESS));
diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
index 6cd449a40..5700f6b12 100644
--- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
@@ -119,7 +119,7 @@ public class FluidTerminalContainer extends AEBaseContainer
         this.clientCM.registerSetting(Settings.SORT_BY, SortOrder.NAME);
         this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
         this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
-        if (Platform.isServer()) {
+        if (isServer()) {
             this.serverCM = terminal.getConfigManager();
             this.monitor = terminal
                     .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class));
@@ -191,7 +191,7 @@ public class FluidTerminalContainer extends AEBaseContainer
     }
 
     private void queueInventory(final IContainerListener c) {
-        if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) {
+        if (isServer() && c instanceof PlayerEntity && this.monitor != null) {
             try {
                 MEFluidInventoryUpdatePacket piu = new MEFluidInventoryUpdatePacket();
                 final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
@@ -216,14 +216,14 @@ public class FluidTerminalContainer extends AEBaseContainer
 
     @Override
     public IConfigManager getConfigManager() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             return this.serverCM;
         }
         return this.clientCM;
     }
 
     public void setTargetStack(final IAEFluidStack stack) {
-        if (Platform.isClient()) {
+        if (isClient()) {
             if (stack == null && this.clientRequestedTargetFluid == null) {
                 return;
             }
@@ -246,7 +246,7 @@ public class FluidTerminalContainer extends AEBaseContainer
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer()) {
+        if (isServer()) {
             if (this.monitor != this.terminal
                     .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class))) {
                 this.setValidContainer(false);
diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.json b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
index 295e03146..0c77639be 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/en_us.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
@@ -289,6 +289,8 @@
   "gui.appliedenergistics2.With": "with",
   "gui.appliedenergistics2.Yellow": "Yellow",
   "gui.appliedenergistics2.Yes": "Yes",
+  "gui.appliedenergistics2.validation.InvalidNumber": "Please enter a number",
+  "gui.appliedenergistics2.validation.NumberLessThanMinValue": "Please enter a number greater than or equal to %d",
   "gui.appliedenergistics2.inWorldCraftingPresses": "Crafting Presses are found in the center of meteorites which can be found in around the world, they can be located by using a meteorite compass.",
   "gui.appliedenergistics2.inWorldFluix": "Drop 1 Charged Certus Quartz + 1 Nether Quartz + Redstone Dust into a puddle next to one another and wait a moment to receive 2 Fluix Crystals.",
   "gui.appliedenergistics2.inWorldPurificationCertus": "Drop a Certus Quartz Seed made from Certus Quartz Dust and Sand into a puddle of water; to make the process faster add Crystal Growth Accelerators.",
diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/states.png b/src/main/resources/assets/appliedenergistics2/textures/guis/states.png
index 15f840c4878a20213a2d8112eba8895576096271..7d2f809a950c6831c848c773fd3d251710fd4391 100644
GIT binary patch
literal 13141
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
Lu6{1-oD!M<K{uIo

literal 12506
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
HP6<r_oWhjA


From e6fb553a53a8c519a7bf7085bc7d1e2997b62c8e Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Sun, 20 Sep 2020 00:26:34 +0200
Subject: [PATCH 5/5] Fixes #4741: Rework Crafting CPU cycling and extract
 commonalities into a separate class. (#4742)

Also Fixes:
- Enter key confirms the "Confirm Crafting" dialog again
- Right Mouse Button correctly cycles backwards through CPUs, while left mouse button forward
- Fixes an internal problem with syncing CPU names
- Naming of unnamed CPUs begins at #1 now
---
 .../java/appeng/client/gui/AEBaseScreen.java  |  23 ++-
 .../implementations/CraftConfirmScreen.java   |  37 ++--
 .../implementations/CraftingStatusScreen.java |  30 +---
 .../gui/implementations/InterfaceScreen.java  |   2 +-
 .../gui/widgets/SettingToggleButton.java      |  10 +-
 .../appeng/container/guisync/SyncData.java    |   2 +
 .../CraftConfirmContainer.java                | 159 +++++-------------
 .../implementations/CraftingCPUContainer.java |  17 +-
 .../implementations/CraftingCPUCycler.java    | 131 +++++++++++++++
 .../CraftingCPUCyclingContainer.java          |  12 ++
 .../implementations/CraftingCPURecord.java    |  17 +-
 .../CraftingStatusContainer.java              | 112 +++---------
 .../core/sync/packets/ConfigValuePacket.java  |  11 +-
 13 files changed, 279 insertions(+), 284 deletions(-)
 create mode 100644 src/main/java/appeng/container/implementations/CraftingCPUCycler.java
 create mode 100644 src/main/java/appeng/container/implementations/CraftingCPUCyclingContainer.java

diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
index 5773c0f11..c73df1de5 100644
--- a/src/main/java/appeng/client/gui/AEBaseScreen.java
+++ b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -106,6 +106,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
     private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
     private ItemStack dbl_whichItem = ItemStack.EMPTY;
     private Slot bl_clicked;
+    private boolean handlingRightClick;
     protected final List<CustomSlotWidget> guiSlots = new ArrayList<>();
 
     public AEBaseScreen(T container, PlayerInventory playerInventory, ITextComponent title) {
@@ -275,12 +276,18 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
         this.drag_click.clear();
 
+        // Forward right-clicks as-if they were left-clicks
         if (btn == 1) {
-            for (final Object o : this.buttons) {
-                final Widget widget = (Widget) o;
-                if (widget.isMouseOver(xCoord, yCoord)) {
-                    return super.mouseClicked(xCoord, yCoord, 0);
+            handlingRightClick = true;
+            try {
+                for (final Object o : this.buttons) {
+                    final Widget widget = (Widget) o;
+                    if (widget.isMouseOver(xCoord, yCoord)) {
+                        return super.mouseClicked(xCoord, yCoord, 0);
+                    }
                 }
+            } finally {
+                handlingRightClick = false;
             }
         }
 
@@ -814,4 +821,12 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
         }
     }
 
+    /**
+     * Returns true while the current event being handled is a click of the right
+     * mouse button.
+     */
+    public boolean isHandlingRightClick() {
+        return handlingRightClick;
+    }
+
 }
diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
index 76c14ff85..6f115c87b 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
@@ -27,6 +27,8 @@ import com.google.common.base.Joiner;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import org.lwjgl.glfw.GLFW;
+
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
@@ -76,10 +78,6 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
         this.setScrollBar(scrollbar);
     }
 
-    boolean isAutoStart() {
-        return this.container.isAutoStart();
-    }
-
     @Override
     public void init() {
         super.init();
@@ -90,8 +88,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
         this.addButton(this.start);
 
         this.selectCPU = new Button(this.guiLeft + (219 - 180) / 2, this.guiTop + this.ySize - 68, 180, 20,
-                new StringTextComponent(GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic),
-                btn -> selectNextCpu());
+                getNextCpuButtonLabel(), btn -> selectNextCpu());
         this.selectCPU.active = false;
         this.addButton(this.selectCPU);
 
@@ -139,22 +136,22 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
     }
 
     private void updateCPUButtonText() {
-        String btnTextText = GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic.getLocal();
-        if (this.container.getSelectedCpu() >= 0)// && status.selectedCpu < status.cpus.size() )
-        {
-            if (this.container.getName() != null) {
-                final String name = this.container.getName().getStringTruncated(20);
-                btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name;
-            } else {
-                btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.container.getSelectedCpu();
-            }
-        }
+        this.selectCPU.setMessage(getNextCpuButtonLabel());
+    }
 
+    private ITextComponent getNextCpuButtonLabel() {
         if (this.container.hasNoCPU()) {
-            btnTextText = GuiText.NoCraftingCPUs.getLocal();
+            return GuiText.NoCraftingCPUs.text();
         }
 
-        this.selectCPU.setMessage(new StringTextComponent(btnTextText));
+        ITextComponent cpuName;
+        if (this.container.cpuName == null) {
+            cpuName = GuiText.Automatic.text();
+        } else {
+            cpuName = this.container.cpuName;
+        }
+
+        return GuiText.CraftingCPU.withSuffix(": ").append(cpuName);
     }
 
     private boolean isSimulation() {
@@ -447,7 +444,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
         if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) {
-            if (keyCode == 28) {
+            if (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
                 this.start();
                 return true;
             }
@@ -456,7 +453,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
     }
 
     private void selectNextCpu() {
-        final boolean backwards = minecraft.mouseHelper.isRightDown();
+        final boolean backwards = isHandlingRightClick();
         NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next"));
     }
 
diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
index a3b4fe4ce..e98ba495a 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
@@ -16,10 +16,6 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-/**
- *
- */
-
 package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
@@ -27,7 +23,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
 
 import appeng.container.implementations.CraftingStatusContainer;
 import appeng.core.localization.GuiText;
@@ -50,8 +45,7 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
     public void init() {
         super.init();
 
-        this.selectCPU = new Button(this.guiLeft + 8, this.guiTop + this.ySize - 25, 150, 20,
-                new StringTextComponent(GuiText.CraftingCPU.getLocal() + ": " + GuiText.NoCraftingCPUs),
+        this.selectCPU = new Button(this.guiLeft + 8, this.guiTop + this.ySize - 25, 150, 20, getNextCpuButtonLabel(),
                 btn -> selectNextCpu());
         this.addButton(this.selectCPU);
 
@@ -68,23 +62,14 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
     }
 
     private void updateCPUButtonText() {
-        String btnTextText = GuiText.NoCraftingJobs.getLocal();
-
-        if (this.container.selectedCpu >= 0)// && status.selectedCpu < status.cpus.size() )
-        {
-            if (this.container.myName != null) {
-                final String name = this.container.myName.getStringTruncated(20);
-                btnTextText = GuiText.CPUs.getLocal() + ": " + name;
-            } else {
-                btnTextText = GuiText.CPUs.getLocal() + ": #" + this.container.selectedCpu;
-            }
-        }
+        this.selectCPU.setMessage(getNextCpuButtonLabel());
+    }
 
+    private ITextComponent getNextCpuButtonLabel() {
         if (this.container.noCPU) {
-            btnTextText = GuiText.NoCraftingJobs.getLocal();
+            return GuiText.NoCraftingJobs.text();
         }
-
-        this.selectCPU.setMessage(new StringTextComponent(btnTextText));
+        return GuiText.CraftingCPU.withSuffix(": ").append(container.cpuName);
     }
 
     @Override
@@ -92,9 +77,8 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
         return in; // the cup name is on the button
     }
 
-    // FIXME: Extract to separate class? Shared with GuiCraftConfirm
     private void selectNextCpu() {
-        final boolean backwards = minecraft.mouseHelper.isRightDown();
+        final boolean backwards = isHandlingRightClick();
         NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next"));
     }
 
diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
index a7d885ac8..fd3c65928 100644
--- a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
@@ -90,7 +90,7 @@ public class InterfaceScreen extends UpgradeableScreen<InterfaceContainer> {
     }
 
     private void selectNextInterfaceMode() {
-        final boolean backwards = getMinecraft().mouseHelper.isRightDown();
+        final boolean backwards = isHandlingRightClick();
         NetworkHandler.instance().sendToServer(new ConfigButtonPacket(Settings.INTERFACE_TERMINAL, backwards));
     }
 
diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
index f5bee7e9c..af875df65 100644
--- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
+++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
@@ -25,6 +25,7 @@ import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
@@ -47,6 +48,7 @@ import appeng.api.config.StorageFilter;
 import appeng.api.config.TerminalStyle;
 import appeng.api.config.ViewItems;
 import appeng.api.config.YesNo;
+import appeng.client.gui.AEBaseScreen;
 import appeng.core.localization.ButtonToolTips;
 import appeng.util.EnumCycler;
 
@@ -232,7 +234,13 @@ public class SettingToggleButton<T extends Enum<T>> extends IconButton {
     }
 
     private void triggerPress() {
-        boolean backwards = Minecraft.getInstance().mouseHelper.isRightDown();
+        boolean backwards = false;
+        // This isn't great, but we don't get any information about right-clicks
+        // otherwise
+        Screen currentScreen = Minecraft.getInstance().currentScreen;
+        if (currentScreen instanceof AEBaseScreen) {
+            backwards = ((AEBaseScreen<?>) currentScreen).isHandlingRightClick();
+        }
         onPress.handle(this, backwards);
     }
 
diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java
index 79d692ded..f5cbb25f4 100644
--- a/src/main/java/appeng/container/guisync/SyncData.java
+++ b/src/main/java/appeng/container/guisync/SyncData.java
@@ -89,6 +89,8 @@ public class SyncData {
                 NetworkHandler.instance().sendTo(new ConfigValuePacket("SyncDat." + this.channel, json),
                         (ServerPlayerEntity) o);
             }
+            this.clientVersion = val;
+            return;
         }
 
         // Types other than ITextComponent must be non-null
diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
index 47e0e2dbd..0f8c87c90 100644
--- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java
@@ -19,14 +19,8 @@
 package appeng.container.implementations;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.concurrent.Future;
 
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableSet;
-
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -67,7 +61,7 @@ import appeng.parts.reporting.CraftingTerminalPart;
 import appeng.parts.reporting.PatternTerminalPart;
 import appeng.parts.reporting.TerminalPart;
 
-public class CraftConfirmContainer extends AEBaseContainer {
+public class CraftConfirmContainer extends AEBaseContainer implements CraftingCPUCyclingContainer {
 
     public static ContainerType<CraftConfirmContainer> TYPE;
 
@@ -82,53 +76,42 @@ public class CraftConfirmContainer extends AEBaseContainer {
         return helper.open(player, locator);
     }
 
-    private final ArrayList<CraftingCPURecord> cpus = new ArrayList<>();
+    private final CraftingCPUCycler cpuCycler;
+
+    private ICraftingCPU selectedCpu;
+
     private Future<ICraftingJob> job;
     private ICraftingJob result;
     @GuiSync(0)
     public long bytesUsed;
-    @GuiSync(1)
-    public long cpuBytesAvail;
-    @GuiSync(2)
-    public int cpuCoProcessors;
     @GuiSync(3)
     public boolean autoStart = false;
     @GuiSync(4)
     public boolean simulation = true;
-    @GuiSync(5)
-    public int selectedCpu = -1;
+
+    // Indicates whether any CPUs are available
     @GuiSync(6)
     public boolean noCPU = true;
+
+    // Properties of the currently selected crafting CPU, this can be null
+    // if no CPUs are available, or if an automatic one is selected
+    @GuiSync(1)
+    public long cpuBytesAvail;
+    @GuiSync(2)
+    public int cpuCoProcessors;
     @GuiSync(7)
-    public ITextComponent myName;
+    public ITextComponent cpuName;
 
     public CraftConfirmContainer(int id, PlayerInventory ip, ITerminalHost te) {
         super(TYPE, id, ip, te);
+        this.cpuCycler = new CraftingCPUCycler(this::cpuMatches, this::onCPUSelectionChanged);
+        // A player can select no crafting CPU to use a suitable one automatically
+        this.cpuCycler.setAllowNoSelection(true);
     }
 
-    public void cycleCpu(final boolean next) {
-        if (next) {
-            this.setSelectedCpu(this.getSelectedCpu() + 1);
-        } else {
-            this.setSelectedCpu(this.getSelectedCpu() - 1);
-        }
-
-        if (this.getSelectedCpu() < -1) {
-            this.setSelectedCpu(this.cpus.size() - 1);
-        } else if (this.getSelectedCpu() >= this.cpus.size()) {
-            this.setSelectedCpu(-1);
-        }
-
-        if (this.getSelectedCpu() == -1) {
-            this.setCpuAvailableBytes(0);
-            this.setCpuCoProcessors(0);
-            this.setName(null);
-        } else {
-            CraftingCPURecord cpu = this.cpus.get(this.getSelectedCpu());
-            this.setName(cpu.getName());
-            this.setCpuAvailableBytes(cpu.getSize());
-            this.setCpuCoProcessors(cpu.getProcessors());
-        }
+    @Override
+    public void cycleSelectedCPU(final boolean next) {
+        this.cpuCycler.cycleCpu(next);
     }
 
     @Override
@@ -137,43 +120,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
             return;
         }
 
-        final ICraftingGrid cc = this.getGrid().getCache(ICraftingGrid.class);
-        final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
-
-        int matches = 0;
-        boolean changed = false;
-        for (final ICraftingCPU c : cpuSet) {
-            boolean found = false;
-            for (final CraftingCPURecord ccr : this.cpus) {
-                if (ccr.getCpu() == c) {
-                    found = true;
-                    break;
-                }
-            }
-
-            final boolean matched = this.cpuMatches(c);
-
-            if (matched) {
-                matches++;
-            }
-
-            if (found == !matched) {
-                changed = true;
-            }
-        }
-
-        if (changed || this.cpus.size() != matches) {
-            this.cpus.clear();
-            for (final ICraftingCPU c : cpuSet) {
-                if (this.cpuMatches(c)) {
-                    this.cpus.add(new CraftingCPURecord(c.getAvailableStorage(), c.getCoProcessors(), c));
-                }
-            }
-
-            this.sendCPUs();
-        }
-
-        this.setNoCPU(this.cpus.isEmpty());
+        this.cpuCycler.detectAndSendChanges(this.getGrid());
 
         super.detectAndSendChanges();
 
@@ -277,22 +224,6 @@ public class CraftConfirmContainer extends AEBaseContainer {
         return c.getAvailableStorage() >= this.getUsedBytes() && !c.isBusy();
     }
 
-    private void sendCPUs() {
-        Collections.sort(this.cpus);
-
-        if (this.getSelectedCpu() >= this.cpus.size()) {
-            this.setSelectedCpu(-1);
-            this.setCpuAvailableBytes(0);
-            this.setCpuCoProcessors(0);
-            this.setName(null);
-        } else if (this.getSelectedCpu() != -1) {
-            CraftingCPURecord cpu = this.cpus.get(this.getSelectedCpu());
-            this.setName(cpu.getName());
-            this.setCpuAvailableBytes(cpu.getSize());
-            this.setCpuCoProcessors(cpu.getProcessors());
-        }
-    }
-
     public void startJob() {
         ContainerType<?> originalGui = null;
 
@@ -315,9 +246,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
 
         if (this.result != null && !this.isSimulation()) {
             final ICraftingGrid cc = this.getGrid().getCache(ICraftingGrid.class);
-            final ICraftingLink g = cc.submitJob(this.result, null,
-                    this.getSelectedCpu() == -1 ? null : this.cpus.get(this.getSelectedCpu()).getCpu(), true,
-                    this.getActionSrc());
+            final ICraftingLink g = cc.submitJob(this.result, null, this.selectedCpu, true, this.getActionSrc());
             this.setAutoStart(false);
             if (g != null && originalGui != null && this.getLocator() != null) {
                 ContainerOpener.openContainer(originalGui, getPlayerInventory().player, getLocator());
@@ -347,6 +276,22 @@ public class CraftConfirmContainer extends AEBaseContainer {
         }
     }
 
+    private void onCPUSelectionChanged(CraftingCPURecord cpuRecord, boolean cpusAvailable) {
+        noCPU = !cpusAvailable;
+
+        if (cpuRecord == null) {
+            cpuBytesAvail = 0;
+            cpuCoProcessors = 0;
+            cpuName = null;
+            selectedCpu = null;
+        } else {
+            cpuBytesAvail = cpuRecord.getSize();
+            cpuCoProcessors = cpuRecord.getProcessors();
+            cpuName = cpuRecord.getName();
+            selectedCpu = cpuRecord.getCpu();
+        }
+    }
+
     public World getWorld() {
         return this.getPlayerInv().player.world;
     }
@@ -371,42 +316,18 @@ public class CraftConfirmContainer extends AEBaseContainer {
         return this.cpuBytesAvail;
     }
 
-    private void setCpuAvailableBytes(final long cpuBytesAvail) {
-        this.cpuBytesAvail = cpuBytesAvail;
-    }
-
     public int getCpuCoProcessors() {
         return this.cpuCoProcessors;
     }
 
-    private void setCpuCoProcessors(final int cpuCoProcessors) {
-        this.cpuCoProcessors = cpuCoProcessors;
-    }
-
-    public int getSelectedCpu() {
-        return this.selectedCpu;
-    }
-
-    private void setSelectedCpu(final int selectedCpu) {
-        this.selectedCpu = selectedCpu;
-    }
-
     public ITextComponent getName() {
-        return this.myName;
-    }
-
-    private void setName(@Nullable final ITextComponent myName) {
-        this.myName = myName;
+        return this.cpuName;
     }
 
     public boolean hasNoCPU() {
         return this.noCPU;
     }
 
-    private void setNoCPU(final boolean noCPU) {
-        this.noCPU = noCPU;
-    }
-
     public boolean isSimulation() {
         return this.simulation;
     }
diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
index fcccf1b5a..901096a5a 100644
--- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java
@@ -66,7 +66,7 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
 
     private final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
-    private IGrid network;
+    private final IGrid network;
     private CraftingCPUCluster monitor = null;
 
     @GuiSync(0)
@@ -81,7 +81,9 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
         final IActionHost host = (IActionHost) (te instanceof IActionHost ? te : null);
 
         if (host != null && host.getActionableNode() != null) {
-            this.setNetwork(host.getActionableNode().getGrid());
+            this.network = host.getActionableNode().getGrid();
+        } else {
+            this.network = null;
         }
 
         if (te instanceof CraftingTileEntity) {
@@ -118,13 +120,13 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
         }
 
         if (c instanceof CraftingCPUCluster) {
-            this.setMonitor((CraftingCPUCluster) c);
+            this.monitor = (CraftingCPUCluster) c;
             this.list.resetStatus();
             this.getMonitor().getListOfItem(this.list, CraftingItemList.ALL);
             this.getMonitor().addListener(this, null);
             this.setEstimatedTime(0);
         } else {
-            this.setMonitor(null);
+            this.monitor = null;
             this.setEstimatedTime(-1);
         }
     }
@@ -232,15 +234,8 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
         return this.monitor;
     }
 
-    private void setMonitor(final CraftingCPUCluster monitor) {
-        this.monitor = monitor;
-    }
-
     IGrid getNetwork() {
         return this.network;
     }
 
-    private void setNetwork(final IGrid network) {
-        this.network = network;
-    }
 }
diff --git a/src/main/java/appeng/container/implementations/CraftingCPUCycler.java b/src/main/java/appeng/container/implementations/CraftingCPUCycler.java
new file mode 100644
index 000000000..d0ada4826
--- /dev/null
+++ b/src/main/java/appeng/container/implementations/CraftingCPUCycler.java
@@ -0,0 +1,131 @@
+package appeng.container.implementations;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import com.google.common.collect.ImmutableSet;
+
+import net.minecraft.util.text.StringTextComponent;
+
+import appeng.api.networking.IGrid;
+import appeng.api.networking.crafting.ICraftingCPU;
+import appeng.api.networking.crafting.ICraftingGrid;
+
+/**
+ * Utility class for dialogs that can cycle through crafting CPUs
+ */
+class CraftingCPUCycler {
+
+    @FunctionalInterface
+    public interface ChangeListener {
+        void onChange(CraftingCPURecord selectedCpu, boolean cpusAvailable);
+    }
+
+    private final Predicate<ICraftingCPU> cpuFilter;
+    private final ChangeListener changeListener;
+    private final List<CraftingCPURecord> cpus = new ArrayList<>();
+    private int selectedCpu = -1;
+    private boolean initialDataSent = false;
+    private boolean allowNoSelection;
+
+    public CraftingCPUCycler(Predicate<ICraftingCPU> cpuFilter, ChangeListener changeListener) {
+        this.cpuFilter = cpuFilter;
+        this.changeListener = changeListener;
+    }
+
+    public void detectAndSendChanges(IGrid network) {
+        final ICraftingGrid cc = network.getCache(ICraftingGrid.class);
+        final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
+
+        int matches = 0;
+        boolean changed = !initialDataSent;
+        initialDataSent = true;
+        for (final ICraftingCPU c : cpuSet) {
+            boolean found = false;
+            for (final CraftingCPURecord ccr : this.cpus) {
+                if (ccr.getCpu() == c) {
+                    found = true;
+                    break;
+                }
+            }
+
+            final boolean matched = this.cpuFilter.test(c);
+
+            if (matched) {
+                matches++;
+            }
+
+            if (found == !matched) {
+                changed = true;
+            }
+        }
+
+        if (changed || this.cpus.size() != matches) {
+            this.cpus.clear();
+            for (final ICraftingCPU c : cpuSet) {
+                if (this.cpuFilter.test(c)) {
+                    this.cpus.add(new CraftingCPURecord(c.getAvailableStorage(), c.getCoProcessors(), c));
+                }
+            }
+
+            // Sort and assign numeric IDs in case they have no names
+            Collections.sort(this.cpus);
+            for (int i = 0; i < this.cpus.size(); i++) {
+                CraftingCPURecord cpu = cpus.get(i);
+                if (cpu.getName() == null) {
+                    cpu.setName(new StringTextComponent("#" + (i + 1)));
+                }
+            }
+
+            this.notifyListener();
+        }
+    }
+
+    public void cycleCpu(final boolean next) {
+        if (next) {
+            this.selectedCpu++;
+        } else {
+            this.selectedCpu--;
+        }
+
+        // If "no CPU" is a valid selection, then -1 is the first potential item
+        int lowerLimit = this.allowNoSelection ? -1 : 0;
+
+        if (this.selectedCpu < lowerLimit) {
+            this.selectedCpu = this.cpus.size() - 1;
+        } else if (this.selectedCpu >= this.cpus.size()) {
+            this.selectedCpu = lowerLimit;
+        }
+
+        this.notifyListener();
+    }
+
+    public boolean isAllowNoSelection() {
+        return allowNoSelection;
+    }
+
+    public void setAllowNoSelection(boolean allowNoSelection) {
+        this.allowNoSelection = allowNoSelection;
+    }
+
+    private void notifyListener() {
+        if (this.selectedCpu >= this.cpus.size()) {
+            this.selectedCpu = -1;
+        }
+
+        // Force the selected CPU to the first available CPU unless no-selection is
+        // explicitly allowed
+        if (!this.allowNoSelection && this.selectedCpu == -1 && !this.cpus.isEmpty()) {
+            this.selectedCpu = 0;
+        }
+
+        if (this.selectedCpu != -1) {
+            this.changeListener.onChange(this.cpus.get(this.selectedCpu), true);
+        } else {
+            this.changeListener.onChange(null, !this.cpus.isEmpty());
+        }
+    }
+
+}
diff --git a/src/main/java/appeng/container/implementations/CraftingCPUCyclingContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUCyclingContainer.java
new file mode 100644
index 000000000..b2877ac9f
--- /dev/null
+++ b/src/main/java/appeng/container/implementations/CraftingCPUCyclingContainer.java
@@ -0,0 +1,12 @@
+package appeng.container.implementations;
+
+/**
+ * Implemented on screens that show information about a crafting CPU and allow
+ * the CPU to be cycled. Is triggered by receiving a config value packet with
+ * name <code>Terminal.Cpu</code>.
+ */
+public interface CraftingCPUCyclingContainer {
+
+    void cycleSelectedCPU(boolean forward);
+
+}
diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java
index d2d0ee459..55dbff264 100644
--- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java
+++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java
@@ -25,16 +25,16 @@ import net.minecraft.util.text.ITextComponent;
 import appeng.api.networking.crafting.ICraftingCPU;
 
 public class CraftingCPURecord implements Comparable<CraftingCPURecord> {
-    private final ITextComponent myName;
     private final ICraftingCPU cpu;
     private final long size;
     private final int processors;
+    private ITextComponent name;
 
     public CraftingCPURecord(final long size, final int coProcessors, final ICraftingCPU server) {
         this.size = size;
         this.processors = coProcessors;
         this.cpu = server;
-        this.myName = server.getName();
+        this.name = server.getName();
     }
 
     @Override
@@ -50,10 +50,6 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord> {
         return this.cpu;
     }
 
-    ITextComponent getName() {
-        return this.myName;
-    }
-
     int getProcessors() {
         return this.processors;
     }
@@ -61,4 +57,13 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord> {
     long getSize() {
         return this.size;
     }
+
+    public ITextComponent getName() {
+        return name;
+    }
+
+    public void setName(ITextComponent name) {
+        this.name = name;
+    }
+
 }
diff --git a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
index dcd1f8406..a1c173661 100644
--- a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
+++ b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java
@@ -18,12 +18,6 @@
 
 package appeng.container.implementations;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.ImmutableSet;
-
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
@@ -31,13 +25,13 @@ import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.api.config.SecurityPermissions;
+import appeng.api.networking.IGrid;
 import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.storage.ITerminalHost;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 
-public class CraftingStatusContainer extends CraftingCPUContainer {
+public class CraftingStatusContainer extends CraftingCPUContainer implements CraftingCPUCyclingContainer {
 
     public static ContainerType<CraftingStatusContainer> TYPE;
 
@@ -52,13 +46,13 @@ public class CraftingStatusContainer extends CraftingCPUContainer {
         return helper.open(player, locator);
     }
 
-    private final List<CraftingCPURecord> cpus = new ArrayList<>();
-    @GuiSync(5)
-    public int selectedCpu = -1;
+    private final CraftingCPUCycler cpuCycler = new CraftingCPUCycler(this::cpuMatches, this::onCPUSelectionChanged);
+
     @GuiSync(6)
     public boolean noCPU = true;
+
     @GuiSync(7)
-    public ITextComponent myName;
+    public ITextComponent cpuName;
 
     public CraftingStatusContainer(int id, final PlayerInventory ip, final ITerminalHost te) {
         super(TYPE, id, ip, te);
@@ -66,43 +60,9 @@ public class CraftingStatusContainer extends CraftingCPUContainer {
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer() && this.getNetwork() != null) {
-            final ICraftingGrid cc = this.getNetwork().getCache(ICraftingGrid.class);
-            final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
-
-            int matches = 0;
-            boolean changed = false;
-            for (final ICraftingCPU c : cpuSet) {
-                boolean found = false;
-                for (final CraftingCPURecord ccr : this.cpus) {
-                    if (ccr.getCpu() == c) {
-                        found = true;
-                    }
-                }
-
-                final boolean matched = this.cpuMatches(c);
-
-                if (matched) {
-                    matches++;
-                }
-
-                if (found == !matched) {
-                    changed = true;
-                }
-            }
-
-            if (changed || this.cpus.size() != matches) {
-                this.cpus.clear();
-                for (final ICraftingCPU c : cpuSet) {
-                    if (this.cpuMatches(c)) {
-                        this.cpus.add(new CraftingCPURecord(c.getAvailableStorage(), c.getCoProcessors(), c));
-                    }
-                }
-
-                this.sendCPUs();
-            }
-
-            this.noCPU = this.cpus.isEmpty();
+        IGrid network = this.getNetwork();
+        if (isServer() && network != null) {
+            cpuCycler.detectAndSendChanges(network);
         }
 
         super.detectAndSendChanges();
@@ -112,52 +72,20 @@ public class CraftingStatusContainer extends CraftingCPUContainer {
         return c.isBusy();
     }
 
-    private void sendCPUs() {
-        Collections.sort(this.cpus);
-
-        if (this.selectedCpu >= this.cpus.size()) {
-            this.selectedCpu = -1;
-            this.myName = null;
-        } else if (this.selectedCpu != -1) {
-            this.myName = this.cpus.get(this.selectedCpu).getName();
-        }
-
-        if (this.selectedCpu == -1 && this.cpus.size() > 0) {
-            this.selectedCpu = 0;
-        }
-
-        if (this.selectedCpu != -1) {
-            if (this.cpus.get(this.selectedCpu).getCpu() != this.getMonitor()) {
-                this.setCPU(this.cpus.get(this.selectedCpu).getCpu());
-            }
+    private void onCPUSelectionChanged(CraftingCPURecord cpuRecord, boolean cpusAvailable) {
+        noCPU = !cpusAvailable;
+        if (cpuRecord == null) {
+            cpuName = null;
+            setCPU(null);
         } else {
-            this.setCPU(null);
+            cpuName = cpuRecord.getName();
+            setCPU(cpuRecord.getCpu());
         }
     }
 
-    public void cycleCpu(final boolean next) {
-        if (next) {
-            this.selectedCpu++;
-        } else {
-            this.selectedCpu--;
-        }
-
-        if (this.selectedCpu < -1) {
-            this.selectedCpu = this.cpus.size() - 1;
-        } else if (this.selectedCpu >= this.cpus.size()) {
-            this.selectedCpu = -1;
-        }
-
-        if (this.selectedCpu == -1 && this.cpus.size() > 0) {
-            this.selectedCpu = 0;
-        }
-
-        if (this.selectedCpu == -1) {
-            this.myName = null;
-            this.setCPU(null);
-        } else {
-            this.myName = this.cpus.get(this.selectedCpu).getName();
-            this.setCPU(this.cpus.get(this.selectedCpu).getCpu());
-        }
+    @Override
+    public void cycleSelectedCPU(boolean forward) {
+        this.cpuCycler.cycleCpu(forward);
     }
+
 }
diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
index 5a222403b..4ab5bfa90 100644
--- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
+++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
@@ -37,7 +37,7 @@ import appeng.container.AEBaseContainer;
 import appeng.container.implementations.CellWorkbenchContainer;
 import appeng.container.implementations.CraftConfirmContainer;
 import appeng.container.implementations.CraftingCPUContainer;
-import appeng.container.implementations.CraftingStatusContainer;
+import appeng.container.implementations.CraftingCPUCyclingContainer;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.container.implementations.NetworkToolContainer;
 import appeng.container.implementations.PatternTermContainer;
@@ -98,12 +98,9 @@ public class ConfigValuePacket extends BasePacket {
             final ItemStack is = player.getHeldItem(hand);
             final IMouseWheelItem si = (IMouseWheelItem) is.getItem();
             si.onWheel(is, this.Value.equals("WheelUp"));
-        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftingStatusContainer) {
-            final CraftingStatusContainer qk = (CraftingStatusContainer) c;
-            qk.cycleCpu(this.Value.equals("Next"));
-        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftConfirmContainer) {
-            final CraftConfirmContainer qk = (CraftConfirmContainer) c;
-            qk.cycleCpu(this.Value.equals("Next"));
+        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftingCPUCyclingContainer) {
+            final CraftingCPUCyclingContainer qk = (CraftingCPUCyclingContainer) c;
+            qk.cycleSelectedCPU(this.Value.equals("Next"));
         } else if (this.Name.equals("Terminal.Start") && c instanceof CraftConfirmContainer) {
             final CraftConfirmContainer qk = (CraftConfirmContainer) c;
             qk.startJob();