Dissolved the top-level fluid package (for now) and grouped Fluid classes with their item counterparts to facilitate easier refactoring later.

.github/workflows/pull_requests.yml

@@ -2,8 +2,7 @@ name: 'Build PRs'
 
 on:
   pull_request:
-    branches:
+    branches: [ master ]
-      - '*'
 
 jobs:
   build:

README.md

@@ -25,9 +25,9 @@ A Mod about Matter, Energy and using them to conquer the world..
 ## Contacts
 
 * [Website](http://ae-mod.info/)
-* [Discord](https://discord.gg/GygKjjm)
-* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
 * [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
+* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
+* [Discord](https://discord.gg/GygKjjm)
 
 ## License
 
@@ -38,7 +38,7 @@ A Mod about Matter, Energy and using them to conquer the world..
   - (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2020, [Ridanisaurus Rid](https://github.com/Ridanisaurus/), (c) 2013 - 2020 AlgorithmX2 et al
+  - (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
   - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
@@ -72,20 +72,12 @@ The API for Applied Energistics 2. It is open source to discuss changes, improve
 
 ### Maven
 
-Our authoritative Maven repository is Github Packages, which you can also use in your builds. Use of Github Packages 
+We use Github Packages as maven repository now. You can use the following snippet as example on how to add a repository to your gradle build file.
-[requires special setup](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages#authenticating-to-github-packages) 
-to authenticate with your personal access token.
-
-AE2 is also available without authentication from Modmaven. You can use the following snippet as example on how to add a repository to your gradle build file.
 
     repositories {
         maven {
-            name "Modmaven"
+            name "AE2"
-            url "https://modmaven.k-4u.nl/"
+            url "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
-            // For Gradle 5.1 and above, limit it to just AE2
-            content {
-                includeGroup 'appeng'
-            }
         }
     }
 
@@ -185,5 +177,4 @@ Thanks to
 * Notch et al for Minecraft
 * Lex et al for MinecraftForge
 * AlgorithmX2 for AppliedEnergistics2
-* [Ridanisaurus Rid](https://github.com/Ridanisaurus/) for the new 2020 textures
 * all [contributors](https://github.com/AppliedEnergistics/Applied-Energistics-2/graphs/contributors)

build.gradle

@@ -30,10 +30,11 @@ buildscript {
 }
 
 plugins {
-    id "maven-publish"
+  id "maven-publish"
-    id "com.diffplug.gradle.spotless" version "4.3.0"
+  id "com.diffplug.gradle.spotless" version "4.3.0"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
+  id "com.matthewprenger.cursegradle" version "1.4.0"
-    id "idea"
+  id "org.sonarqube" version "2.8"
+  id "jacoco"
 }
 
 apply plugin: 'net.minecraftforge.gradle'
@@ -44,32 +45,8 @@ repositories {
     mavenLocal()
     jcenter()
     mavenCentral()
-    maven { // modmaven, maven proxy
-        name 'modmaven'
-        url "https://modmaven.k-4u.nl/"
-    }
 }
 
-dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-
-    // compile against provided APIs
-    compileOnly "mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api"
-    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
-
-    // Runtime, Mods
-    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
-    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
-
-    // unit test dependencies
-    testCompile "junit:junit:4.13"
-    
-    // Annotation Processors
-    annotationProcessor 'org.spongepowered:mixin:0.8:processor'
-}
-group = artifact_group
-archivesBaseName = artifact_basename
-
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 compileJava {
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
@@ -81,8 +58,7 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-///////////////////
+// Create version number
-// Version Number
 version = version_major + "." + version_minor + "." + version_patch
 
 ext.pr = System.getenv('PR_NUMBER') ?: ""
@@ -100,8 +76,10 @@ if (ext.release) {
   version = ext.release
 }
 
-ext.isAlpha = project.version.contains("alpha")
+
-ext.isBeta = project.version.contains("beta")
+// Maven group and artifact name
+group = artifact_group
+archivesBaseName = artifact_basename
 
 sourceSets {
     api
@@ -125,8 +103,9 @@ configurations {
     apiCompile.extendsFrom(compile)
 }
 
-////////////////////
+apply from: 'gradle/scripts/dependencies.gradle'
-// Forge/Minecraft
+apply from: 'gradle/scripts/spotless.gradle'
+
 minecraft {
     mappings channel: "snapshot", version: project.mcp_mappings
 
@@ -157,9 +136,6 @@ minecraft {
         data {
             property 'forge.logging.console.level', 'debug'
             workingDirectory project.file('run')
-            // ForgeGradle will just force-exit the Gradle Daemon which fails our builds in case
-            // a daemon is used for any reason.
-            forceExit false
             args '--mod', 'appliedenergistics2', '--all', '--output', file('src/generated/resources/')
             mods {
                 appliedenergistics2 {
@@ -171,14 +147,18 @@ minecraft {
     }
 }
 
-///////////
-// Mixins
 mixin {
     add sourceSets.main, "appliedenergistics2.mixins.refmap.json"
 }
 
-////////////////
+jar {
-// Jar Signing
+    manifest {
+        attributes([
+                "MixinConfigs": "appliedenergistics2.mixins.json"
+        ])
+    }
+}
+
 def signProps = [:]
 if (System.getenv("KEY_STORE_FILE")) {
     signProps['keyStore'] = System.getenv("KEY_STORE_FILE")
@@ -201,75 +181,9 @@ task signJar(type: net.minecraftforge.gradle.common.task.SignJar, dependsOn: 're
     }
 }
 
-//////////////
+apply from: 'gradle/scripts/artifacts.gradle'
-// Aritfacts
+apply from: 'gradle/scripts/curseforge.gradle'
-processResources {
-    exclude '.cache'
-}
 
-jar {
-    finalizedBy 'reobfJar'
-    finalizedBy 'signJar'
-
-    from sourceSets.main.output.classesDirs
-    from sourceSets.api.output.classesDirs
-    from sourceSets.main.output.resourcesDir
-    from sourceSets.api.output.resourcesDir
-
-    manifest {
-        attributes([
-                "Specification-Title": "Applied Energistics 2",
-                "Specification-Vendor": "TeamAppliedEnergistics",
-                "Specification-Version": "${project.version}",
-                "Implementation-Title": "${project.name}",
-                "Implementation-Version": "${project.version}",
-                "Implementation-Vendor" :"TeamAppliedEnergistics",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                "MixinConfigs": "appliedenergistics2.mixins.json"
-        ])
-    }
-}
-
-task javadocs(type: Javadoc) {
-    classpath = sourceSets.main.compileClasspath
-    source = sourceSets.api.java
-    include "appeng/api/**"
-
-    options.addStringOption('Xdoclint:none', '-quiet')
-    options.encoding = 'UTF-8'
-    options.charSet = 'UTF-8'
-}
-
-task javadocJar(type: Jar, dependsOn: javadocs) {
-    classifier = "javadoc"
-    from javadoc.destinationDir
-}
-
-task sourcesJar(type: Jar) {
-    classifier = "sources"
-    from sourceSets.main.allJava
-    from sourceSets.api.allJava
-}
-
-task apiJar(type: Jar) {
-    classifier = "api"
-    from sourceSets.api.output
-    include "appeng/api/**"
-
-    // TODO: when FG bug is fixed, remove allJava from the api jar.
-    // https://github.com/MinecraftForge/ForgeGradle/issues/369
-    // Gradle should be able to pull them from the -sources jar.
-    from sourceSets.api.allJava
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-    archives apiJar
-}
-
-//////////////////
-// Maven publish
 publishing {
     publications {
         maven(MavenPublication) {
@@ -308,53 +222,3 @@ publishing {
         }
     }
 }
-
-/////////////
-// Spotless
-spotless {
-    java {
-        target 'src/*/java/appeng/**/*.java'
-
-        indentWithSpaces()
-        eclipse().configFile 'codeformat/codeformat.xml'
-        importOrderFile 'codeformat/ae2.importorder'
-    }
-    format 'json', {
-        target 'src/*/resources/**/*.json'
-        targetExclude 'src/generated/resources/**'
-        prettier().config(['parser': 'json'])
-    }
-}
-
-////////////////
-// Curse Forge
-if (System.getenv("CURSEFORGE")) {
-    def cfReleaseType = "release"
-    if (ext.isAlpha) {
-      cfReleaseType = "alpha"
-    } else if (ext.isBeta) {
-      cfReleaseType = "beta"
-    }
-
-    curseforge {
-        apiKey = System.getenv("CURSEFORGE")
-        project {
-            id = project.curseforge_project
-            changelogType = "markdown"
-            changelog = System.getenv("CHANGELOG") ?: "Please visit our [releases](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases) for a changelog"
-            releaseType = cfReleaseType
-        }
-    }
-}
-
-////////////////
-// IntelliJ Project Import
-// The Mixin annotation process does not have an obfuscation source when running through the IntelliJ compiler,
-// thus we have to prevent it from being activated as part of importing this Gradle project into IntelliJ.
-if (System.getProperty("idea.sync.active") == "true") {
-    afterEvaluate {
-        tasks.withType(JavaCompile).all {
-            it.options.annotationProcessorPath = files()
-        }
-    }
-}

gradle.properties

@@ -9,24 +9,23 @@ artifact_basename=appliedenergistics2
 # Minecraft Versions                                    #
 #########################################################
 minecraft_release=1.16
-minecraft_version=1.16.3
+minecraft_version=1.16.1
-mcp_mappings=20200916-1.16.2
+mcp_mappings=20200723-1.16.1
-forge_version=34.0.8
+forge_version=32.0.108
 
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_minecraft_version=1.16.2
+jei_version=7.0.0.6
-jei_version=7.3.2.25
+top_version=3.0.1-beta-4
-top_version=3.0.3-beta-6
 hwyla_version=1.10.8-B72_1.15.2
 ctm_version=MC1.15.2-1.1.0.9
 
 #########################################################
 # Deployment                                            #
 #########################################################
-website_version=1.16.2
+website_version=1.16.1
-curse_versions=1.16.2
+curse_versions=1.16.1
 curseforge_project=223794
 
 #########################################################

gradle/scripts/artifacts.gradle

@@ -0,0 +1,81 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, 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>.
+ */
+
+processResources {
+    exclude '.cache'
+}
+
+jar {
+    finalizedBy 'reobfJar'
+    finalizedBy 'signJar'
+
+    from sourceSets.main.output.classesDirs
+    from sourceSets.api.output.classesDirs
+    from sourceSets.main.output.resourcesDir
+    from sourceSets.api.output.resourcesDir
+
+    manifest {
+        attributes([
+                "Specification-Title": "Applied Energistics 2",
+                "Specification-Vendor": "TeamAppliedEnergistics",
+                "Specification-Version": "${project.version}",
+                "Implementation-Title": "${project.name}",
+                "Implementation-Version": "${project.version}",
+                "Implementation-Vendor" :"TeamAppliedEnergistics",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+        ])
+    }
+}
+
+task javadocs(type: Javadoc) {
+    classpath = sourceSets.main.compileClasspath
+    source = sourceSets.api.java
+    include "appeng/api/**"
+
+    options.addStringOption('Xdoclint:none', '-quiet')
+    options.encoding = 'UTF-8'
+    options.charSet = 'UTF-8'
+}
+
+task javadocJar(type: Jar, dependsOn: javadocs) {
+    classifier = "javadoc"
+    from javadoc.destinationDir
+}
+
+task sourcesJar(type: Jar) {
+    classifier = "sources"
+    from sourceSets.main.allJava
+    from sourceSets.api.allJava
+}
+
+task apiJar(type: Jar) {
+    classifier = "api"
+    from sourceSets.api.output
+    include "appeng/api/**"
+
+    // TODO: when FG bug is fixed, remove allJava from the api jar.
+    // https://github.com/MinecraftForge/ForgeGradle/issues/369
+    // Gradle should be able to pull them from the -sources jar.
+    from sourceSets.api.allJava
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+    archives apiJar
+}

gradle/scripts/curseforge.gradle

@@ -0,0 +1,39 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2020, TeamAppliedEnergistics, 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
+ *g 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>.
+ */
+
+def isAlpha = project.version.contains("alpha")
+def isBeta = project.version.contains("beta")
+
+def cfReleaseType = "release"
+if (isAlpha) {
+  cfReleaseType = "alpha"
+} else if (isBeta) {
+  cfReleaseType = "beta"
+}
+
+if (System.getenv("CURSEFORGE")) {
+  curseforge {
+    apiKey = System.getenv("CURSEFORGE")
+    project {
+      id = project.curseforge_project
+      changelogType = "markdown"
+      changelog = System.getenv("CHANGELOG") ?: "Please visit our [releases](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases) for a changelog"
+      releaseType = cfReleaseType
+    }
+  }
+}

gradle/scripts/dependencies.gradle

@@ -0,0 +1,42 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, 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>.
+ */
+
+repositories {
+    mavenLocal()
+
+    maven { // modmaven, maven proxy
+        name 'modmaven'
+        url "https://modmaven.k-4u.nl/"
+    }
+}
+
+dependencies {
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+
+    // compile against provided APIs
+    compileOnly "mezz.jei:jei-${minecraft_version}:${jei_version}:api"
+    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
+
+    // Runtime, Mods
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
+    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
+    //runtimeOnly fg.deobf("team.chisel.ctm:CTM:${ctm_version}")
+
+    // unit test dependencies
+    testCompile "junit:junit:4.13"
+}

gradle/scripts/spotless.gradle

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2020, 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
+ *g 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>.
+ */
+
+spotless {
+    java {
+        target 'src/*/java/appeng/**/*.java'
+
+        indentWithSpaces()
+        eclipse().configFile 'codeformat/codeformat.xml'
+        importOrderFile 'codeformat/ae2.importorder'
+    }
+    format 'json', {
+        target 'src/*/resources/**/*.json'
+        targetExclude 'src/generated/resources/**'
+        prettier().config(['parser': 'json'])
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/api/java/appeng/api/networking/GridNotification.java

@@ -28,9 +28,4 @@ public enum GridNotification {
      * the visible connections for this node have changed, useful for cable.
      */
     CONNECTIONS_CHANGED,
-
-    /**
-     * the owner of the grid node has changed, and the node needs to be re-saved
-     */
-    OWNER_CHANGED
 }

src/api/java/appeng/api/networking/IGridBlock.java

@@ -87,8 +87,7 @@ public interface IGridBlock {
     AEColor getGridColor();
 
     /**
-     * Called by the {@link IGridNode} to notify its {@link IGridBlock} about
+     * Notifies your IGridBlock that changes were made to your connections
-     * events.
      */
     void onGridNotification(@Nonnull GridNotification notification);
 

src/api/java/appeng/api/util/DimensionalCoord.java

@@ -27,14 +27,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.DimensionType;
 import net.minecraft.world.IWorld;
-import net.minecraft.world.World;
 
 /**
  * Represents a location in the Minecraft Universe
  */
 public class DimensionalCoord extends WorldCoord {
 
-    private final World world;
+    private final IWorld world;
     private final DimensionType dimension;
 
     public DimensionalCoord(final DimensionalCoord coordinate) {
@@ -46,19 +45,19 @@ public class DimensionalCoord extends WorldCoord {
     public DimensionalCoord(final TileEntity tileEntity) {
         super(tileEntity);
         this.world = tileEntity.getWorld();
-        this.dimension = this.world.getDimensionType();
+        this.dimension = this.world.func_230315_m_();
     }
 
-    public DimensionalCoord(final World world, final int x, final int y, final int z) {
+    public DimensionalCoord(final IWorld world, final int x, final int y, final int z) {
         super(x, y, z);
         this.world = world;
-        this.dimension = world.getDimensionType();
+        this.dimension = world.func_230315_m_();
     }
 
-    public DimensionalCoord(final World world, final BlockPos pos) {
+    public DimensionalCoord(final IWorld world, final BlockPos pos) {
         super(pos);
         this.world = world;
-        this.dimension = world.getDimensionType();
+        this.dimension = world.func_230315_m_();
     }
 
     @Override
@@ -85,7 +84,7 @@ public class DimensionalCoord extends WorldCoord {
         return this.world == world;
     }
 
-    public World getWorld() {
+    public IWorld getWorld() {
         return this.world;
     }
 

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -111,6 +111,11 @@ public abstract class AEBaseTileBlock<T extends AEBaseTileEntity> extends AEBase
         return this.tileEntityFactory.get();
     }
 
+    @Override
+    public void dropXpOnBlockBreak(World worldIn, BlockPos pos, int amount) {
+        super.dropXpOnBlockBreak(worldIn, pos, amount);
+    }
+
     @Override
     public void onReplaced(BlockState state, World w, BlockPos pos, BlockState newState, boolean isMoving) {
         if (newState.getBlock() == state.getBlock()) {

src/main/java/appeng/block/misc/FluidInterfaceBlock.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.block;
+package appeng.block.misc;
 
 import javax.annotation.Nullable;
 
@@ -33,8 +33,8 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.container.implementations.FluidInterfaceContainer;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.util.Platform;
 
 public class FluidInterfaceBlock extends AEBaseTileBlock<FluidInterfaceTileEntity> {

src/main/java/appeng/block/networking/CableBusBlock.java

@@ -39,8 +39,6 @@ import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.DyeColor;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
-import net.minecraft.state.IntegerProperty;
-import net.minecraft.state.StateContainer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
@@ -84,12 +82,8 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
 
     private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
 
-    private static final IntegerProperty LIGHT_LEVEL = IntegerProperty.create("light_level", 0, 15);
-
     public CableBusBlock() {
-        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity()
+        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity());
-                .setLightLevel(state -> state.get(LIGHT_LEVEL)));
-        setDefaultState(getDefaultState().with(LIGHT_LEVEL, 0));
     }
 
     @Override
@@ -132,9 +126,11 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
     }
 
     @Override
-    protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
+    public int getLightValue(final BlockState state, final IBlockReader world, final BlockPos pos) {
-        super.fillStateContainer(builder);
+        if (state.getBlock() != this) {
-        builder.add(LIGHT_LEVEL);
+            return state.getBlock().getLightValue(state, world, pos);
+        }
+        return this.cb(world, pos).getLightValue();
     }
 
     @Override
@@ -390,13 +386,4 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
         }
     }
 
-    @Override
-    protected BlockState updateBlockStateFromTileEntity(BlockState currentState, CableBusTileEntity te) {
-        if (currentState.getBlock() != this) {
-            return currentState;
-        }
-        int lightLevel = te.getCableBus().getLightValue();
-        return super.updateBlockStateFromTileEntity(currentState, te).with(LIGHT_LEVEL, lightLevel);
-    }
-
 }

src/main/java/appeng/block/networking/EnergyCellBlock.java

@@ -35,9 +35,7 @@ import appeng.tile.networking.EnergyCellTileEntity;
 
 public class EnergyCellBlock extends AEBaseTileBlock<EnergyCellTileEntity> {
 
-    public static final int MAX_FULLNESS = 4;
+    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, 7);
-
-    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, MAX_FULLNESS);
 
     public EnergyCellBlock() {
         super(defaultProps(AEMaterials.GLASS));

src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java

@@ -79,10 +79,10 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel {
 
             if (s.isLumen()) {
                 builder.setColorRGB(s.getColor().whiteVariant);
-                builder.setEmissiveMaterial(true);
+                builder.setRenderFullBright(true);
             } else {
                 builder.setColorRGB(s.getColor().mediumVariant);
-                builder.setEmissiveMaterial(false);
+                builder.setRenderFullBright(false);
             }
 
             float offset = offsetConstant;
@@ -167,7 +167,7 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -117,7 +117,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
 
                 if (formedState.isPowered()) {
                     builder.setTexture(this.lightCornerTexture);
-                    builder.setEmissiveMaterial(true);
+                    builder.setRenderFullBright(true);
                     for (Direction facing : Direction.values()) {
                         // Offset the face by a slight amount so that it is drawn over the already drawn
                         // ring texture
@@ -131,7 +131,6 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
                                 DEFAULT_RENDER_MIN - zOffset, DEFAULT_RENDER_MAX + xOffset,
                                 DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset);
                     }
-                    builder.setEmissiveMaterial(false);
                 }
             } else {
                 builder.setTexture(this.ringTexture);
@@ -144,7 +143,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
 
                 if (formedState.isPowered()) {
                     builder.setTexture(this.lightTexture);
-                    builder.setEmissiveMaterial(true);
+                    builder.setRenderFullBright(true);
                     for (Direction facing : Direction.values()) {
                         // Offset the face by a slight amount so that it is drawn over the already drawn
                         // ring texture
@@ -203,7 +202,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java

@@ -160,7 +160,7 @@ class BlockDefinitionBuilder implements IBlockBuilder {
                 @Override
                 @OnlyIn(Dist.CLIENT)
                 public void setup() {
-                    ItemModelsProperties.registerProperty(item, new ResourceLocation("appliedenergistics2:fill_level"),
+                    ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:fill_level"),
                             (is, world, entity) -> {
                                 double curPower = chargeable.getAECurrentPower(is);
                                 double maxPower = chargeable.getAEMaxPower(is);

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

@@ -22,7 +22,6 @@ import java.text.NumberFormat;
 import java.util.List;
 import java.util.Locale;
 
-import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.entity.player.PlayerInventory;
@@ -73,16 +72,14 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
                     currentToolTip.add(ButtonToolTips.ItemsRequestable.text(formattedAmount));
                 }
 
-                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
-                        this.font);
 
                 return;
             } else if (stack.getCount() > bigNumber) {
                 final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(stack.getCount());
                 currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).mergeStyle(TextFormatting.GRAY));
 
-                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
-                        this.font);
 
                 return;
             }

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

@@ -70,6 +70,7 @@ import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
+import appeng.client.render.FluidStackSizeRenderer;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngCraftingSlot;
@@ -78,6 +79,7 @@ import appeng.container.slot.AppEngSlot.CalculatedValidity;
 import appeng.container.slot.CraftingTermSlot;
 import appeng.container.slot.DisabledSlot;
 import appeng.container.slot.FakeSlot;
+import appeng.container.slot.IMEFluidSlot;
 import appeng.container.slot.IOptionalSlot;
 import appeng.container.slot.InaccessibleSlot;
 import appeng.container.slot.OutputSlot;
@@ -88,8 +90,6 @@ import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.InventoryActionPacket;
 import appeng.core.sync.packets.SwapSlotsPacket;
-import appeng.fluids.client.render.FluidStackSizeRenderer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 
 public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerScreen<T> {
@@ -106,7 +106,6 @@ 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) {
@@ -147,7 +146,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
         RenderSystem.popMatrix();
         RenderSystem.enableDepthTest();
 
-        this.renderHoveredTooltip(matrixStack, mouseX, mouseY);
+        this.func_230459_a_(matrixStack, mouseX, mouseY);
 
         for (final Object c : this.buttons) {
             if (c instanceof ITooltip) {
@@ -219,7 +218,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
             styledLines.add(lines.get(i).deepCopy().modifyStyle(s -> style));
         }
 
-        this.func_243308_b(matrices, styledLines, x, y);
+        this.renderTooltip(matrices, styledLines, x, y);
 
     }
 
@@ -230,7 +229,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
 
         if (this.getScrollBar() != null) {
-            this.getScrollBar().draw(matrixStack, this);
+            this.getScrollBar().draw(this);
         }
 
         this.drawFG(matrixStack, ox, oy, x, y);
@@ -276,18 +275,12 @@ 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) {
-            handlingRightClick = true;
+            for (final Object o : this.buttons) {
-            try {
+                final Widget widget = (Widget) o;
-                for (final Object o : this.buttons) {
+                if (widget.isMouseOver(xCoord, yCoord)) {
-                    final Widget widget = (Widget) o;
+                    return super.mouseClicked(xCoord, yCoord, 0);
-                    if (widget.isMouseOver(xCoord, yCoord)) {
-                        return super.mouseClicked(xCoord, yCoord, 0);
-                    }
                 }
-            } finally {
-                handlingRightClick = false;
             }
         }
 
@@ -298,36 +291,22 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
             }
         }
 
-        // Forward left mouse button down events to the scrollbar
+        if (this.getScrollBar() != null) {
-        if (btn == 0 && this.getScrollBar() != null) {
+            this.getScrollBar().click(xCoord - this.guiLeft, yCoord - this.guiTop);
-            if (this.getScrollBar().mouseDown(xCoord - this.guiLeft, yCoord - this.guiTop)) {
-                return true;
-            }
         }
 
         return super.mouseClicked(xCoord, yCoord, btn);
     }
 
-    @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        // Forward left mouse button up events to the scrollbar
-        if (button == 0 && this.getScrollBar() != null) {
-            if (this.getScrollBar().mouseUp(mouseX - this.guiLeft, mouseY - this.guiTop)) {
-                return true;
-            }
-        }
-
-        return super.mouseReleased(mouseX, mouseY, button);
-    }
-
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int mouseButton, double dragX, double dragY) {
+
         final Slot slot = this.getSlot((int) mouseX, (int) mouseY);
         final ItemStack itemstack = getPlayer().inventory.getItemStack();
 
         if (this.getScrollBar() != null) {
             // FIXME: Coordinate system of mouseX/mouseY is unclear
-            this.getScrollBar().mouseDragged((int) mouseX - this.guiLeft, (int) mouseY - this.guiTop);
+            this.getScrollBar().click((int) mouseX - this.guiLeft, (int) mouseY - this.guiTop);
         }
 
         if (slot instanceof FakeSlot && !itemstack.isEmpty()) {
@@ -602,7 +581,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
         if (slot instanceof SlotME) {
             final IAEItemStack item = ((SlotME) slot).getAEStack();
             if (item != null) {
-                this.container.setTargetStack(item);
+                ((AEBaseContainer) this.container).setTargetStack(item);
                 final InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
                 final int times = (int) Math.abs(wheel);
                 final int inventorySize = this.getInventorySlots().size();
@@ -635,7 +614,15 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
     }
 
     protected ITextComponent getGuiDisplayName(final ITextComponent in) {
-        return title.getString().isEmpty() ? in : title;
+        return this.hasCustomInventoryName() ? new StringTextComponent(this.getInventoryName()) : in;
+    }
+
+    private boolean hasCustomInventoryName() {
+        return this.container.getCustomName() != null;
+    }
+
+    private String getInventoryName() {
+        return this.container.getCustomName();
     }
 
     /**
@@ -809,11 +796,6 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
 
     public void tick() {
         super.tick();
-
-        if (this.getScrollBar() != null) {
-            this.getScrollBar().tick();
-        }
-
         for (IGuiEventListener child : children) {
             if (child instanceof ITickingWidget) {
                 ((ITickingWidget) child).tick();
@@ -821,12 +803,4 @@ 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;
-    }
-
 }

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

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

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

@@ -48,28 +48,22 @@ public class CraftAmountScreen extends AEBaseScreen<CraftAmountContainer> {
     public void init() {
         super.init();
 
-        this.amountToCraft = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.CRAFT_ITEM_COUNT);
+        this.amountToCraft = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.CRAFT_ITEM_COUNT, value -> {
+        });
         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) {
-        int amount = this.amountToCraft.getIntValue().orElse(0);
+        NetworkHandler.instance()
-        if (amount <= 0) {
+                .sendToServer(new CraftRequestPacket((int) this.amountToCraft.getValue(), hasShiftDown()));
-            return;
-        }
-        NetworkHandler.instance().sendToServer(new CraftRequestPacket(amount, hasShiftDown()));
     }
 
     @Override
@@ -86,9 +80,23 @@ 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.getIntValue().orElse(0) > 0;
+        this.next.active = this.amountToCraft.getValue() > 0;
 
         this.amountToCraft.render(matrixStack, offsetX, offsetY, partialTicks);
     }
 
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
+        if (keyCode == 28) {
+            this.next.onPress();
+            return true;
+        } else {
+            return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
+        }
+    }
+
+    protected String getBackground() {
+        return "guis/craftAmt.png";
+    }
+
 }

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

@@ -27,8 +27,6 @@ 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;
@@ -78,6 +76,10 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
         this.setScrollBar(scrollbar);
     }
 
+    boolean isAutoStart() {
+        return this.container.isAutoStart();
+    }
+
     @Override
     public void init() {
         super.init();
@@ -88,14 +90,13 @@ 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,
-                getNextCpuButtonLabel(), btn -> selectNextCpu());
+                new StringTextComponent(GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic),
+                btn -> selectNextCpu());
         this.selectCPU.active = false;
         this.addButton(this.selectCPU);
 
         addButton(new Button(this.guiLeft + 6, this.guiTop + this.ySize - 25, 50, 20, GuiText.Cancel.text(),
                 btn -> subGui.goBack()));
-
-        this.setScrollBar();
     }
 
     @Override
@@ -136,22 +137,22 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
     }
 
     private void updateCPUButtonText() {
-        this.selectCPU.setMessage(getNextCpuButtonLabel());
+        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();
+            }
+        }
 
-    private ITextComponent getNextCpuButtonLabel() {
         if (this.container.hasNoCPU()) {
-            return GuiText.NoCraftingCPUs.text();
+            btnTextText = GuiText.NoCraftingCPUs.getLocal();
         }
 
-        ITextComponent cpuName;
+        this.selectCPU.setMessage(new StringTextComponent(btnTextText));
-        if (this.container.cpuName == null) {
-            cpuName = GuiText.Automatic.text();
-        } else {
-            cpuName = this.container.cpuName;
-        }
-
-        return GuiText.CraftingCPU.withSuffix(": ").append(cpuName);
     }
 
     private boolean isSimulation() {
@@ -444,7 +445,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 == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
+            if (keyCode == 28) {
                 this.start();
                 return true;
             }
@@ -453,7 +454,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
     }
 
     private void selectNextCpu() {
-        final boolean backwards = isHandlingRightClick();
+        final boolean backwards = minecraft.mouseHelper.isRightDown();
         NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next"));
     }
 

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

@@ -16,6 +16,10 @@
  * 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;
@@ -23,6 +27,7 @@ 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;
@@ -45,13 +50,14 @@ 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, getNextCpuButtonLabel(),
+        this.selectCPU = new Button(this.guiLeft + 8, this.guiTop + this.ySize - 25, 150, 20,
+                new StringTextComponent(GuiText.CraftingCPU.getLocal() + ": " + GuiText.NoCraftingCPUs),
                 btn -> selectNextCpu());
         this.addButton(this.selectCPU);
 
         subGui.addBackButton(btn -> {
             addButton(btn);
-            btn.setHideEdge(true);
+            btn.setHideEdge(13);
         }, 213, -4);
     }
 
@@ -62,14 +68,23 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
     }
 
     private void updateCPUButtonText() {
-        this.selectCPU.setMessage(getNextCpuButtonLabel());
+        String btnTextText = GuiText.NoCraftingJobs.getLocal();
-    }
 
-    private ITextComponent getNextCpuButtonLabel() {
+        if (this.container.selectedCpu >= 0)// && status.selectedCpu < status.cpus.size() )
-        if (this.container.noCPU) {
+        {
-            return GuiText.NoCraftingJobs.text();
+            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;
+            }
         }
-        return GuiText.CraftingCPU.withSuffix(": ").append(container.cpuName);
+
+        if (this.container.noCPU) {
+            btnTextText = GuiText.NoCraftingJobs.getLocal();
+        }
+
+        this.selectCPU.setMessage(new StringTextComponent(btnTextText));
     }
 
     @Override
@@ -77,8 +92,9 @@ 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 = isHandlingRightClick();
+        final boolean backwards = minecraft.mouseHelper.isRightDown();
         NetworkHandler.instance().sendToServer(new ConfigValuePacket("Terminal.Cpu", backwards ? "Prev" : "Next"));
     }
 

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

@@ -1,19 +1,19 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.util.fluid.IAEFluidTank;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.IAEFluidTank;
 
 public class FluidFormationPlaneScreen extends UpgradeableScreen<FluidFormationPlaneContainer> {
     public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory,

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

@@ -16,18 +16,18 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.container.implementations.FluidIOContainer;
 import appeng.core.localization.GuiText;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.parts.automation.FluidImportBusPart;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.util.fluid.IAEFluidTank;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -25,16 +25,16 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.FluidTankWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.helpers.DualityFluidInterface;
-import appeng.fluids.client.gui.widgets.FluidTankWidget;
+import appeng.util.fluid.IAEFluidTank;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.util.IAEFluidTank;
 
 public class FluidInterfaceScreen extends UpgradeableScreen<FluidInterfaceContainer> {
     public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory,

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -11,10 +11,12 @@ import appeng.api.config.Settings;
 import appeng.client.gui.NumberEntryType;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
+import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.localization.GuiText;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.core.sync.network.NetworkHandler;
-import appeng.fluids.container.FluidLevelEmitterContainer;
+import appeng.core.sync.packets.ConfigValuePacket;
 
 public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitterContainer> {
 
@@ -29,24 +31,17 @@ 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.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_FLUID_VOLUME,
+                this::onLevelChange);
         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,
@@ -87,4 +82,8 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitter
     protected void handleButtonVisibility() {
     }
 
+    private void onLevelChange(long level) {
+        NetworkHandler.instance().sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(level)));
+    }
+
 }

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -30,18 +30,18 @@ import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ActionButton;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.util.fluid.IAEFluidTank;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -51,14 +51,14 @@ import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.me.FluidRepo;
 import appeng.client.me.InternalFluidSlotME;
 import appeng.client.me.SlotFluidME;
+import appeng.container.implementations.FluidTerminalContainer;
+import appeng.container.slot.IMEFluidSlot;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.InventoryActionPacket;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
@@ -158,7 +158,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     }
 
     @Override
-    protected void renderHoveredTooltip(MatrixStack matrixStack, int mouseX, int mouseY) {
+    protected void func_230459_a_(MatrixStack matrixStack, int mouseX, int mouseY) {
         final Slot slot = this.getSlot(mouseX, mouseY);
 
         if (slot instanceof IMEFluidSlot && slot.isEnabled()) {
@@ -176,12 +176,12 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
                 list.add(new StringTextComponent(formattedAmount));
                 list.add(new StringTextComponent(modName));
 
-                this.func_243308_b(matrixStack, list, mouseX, mouseY);
+                this.renderTooltip(matrixStack, list, mouseX, mouseY);
 
                 return;
             }
         }
-        super.renderHoveredTooltip(matrixStack, mouseX, mouseY);
+        super.func_230459_a_(matrixStack, mouseX, mouseY);
     }
 
     private <S extends Enum<S>> void toggleServerSetting(SettingToggleButton<S> btn, boolean backwards) {

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 = isHandlingRightClick();
+        final boolean backwards = getMinecraft().mouseHelper.isRightDown();
         NetworkHandler.instance().sendToServer(new ConfigButtonPacket(Settings.INTERFACE_TERMINAL, backwards));
     }
 

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

@@ -71,7 +71,8 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
     public InterfaceTerminalScreen(InterfaceTerminalContainer container, PlayerInventory playerInventory,
             ITextComponent title) {
         super(container, playerInventory, title);
-        this.setScrollBar(new Scrollbar().setLeft(175).setTop(18).setHeight(106));
+        final Scrollbar scrollbar = new Scrollbar();
+        this.setScrollBar(scrollbar);
         this.xSize = 195;
         this.ySize = 222;
     }
@@ -80,6 +81,10 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
     public void init() {
         super.init();
 
+        this.getScrollBar().setLeft(175);
+        this.getScrollBar().setHeight(106);
+        this.getScrollBar().setTop(18);
+
         this.searchField = new AETextField(this.font, this.guiLeft + 104, this.guiTop + 4, 65, 12);
         this.searchField.setEnableBackgroundDrawing(false);
         this.searchField.setMaxStringLength(25);
@@ -211,7 +216,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
                 try {
                     final long id = Long.parseLong(key.substring(1), Character.MAX_RADIX);
                     final CompoundNBT invData = in.getCompound(key);
-                    ITextComponent un = ITextComponent.Serializer.getComponentFromJson(invData.getString("un"));
+                    ITextComponent un = ITextComponent.Serializer.func_240643_a_(invData.getString("un"));
                     final ClientDCInternalInv current = this.getById(id, invData.getLong("sortBy"), un);
 
                     for (int x = 0; x < current.getInventory().getSlots(); x++) {

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

@@ -35,6 +35,8 @@ 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> {
 
@@ -50,18 +52,15 @@ 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.level = new NumberEntryWidget(this, 20, 17, 138, 62, NumberEntryType.LEVEL_ITEM_COUNT,
+                this::onLevelChange);
         this.level.setTextFieldBounds(25, 44, 75);
         this.level.addButtons(children::add, this::addButton);
-        this.level.setValue(container.getReportingValue());
+        container.setTextField(this.level);
-        this.level.setOnChange(this::saveReportingValue);
-        this.level.setOnConfirm(this::closeScreen);
-
-        this.changeFocus(true);
     }
 
-    private void saveReportingValue() {
+    private void onLevelChange(long level) {
-        this.level.getLongValue().ifPresent(container::setReportingValue);
+        NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(level)));
     }
 
     @Override

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

@@ -51,7 +51,6 @@ import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.gui.widgets.TabButton;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.ItemRepo;
-import appeng.client.render.StackSizeRenderer;
 import appeng.container.implementations.CraftingStatusContainer;
 import appeng.container.implementations.MEMonitorableContainer;
 import appeng.container.slot.AppEngSlot;
@@ -238,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(true);
+            this.craftingStatusBtn.setHideEdge(13);
         }
 
         this.isAutoFocus = SearchBoxMode.AUTOSEARCH == searchMode || SearchBoxMode.JEI_AUTOSEARCH == searchMode
@@ -284,8 +283,6 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
         craftingGridOffsetX -= 25;
         craftingGridOffsetY -= 6;
 
-        this.setScrollBar();
-
     }
 
     @Override
@@ -296,16 +293,6 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
 
         this.currentMouseX = mouseX;
         this.currentMouseY = mouseY;
-
-        // Show the number of active crafting jobs
-        if (this.craftingStatusBtn != null && container.activeCraftingJobs != -1) {
-            // The stack size renderer expects a 16x16 slot, while the button is normally
-            // bigger
-            int x = this.craftingStatusBtn.x + (this.craftingStatusBtn.getWidth() - 16) / 2;
-            int y = this.craftingStatusBtn.y + (this.craftingStatusBtn.getHeightRealms() - 16) / 2;
-            StackSizeRenderer.renderSizeLabel(font, x - this.guiLeft, y - this.guiTop,
-                    String.valueOf(container.activeCraftingJobs));
-        }
     }
 
     @Override
@@ -370,7 +357,6 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
         if (this.searchField != null) {
             this.searchField.render(matrixStack, mouseX, mouseY, partialTicks);
         }
-
     }
 
     protected String getBackground() {

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

@@ -2,60 +2,43 @@ 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.ConfirmableTextField;
+import appeng.client.gui.widgets.ITickingWidget;
-import appeng.client.gui.widgets.ValidationIcon;
+import appeng.client.gui.widgets.NumberBox;
 import appeng.core.AEConfig;
 
 /**
  * A utility widget that consists of a text-field to enter a number with
  * attached buttons to increment/decrement the number in fixed intervals.
  */
-public class NumberEntryWidget extends AbstractGui {
+public class NumberEntryWidget implements ITickingWidget {
 
-    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 ConfirmableTextField textField;
+    private final NumberBox level;
     private final NumberEntryType type;
     private List<Button> buttons;
-    private long minValue;
-    private ValidationIcon validationIcon;
 
-    // Called when the value changes
+    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type,
-    private Runnable onChange;
+            LongConsumer changeListener) {
-
-    // 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;
@@ -64,51 +47,28 @@ public class NumberEntryWidget extends AbstractGui {
         FontRenderer font = parent.getMinecraft().fontRenderer;
         int inputX = parent.getGuiLeft() + x;
         int inputY = parent.getGuiTop() + y;
-        this.textField = new ConfirmableTextField(font, inputX, inputY, width, font.FONT_HEIGHT,
+        this.level = new NumberBox(font, inputX, inputY, width, font.FONT_HEIGHT, type.getInputType(), changeListener);
-                StringTextComponent.EMPTY);
+        this.level.setEnableBackgroundDrawing(false);
-        this.textField.setEnableBackgroundDrawing(false);
+        this.level.setMaxStringLength(16);
-        this.textField.setMaxStringLength(16);
+        this.level.setTextColor(0xFFFFFF);
-        this.textField.setTextColor(TEXT_COLOR_NORMAL);
+        this.level.setVisible(true);
-        this.textField.setVisible(true);
+        this.level.setFocused2(true);
-        this.textField.setFocused2(true);
+        parent.setFocusedDefault(this.level);
-        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.textField.setEnabled(active);
+        this.level.setEnabled(active);
         this.buttons.forEach(b -> b.active = active);
     }
 
     public void setTextFieldBounds(int x, int y, int width) {
-        this.textField.x = parent.getGuiLeft() + x;
+        this.level.x = parent.getGuiLeft() + x;
-        this.textField.y = parent.getGuiTop() + y;
+        this.level.y = parent.getGuiTop() + y;
-        this.textField.setWidth(width);
+        this.level.setWidth(width);
     }
 
     public void setMinValue(long minValue) {
-        this.minValue = minValue;
+        this.level.setMinValue(minValue);
-        validate();
     }
 
     public void addButtons(Consumer<IGuiEventListener> addChildren, Consumer<Button> addButton) {
@@ -121,116 +81,54 @@ public class NumberEntryWidget extends AbstractGui {
         int left = parent.getGuiLeft() + x;
         int top = parent.getGuiTop() + y;
 
-        List<Button> buttons = new ArrayList<>(9);
+        List<Button> buttons = new ArrayList<>(8);
 
         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.textField);
+        addChildren.accept(this.level);
 
         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();
-    }
-
-    /**
-     * 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();
-        }
-    }
-
-    /**
-     * 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) {
-        this.textField.setText(String.valueOf(Math.max(minValue, value)));
-        this.textField.setCursorPositionEnd();
-        this.textField.setSelectionPos(0);
-        validate();
     }
 
     private void addQty(final long i) {
-        getLongValue().ifPresent(currentValue -> setValue(currentValue + i));
+        long currentValue = this.level.getValue();
+        long minValue = this.level.getMinValue();
+        this.level.setText(String.valueOf(Math.max(minValue, currentValue + i)));
     }
 
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
+    public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
-        this.textField.render(matrices, mouseX, mouseY, partialTicks);
+        this.level.render(matrixStack, mouseX, mouseY, partialTicks);
     }
 
-    private void validate() {
+    public void setValue(long value, boolean skipNotify) {
-        List<ITextComponent> validationErrors = new ArrayList<>();
+        this.level.setValue(value, skipNotify);
+    }
 
-        String text = textField.getText().trim();
+    public void setValue(long value) {
-        try {
+        setValue(value, false);
-            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();
+    public long getValue() {
-        this.textField.setTextColor(valid ? TEXT_COLOR_NORMAL : TEXT_COLOR_ERROR);
+        return level.getValue();
-        if (this.validationIcon != null) {
+    }
-            this.validationIcon.setValid(valid);
+
-            this.validationIcon.setTooltip(validationErrors);
+    @Override
-        }
+    public void tick() {
+        this.level.tick();
     }
 
     private ITextComponent makeLabel(ITextComponent prefix, int amount) {
         return prefix.copyRaw().appendString(String.valueOf(amount));
     }
 
-    public void setHideValidationIcon(boolean hideValidationIcon) {
-        this.hideValidationIcon = hideValidationIcon;
-    }
-
 }

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

@@ -18,8 +18,6 @@
 
 package appeng.client.gui.implementations;
 
-import java.util.OptionalInt;
-
 import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.entity.player.PlayerInventory;
@@ -29,6 +27,8 @@ 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,38 +39,24 @@ 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.priority = new NumberEntryWidget(this, 20, 30, 138, 62, NumberEntryType.PRIORITY, this::onPriorityChange);
         this.priority.setTextFieldBounds(62, 57, 50);
         this.priority.setMinValue(Integer.MIN_VALUE);
-        this.priority.setValue(this.container.getPriorityValue());
+        container.setTextField(this.priority);
         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 savePriority() {
+    private void onPriorityChange(long priority) {
-        OptionalInt priority = this.priority.getIntValue();
+        NetworkHandler.instance()
-        if (priority.isPresent()) {
+                .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(priority)));
-            container.setPriority(priority.getAsInt());
-        }
     }
 
     @Override
@@ -82,10 +68,13 @@ 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("guis/priority.png");
+        this.bindTexture(getBackground());
         blit(matrixStack, offsetX, offsetY, 0, 0, this.xSize, this.ySize);
 
         this.priority.render(matrixStack, mouseX, mouseY, partialTicks);
     }
 
+    protected String getBackground() {
+        return "guis/priority.png";
+    }
 }

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

@@ -1,51 +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 org.lwjgl.glfw.GLFW;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.util.text.ITextComponent;
-
-public class ConfirmableTextField extends TextFieldWidget {
-
-    private Runnable onConfirm;
-
-    public ConfirmableTextField(FontRenderer fontRenderer, int x, int y, int width, int height, ITextComponent text) {
-        super(fontRenderer, x, y, width, height, text);
-    }
-
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (canWrite() && (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER)) {
-            if (this.onConfirm != null) {
-                this.onConfirm.run();
-            }
-            return true;
-        }
-
-        return super.keyPressed(keyCode, scanCode, modifiers);
-    }
-
-    public void setOnConfirm(Runnable onConfirm) {
-        this.onConfirm = onConfirm;
-    }
-
-}

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

@@ -1,96 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, 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.time.Duration;
-
-/**
- * This class can be used to implement repeating events such as holding down a
- * button to fire an event repeatedly while the button is still being held, or
- * repeatedly scrolling down a page, while the mouse is held down on the
- * scrollbar.
- */
-public class EventRepeater {
-
-    /**
-     * -1 if no repeat event is scheduled. Otherwise contains the
-     * {@link System#nanoTime()} at which the next event should occur.
-     */
-    private long nextEventTime = -1;
-
-    private EventCallback eventCallback = null;
-
-    private final long eventDelay; // In nanoseconds
-
-    private final long eventInterval; // In nanoseconds
-
-    public EventRepeater(Duration delay, Duration interval) {
-        this.eventDelay = delay.toNanos();
-        this.eventInterval = interval.toNanos();
-    }
-
-    public void tick() {
-        if (this.eventCallback == null) {
-            return; // No event scheduled
-        }
-
-        // Use nanoTime here because it is monotonically increasing, while
-        // System.currentTimeMillis is not
-        long nanoTime = System.nanoTime();
-        if (nanoTime < this.nextEventTime) {
-            return; // Event time not reached
-        }
-
-        // Before triggering, recompute the next event, since
-        // the event callback itself may reschedule/cancel, and
-        // we should not overwrite that
-        this.nextEventTime = nanoTime + this.eventInterval;
-        this.eventCallback.trigger();
-    }
-
-    /**
-     * Schedule the given callback to be called after a given initial delay, and
-     * then after the given interval repeatedly.
-     *
-     * <p>
-     * Replaces any previously queued callback.
-     */
-    public void repeat(EventCallback callback) {
-        long time = System.nanoTime();
-        this.eventCallback = callback;
-        this.nextEventTime = time + eventDelay;
-    }
-
-    public boolean isRepeating() {
-        return this.eventCallback != null;
-    }
-
-    /**
-     * Stop repeating the event.
-     */
-    public void stop() {
-        this.eventCallback = null;
-    }
-
-    @FunctionalInterface
-    public interface EventCallback {
-        void trigger();
-    }
-
-}

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

@@ -1,7 +1,6 @@
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import java.util.Collections;
-import java.util.Optional;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -15,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
@@ -24,8 +24,8 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSlotWidget extends CustomSlotWidget {
     private final IAEFluidTank fluids;
@@ -73,7 +73,7 @@ public class FluidSlotWidget extends CustomSlotWidget {
         if (clickStack.isEmpty() || mouseButton == 1) {
             this.setFluidStack(null);
         } else if (mouseButton == 0) {
-            final Optional<FluidStack> fluidOpt = FluidUtil.getFluidContained(clickStack);
+            final LazyOptional<FluidStack> fluidOpt = FluidUtil.getFluidContained(clickStack);
             fluidOpt.ifPresent(fluid -> {
                 this.setFluidStack(AEFluidStack.fromFluidStack(fluid));
             });

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidAttributes;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 @OnlyIn(Dist.CLIENT)
 public class FluidTankWidget extends Widget implements ITooltip {

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

@@ -22,7 +22,6 @@ 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;
@@ -36,10 +35,6 @@ 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);
     }
@@ -49,13 +44,6 @@ 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) {
 
@@ -86,9 +74,7 @@ public abstract class IconButton extends Button implements ITooltip {
                 final int uv_y = iconIndex / 16;
                 final int uv_x = iconIndex - uv_y * 16;
 
-                if (!disableBackground) {
+                GuiUtils.drawTexturedModalRect(0, 0, 256 - 16, 256 - 16, 16, 16, 0);
-                    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 {
@@ -101,18 +87,12 @@ public abstract class IconButton extends Button implements ITooltip {
                 final int uv_y = iconIndex / 16;
                 final int uv_x = iconIndex - uv_y * 16;
 
-                if (!disableBackground) {
+                GuiUtils.drawTexturedModalRect(this.x, this.y, 256 - 16, 256 - 16, 16, 16, 0);
-                    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();
@@ -155,20 +135,4 @@ public abstract class IconButton extends Button implements ITooltip {
         this.halfSize = halfSize;
     }
 
-    public boolean isDisableClickSound() {
-        return disableClickSound;
-    }
-
-    public void setDisableClickSound(boolean disableClickSound) {
-        this.disableClickSound = disableClickSound;
-    }
-
-    public boolean isDisableBackground() {
-        return disableBackground;
-    }
-
-    public void setDisableBackground(boolean disableBackground) {
-        this.disableBackground = disableBackground;
-    }
-
 }

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

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

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
@@ -7,7 +7,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.slot.IOptionalSlotHost;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class OptionalFluidSlotWidget extends FluidSlotWidget {
     private final IOptionalSlotHost containerBus;

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

@@ -18,75 +18,17 @@
 
 package appeng.client.gui.widgets;
 
-import java.time.Duration;
+import com.mojang.blaze3d.systems.RenderSystem;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraftforge.fml.client.gui.GuiUtils;
-
-import net.minecraft.client.gui.AbstractGui;
-import net.minecraft.client.renderer.Rectangle2d;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 
 import appeng.client.gui.AEBaseScreen;
 
-/**
+public class Scrollbar implements IScrollSource {
- * Implements a vertical scrollbar using Vanilla's scrollbar handle texture from
- * the creative tab.
- * <p>
- * It is expected that the background of the UI contains a pre-baked scrollbar
- * track border, and that the exact rectangle of that track is set on this
- * object via {@link #setLeft(int)}, {@link #setTop(int)} and
- * {@link #setHeight(int)}. While the width of the track can also be set, the
- * drawn handle will use vanilla's sprite width (see {@link #HANDLE_WIDTH}.
- */
-public class Scrollbar extends AbstractGui implements IScrollSource {
 
-    /**
-     * Width of the scrollbar handle sprite in the source texture.
-     */
-    private static final int HANDLE_WIDTH = 12;
-
-    /**
-     * Height of the scrollbar handle sprite in the source texture.
-     */
-    private static final int HANDLE_HEIGHT = 15;
-
-    /**
-     * Texture containing the scrollbar handle sprites.
-     */
-    private static final ResourceLocation TEXTURE = new ResourceLocation("minecraft",
-            "textures/gui/container/creative_inventory/tabs.png");
-
-    /**
-     * Rectangle in the source texture that contains the sprite for an enabled
-     * handle.
-     */
-    private static final Rectangle2d ENABLED = new Rectangle2d(232, 0, HANDLE_WIDTH, HANDLE_HEIGHT);
-
-    /**
-     * Rectangle in the source texture that contains the sprite for a disabled
-     * handle.
-     */
-    private static final Rectangle2d DISABLED = new Rectangle2d(232 + HANDLE_WIDTH, 0, HANDLE_WIDTH, HANDLE_HEIGHT);
-
-    /**
-     * The screen x-coordinate of the scrollbar's inner track.
-     */
     private int displayX = 0;
-
-    /**
-     * The screen y-coordinate of the scrollbar's inner track.
-     */
     private int displayY = 0;
-
+    private int width = 12;
-    /**
-     * The inner width of the scrollbar track.
-     */
-    private int width = HANDLE_WIDTH;
-
-    /**
-     * The inner height of the scrollbar track.
-     */
     private int height = 16;
     private int pageSize = 1;
 
@@ -94,58 +36,18 @@ public class Scrollbar extends AbstractGui implements IScrollSource {
     private int minScroll = 0;
     private int currentScroll = 0;
 
-    /**
+    public void draw(final AEBaseScreen<?> g) {
-     * True if the scrollbar's handle is currently being dragged.
+        g.bindTexture("minecraft", "gui/container/creative_inventory/tabs.png");
-     */
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-    private boolean dragging;
-    /**
-     * The y-coordinate relative to the upper edge of the scrollbar handle, where
-     * the user pressed the mouse button to drag. While dragging, this is applied as
-     * an offset to the effective scrollbar position.
-     */
-    private int dragYOffset;
 
-    private final EventRepeater eventRepeater = new EventRepeater(Duration.ofMillis(250), Duration.ofMillis(150));
-
-    /**
-     * Draws the handle of the scrollbar.
-     * <p>
-     * The GUI is assumed to already contain a prebaked scrollbar track in its
-     * background.
-     */
-    public void draw(MatrixStack matrices, final AEBaseScreen<?> g) {
-        setBlitOffset(g.getBlitOffset());
-
-        // Draw the track (nice for debugging)
-        // fill(matrices, displayX, displayY, this.displayX + width, this.displayY +
-        // height, 0xffff0000);
-
-        g.bindTexture(TEXTURE);
-
-        int yOffset;
-        Rectangle2d sourceRect;
         if (this.getRange() == 0) {
-            yOffset = 0;
+            GuiUtils.drawTexturedModalRect(this.displayX, this.displayY, 232 + this.width, 0, this.width, 15,
-            sourceRect = DISABLED;
+                    g.getBlitOffset());
         } else {
-            yOffset = getHandleYOffset();
+            final int offset = (this.currentScroll - this.minScroll) * (this.height - 15) / this.getRange();
-            sourceRect = ENABLED;
+            GuiUtils.drawTexturedModalRect(this.displayX, offset + this.displayY, 232, 0, this.width, 15,
+                    g.getBlitOffset());
         }
-
-        blit(matrices, this.displayX, this.displayY + yOffset, sourceRect.getX(), sourceRect.getY(),
-                sourceRect.getWidth(), sourceRect.getHeight());
-    }
-
-    /**
-     * Returns the y-position of the scrollbar handle in relation to the upper edge
-     * of the scrollbar's track.
-     */
-    private int getHandleYOffset() {
-        if (getRange() == 0) {
-            return 0;
-        }
-        int availableHeight = this.height - HANDLE_HEIGHT;
-        return (this.currentScroll - this.minScroll) * availableHeight / this.getRange();
     }
 
     private int getRange() {
@@ -209,96 +111,24 @@ public class Scrollbar extends AbstractGui implements IScrollSource {
         return this.currentScroll;
     }
 
-    public boolean mouseDown(double x, double y) {
+    public void click(final double x, final double y) {
-        this.dragging = false;
+        if (this.getRange() == 0) {
-
-        // Clicks to the left or right of the scrollbar don't do anything
-        if (x < displayX || x >= displayX + width) {
-            return false;
-        }
-
-        // Clicks to the top or bottom don't do anything either
-        int relY = (int) Math.round(y - displayY);
-        if (relY < 0 || relY >= height) {
-            return false;
-        }
-
-        // Do nothing when there's no range, but swallow the event
-        if (getRange() == 0) {
-            return true;
-        }
-
-        int handleYOffset = getHandleYOffset();
-
-        if (relY < handleYOffset) {
-            // Clicks above the handle will page up, repeatedly
-            pageUp();
-            eventRepeater.repeat(this::pageUp);
-
-        } else if (relY < handleYOffset + HANDLE_HEIGHT) {
-            // Clicks on the handle will initiate dragging it
-            this.dragging = true;
-            this.dragYOffset = relY - handleYOffset;
-        } else {
-            // Clicks below the handle will page down, repeatedly
-            pageDown();
-            eventRepeater.repeat(this::pageDown);
-        }
-
-        return true;
-    }
-
-    public boolean mouseUp(double x, double y) {
-        this.dragging = false;
-        this.eventRepeater.stop();
-        return false;
-    }
-
-    public void mouseDragged(double x, double y) {
-        if (this.getRange() == 0 || !this.dragging || this.eventRepeater.isRepeating()) {
             return;
         }
 
-        // Compute the position of the mouse (adjusted for where it grabbed the handle,
+        if (x > this.displayX && x <= this.displayX + this.width) {
-        // so as if it grabbed
+            if (y > this.displayY && y <= this.displayY + this.height) {
-        // the upper edge of it) within the scrollable area of the track (minus the
+                this.currentScroll = (int) (y - this.displayY);
-        // handle height).
+                this.currentScroll = this.minScroll + ((this.currentScroll * 2 * this.getRange() / this.height));
-        double handleUpperEdgeY = y - this.displayY - this.dragYOffset;
+                this.currentScroll = (this.currentScroll + 1) >> 1;
-        double availableHeight = this.height - HANDLE_HEIGHT;
+                this.applyRange();
-        double position = MathHelper.clamp(handleUpperEdgeY / availableHeight, 0.0, 1.0);
+            }
-
+        }
-        this.currentScroll = this.minScroll + (int) Math.round(position * this.getRange());
-        this.applyRange();
     }
 
     public void wheel(double delta) {
-        // Do nothing when there's no range
-        if (getRange() == 0) {
-            return;
-        }
-
         delta = Math.max(Math.min(-delta, 1), -1);
         this.currentScroll += delta * this.pageSize;
         this.applyRange();
     }
-
-    /**
-     * Ticks the scrollbar for the purposes of input-repeats (since mouse-downs are
-     * not repeat-triggered), used to repeatedly page-up or page-down when the mouse
-     * is held in the area above or below the scrollbar handle.
-     */
-    public void tick() {
-        this.eventRepeater.tick();
-    }
-
-    private void pageUp() {
-        this.currentScroll -= this.pageSize;
-        this.applyRange();
-    }
-
-    private void pageDown() {
-        this.currentScroll += this.pageSize;
-        this.applyRange();
-    }
-
 }

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

@@ -25,7 +25,6 @@ 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;
@@ -48,7 +47,6 @@ 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;
 
@@ -91,11 +89,9 @@ 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.CondenserOutput, ButtonToolTips.MatterBalls);
-                    ButtonToolTips.MatterBalls.text(CondenserOutput.MATTER_BALLS.requiredPower));
             registerApp(16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY,
-                    ButtonToolTips.CondenserOutput,
+                    ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity);
-                    ButtonToolTips.Singularity.text(CondenserOutput.SINGULARITY.requiredPower));
 
             registerApp(16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode,
                     ButtonToolTips.Read);
@@ -234,13 +230,7 @@ public class SettingToggleButton<T extends Enum<T>> extends IconButton {
     }
 
     private void triggerPress() {
-        boolean backwards = false;
+        boolean backwards = Minecraft.getInstance().mouseHelper.isRightDown();
-        // 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);
     }
 

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

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

@@ -1,65 +0,0 @@
-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.func_243308_b(matrices, this.tooltip, x, y);
-    }
-}

src/main/java/appeng/client/me/FluidRepo.java

@@ -37,8 +37,8 @@ import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
 import appeng.core.Api;
-import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
+import appeng.util.fluid.FluidSorters;
 import appeng.util.prioritylist.IPartitionList;
 
 public class FluidRepo {

src/main/java/appeng/client/me/SlotFluidME.java

@@ -27,7 +27,7 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.fluids.container.slots.IMEFluidSlot;
+import appeng.container.slot.IMEFluidSlot;
 
 public class SlotFluidME extends Slot implements IMEFluidSlot {
 

src/main/java/appeng/client/render/DelegateBakedModel.java

@@ -47,8 +47,8 @@ public abstract class DelegateBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
-        return baseModel.isSideLit();
+        return baseModel.func_230044_c_();
     }
 
     @Override

src/main/java/appeng/client/render/DummyFluidBakedModel.java

@@ -60,7 +60,7 @@ public class DummyFluidBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java

@@ -45,7 +45,7 @@ import net.minecraftforge.client.model.ItemLayerModel;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 
-import appeng.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;
 
 /**
  * This baked model class is used as a dispatcher to redirect the renderer to
@@ -73,8 +73,8 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
-        return getBaseModel().isSideLit();
+        return getBaseModel().func_230044_c_();
     }
 
     @Override
@@ -86,7 +86,7 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 if (!(stack.getItem() instanceof FluidDummyItem)) {
                     return originalModel;

src/main/java/appeng/client/render/FacadeBakedItemModel.java

@@ -80,7 +80,7 @@ public class FacadeBakedItemModel extends DelegateBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -50,7 +50,7 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 if (!(stack.getItem() instanceof FacadeItem)) {
                     return originalModel;

src/main/java/appeng/client/render/FluidDummyItemColor.java

@@ -1,4 +1,4 @@
-package appeng.fluids.items;
+package appeng.client.render;
 
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
@@ -7,6 +7,8 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fluids.FluidStack;
 
+import appeng.items.misc.FluidDummyItem;
+
 @OnlyIn(Dist.CLIENT)
 public class FluidDummyItemColor implements IItemColor {
 

src/main/java/appeng/client/render/FluidStackSizeRenderer.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.render;
+package appeng.client.render;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;

src/main/java/appeng/client/render/cablebus/CableBuilder.java

@@ -342,7 +342,7 @@ class CableBuilder {
             this.addBigCoveredCableSizedCube(facing, cubeBuilder);
 
             // Render the channel indicators brightly lit at night
-            cubeBuilder.setEmissiveMaterial(true);
+            cubeBuilder.setRenderFullBright(true);
 
             cubeBuilder.setTexture(oddChannel);
             cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -353,14 +353,14 @@ class CableBuilder {
             this.addBigCoveredCableSizedCube(facing, cubeBuilder);
 
             // Reset back to normal rendering for the rest
-            cubeBuilder.setEmissiveMaterial(false);
+            cubeBuilder.setRenderFullBright(false);
             cubeBuilder.setTexture(texture);
         }
 
         addCoveredCableSizedCube(facing, cubeBuilder);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -369,9 +369,6 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addCoveredCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels,
@@ -389,7 +386,7 @@ class CableBuilder {
         TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -398,9 +395,6 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addStraightCoveredCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels,
@@ -423,7 +417,7 @@ class CableBuilder {
         TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -432,9 +426,6 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addDenseCoveredConnection(Direction facing, AEColor cableColor, AECableType connectionType,
@@ -458,7 +449,7 @@ class CableBuilder {
         addDenseCableSizedCube(facing, cubeBuilder);
 
         // Reset back to normal rendering for the rest
-        cubeBuilder.setEmissiveMaterial(false);
+        cubeBuilder.setRenderFullBright(false);
         cubeBuilder.setTexture(texture);
     }
 
@@ -494,7 +485,7 @@ class CableBuilder {
         TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -505,7 +496,7 @@ class CableBuilder {
         addDenseCableSizedCube(facing, cubeBuilder);
 
         // Reset back to normal rendering for the rest
-        cubeBuilder.setEmissiveMaterial(false);
+        cubeBuilder.setRenderFullBright(false);
         cubeBuilder.setTexture(texture);
     }
 
@@ -538,7 +529,7 @@ class CableBuilder {
         TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -547,9 +538,6 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addStraightDenseCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
     }
 
     private static void addDenseCableSizedCube(Direction facing, CubeBuilder cubeBuilder) {

src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java

@@ -331,7 +331,7 @@ public class CableBusBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;// TODO
     }
 

src/main/java/appeng/client/render/cablebus/CubeBuilder.java

@@ -52,7 +52,7 @@ public class CubeBuilder {
 
     private boolean useStandardUV = false;
 
-    private boolean emissiveMaterial;
+    private boolean renderFullBright;
 
     public CubeBuilder(List<BakedQuad> output) {
         this.output = output;
@@ -379,7 +379,7 @@ public class CubeBuilder {
                     if (e.getIndex() == 0) {
                         builder.put(i, u, v);
                         break;
-                    } else if (e.getIndex() == 2 && emissiveMaterial) {
+                    } else if (e.getIndex() == 2 && renderFullBright) {
                         // Force Brightness to 15, this is for full bright mode
                         // this vertex element will only be present in that case
                         final float lightMapU = (float) (15 * 0x20) / 0xFFFF;
@@ -434,8 +434,8 @@ public class CubeBuilder {
         this.setColorRGB((int) (r * 255) << 16 | (int) (g * 255) << 8 | (int) (b * 255));
     }
 
-    public void setEmissiveMaterial(boolean renderFullBright) {
+    public void setRenderFullBright(boolean renderFullBright) {
-        this.emissiveMaterial = renderFullBright;
+        this.renderFullBright = renderFullBright;
     }
 
     public void setCustomUv(Direction facing, float u1, float v1, float u2, float v2) {

src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java

@@ -49,7 +49,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
 
         cb.setTexture(this.texture);
         cb.useStandardUV();
-        cb.setEmissiveMaterial(active);
+        cb.setRenderFullBright(active);
 
         for (int i = 0; i < 4; ++i) {
             final int[] offs = QUAD_OFFSETS[i];
@@ -70,10 +70,6 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
             }
 
         }
-
-        // Reset back to default
-        cb.setEmissiveMaterial(false);
-
         return cb.getOutput();
     }
 
@@ -100,7 +96,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;// TODO
     }
 

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, Direction side, EnumSet<Direction> connections) {
+    private void addRing(CubeBuilder builder, @Nullable Direction side, EnumSet<Direction> connections) {
         // Fill in the corners
         builder.setTexture(this.ringCorner);
         this.addCornerCap(builder, connections, side, Direction.UP, Direction.EAST, Direction.NORTH);
@@ -276,7 +276,7 @@ abstract class CraftingCubeBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java

@@ -86,8 +86,8 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
         // This determines diffuse lighting in the UI, and since we want to render
         // the outputModel in the UI, we need to use it's setting here
         @Override
-        public boolean isSideLit() {
+        public boolean func_230044_c_() {
-            return outputModel.isSideLit();
+            return outputModel.func_230044_c_();
         }
 
     }
@@ -112,7 +112,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
 
         @Nullable
         @Override
-        public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
+        public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
                 @Nullable LivingEntity entity) {
             boolean shiftHeld = Screen.hasShiftDown();
             if (shiftHeld) {
@@ -122,12 +122,12 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
                     IBakedModel realModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher()
                             .getItemModel(output);
                     // Give the item model a chance to handle the overrides as well
-                    realModel = realModel.getOverrides().getOverrideModel(realModel, output, world, entity);
+                    realModel = realModel.getOverrides().func_239290_a_(realModel, output, world, entity);
                     return new ShiftHoldingModelWrapper(getBaseModel(), realModel);
                 }
             }
 
-            return getBaseModel().getOverrides().getOverrideModel(originalModel, stack, world, entity);
+            return getBaseModel().getOverrides().func_239290_a_(originalModel, stack, world, entity);
         }
     }
 

src/main/java/appeng/client/render/crafting/LightBakedModel.java

@@ -51,10 +51,8 @@ class LightBakedModel extends CraftingCubeBakedModel {
         builder.addCube(x1, y1, z1, x2, y2, z2);
 
         boolean powered = state.get(AbstractCraftingUnitBlock.POWERED);
-        builder.setEmissiveMaterial(powered);
+        builder.setRenderFullBright(powered);
         builder.setTexture(this.lightTexture);
         builder.addCube(x1, y1, z1, x2, y2, z2);
-        // Reset back to default
-        builder.setEmissiveMaterial(false);
     }
 }

src/main/java/appeng/client/render/crafting/MonitorBakedModel.java

@@ -78,7 +78,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
         AEColor color = getColor(modelData);
         boolean powered = state.get(CraftingMonitorBlock.POWERED);
 
-        builder.setEmissiveMaterial(powered);
+        builder.setRenderFullBright(powered);
 
         builder.setColorRGB(color.whiteVariant);
         builder.setTexture(this.lightBrightTexture);
@@ -92,8 +92,6 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
         builder.setTexture(this.lightDarkTexture);
         builder.addCube(x1, y1, z1, x2, y2, z2);
 
-        // Reset back to default
-        builder.setEmissiveMaterial(false);
     }
 
     private static AEColor getColor(IModelData modelData) {

src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java

@@ -107,7 +107,7 @@ public class AutoRotatingBakedModel extends DelegateBakedModel {
             // when piping it
             // to the AO lighter, thus fixing our problem.
             BakedQuad packedQuad = new BakedQuad(unpackedQuad.getVertexData(), quad.getTintIndex(),
-                    unpackedQuad.getFace(), quad.getSprite(), quad.applyDiffuseLighting());
+                    unpackedQuad.getFace(), quad.func_187508_a(), quad.func_239287_f_());
             rotated.add(packedQuad);
         }
         return rotated;

src/main/java/appeng/client/render/model/BiometricCardBakedModel.java

@@ -120,7 +120,7 @@ class BiometricCardBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;// TODO
     }
 
@@ -143,7 +143,7 @@ class BiometricCardBakedModel implements IBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 String username = "";
                 if (stack.getItem() instanceof IBiometricCard) {

src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java

@@ -50,19 +50,19 @@ class ColorApplicatorBakedModel implements IBakedModel {
         for (BakedQuad quad : quads) {
             int tint;
 
-            if (quad.getSprite() == texDark) {
+            if (quad.func_187508_a() == texDark) {
                 tint = 1;
-            } else if (quad.getSprite() == texMedium) {
+            } else if (quad.func_187508_a() == texMedium) {
                 tint = 2;
-            } else if (quad.getSprite() == texBright) {
+            } else if (quad.func_187508_a() == texBright) {
                 tint = 3;
             } else {
                 result.add(quad);
                 continue;
             }
 
-            BakedQuad newQuad = new BakedQuad(quad.getVertexData(), tint, quad.getFace(), quad.getSprite(),
+            BakedQuad newQuad = new BakedQuad(quad.getVertexData(), tint, quad.getFace(), quad.func_187508_a(),
-                    quad.applyDiffuseLighting());
+                    quad.func_239287_f_());
             result.add(newQuad);
         }
 
@@ -88,7 +88,7 @@ class ColorApplicatorBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;// TODO
     }
 

src/main/java/appeng/client/render/model/GlassBakedModel.java

@@ -157,7 +157,7 @@ class GlassBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         // TODO: Forge: Auto-generated method stub
         return false;
     }

src/main/java/appeng/client/render/model/MemoryCardBakedModel.java

@@ -105,7 +105,7 @@ class MemoryCardBakedModel implements IBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;// TODO
     }
 
@@ -128,7 +128,7 @@ class MemoryCardBakedModel implements IBakedModel {
     public ItemOverrideList getOverrides() {
         return new ItemOverrideList() {
             @Override
-            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, ClientWorld world,
+            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, ClientWorld world,
                     LivingEntity entity) {
                 try {
                     if (stack.getItem() instanceof IMemoryCard) {

src/main/java/appeng/client/render/model/SkyCompassBakedModel.java

@@ -122,7 +122,7 @@ public class SkyCompassBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 
@@ -149,7 +149,7 @@ public class SkyCompassBakedModel implements IDynamicBakedModel {
          */
         return new ItemOverrideList() {
             @Override
-            public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
+            public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world,
                     @Nullable LivingEntity entity) {
                 // FIXME: This check prevents compasses being held by OTHERS from getting the
                 // rotation, BUT do we actually still need this???

src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java

@@ -117,7 +117,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
 
             if ((flags
                     & SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) {
-                builder.setEmissiveMaterial(true);
+                builder.setRenderFullBright(true);
             }
 
             builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)),
@@ -135,9 +135,6 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
             builder.addCube(0, 0, 0, 16, 16, 16);
         }
 
-        // Reset back to default
-        builder.setEmissiveMaterial(false);
-
         return builder.getOutput();
     }
 
@@ -181,7 +178,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean func_230044_c_() {
         return false;
     }
 

src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java

@@ -149,7 +149,7 @@ public class ChestTileEntityRenderer extends TileEntityRenderer<ChestTileEntity>
             for (int i = 0; i < quads.size(); i++) {
                 BakedQuad quad = quads.get(i);
                 quads.set(i, new BakedQuad(quad.getVertexData(), quad.getTintIndex(), r.rotate(quad.getFace()),
-                        quad.getSprite(), quad.applyDiffuseLighting()));
+                        quad.func_187508_a(), quad.func_239287_f_()));
             }
 
             return quads;

src/main/java/appeng/container/AEBaseContainer.java

@@ -65,8 +65,10 @@ 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;
@@ -84,9 +86,11 @@ 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;
 
@@ -293,7 +297,9 @@ public abstract class AEBaseContainer extends Container {
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer()) {
+        this.sendCustomName();
+
+        if (Platform.isServer()) {
             if (this.tileEntity != null
                     && this.tileEntity.getWorld().getTileEntity(this.tileEntity.getPos()) != this.tileEntity) {
                 this.setValidContainer(false);
@@ -860,6 +866,43 @@ 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);
@@ -949,6 +992,14 @@ 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;
     }
@@ -977,18 +1028,4 @@ 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();
-    }
-
 }

src/main/java/appeng/container/ContainerLocator.java

@@ -69,7 +69,7 @@ public final class ContainerLocator {
     private final AEPartLocation side;
 
     private ContainerLocator(Type type, int itemIndex, World world, BlockPos blockPos, AEPartLocation side) {
-        this(type, itemIndex, world.getDimensionKey().getLocation(), blockPos, side);
+        this(type, itemIndex, world.func_234923_W_().func_240901_a_(), blockPos, side);
     }
 
     private ContainerLocator(Type type, int itemIndex, ResourceLocation worldId, BlockPos blockPos,
@@ -133,7 +133,7 @@ public final class ContainerLocator {
     public static ContainerLocator forPart(AEBasePart part) {
         IPartHost host = part.getHost();
         DimensionalCoord pos = host.getLocation();
-        return new ContainerLocator(Type.PART, -1, pos.getWorld(), pos.getBlockPos(), part.getSide());
+        return new ContainerLocator(Type.PART, -1, pos.getWorld().getWorld(), pos.getBlockPos(), part.getSide());
     }
 
     public boolean hasItemIndex() {

src/main/java/appeng/container/guisync/FluidSyncHelper.java

@@ -1,5 +1,5 @@
 
-package appeng.fluids.helper;
+package appeng.container.guisync;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import net.minecraft.inventory.container.IContainerListener;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidInventory;
+import appeng.util.fluid.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSyncHelper {
     private final IAEFluidTank inv;

src/main/java/appeng/container/guisync/SyncData.java

@@ -89,8 +89,6 @@ 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
@@ -129,7 +127,7 @@ public class SyncData {
                     String json = (String) val;
                     ITextComponent text = null;
                     if (!json.isEmpty()) {
-                        text = ITextComponent.Serializer.getComponentFromJson((String) val);
+                        text = ITextComponent.Serializer.func_240643_a_((String) val);
                     }
                     this.updateTextComponent(text);
                 } else {

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

@@ -49,6 +49,7 @@ 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;
@@ -142,7 +143,7 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
     @Override
     public void detectAndSendChanges() {
         final ItemStack is = this.workBench.getInventoryByName("cell").getStackInSlot(0);
-        if (isServer()) {
+        if (Platform.isServer()) {
             for (final IContainerListener listener : this.listeners) {
                 if (this.prevStack != is) {
                     // if the bars changed an item was probably made, so just send shit!

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

@@ -33,6 +33,7 @@ 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 {
 
@@ -74,13 +75,13 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             final double maxStorage = this.condenser.getStorage();
             final double requiredEnergy = this.condenser.getRequiredPower();
 
             this.requiredEnergy = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min(requiredEnergy, maxStorage);
             this.storedPower = (int) this.condenser.getStoredPower();
-            this.output = (CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT);
+            this.setOutput((CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT));
         }
 
         super.detectAndSendChanges();
@@ -100,4 +101,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv
         return this.output;
     }
 
+    private void setOutput(final CondenserOutput output) {
+        this.output = output;
+    }
 }

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

@@ -1,7 +1,5 @@
 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;
@@ -13,6 +11,8 @@ 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,8 +43,6 @@ 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);
     }
@@ -56,47 +54,19 @@ 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) {
-            C container = factory.create(windowId, inv, host);
+            return 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?
@@ -113,7 +83,7 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
             return false;
         }
 
-        ITextComponent title = containerTitleStrategy.apply(accessInterface);
+        ITextComponent title = findContainerTitle(player.world, locator, accessInterface);
 
         INamedContainerProvider container = new SimpleNamedContainerProvider((wnd, p, pl) -> {
             C c = factory.create(wnd, p, accessInterface);
@@ -122,14 +92,34 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
             c.setLocator(locator);
             return c;
         }, title);
-        NetworkHooks.openGui((ServerPlayerEntity) player, container, buffer -> {
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator::write);
-            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);
@@ -206,24 +196,6 @@ 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) {
@@ -234,15 +206,4 @@ 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;
-    }
-
 }

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

@@ -19,8 +19,14 @@
 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;
@@ -60,8 +66,9 @@ 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 implements CraftingCPUCyclingContainer {
+public class CraftConfirmContainer extends AEBaseContainer {
 
     public static ContainerType<CraftConfirmContainer> TYPE;
 
@@ -76,51 +83,98 @@ public class CraftConfirmContainer extends AEBaseContainer implements CraftingCP
         return helper.open(player, locator);
     }
 
-    private final CraftingCPUCycler cpuCycler;
+    private final ArrayList<CraftingCPURecord> cpus = new ArrayList<>();
-
-    private ICraftingCPU selectedCpu;
-
     private Future<ICraftingJob> job;
     private ICraftingJob result;
     @GuiSync(0)
     public long bytesUsed;
-    @GuiSync(3)
-    public boolean autoStart = false;
-    @GuiSync(4)
-    public boolean simulation = true;
-
-    // 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(3)
+    public boolean autoStart = false;
+    @GuiSync(4)
+    public boolean simulation = true;
+    @GuiSync(5)
+    public int selectedCpu = -1;
+    @GuiSync(6)
+    public boolean noCPU = true;
     @GuiSync(7)
-    public ITextComponent cpuName;
+    public ITextComponent myName;
 
     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);
     }
 
-    @Override
+    public void cycleCpu(final boolean next) {
-    public void cycleSelectedCPU(final boolean next) {
+        if (next) {
-        this.cpuCycler.cycleCpu(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 detectAndSendChanges() {
-        if (isClient()) {
+        if (Platform.isClient()) {
             return;
         }
 
-        this.cpuCycler.detectAndSendChanges(this.getGrid());
+        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());
 
         super.detectAndSendChanges();
 
@@ -224,6 +278,22 @@ public class CraftConfirmContainer extends AEBaseContainer implements CraftingCP
         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;
 
@@ -246,7 +316,9 @@ public class CraftConfirmContainer extends AEBaseContainer implements CraftingCP
 
         if (this.result != null && !this.isSimulation()) {
             final ICraftingGrid cc = this.getGrid().getCache(ICraftingGrid.class);
-            final ICraftingLink g = cc.submitJob(this.result, null, this.selectedCpu, true, this.getActionSrc());
+            final ICraftingLink g = cc.submitJob(this.result, null,
+                    this.getSelectedCpu() == -1 ? null : this.cpus.get(this.getSelectedCpu()).getCpu(), true,
+                    this.getActionSrc());
             this.setAutoStart(false);
             if (g != null && originalGui != null && this.getLocator() != null) {
                 ContainerOpener.openContainer(originalGui, getPlayerInventory().player, getLocator());
@@ -276,22 +348,6 @@ public class CraftConfirmContainer extends AEBaseContainer implements CraftingCP
         }
     }
 
-    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;
     }
@@ -316,18 +372,42 @@ public class CraftConfirmContainer extends AEBaseContainer implements CraftingCP
         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.cpuName;
+        return this.myName;
+    }
+
+    private void setName(@Nullable final ITextComponent myName) {
+        this.myName = myName;
     }
 
     public boolean hasNoCPU() {
         return this.noCPU;
     }
 
+    private void setNoCPU(final boolean noCPU) {
+        this.noCPU = noCPU;
+    }
+
     public boolean isSimulation() {
         return this.simulation;
     }

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.StringTextComponent;
+import net.minecraft.util.text.ITextComponent;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
@@ -46,28 +46,24 @@ 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> {
+public class CraftingCPUContainer extends AEBaseContainer
+        implements IMEMonitorHandlerReceiver<IAEItemStack>, ICustomNameObject {
 
     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 final IGrid network;
+    private IGrid network;
     private CraftingCPUCluster monitor = null;
+    private ITextComponent cpuName = null;
 
     @GuiSync(0)
     public long eta = -1;
@@ -81,16 +77,14 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
         final IActionHost host = (IActionHost) (te instanceof IActionHost ? te : null);
 
         if (host != null && host.getActionableNode() != null) {
-            this.network = host.getActionableNode().getGrid();
+            this.setNetwork(host.getActionableNode().getGrid());
-        } else {
-            this.network = null;
         }
 
         if (te instanceof CraftingTileEntity) {
             this.setCPU(((CraftingTileEntity) te).getCluster());
         }
 
-        if (this.getNetwork() == null && isServer()) {
+        if (this.getNetwork() == null && Platform.isServer()) {
             this.setValidContainer(false);
         }
     }
@@ -120,13 +114,15 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
         }
 
         if (c instanceof CraftingCPUCluster) {
-            this.monitor = (CraftingCPUCluster) c;
+            this.cpuName = c.getName();
+            this.setMonitor((CraftingCPUCluster) c);
             this.list.resetStatus();
             this.getMonitor().getListOfItem(this.list, CraftingItemList.ALL);
             this.getMonitor().addListener(this, null);
             this.setEstimatedTime(0);
         } else {
-            this.monitor = null;
+            this.setMonitor(null);
+            this.cpuName = null;
             this.setEstimatedTime(-1);
         }
     }
@@ -157,7 +153,7 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer() && this.getMonitor() != null && !this.list.isEmpty()) {
+        if (Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty()) {
             try {
                 if (this.getEstimatedTime() >= 0) {
                     final long elapsedTime = this.getMonitor().getElapsedTime();
@@ -222,6 +218,16 @@ public class CraftingCPUContainer extends AEBaseContainer implements IMEMonitorH
 
     }
 
+    @Override
+    public ITextComponent getCustomInventoryName() {
+        return this.cpuName;
+    }
+
+    @Override
+    public boolean hasCustomInventoryName() {
+        return this.cpuName != null;
+    }
+
     public long getEstimatedTime() {
         return this.eta;
     }
@@ -234,8 +240,15 @@ 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;
+    }
 }

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

@@ -1,131 +0,0 @@
-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());
-        }
-    }
-
-}

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

@@ -1,12 +0,0 @@
-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);
-
-}

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.name = server.getName();
+        this.myName = server.getName();
     }
 
     @Override
@@ -50,6 +50,10 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord> {
         return this.cpu;
     }
 
+    ITextComponent getName() {
+        return this.myName;
+    }
+
     int getProcessors() {
         return this.processors;
     }
@@ -57,13 +61,4 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord> {
     long getSize() {
         return this.size;
     }
-
-    public ITextComponent getName() {
-        return name;
-    }
-
-    public void setName(ITextComponent name) {
-        this.name = name;
-    }
-
 }

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

@@ -18,6 +18,12 @@
 
 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;
@@ -25,13 +31,14 @@ 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;
+import appeng.util.Platform;
 
-public class CraftingStatusContainer extends CraftingCPUContainer implements CraftingCPUCyclingContainer {
+public class CraftingStatusContainer extends CraftingCPUContainer {
 
     public static ContainerType<CraftingStatusContainer> TYPE;
 
@@ -46,13 +53,13 @@ public class CraftingStatusContainer extends CraftingCPUContainer implements Cra
         return helper.open(player, locator);
     }
 
-    private final CraftingCPUCycler cpuCycler = new CraftingCPUCycler(this::cpuMatches, this::onCPUSelectionChanged);
+    private final List<CraftingCPURecord> cpus = new ArrayList<>();
-
+    @GuiSync(5)
+    public int selectedCpu = -1;
     @GuiSync(6)
     public boolean noCPU = true;
-
     @GuiSync(7)
-    public ITextComponent cpuName;
+    public ITextComponent myName;
 
     public CraftingStatusContainer(int id, final PlayerInventory ip, final ITerminalHost te) {
         super(TYPE, id, ip, te);
@@ -60,9 +67,43 @@ public class CraftingStatusContainer extends CraftingCPUContainer implements Cra
 
     @Override
     public void detectAndSendChanges() {
-        IGrid network = this.getNetwork();
+        if (Platform.isServer() && this.getNetwork() != null) {
-        if (isServer() && network != null) {
+            final ICraftingGrid cc = this.getNetwork().getCache(ICraftingGrid.class);
-            cpuCycler.detectAndSendChanges(network);
+            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();
         }
 
         super.detectAndSendChanges();
@@ -72,20 +113,52 @@ public class CraftingStatusContainer extends CraftingCPUContainer implements Cra
         return c.isBusy();
     }
 
-    private void onCPUSelectionChanged(CraftingCPURecord cpuRecord, boolean cpusAvailable) {
+    private void sendCPUs() {
-        noCPU = !cpusAvailable;
+        Collections.sort(this.cpus);
-        if (cpuRecord == null) {
+
-            cpuName = null;
+        if (this.selectedCpu >= this.cpus.size()) {
-            setCPU(null);
+            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());
+            }
         } else {
-            cpuName = cpuRecord.getName();
+            this.setCPU(null);
-            setCPU(cpuRecord.getCpu());
         }
     }
 
-    @Override
+    public void cycleCpu(final boolean next) {
-    public void cycleSelectedCPU(boolean forward) {
+        if (next) {
-        this.cpuCycler.cycleCpu(forward);
+            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());
+        }
+    }
 }

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

@@ -1,25 +1,26 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.Optional;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.guisync.FluidSyncHelper;
 import appeng.container.implementations.UpgradeableContainer;
-import appeng.fluids.helper.FluidSyncHelper;
+import appeng.container.interfaces.IFluidSyncContainer;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;
 
 public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer {
     private FluidSyncHelper sync = null;
@@ -39,7 +40,7 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im
 
     @Override
     protected ItemStack transferStackToContainer(ItemStack input) {
-        Optional<FluidStack> fsOpt = FluidUtil.getFluidContained(input);
+        LazyOptional<FluidStack> fsOpt = FluidUtil.getFluidContained(input);
         if (fsOpt.isPresent()) {
             final IAEFluidTank t = this.getFluidConfigInventory();
             final IAEFluidStack stack = AEFluidStack.fromFluidStack(fsOpt.orElse(null));
@@ -71,7 +72,7 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im
 
     @Override
     protected void standardDetectAndSendChanges() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.getSyncHelper().sendDiff(this.listeners);
 
             // clear out config items that are no longer valid (eg capacity upgrade removed)

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -11,10 +11,9 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Upgrades;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
-import appeng.fluids.parts.FluidFormationPlanePart;
+import appeng.parts.automation.FluidFormationPlanePart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {
 

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -25,9 +25,8 @@ import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
+import appeng.parts.automation.SharedFluidBusPart;
-import appeng.fluids.parts.SharedFluidBusPart;
+import appeng.util.fluid.IAEFluidTank;
-import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
@@ -31,12 +31,11 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
+import appeng.container.guisync.FluidSyncHelper;
-import appeng.fluids.helper.DualityFluidInterface;
+import appeng.helpers.DualityFluidInterface;
-import appeng.fluids.helper.FluidSyncHelper;
+import appeng.helpers.IFluidInterfaceHost;
-import appeng.fluids.helper.IFluidInterfaceHost;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceContainer extends FluidConfigurableContainer {
 
@@ -81,7 +80,7 @@ public class FluidInterfaceContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.tankSync.sendDiff(this.listeners);
         }
 

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

@@ -1,20 +1,21 @@
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 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.implementations.ContainerHelper;
+import appeng.container.guisync.GuiSync;
-import appeng.core.sync.network.NetworkHandler;
+import appeng.parts.automation.FluidLevelEmitterPart;
-import appeng.core.sync.packets.ConfigValuePacket;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public static ContainerType<FluidLevelEmitterContainer> TYPE;
@@ -23,41 +24,34 @@ 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, (host, container, buffer) -> {
+        return helper.fromNetwork(windowId, inv, buf);
-            container.reportingValue = buffer.readVarLong();
-        });
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator, (host, buffer) -> {
+        return helper.open(player, locator);
-            buffer.writeVarLong(host.getReportingValue());
-        });
     }
 
     private final FluidLevelEmitterPart lvlEmitter;
 
-    // Only synced once on container-open, and only used on client
+    @OnlyIn(Dist.CLIENT)
-    private long reportingValue;
+    private NumberEntryWidget textField;
+    @GuiSync(3)
+    public long EmitterValue = -1;
 
     public FluidLevelEmitterContainer(int id, final PlayerInventory ip, final FluidLevelEmitterPart te) {
         super(TYPE, id, ip, te);
         this.lvlEmitter = te;
     }
 
-    public long getReportingValue() {
+    @OnlyIn(Dist.CLIENT)
-        return reportingValue;
+    public void setTextField(final NumberEntryWidget level) {
+        this.textField = level;
+        this.textField.setValue(this.EmitterValue);
     }
 
-    public void setReportingValue(long reportingValue) {
+    public void setLevel(final long l, final PlayerEntity player) {
-        if (isClient()) {
+        this.lvlEmitter.setReportingValue(l);
-            if (reportingValue != this.reportingValue) {
+        this.EmitterValue = l;
-                this.reportingValue = reportingValue;
-                NetworkHandler.instance()
-                        .sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(reportingValue)));
-            }
-        } else {
-            this.lvlEmitter.setReportingValue(reportingValue);
-        }
     }
 
     @Override
@@ -79,7 +73,8 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
+            this.EmitterValue = this.lvlEmitter.getReportingValue();
             this.setRedStoneMode(
                     (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting(Settings.REDSTONE_EMITTER));
         }
@@ -87,6 +82,15 @@ 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();

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Iterator;
 
@@ -38,12 +38,11 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
-import appeng.fluids.parts.FluidStorageBusPart;
+import appeng.parts.misc.FluidStorageBusPart;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.iterators.NullIterator;
 
 /**
@@ -128,7 +127,7 @@ public class FluidStorageBusContainer extends FluidConfigurableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.setFuzzyMode((FuzzyMode) this.getUpgradeable().getConfigManager().getSetting(Settings.FUZZY_MODE));
             this.setReadWriteMode(
                     (AccessRestriction) this.getUpgradeable().getConfigManager().getSetting(Settings.ACCESS));

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -63,19 +63,18 @@ import appeng.api.util.IConfigurableObject;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 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.MEFluidInventoryUpdatePacket;
 import appeng.core.sync.packets.TargetFluidStackPacket;
-import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS
@@ -119,7 +118,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 (isServer()) {
+        if (Platform.isServer()) {
             this.serverCM = terminal.getConfigManager();
             this.monitor = terminal
                     .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class));
@@ -191,7 +190,7 @@ public class FluidTerminalContainer extends AEBaseContainer
     }
 
     private void queueInventory(final IContainerListener c) {
-        if (isServer() && c instanceof PlayerEntity && this.monitor != null) {
+        if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) {
             try {
                 MEFluidInventoryUpdatePacket piu = new MEFluidInventoryUpdatePacket();
                 final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
@@ -216,14 +215,14 @@ public class FluidTerminalContainer extends AEBaseContainer
 
     @Override
     public IConfigManager getConfigManager() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             return this.serverCM;
         }
         return this.clientCM;
     }
 
     public void setTargetStack(final IAEFluidStack stack) {
-        if (isClient()) {
+        if (Platform.isClient()) {
             if (stack == null && this.clientRequestedTargetFluid == null) {
                 return;
             }
@@ -246,7 +245,7 @@ public class FluidTerminalContainer extends AEBaseContainer
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             if (this.monitor != this.terminal
                     .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class))) {
                 this.setValidContainer(false);

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

@@ -35,6 +35,7 @@ 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 {
 
@@ -106,7 +107,7 @@ public class FormationPlaneContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.setFuzzyMode((FuzzyMode) this.getUpgradeable().getConfigManager().getSetting(Settings.FUZZY_MODE));
             this.setPlaceMode((YesNo) this.getUpgradeable().getConfigManager().getSetting(Settings.PLACE_BLOCK));
         }

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

@@ -34,6 +34,7 @@ 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 {
 
@@ -110,7 +111,7 @@ public class IOPortContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.setOperationMode(
                     (OperationMode) this.getUpgradeable().getConfigManager().getSetting(Settings.OPERATION_MODE));
             this.setFullMode(

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

@@ -35,6 +35,7 @@ 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
@@ -118,7 +119,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
     public void detectAndSendChanges() {
         this.standardDetectAndSendChanges();
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.maxProcessingTime = this.ti.getMaxProcessingTime();
             this.processingTime = this.ti.getProcessingTime();
         }

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

@@ -52,6 +52,7 @@ 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;
@@ -87,7 +88,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
     public InterfaceTerminalContainer(int id, final PlayerInventory ip, final InterfaceTerminalPart anchor) {
         super(TYPE, id, ip, anchor);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.grid = anchor.getActionableNode().getGrid();
         }
 
@@ -96,7 +97,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
 
     @Override
     public void detectAndSendChanges() {
-        if (isClient()) {
+        if (Platform.isClient()) {
             return;
         }
 

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

@@ -22,6 +22,8 @@ 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;
@@ -30,13 +32,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 {
 
@@ -46,46 +48,38 @@ 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, (host, container, buffer) -> {
+        return helper.fromNetwork(windowId, inv, buf);
-            container.reportingValue = buffer.readVarLong();
-        });
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator, (host, buffer) -> {
+        return helper.open(player, locator);
-            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;
     }
 
-    public long getReportingValue() {
+    @OnlyIn(Dist.CLIENT)
-        return reportingValue;
+    public void setTextField(final NumberEntryWidget level) {
+        this.textField = level;
+        this.textField.setValue(this.EmitterValue);
     }
 
-    public void setReportingValue(long reportingValue) {
+    public void setLevel(final long l, final PlayerEntity player) {
-        if (isClient()) {
+        this.lvlEmitter.setReportingValue(l);
-            if (reportingValue != this.reportingValue) {
+        this.EmitterValue = l;
-                this.reportingValue = reportingValue;
-                NetworkHandler.instance()
-                        .sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(reportingValue)));
-            }
-        } else {
-            this.lvlEmitter.setReportingValue(reportingValue);
-        }
     }
 
     @Override
@@ -121,6 +115,7 @@ public class LevelEmitterContainer extends UpgradeableContainer {
 
     @Override
     public int availableUpgrades() {
+
         return 1;
     }
 
@@ -128,7 +123,8 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
+            this.EmitterValue = this.lvlEmitter.getReportingValue();
             this.setCraftingMode(
                     (YesNo) this.getUpgradeable().getConfigManager().getSetting(Settings.CRAFT_VIA_REDSTONE));
             this.setLevelMode((LevelType) this.getUpgradeable().getConfigManager().getSetting(Settings.LEVEL_TYPE));
@@ -140,6 +136,15 @@ 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;
@@ -157,5 +162,4 @@ public class LevelEmitterContainer extends UpgradeableContainer {
     private void setLevelMode(final LevelType lvType) {
         this.lvType = lvType;
     }
-
 }

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

@@ -46,8 +46,6 @@ import appeng.api.implementations.tiles.IViewCellStorage;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.IActionHost;
@@ -75,6 +73,7 @@ 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> {
@@ -102,13 +101,6 @@ public class MEMonitorableContainer extends AEBaseContainer
     public boolean canAccessViewCells = false;
     @GuiSync(98)
     public boolean hasPower = false;
-    /**
-     * The number of active crafting jobs in the network. -1 means unknown and will
-     * hide the label on the screen.
-     */
-    @GuiSync(100)
-    public int activeCraftingJobs = -1;
-
     private IConfigManagerHost gui;
     private IConfigManager serverCM;
     private IGridNode networkNode;
@@ -130,7 +122,7 @@ public class MEMonitorableContainer extends AEBaseContainer
         this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
         this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.serverCM = monitorable.getConfigManager();
 
             this.monitor = monitorable
@@ -191,14 +183,12 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             if (this.monitor != this.host
                     .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))) {
                 this.setValidContainer(false);
             }
 
-            this.updateActiveCraftingJobs();
-
             for (final Settings set : this.serverCM.getSettings()) {
                 final Enum<?> sideLocal = this.serverCM.getSetting(set);
                 final Enum<?> sideRemote = this.clientCM.getSetting(set);
@@ -296,38 +286,8 @@ public class MEMonitorableContainer extends AEBaseContainer
         this.queueInventory(c);
     }
 
-    private void updateActiveCraftingJobs() {
-        IGridNode hostNode = networkNode;
-        if (hostNode == null) {
-            // Wireless terminals do not directly expose the target grid (even though they
-            // have one)
-            if (host instanceof IActionHost) {
-                hostNode = ((IActionHost) host).getActionableNode();
-            }
-        }
-        IGrid grid = null;
-        if (hostNode != null) {
-            grid = hostNode.getGrid();
-        }
-
-        if (grid == null) {
-            // No grid to query crafting jobs from
-            this.activeCraftingJobs = -1;
-            return;
-        }
-
-        int activeJobs = 0;
-        ICraftingGrid craftingGrid = grid.getCache(ICraftingGrid.class);
-        for (ICraftingCPU cpus : craftingGrid.getCpus()) {
-            if (cpus.isBusy()) {
-                activeJobs++;
-            }
-        }
-        this.activeCraftingJobs = activeJobs;
-    }
-
     private void queueInventory(final IContainerListener c) {
-        if (isServer() && c instanceof PlayerEntity && this.monitor != null) {
+        if (Platform.isServer() && c instanceof PlayerEntity && this.monitor != null) {
             try {
                 MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket();
                 final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
@@ -396,7 +356,7 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     @Override
     public IConfigManager getConfigManager() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             return this.serverCM;
         }
         return this.clientCM;